diff --git a/PROMS/DataLoader/frmLoader.Designer.cs b/PROMS/DataLoader/frmLoader.Designer.cs index 0bec7b11..f71463ff 100644 --- a/PROMS/DataLoader/frmLoader.Designer.cs +++ b/PROMS/DataLoader/frmLoader.Designer.cs @@ -66,7 +66,7 @@ namespace DataLoader // this.sc.Dock = System.Windows.Forms.DockStyle.Fill; this.sc.Location = new System.Drawing.Point(0, 0); - this.sc.Margin = new System.Windows.Forms.Padding(2); + this.sc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.sc.Name = "sc"; this.sc.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -99,16 +99,16 @@ namespace DataLoader // sc.Panel2 // this.sc.Panel2.Controls.Add(this.tv); - this.sc.Size = new System.Drawing.Size(623, 413); - this.sc.SplitterDistance = 190; - this.sc.SplitterWidth = 3; + this.sc.Size = new System.Drawing.Size(829, 506); + this.sc.SplitterDistance = 232; this.sc.TabIndex = 46; // // btnCtTok // - this.btnCtTok.Location = new System.Drawing.Point(482, 0); + this.btnCtTok.Location = new System.Drawing.Point(643, 0); + this.btnCtTok.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnCtTok.Name = "btnCtTok"; - this.btnCtTok.Size = new System.Drawing.Size(96, 20); + this.btnCtTok.Size = new System.Drawing.Size(128, 25); this.btnCtTok.TabIndex = 70; this.btnCtTok.Text = "Count Tokens"; this.btnCtTok.UseVisualStyleBackColor = true; @@ -116,9 +116,10 @@ namespace DataLoader // // btnGroup // - this.btnGroup.Location = new System.Drawing.Point(387, -3); + this.btnGroup.Location = new System.Drawing.Point(516, -4); + this.btnGroup.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnGroup.Name = "btnGroup"; - this.btnGroup.Size = new System.Drawing.Size(89, 23); + this.btnGroup.Size = new System.Drawing.Size(119, 28); this.btnGroup.TabIndex = 69; this.btnGroup.Text = "Group/Security"; this.btnGroup.UseVisualStyleBackColor = true; @@ -126,9 +127,10 @@ namespace DataLoader // // btnVETree_CSLA // - this.btnVETree_CSLA.Location = new System.Drawing.Point(248, -1); + this.btnVETree_CSLA.Location = new System.Drawing.Point(331, -1); + this.btnVETree_CSLA.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnVETree_CSLA.Name = "btnVETree_CSLA"; - this.btnVETree_CSLA.Size = new System.Drawing.Size(133, 21); + this.btnVETree_CSLA.Size = new System.Drawing.Size(177, 26); this.btnVETree_CSLA.TabIndex = 68; this.btnVETree_CSLA.Text = "Load VETree from CSLA"; this.btnVETree_CSLA.UseVisualStyleBackColor = true; @@ -136,10 +138,10 @@ namespace DataLoader // // btnBrowseVesam // - this.btnBrowseVesam.Location = new System.Drawing.Point(479, 26); - this.btnBrowseVesam.Margin = new System.Windows.Forms.Padding(2); + this.btnBrowseVesam.Location = new System.Drawing.Point(639, 32); + this.btnBrowseVesam.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnBrowseVesam.Name = "btnBrowseVesam"; - this.btnBrowseVesam.Size = new System.Drawing.Size(119, 19); + this.btnBrowseVesam.Size = new System.Drawing.Size(159, 23); this.btnBrowseVesam.TabIndex = 67; this.btnBrowseVesam.Text = "Browse for Vesam..."; this.btnBrowseVesam.UseVisualStyleBackColor = true; @@ -147,17 +149,19 @@ namespace DataLoader // // tbVesamPath // - this.tbVesamPath.Location = new System.Drawing.Point(114, 26); + this.tbVesamPath.Location = new System.Drawing.Point(152, 32); + this.tbVesamPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tbVesamPath.Name = "tbVesamPath"; - this.tbVesamPath.Size = new System.Drawing.Size(353, 20); + this.tbVesamPath.Size = new System.Drawing.Size(469, 22); this.tbVesamPath.TabIndex = 66; this.tbVesamPath.Text = "e:\\ve-proms\\vesam.opt"; // // btnVesam // - this.btnVesam.Location = new System.Drawing.Point(2, 24); + this.btnVesam.Location = new System.Drawing.Point(3, 30); + this.btnVesam.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnVesam.Name = "btnVesam"; - this.btnVesam.Size = new System.Drawing.Size(108, 21); + this.btnVesam.Size = new System.Drawing.Size(144, 26); this.btnVesam.TabIndex = 65; this.btnVesam.Text = "Convert Security"; this.btnVesam.UseVisualStyleBackColor = true; @@ -165,9 +169,10 @@ namespace DataLoader // // btnLoadTreeCSLA // - this.btnLoadTreeCSLA.Location = new System.Drawing.Point(123, 0); + this.btnLoadTreeCSLA.Location = new System.Drawing.Point(164, 0); + this.btnLoadTreeCSLA.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnLoadTreeCSLA.Name = "btnLoadTreeCSLA"; - this.btnLoadTreeCSLA.Size = new System.Drawing.Size(119, 20); + this.btnLoadTreeCSLA.Size = new System.Drawing.Size(159, 25); this.btnLoadTreeCSLA.TabIndex = 64; this.btnLoadTreeCSLA.Text = "Load Tree from CSLA"; this.btnLoadTreeCSLA.UseVisualStyleBackColor = true; @@ -178,20 +183,20 @@ namespace DataLoader this.cbLazy.AutoSize = true; this.cbLazy.Checked = true; this.cbLazy.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbLazy.Location = new System.Drawing.Point(478, 142); - this.cbLazy.Margin = new System.Windows.Forms.Padding(2); + this.cbLazy.Location = new System.Drawing.Point(637, 175); + this.cbLazy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbLazy.Name = "cbLazy"; - this.cbLazy.Size = new System.Drawing.Size(75, 17); + this.cbLazy.Size = new System.Drawing.Size(96, 21); this.cbLazy.TabIndex = 63; this.cbLazy.Text = "Lazy Load"; this.cbLazy.UseVisualStyleBackColor = true; // // btnConvertSelected // - this.btnConvertSelected.Location = new System.Drawing.Point(2, 166); - this.btnConvertSelected.Margin = new System.Windows.Forms.Padding(2); + this.btnConvertSelected.Location = new System.Drawing.Point(3, 204); + this.btnConvertSelected.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnConvertSelected.Name = "btnConvertSelected"; - this.btnConvertSelected.Size = new System.Drawing.Size(160, 19); + this.btnConvertSelected.Size = new System.Drawing.Size(213, 23); this.btnConvertSelected.TabIndex = 62; this.btnConvertSelected.Text = "Convert Dbf Selected In Tree"; this.btnConvertSelected.UseVisualStyleBackColor = true; @@ -200,9 +205,9 @@ namespace DataLoader // btnLoadTreeDB // this.btnLoadTreeDB.Location = new System.Drawing.Point(0, 0); - this.btnLoadTreeDB.Margin = new System.Windows.Forms.Padding(2); + this.btnLoadTreeDB.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnLoadTreeDB.Name = "btnLoadTreeDB"; - this.btnLoadTreeDB.Size = new System.Drawing.Size(118, 19); + this.btnLoadTreeDB.Size = new System.Drawing.Size(157, 23); this.btnLoadTreeDB.TabIndex = 60; this.btnLoadTreeDB.Text = "Convert Top Folders"; this.btnLoadTreeDB.UseVisualStyleBackColor = true; @@ -213,10 +218,10 @@ namespace DataLoader this.cbPurgeData.AutoSize = true; this.cbPurgeData.Checked = true; this.cbPurgeData.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbPurgeData.Location = new System.Drawing.Point(478, 121); - this.cbPurgeData.Margin = new System.Windows.Forms.Padding(2); + this.cbPurgeData.Location = new System.Drawing.Point(637, 149); + this.cbPurgeData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbPurgeData.Name = "cbPurgeData"; - this.cbPurgeData.Size = new System.Drawing.Size(119, 17); + this.cbPurgeData.Size = new System.Drawing.Size(154, 21); this.cbPurgeData.TabIndex = 59; this.cbPurgeData.Text = "Purge Existing Data"; this.cbPurgeData.UseVisualStyleBackColor = true; @@ -224,34 +229,33 @@ namespace DataLoader // lblTime // this.lblTime.BackColor = System.Drawing.SystemColors.ButtonShadow; - this.lblTime.Location = new System.Drawing.Point(70, 135); - this.lblTime.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblTime.Location = new System.Drawing.Point(93, 166); this.lblTime.Name = "lblTime"; - this.lblTime.Size = new System.Drawing.Size(84, 20); + this.lblTime.Size = new System.Drawing.Size(112, 25); this.lblTime.TabIndex = 58; // // pbStep // - this.pbStep.Location = new System.Drawing.Point(160, 119); - this.pbStep.Margin = new System.Windows.Forms.Padding(2); + this.pbStep.Location = new System.Drawing.Point(213, 146); + this.pbStep.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pbStep.Name = "pbStep"; - this.pbStep.Size = new System.Drawing.Size(308, 15); + this.pbStep.Size = new System.Drawing.Size(411, 18); this.pbStep.TabIndex = 57; // // pbSect // - this.pbSect.Location = new System.Drawing.Point(160, 99); - this.pbSect.Margin = new System.Windows.Forms.Padding(2); + this.pbSect.Location = new System.Drawing.Point(213, 122); + this.pbSect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pbSect.Name = "pbSect"; - this.pbSect.Size = new System.Drawing.Size(307, 15); + this.pbSect.Size = new System.Drawing.Size(409, 18); this.pbSect.TabIndex = 56; // // pbProc // - this.pbProc.Location = new System.Drawing.Point(160, 80); - this.pbProc.Margin = new System.Windows.Forms.Padding(2); + this.pbProc.Location = new System.Drawing.Point(213, 98); + this.pbProc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pbProc.Name = "pbProc"; - this.pbProc.Size = new System.Drawing.Size(308, 15); + this.pbProc.Size = new System.Drawing.Size(411, 18); this.pbProc.TabIndex = 55; // // cbSaveDoc @@ -259,10 +263,10 @@ namespace DataLoader this.cbSaveDoc.AutoSize = true; this.cbSaveDoc.Checked = true; this.cbSaveDoc.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbSaveDoc.Location = new System.Drawing.Point(479, 80); - this.cbSaveDoc.Margin = new System.Windows.Forms.Padding(2); + this.cbSaveDoc.Location = new System.Drawing.Point(639, 98); + this.cbSaveDoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbSaveDoc.Name = "cbSaveDoc"; - this.cbSaveDoc.Size = new System.Drawing.Size(77, 17); + this.cbSaveDoc.Size = new System.Drawing.Size(96, 21); this.cbSaveDoc.TabIndex = 54; this.cbSaveDoc.Text = "Save DOC"; this.cbSaveDoc.UseVisualStyleBackColor = true; @@ -271,10 +275,10 @@ namespace DataLoader // cbSaveRTF // this.cbSaveRTF.AutoSize = true; - this.cbSaveRTF.Location = new System.Drawing.Point(479, 100); - this.cbSaveRTF.Margin = new System.Windows.Forms.Padding(2); + this.cbSaveRTF.Location = new System.Drawing.Point(639, 123); + this.cbSaveRTF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbSaveRTF.Name = "cbSaveRTF"; - this.cbSaveRTF.Size = new System.Drawing.Size(75, 17); + this.cbSaveRTF.Size = new System.Drawing.Size(93, 21); this.cbSaveRTF.TabIndex = 53; this.cbSaveRTF.Text = "Save RTF"; this.cbSaveRTF.UseVisualStyleBackColor = true; @@ -282,10 +286,10 @@ namespace DataLoader // // btnBrowse // - this.btnBrowse.Location = new System.Drawing.Point(479, 53); - this.btnBrowse.Margin = new System.Windows.Forms.Padding(2); + this.btnBrowse.Location = new System.Drawing.Point(639, 65); + this.btnBrowse.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnBrowse.Name = "btnBrowse"; - this.btnBrowse.Size = new System.Drawing.Size(56, 19); + this.btnBrowse.Size = new System.Drawing.Size(75, 23); this.btnBrowse.TabIndex = 52; this.btnBrowse.Text = "Browse..."; this.btnBrowse.UseVisualStyleBackColor = true; @@ -293,10 +297,10 @@ namespace DataLoader // // tbSource // - this.tbSource.Location = new System.Drawing.Point(71, 53); - this.tbSource.Margin = new System.Windows.Forms.Padding(2); + this.tbSource.Location = new System.Drawing.Point(95, 65); + this.tbSource.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tbSource.Name = "tbSource"; - this.tbSource.Size = new System.Drawing.Size(397, 20); + this.tbSource.Size = new System.Drawing.Size(528, 22); this.tbSource.TabIndex = 51; this.tbSource.Text = "i:\\vedata\\vewcnfp\\fp.prc"; this.tbSource.TextChanged += new System.EventHandler(this.tbSource_TextChanged); @@ -304,36 +308,33 @@ namespace DataLoader // lblStep // this.lblStep.BackColor = System.Drawing.SystemColors.ButtonShadow; - this.lblStep.Location = new System.Drawing.Point(70, 115); - this.lblStep.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblStep.Location = new System.Drawing.Point(93, 142); this.lblStep.Name = "lblStep"; - this.lblStep.Size = new System.Drawing.Size(84, 20); + this.lblStep.Size = new System.Drawing.Size(112, 25); this.lblStep.TabIndex = 49; // // lblSection // this.lblSection.BackColor = System.Drawing.SystemColors.ButtonShadow; - this.lblSection.Location = new System.Drawing.Point(70, 96); - this.lblSection.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblSection.Location = new System.Drawing.Point(93, 118); this.lblSection.Name = "lblSection"; - this.lblSection.Size = new System.Drawing.Size(84, 19); + this.lblSection.Size = new System.Drawing.Size(112, 23); this.lblSection.TabIndex = 48; // // lblProc // this.lblProc.BackColor = System.Drawing.SystemColors.ButtonShadow; - this.lblProc.Location = new System.Drawing.Point(70, 77); - this.lblProc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblProc.Location = new System.Drawing.Point(93, 95); this.lblProc.Name = "lblProc"; - this.lblProc.Size = new System.Drawing.Size(84, 19); + this.lblProc.Size = new System.Drawing.Size(112, 23); this.lblProc.TabIndex = 47; // // btnConvert // - this.btnConvert.Location = new System.Drawing.Point(2, 54); - this.btnConvert.Margin = new System.Windows.Forms.Padding(2); + this.btnConvert.Location = new System.Drawing.Point(3, 66); + this.btnConvert.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnConvert.Name = "btnConvert"; - this.btnConvert.Size = new System.Drawing.Size(56, 40); + this.btnConvert.Size = new System.Drawing.Size(75, 49); this.btnConvert.TabIndex = 46; this.btnConvert.Text = "Convert Dbf"; this.btnConvert.Click += new System.EventHandler(this.btnConvert_Click); @@ -342,10 +343,10 @@ namespace DataLoader // this.tv.CheckBoxes = true; this.tv.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tv.Location = new System.Drawing.Point(0, -4); - this.tv.Margin = new System.Windows.Forms.Padding(2); + this.tv.Location = new System.Drawing.Point(0, -5); + this.tv.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tv.Name = "tv"; - this.tv.Size = new System.Drawing.Size(623, 224); + this.tv.Size = new System.Drawing.Size(829, 275); this.tv.TabIndex = 24; this.tv.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.tv_BeforeExpand); this.tv.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tv_AfterSelect); @@ -354,30 +355,31 @@ namespace DataLoader // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabel1}); - this.statusStrip1.Location = new System.Drawing.Point(0, 391); + this.statusStrip1.Location = new System.Drawing.Point(0, 483); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(623, 22); + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0); + this.statusStrip1.Size = new System.Drawing.Size(829, 23); this.statusStrip1.TabIndex = 47; this.statusStrip1.Text = "statusStrip1"; // // toolStripStatusLabel1 // this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(97, 17); + this.toolStripStatusLabel1.Size = new System.Drawing.Size(130, 18); this.toolStripStatusLabel1.Text = "Status Information"; // // frmLoader // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(623, 413); + this.ClientSize = new System.Drawing.Size(829, 506); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.sc); - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "frmLoader"; this.Text = "frmLoader"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmLoader_FormClosing); this.Load += new System.EventHandler(this.frmLoader_Load); + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmLoader_FormClosing); this.sc.Panel1.ResumeLayout(false); this.sc.Panel1.PerformLayout(); this.sc.Panel2.ResumeLayout(false); diff --git a/PROMS/DataLoader/frmLoader.cs b/PROMS/DataLoader/frmLoader.cs index 9fcec177..fbc2b995 100644 --- a/PROMS/DataLoader/frmLoader.cs +++ b/PROMS/DataLoader/frmLoader.cs @@ -80,6 +80,9 @@ namespace DataLoader //tbSource.Text = @"I:\UNZIPPED ACTIVE BASELINE DATA\vehlp\Procs"; // Sub-sections tbSource.Text = @"I:\veDATA\vehlp\Procs"; // Sub-sections break; + case "JOHN": + tbSource.Text = "G:\\PROMSDAT\\vehlp\\procs";// South Texas EOPS + break; default: throw new Exception("Not configured for " + SystemInformation.ComputerName); } @@ -181,21 +184,25 @@ namespace DataLoader success=ldr.LoadFolders(); if (success) success = ldr.LoadSecurity(tbVesamPath.Text); } - if (success) - { - DateTime tstart = DateTime.Now; - DocVersionInfoList vl = DocVersionInfoList.Get(); - DocVersion v = null; - foreach (DocVersionInfo vi in vl) + if (success) { - if (vi.Title.ToUpper() == tbSource.Text.ToUpper()) + DateTime tstart = DateTime.Now; + DocVersionInfoList vl = DocVersionInfoList.Get(); + DocVersion v = null; + foreach (DocVersionInfo vi in vl) { - v = DocVersion.Get(vi.VersionID); - Item itm = ldr.MigrateDocVersion(v); + if (vi.Title.ToUpper() == tbSource.Text.ToUpper()) // is this the procedure set we want to convert? + { + v = DocVersion.Get(vi.VersionID); + Item itm = ldr.MigrateDocVersion(v, true); + } + //v = DocVersion.Get(vi.VersionID); + //bool convertProcedures = (vi.Title.ToUpper() == tbSource.Text.ToUpper()); + //Item itm = ldr.MigrateDocVersion(v, convertProcedures); + } + MessageBox.Show(string.Format("{0} seconds", TimeSpan.FromTicks(DateTime.Now.Ticks - tstart.Ticks).TotalSeconds)); } - MessageBox.Show(string.Format("{0} seconds",TimeSpan.FromTicks(DateTime.Now.Ticks-tstart.Ticks).TotalSeconds)); - } } public void UpdateLabels(int incPrc, int incSec, int incStp) {