From dffea37fadc982c166878ab55a6d2afd1991f436 Mon Sep 17 00:00:00 2001 From: Kathy Ruffing Date: Thu, 18 Apr 2024 08:36:51 -0400 Subject: [PATCH 1/5] B2023-025: AER Ro table displays too far to left --- PROMS/Volian.Controls.Library/EditItem.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index dd07f3fa..2c4bab67 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -2185,6 +2185,9 @@ namespace Volian.Controls.Library // B2017-043 account for Horizontal Scroll int colT = MyStepPanel.DisplayRectangle.X + MyStepPanel.ToDisplay((int)myStepSectionLayoutData.ColT); if (x < colT) x = colT; + // B2023-025: if x is <= 0, add 20 to it so that left column of table isn't cut-off. 20 was used because lesser numbers + // still cut-off the left column (by trial and error). + if (x <= 0) x = 20; int y = FindTop(myParentEditItem.Bottom); return new Point(x, y); } -- 2.47.2 From fccc47483f55abab334160f50e6def1210412dec Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Fri, 19 Apr 2024 09:29:36 -0400 Subject: [PATCH 2/5] C2017-033 Remove text inserted for new step from V button --- PROMS/Volian.Controls.Library/vlnTreeView.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 46282f4d..cddd4d47 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -3185,7 +3185,7 @@ namespace Volian.Controls.Library { // If parent step is open in editor, use the OnInsertItemInfo to insert step & add RTBItems to step editor panel ItemInfo ii = tn.VEObject as ItemInfo; - if (OnInsertItemInfo(this, new vlnTreeItemInfoInsertEventArgs(ii, (newtype == MenuSelections.StepAfter) ? E_InsertType.After : E_InsertType.Before, "New Step"))) + if (OnInsertItemInfo(this, new vlnTreeItemInfoInsertEventArgs(ii, (newtype == MenuSelections.StepAfter) ? E_InsertType.After : E_InsertType.Before, ""))) { tn = (VETreeNode)((newtype == MenuSelections.StepAfter) ? tn.NextNode : tn.PrevNode); } -- 2.47.2 From 0607fcf261306bbf054d6afe3b75e33f9fbe4ada Mon Sep 17 00:00:00 2001 From: John Jenko Date: Mon, 22 Apr 2024 15:43:31 -0400 Subject: [PATCH 3/5] F2024-054 F2024-055 Added a Dashed Double Spaced List and a Dashed Explicit OR sub-step type, Added "NO" to be underlined in ReplaceWords --- PROMS/Formats/fmtall/VEGP1all.xml | Bin 184770 -> 186070 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 228998 -> 230064 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index e5b180081e901be193a1b07797843d370c4873e1..31e5e27468a5c91a10f0d2a2edb91541c3a42b14 100644 GIT binary patch delta 291 zcmX@KnETpV?hT&;CpW||VD@A1pR5?8$XUve!=S(b;vM(bpT@()*8C%I`;S1z2MyD^ zRx_n8n(lCkQDeHu6~CbAz!7WT4#kj;o9txF-v+vQ1Yw z!pJfG%mPLMM$_qylNp7lS6yP{V>FsRv7b?P`i3PygL1Yps=&-pn0{s(quBIY3mK)R zi%nzXn{3A}H2uOA#ud^o4EYSD3`zK%xE<)kG{)%;u}mz}*MTe!>tPhy9`=wi=K}!e C&Sbv; delta 119 zcmV--0EqwAtqa1V3$XH0mykaK27~lcxAam0;DDEa%>fLT;?n_+9Zvvo0CWIp0B-

hb0T7dpCK8vh-~oo0faC!p Zm#*Cb5Vtzl0k8{~FscFsw@~H*hVcB(F1G*x diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index dd2ccec307383e90ef73272bb787eec24cfe533b..dadeaf2b12ec9baefe0de26080b0508f8f5f030a 100644 GIT binary patch delta 306 zcmZqs%e$eKZ^H_Q=@Wz)7cu%ze(0|_Il-EZ*^j}0y5c-W;mH&1WTx|7Vq|Mx=dgX9 z1LK#z={>s{d8X^sGfGSsxXd_fd)x)a4UE$bs)2mFON<))ehm2xB@9kLGKV3BA$9u0 zxs3AD`z|pmfHd+=*YjW&ntot8quum?Ym7b9|6OAgk%nkdKxhJLRABI6@L>p^Ubv94 ze7esS#$D4FtYU1KKJO~yG*lO~ZNGDkF^qM3!&RUapN=pJP2Y8fk&n@6dSW%B?DU2i zKmne0j3U#mZZgV1oV{T_qulhSsf<$7k906vO)t2{m;-W$61xk~(WMMY(@&md{5YNC b2IHpb0+X3oCg+)RwAmpKY|X12x36+!{L(jl!3svD=?^*?rMBO>z-Yh(mYx2kfl*+3 zLOr9@bd}4D8qC3J%+D%`O%&ai2n~`IBK@X!Hqr!AY zLng^-cY*e$U1OYra1+Svoar&Q8O^3|ILF90J?kQ)!1f>48JSq83ve*8v?n}Z+@A1& HDPR!*ZB0_o -- 2.47.2 From 20cbff0255ceec02e46116a2fa3e27e3fbb564d5 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 24 Apr 2024 11:15:31 -0400 Subject: [PATCH 4/5] F2024-056 Centered the AND and OR separators in the PROMS User Manual single column format. --- PROMS/Formats/fmtall/BASEall.xml | Bin 101344 -> 101508 bytes PROMS/Formats/fmtall/PROMSMan1all.xml | Bin 87768 -> 87878 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index 2d2705fe4b3de4fd01ccfe1e693fea03e713960e..e08cd3f3c3cf02dfd1de7f37487f80831a10d349 100644 GIT binary patch delta 110 zcmaDbovmdi+Xkz`$sX=v?1~J!K&UX;wNO=Afx!UC_F+h6NMk5r&|y$uFa+|07%~~s z88RRulcU+B#SMWnx(v=hb$LM1RE8oTP63+HI8$_T!!nl10hKJxUWMDe3K^$K0RTdl B8Ib@0 delta 22 ecmZpf$@XA6+Xkz`$uBAen%@;}e^e^a`l} diff --git a/PROMS/Formats/fmtall/PROMSMan1all.xml b/PROMS/Formats/fmtall/PROMSMan1all.xml index c0f6a855b706e97387217e8b1d50150c1e5b5d63..13a6cbb6874d5656d4d81523956c2fc128424826 100644 GIT binary patch delta 130 zcmcbymi5>=)(sr$lf7OFOm+}u3shv#1wsXeVung)ANl|Q delta 43 zcmV+`0M!4+t_9ew1+WMwld4<{k}w35h9@KeIFq4V6O+CtOp`F07K0!tw;(71CNFIB B4&?v< -- 2.47.2 From 076e0bfe8e5966dbf754ee07e9c6b89efb103eaf Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 24 Apr 2024 13:41:15 -0400 Subject: [PATCH 5/5] C2023-006 Add time / eidt time to showing change bars. --- .../dlgSetChangeBarStartDate.Designer.cs | 10 ++--- .../dlgSetChangeBarStartDate.cs | 39 +++++++++++++++++-- .../dlgSetChangeBarStartDate.resx | 6 +-- 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.Designer.cs b/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.Designer.cs index b75465e7..9f87e261 100644 --- a/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.Designer.cs +++ b/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.Designer.cs @@ -57,7 +57,7 @@ this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(165, 111); + this.btnCancel.Location = new System.Drawing.Point(179, 111); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(64, 23); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -88,7 +88,7 @@ this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; this.dateTimeInput1.ButtonDropDown.Visible = true; - this.dateTimeInput1.CustomFormat = "MM/dd/yyyy"; + this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss"; this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector; this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom; this.dateTimeInput1.IsPopupCalendarOpen = false; @@ -122,7 +122,7 @@ this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true; this.dateTimeInput1.Name = "dateTimeInput1"; - this.dateTimeInput1.Size = new System.Drawing.Size(113, 20); + this.dateTimeInput1.Size = new System.Drawing.Size(146, 20); this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.dateTimeInput1, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar Start Date", "", "Only the changes made after this date will have change bars.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(138, 67))); this.dateTimeInput1.TabIndex = 4; @@ -133,7 +133,7 @@ // this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnNow.Location = new System.Drawing.Point(149, 51); + this.btnNow.Location = new System.Drawing.Point(182, 51); this.btnNow.Name = "btnNow"; this.btnNow.Size = new System.Drawing.Size(49, 23); this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -146,7 +146,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(241, 144); + this.ClientSize = new System.Drawing.Size(268, 144); this.Controls.Add(this.btnNow); this.Controls.Add(this.dateTimeInput1); this.Controls.Add(this.label1); diff --git a/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs b/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs index a5ad609f..ba10dfbf 100644 --- a/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs +++ b/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs @@ -32,13 +32,46 @@ namespace VEPROMS { string cbdt = MyProcConfig.Print_ChangeBarDate; string[] tmp = cbdt.Split(' '); - cbdt = tmp[0] + " 00:00:00"; - dateTimeInput1.Value = (cbdt == null || cbdt == "") ? DateTime.Now : DateTime.Parse(cbdt); + + if (tmp[0] == null || tmp[0] == "") // First time date set. + { + cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + DateTime.Now.ToString("HH:mm:ss"); + dateTimeInput1.Value = DateTime.Parse(cbdt); + return; + } + else + { + DateTime tmpdt = DateTime.Parse(cbdt); + if (tmpdt.Date == DateTime.Today) // Date has before been set. + { + TimeSpan start = TimeSpan.Parse("00:00:00"); + + var time = tmpdt.TimeOfDay; + if (start < time) // If time is greater than 12:00:00 AM + { + cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + tmpdt.TimeOfDay.ToString(); + dateTimeInput1.Value = DateTime.Parse(cbdt); + return; + } + else // if time is 12:00:00 AM + { + cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + " 00:00:00"; + dateTimeInput1.Value = DateTime.Parse(cbdt); + return; + } + } + else + { + cbdt = tmpdt.ToString(); + dateTimeInput1.Value = DateTime.Parse(cbdt); + return; + } + } } private void btnOK_Click(object sender, EventArgs e) { - MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy 00:00:00");// ("MM/dd/yyyy HH:mm:ss"); + MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss"); } diff --git a/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.resx b/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.resx index 92c0f12c..6a90c7d0 100644 --- a/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.resx +++ b/PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 \ No newline at end of file -- 2.47.2