From da310f2436d6ac011784963606ef5d7413411203 Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 16 Sep 2009 16:12:11 +0000 Subject: [PATCH] Added checkbox to limit data loading to Format. --- PROMS/DataLoader/frmLoader.Designer.cs | 203 +++++++++++++------------ PROMS/DataLoader/frmLoader.cs | 19 ++- 2 files changed, 120 insertions(+), 102 deletions(-) diff --git a/PROMS/DataLoader/frmLoader.Designer.cs b/PROMS/DataLoader/frmLoader.Designer.cs index 22574d06..777568c1 100644 --- a/PROMS/DataLoader/frmLoader.Designer.cs +++ b/PROMS/DataLoader/frmLoader.Designer.cs @@ -30,6 +30,8 @@ namespace DataLoader private void InitializeComponent() { this.sc = new System.Windows.Forms.SplitContainer(); + this.btnBrowseVeProms = new System.Windows.Forms.Button(); + this.tbVePromsPath = new System.Windows.Forms.TextBox(); this.btnCtTok = new System.Windows.Forms.Button(); this.btnGroup = new System.Windows.Forms.Button(); this.btnVETree_CSLA = new System.Windows.Forms.Button(); @@ -57,8 +59,7 @@ namespace DataLoader this.fbd = new System.Windows.Forms.FolderBrowserDialog(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); - this.tbVePromsPath = new System.Windows.Forms.TextBox(); - this.btnBrowseVeProms = new System.Windows.Forms.Button(); + this.cbFormatsOnly = new System.Windows.Forms.CheckBox(); this.sc.Panel1.SuspendLayout(); this.sc.Panel2.SuspendLayout(); this.sc.SuspendLayout(); @@ -69,12 +70,13 @@ 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(3, 2, 3, 2); + this.sc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.sc.Name = "sc"; this.sc.Orientation = System.Windows.Forms.Orientation.Horizontal; // // sc.Panel1 // + this.sc.Panel1.Controls.Add(this.cbFormatsOnly); this.sc.Panel1.Controls.Add(this.btnBrowseVeProms); this.sc.Panel1.Controls.Add(this.tbVePromsPath); this.sc.Panel1.Controls.Add(this.btnCtTok); @@ -104,16 +106,35 @@ namespace DataLoader // sc.Panel2 // this.sc.Panel2.Controls.Add(this.tv); - this.sc.Size = new System.Drawing.Size(829, 542); - this.sc.SplitterDistance = 272; + this.sc.Size = new System.Drawing.Size(622, 440); + this.sc.SplitterDistance = 220; + this.sc.SplitterWidth = 3; this.sc.TabIndex = 46; // + // btnBrowseVeProms + // + this.btnBrowseVeProms.Location = new System.Drawing.Point(478, 29); + this.btnBrowseVeProms.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnBrowseVeProms.Name = "btnBrowseVeProms"; + this.btnBrowseVeProms.Size = new System.Drawing.Size(119, 19); + this.btnBrowseVeProms.TabIndex = 72; + this.btnBrowseVeProms.Text = "Browse for VeProms..."; + this.btnBrowseVeProms.UseVisualStyleBackColor = true; + this.btnBrowseVeProms.Click += new System.EventHandler(this.btnBrowseVeProms_Click); + // + // tbVePromsPath + // + this.tbVePromsPath.Location = new System.Drawing.Point(2, 29); + this.tbVePromsPath.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbVePromsPath.Name = "tbVePromsPath"; + this.tbVePromsPath.Size = new System.Drawing.Size(464, 20); + this.tbVePromsPath.TabIndex = 71; + // // btnCtTok // - this.btnCtTok.Location = new System.Drawing.Point(643, 0); - this.btnCtTok.Margin = new System.Windows.Forms.Padding(4); + this.btnCtTok.Location = new System.Drawing.Point(482, 0); this.btnCtTok.Name = "btnCtTok"; - this.btnCtTok.Size = new System.Drawing.Size(128, 25); + this.btnCtTok.Size = new System.Drawing.Size(96, 20); this.btnCtTok.TabIndex = 70; this.btnCtTok.Text = "Count Tokens"; this.btnCtTok.UseVisualStyleBackColor = true; @@ -121,10 +142,9 @@ namespace DataLoader // // btnGroup // - this.btnGroup.Location = new System.Drawing.Point(516, -4); - this.btnGroup.Margin = new System.Windows.Forms.Padding(4); + this.btnGroup.Location = new System.Drawing.Point(387, -3); this.btnGroup.Name = "btnGroup"; - this.btnGroup.Size = new System.Drawing.Size(119, 28); + this.btnGroup.Size = new System.Drawing.Size(89, 23); this.btnGroup.TabIndex = 69; this.btnGroup.Text = "Group/Security"; this.btnGroup.UseVisualStyleBackColor = true; @@ -132,10 +152,9 @@ namespace DataLoader // // btnVETree_CSLA // - this.btnVETree_CSLA.Location = new System.Drawing.Point(331, -1); - this.btnVETree_CSLA.Margin = new System.Windows.Forms.Padding(4); + this.btnVETree_CSLA.Location = new System.Drawing.Point(248, -1); this.btnVETree_CSLA.Name = "btnVETree_CSLA"; - this.btnVETree_CSLA.Size = new System.Drawing.Size(177, 26); + this.btnVETree_CSLA.Size = new System.Drawing.Size(133, 21); this.btnVETree_CSLA.TabIndex = 68; this.btnVETree_CSLA.Text = "Load VETree from CSLA"; this.btnVETree_CSLA.UseVisualStyleBackColor = true; @@ -143,10 +162,10 @@ namespace DataLoader // // btnBrowseVesam // - this.btnBrowseVesam.Location = new System.Drawing.Point(638, 71); - this.btnBrowseVesam.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnBrowseVesam.Location = new System.Drawing.Point(478, 58); + this.btnBrowseVesam.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnBrowseVesam.Name = "btnBrowseVesam"; - this.btnBrowseVesam.Size = new System.Drawing.Size(159, 23); + this.btnBrowseVesam.Size = new System.Drawing.Size(119, 19); this.btnBrowseVesam.TabIndex = 67; this.btnBrowseVesam.Text = "Browse for Vesam..."; this.btnBrowseVesam.UseVisualStyleBackColor = true; @@ -154,19 +173,17 @@ namespace DataLoader // // tbVesamPath // - this.tbVesamPath.Location = new System.Drawing.Point(151, 71); - this.tbVesamPath.Margin = new System.Windows.Forms.Padding(4); + this.tbVesamPath.Location = new System.Drawing.Point(113, 58); this.tbVesamPath.Name = "tbVesamPath"; - this.tbVesamPath.Size = new System.Drawing.Size(469, 22); + this.tbVesamPath.Size = new System.Drawing.Size(353, 20); this.tbVesamPath.TabIndex = 66; this.tbVesamPath.Text = "C:\\16bit\\Ve-proms\\vesam.opt"; // // btnVesam // - this.btnVesam.Location = new System.Drawing.Point(2, 69); - this.btnVesam.Margin = new System.Windows.Forms.Padding(4); + this.btnVesam.Location = new System.Drawing.Point(2, 56); this.btnVesam.Name = "btnVesam"; - this.btnVesam.Size = new System.Drawing.Size(144, 26); + this.btnVesam.Size = new System.Drawing.Size(108, 21); this.btnVesam.TabIndex = 65; this.btnVesam.Text = "Convert Security"; this.btnVesam.UseVisualStyleBackColor = true; @@ -174,10 +191,9 @@ namespace DataLoader // // btnLoadTreeCSLA // - this.btnLoadTreeCSLA.Location = new System.Drawing.Point(164, 0); - this.btnLoadTreeCSLA.Margin = new System.Windows.Forms.Padding(4); + this.btnLoadTreeCSLA.Location = new System.Drawing.Point(123, 0); this.btnLoadTreeCSLA.Name = "btnLoadTreeCSLA"; - this.btnLoadTreeCSLA.Size = new System.Drawing.Size(159, 25); + this.btnLoadTreeCSLA.Size = new System.Drawing.Size(119, 20); this.btnLoadTreeCSLA.TabIndex = 64; this.btnLoadTreeCSLA.Text = "Load Tree from CSLA"; this.btnLoadTreeCSLA.UseVisualStyleBackColor = true; @@ -188,20 +204,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(636, 214); - this.cbLazy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbLazy.Location = new System.Drawing.Point(477, 174); + this.cbLazy.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbLazy.Name = "cbLazy"; - this.cbLazy.Size = new System.Drawing.Size(96, 21); + this.cbLazy.Size = new System.Drawing.Size(75, 17); this.cbLazy.TabIndex = 63; this.cbLazy.Text = "Lazy Load"; this.cbLazy.UseVisualStyleBackColor = true; // // btnConvertSelected // - this.btnConvertSelected.Location = new System.Drawing.Point(2, 243); - this.btnConvertSelected.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnConvertSelected.Location = new System.Drawing.Point(2, 197); + this.btnConvertSelected.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnConvertSelected.Name = "btnConvertSelected"; - this.btnConvertSelected.Size = new System.Drawing.Size(213, 23); + this.btnConvertSelected.Size = new System.Drawing.Size(160, 19); this.btnConvertSelected.TabIndex = 62; this.btnConvertSelected.Text = "Convert Dbf Selected In Tree"; this.btnConvertSelected.UseVisualStyleBackColor = true; @@ -210,9 +226,9 @@ namespace DataLoader // btnLoadTreeDB // this.btnLoadTreeDB.Location = new System.Drawing.Point(0, 0); - this.btnLoadTreeDB.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnLoadTreeDB.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnLoadTreeDB.Name = "btnLoadTreeDB"; - this.btnLoadTreeDB.Size = new System.Drawing.Size(157, 23); + this.btnLoadTreeDB.Size = new System.Drawing.Size(118, 19); this.btnLoadTreeDB.TabIndex = 60; this.btnLoadTreeDB.Text = "Convert Top Folders"; this.btnLoadTreeDB.UseVisualStyleBackColor = true; @@ -223,10 +239,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(636, 188); - this.cbPurgeData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbPurgeData.Location = new System.Drawing.Point(477, 153); + this.cbPurgeData.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbPurgeData.Name = "cbPurgeData"; - this.cbPurgeData.Size = new System.Drawing.Size(154, 21); + this.cbPurgeData.Size = new System.Drawing.Size(119, 17); this.cbPurgeData.TabIndex = 59; this.cbPurgeData.Text = "Purge Existing Data"; this.cbPurgeData.UseVisualStyleBackColor = true; @@ -234,33 +250,34 @@ namespace DataLoader // lblTime // this.lblTime.BackColor = System.Drawing.SystemColors.ButtonShadow; - this.lblTime.Location = new System.Drawing.Point(92, 205); + this.lblTime.Location = new System.Drawing.Point(69, 167); + this.lblTime.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblTime.Name = "lblTime"; - this.lblTime.Size = new System.Drawing.Size(112, 25); + this.lblTime.Size = new System.Drawing.Size(84, 20); this.lblTime.TabIndex = 58; // // pbStep // - this.pbStep.Location = new System.Drawing.Point(212, 185); - this.pbStep.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pbStep.Location = new System.Drawing.Point(159, 150); + this.pbStep.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pbStep.Name = "pbStep"; - this.pbStep.Size = new System.Drawing.Size(411, 18); + this.pbStep.Size = new System.Drawing.Size(308, 15); this.pbStep.TabIndex = 57; // // pbSect // - this.pbSect.Location = new System.Drawing.Point(212, 161); - this.pbSect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pbSect.Location = new System.Drawing.Point(159, 131); + this.pbSect.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pbSect.Name = "pbSect"; - this.pbSect.Size = new System.Drawing.Size(409, 18); + this.pbSect.Size = new System.Drawing.Size(307, 15); this.pbSect.TabIndex = 56; // // pbProc // - this.pbProc.Location = new System.Drawing.Point(212, 137); - this.pbProc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pbProc.Location = new System.Drawing.Point(159, 111); + this.pbProc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pbProc.Name = "pbProc"; - this.pbProc.Size = new System.Drawing.Size(411, 18); + this.pbProc.Size = new System.Drawing.Size(308, 15); this.pbProc.TabIndex = 55; // // cbSaveDoc @@ -268,10 +285,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(638, 137); - this.cbSaveDoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbSaveDoc.Location = new System.Drawing.Point(478, 111); + this.cbSaveDoc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbSaveDoc.Name = "cbSaveDoc"; - this.cbSaveDoc.Size = new System.Drawing.Size(96, 21); + this.cbSaveDoc.Size = new System.Drawing.Size(77, 17); this.cbSaveDoc.TabIndex = 54; this.cbSaveDoc.Text = "Save DOC"; this.cbSaveDoc.UseVisualStyleBackColor = true; @@ -280,10 +297,10 @@ namespace DataLoader // cbSaveRTF // this.cbSaveRTF.AutoSize = true; - this.cbSaveRTF.Location = new System.Drawing.Point(638, 162); - this.cbSaveRTF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbSaveRTF.Location = new System.Drawing.Point(478, 132); + this.cbSaveRTF.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbSaveRTF.Name = "cbSaveRTF"; - this.cbSaveRTF.Size = new System.Drawing.Size(93, 21); + this.cbSaveRTF.Size = new System.Drawing.Size(75, 17); this.cbSaveRTF.TabIndex = 53; this.cbSaveRTF.Text = "Save RTF"; this.cbSaveRTF.UseVisualStyleBackColor = true; @@ -291,10 +308,10 @@ namespace DataLoader // // btnBrowse // - this.btnBrowse.Location = new System.Drawing.Point(638, 104); - this.btnBrowse.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnBrowse.Location = new System.Drawing.Point(478, 84); + this.btnBrowse.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnBrowse.Name = "btnBrowse"; - this.btnBrowse.Size = new System.Drawing.Size(75, 23); + this.btnBrowse.Size = new System.Drawing.Size(56, 19); this.btnBrowse.TabIndex = 52; this.btnBrowse.Text = "Browse..."; this.btnBrowse.UseVisualStyleBackColor = true; @@ -302,10 +319,10 @@ namespace DataLoader // // tbSource // - this.tbSource.Location = new System.Drawing.Point(94, 104); - this.tbSource.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tbSource.Location = new System.Drawing.Point(70, 84); + this.tbSource.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tbSource.Name = "tbSource"; - this.tbSource.Size = new System.Drawing.Size(528, 22); + this.tbSource.Size = new System.Drawing.Size(397, 20); this.tbSource.TabIndex = 51; this.tbSource.Text = "i:\\vedata\\vewcnfp\\fp.prc"; this.tbSource.TextChanged += new System.EventHandler(this.tbSource_TextChanged); @@ -313,33 +330,36 @@ namespace DataLoader // lblStep // this.lblStep.BackColor = System.Drawing.SystemColors.ButtonShadow; - this.lblStep.Location = new System.Drawing.Point(92, 181); + this.lblStep.Location = new System.Drawing.Point(69, 147); + this.lblStep.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblStep.Name = "lblStep"; - this.lblStep.Size = new System.Drawing.Size(112, 25); + this.lblStep.Size = new System.Drawing.Size(84, 20); this.lblStep.TabIndex = 49; // // lblSection // this.lblSection.BackColor = System.Drawing.SystemColors.ButtonShadow; - this.lblSection.Location = new System.Drawing.Point(92, 157); + this.lblSection.Location = new System.Drawing.Point(69, 128); + this.lblSection.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblSection.Name = "lblSection"; - this.lblSection.Size = new System.Drawing.Size(112, 23); + this.lblSection.Size = new System.Drawing.Size(84, 19); this.lblSection.TabIndex = 48; // // lblProc // this.lblProc.BackColor = System.Drawing.SystemColors.ButtonShadow; - this.lblProc.Location = new System.Drawing.Point(92, 134); + this.lblProc.Location = new System.Drawing.Point(69, 109); + this.lblProc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblProc.Name = "lblProc"; - this.lblProc.Size = new System.Drawing.Size(112, 23); + this.lblProc.Size = new System.Drawing.Size(84, 19); this.lblProc.TabIndex = 47; // // btnConvert // - this.btnConvert.Location = new System.Drawing.Point(2, 105); - this.btnConvert.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnConvert.Location = new System.Drawing.Point(2, 85); + this.btnConvert.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnConvert.Name = "btnConvert"; - this.btnConvert.Size = new System.Drawing.Size(75, 49); + this.btnConvert.Size = new System.Drawing.Size(56, 40); this.btnConvert.TabIndex = 46; this.btnConvert.Text = "Convert Dbf"; this.btnConvert.Click += new System.EventHandler(this.btnConvert_Click); @@ -348,10 +368,10 @@ namespace DataLoader // this.tv.CheckBoxes = true; this.tv.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tv.Location = new System.Drawing.Point(0, 8); - this.tv.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tv.Location = new System.Drawing.Point(0, 7); + this.tv.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tv.Name = "tv"; - this.tv.Size = new System.Drawing.Size(829, 258); + this.tv.Size = new System.Drawing.Size(622, 210); 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); @@ -360,45 +380,37 @@ namespace DataLoader // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabel1}); - this.statusStrip1.Location = new System.Drawing.Point(0, 517); + this.statusStrip1.Location = new System.Drawing.Point(0, 418); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0); - this.statusStrip1.Size = new System.Drawing.Size(829, 25); + this.statusStrip1.Size = new System.Drawing.Size(622, 22); this.statusStrip1.TabIndex = 47; this.statusStrip1.Text = "statusStrip1"; // // toolStripStatusLabel1 // this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(131, 20); + this.toolStripStatusLabel1.Size = new System.Drawing.Size(105, 17); this.toolStripStatusLabel1.Text = "Status Information"; // - // tbVePromsPath + // cbFormatsOnly // - this.tbVePromsPath.Location = new System.Drawing.Point(3, 36); - this.tbVePromsPath.Name = "tbVePromsPath"; - this.tbVePromsPath.Size = new System.Drawing.Size(617, 22); - this.tbVePromsPath.TabIndex = 71; - // - // btnBrowseVeProms - // - this.btnBrowseVeProms.Location = new System.Drawing.Point(638, 36); - this.btnBrowseVeProms.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.btnBrowseVeProms.Name = "btnBrowseVeProms"; - this.btnBrowseVeProms.Size = new System.Drawing.Size(159, 23); - this.btnBrowseVeProms.TabIndex = 72; - this.btnBrowseVeProms.Text = "Browse for VeProms..."; - this.btnBrowseVeProms.UseVisualStyleBackColor = true; - this.btnBrowseVeProms.Click += new System.EventHandler(this.btnBrowseVeProms_Click); + this.cbFormatsOnly.AutoSize = true; + this.cbFormatsOnly.Location = new System.Drawing.Point(477, 195); + this.cbFormatsOnly.Margin = new System.Windows.Forms.Padding(2); + this.cbFormatsOnly.Name = "cbFormatsOnly"; + this.cbFormatsOnly.Size = new System.Drawing.Size(87, 17); + this.cbFormatsOnly.TabIndex = 73; + this.cbFormatsOnly.Text = "Formats Only"; + this.cbFormatsOnly.UseVisualStyleBackColor = true; // // frmLoader // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(829, 542); + this.ClientSize = new System.Drawing.Size(622, 440); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.sc); - this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "frmLoader"; this.Text = "frmLoader"; this.Load += new System.EventHandler(this.frmLoader_Load); @@ -446,5 +458,6 @@ namespace DataLoader private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; private System.Windows.Forms.Button btnBrowseVeProms; private System.Windows.Forms.TextBox tbVePromsPath; + private System.Windows.Forms.CheckBox cbFormatsOnly; } } \ No newline at end of file diff --git a/PROMS/DataLoader/frmLoader.cs b/PROMS/DataLoader/frmLoader.cs index 821a0ffa..1960fc6b 100644 --- a/PROMS/DataLoader/frmLoader.cs +++ b/PROMS/DataLoader/frmLoader.cs @@ -116,8 +116,8 @@ namespace DataLoader return; } DocVersion v = ((DocVersionInfo)o).Get(); - Item itm = ldr.MigrateDocVersion(v); - if (itm != null) + ldr.MigrateDocVersion(v); + if (v.MyItem != null) { tn.Checked = true; } @@ -138,8 +138,8 @@ namespace DataLoader return; } DocVersion v = (DocVersion)o; - Item itm = ldr.MigrateDocVersion(v); - if (itm != null) + ldr.MigrateDocVersion(v); + if (v.MyItem != null) { tn.Checked = true; } @@ -195,10 +195,15 @@ namespace DataLoader ldr.ClearData(); success = ldr.LoadFolders(tbVePromsPath.Text); if (success) success = ldr.LoadSecurity(tbVesamPath.Text, tbVePromsPath.Text); + if (cbFormatsOnly.Checked) + { + MessageBox.Show("Formats Loaded"); + return; + } } if (success) { - DateTime tstart = DateTime.Now; + TimeSpan ts = new TimeSpan(); DocVersionInfoList vl = DocVersionInfoList.Get(); DocVersion v = null; foreach (DocVersionInfo vi in vl) @@ -206,14 +211,14 @@ namespace DataLoader 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); + ts+=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", ts.TotalSeconds)); } } public void UpdateLabels(int incPrc, int incSec, int incStp)