From b01a9edc1e6e97815cb9b2129dae769dc9d30ac3 Mon Sep 17 00:00:00 2001 From: Chris Glavan Date: Mon, 18 Mar 2024 11:42:04 -0400 Subject: [PATCH 1/4] ~Upgraded CSLA library to v3.0.5 --- .../VEPROMS User Interface/VEPROMS_UI.csproj | 5 ++-- .../VEPROMS.CSLA.Library.csproj | 2 +- PROMS/VEPROMS.CSLA.Library/app.config | 23 ++++++++++++++++ PROMS/VEPROMS.CSLA.Library/packages.config | 26 +++++++++++++++++++ .../Volian.Controls.Library.csproj | 2 +- .../Volian.Print.Library.csproj | 2 +- PROMS/Volian.Print.Library/app.config | 15 +++++++++++ PROMS/Volian.Print.Library/vlnParagraph.cs | 6 +++-- 8 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 PROMS/VEPROMS.CSLA.Library/app.config create mode 100644 PROMS/VEPROMS.CSLA.Library/packages.config create mode 100644 PROMS/Volian.Print.Library/app.config diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index d511f0be..01f603eb 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -105,8 +105,9 @@ False - - ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll + + False + C:\Users\Chris.VLN\Downloads\csla-3-0-5\cslacs\Csla\bin\Debug\Csla.dll False diff --git a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj index 14ae24e0..15071caf 100644 --- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj +++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj @@ -85,7 +85,7 @@ False - ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll + C:\Users\Chris.VLN\Downloads\csla-3-0-5\cslacs\Csla\bin\Debug\Csla.dll False diff --git a/PROMS/VEPROMS.CSLA.Library/app.config b/PROMS/VEPROMS.CSLA.Library/app.config new file mode 100644 index 00000000..4b2e0f1f --- /dev/null +++ b/PROMS/VEPROMS.CSLA.Library/app.config @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PROMS/VEPROMS.CSLA.Library/packages.config b/PROMS/VEPROMS.CSLA.Library/packages.config new file mode 100644 index 00000000..345cd9c8 --- /dev/null +++ b/PROMS/VEPROMS.CSLA.Library/packages.config @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj index 9c76fbf7..708f2197 100644 --- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj +++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj @@ -95,7 +95,7 @@ False - ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll + C:\Users\Chris.VLN\Downloads\csla-3-0-5\cslacs\Csla\bin\Debug\Csla.dll False diff --git a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj index 12ed5491..dddee375 100644 --- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj +++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj @@ -70,7 +70,7 @@ False - ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll + C:\Users\Chris.VLN\Downloads\csla-3-0-5\cslacs\Csla\bin\Debug\Csla.dll ..\FlexableMessageBox\bin\Debug\FlexableMessageBox.dll diff --git a/PROMS/Volian.Print.Library/app.config b/PROMS/Volian.Print.Library/app.config new file mode 100644 index 00000000..7be68eba --- /dev/null +++ b/PROMS/Volian.Print.Library/app.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index f00363f0..d056d8e7 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1407,7 +1407,8 @@ namespace Volian.Print.Library } } } - StepConfig sc = new StepConfig(MyItemInfo as StepInfo); + StepInfo si = (StepInfo)MyItemInfo; + StepConfig sc = new StepConfig(si.MyContent.Config); if (sc != null && sc.Step_ImageWidth != 0) { Width = sc.Step_ImageWidth; @@ -4184,7 +4185,8 @@ namespace Volian.Print.Library { Width *= (h2 / h1); } - StepConfig sc = new StepConfig(MyItemInfo as StepInfo); + StepInfo si = (StepInfo)MyItemInfo; + StepConfig sc = new StepConfig(si.MyContent.Config); if (sc != null && sc.Step_ImageWidth != 0) { Width = sc.Step_ImageWidth; -- 2.47.2 From 31301c4717deffc6c7dd62437be7baa0760c3a0c Mon Sep 17 00:00:00 2001 From: Chris Glavan Date: Tue, 19 Mar 2024 11:21:21 -0400 Subject: [PATCH 2/4] ~Added CSLA v3.8.4 library --- PROMS/VEPROMS User Interface/VEPROMS_UI.csproj | 4 ++-- PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj | 4 ++-- PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj | 5 ++--- PROMS/Volian.Print.Library/Volian.Print.Library.csproj | 5 ++--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index 01f603eb..da811d46 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -105,9 +105,9 @@ False - + False - C:\Users\Chris.VLN\Downloads\csla-3-0-5\cslacs\Csla\bin\Debug\Csla.dll + C:\Git\Production\3rdPartyLibraries\CSLA\v3.8.4\Csla.dll False diff --git a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj index 15071caf..8ec4b1b0 100644 --- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj +++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj @@ -83,9 +83,9 @@ false - + False - C:\Users\Chris.VLN\Downloads\csla-3-0-5\cslacs\Csla\bin\Debug\Csla.dll + C:\Git\Production\3rdPartyLibraries\CSLA\v3.8.4\Csla.dll False diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj index 708f2197..5dcfdc83 100644 --- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj +++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj @@ -93,9 +93,8 @@ False - - False - C:\Users\Chris.VLN\Downloads\csla-3-0-5\cslacs\Csla\bin\Debug\Csla.dll + + C:\Git\Production\3rdPartyLibraries\CSLA\v3.8.4\Csla.dll False diff --git a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj index dddee375..19f169a9 100644 --- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj +++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj @@ -68,9 +68,8 @@ False - - False - C:\Users\Chris.VLN\Downloads\csla-3-0-5\cslacs\Csla\bin\Debug\Csla.dll + + C:\Git\Production\3rdPartyLibraries\CSLA\v3.8.4\Csla.dll ..\FlexableMessageBox\bin\Debug\FlexableMessageBox.dll -- 2.47.2 From 97dbfad875bd84ac7dbfcbb983b7b8ced99137ab Mon Sep 17 00:00:00 2001 From: John Jenko Date: Tue, 19 Mar 2024 15:30:57 -0400 Subject: [PATCH 3/4] =?UTF-8?q?F2024-037=20Adjustments=20made=20for=20sing?= =?UTF-8?q?le=20column=20sections=20of=20the=20Vogtle=20Units=203=20&=204,?= =?UTF-8?q?=20including=20length=20of=20un-numbered=20HLS,=20resetting=20t?= =?UTF-8?q?he=20sub-step=20numbering=20when=20staring=20under=20an=20un-nu?= =?UTF-8?q?mbered=20HLS,=20removed=20=E2=80=9CTwo=20Column=E2=80=9D=20from?= =?UTF-8?q?=20the=20section=20type=20name=20Purpose=20and=20Symptoms=20Ste?= =?UTF-8?q?p=20Editor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/VEGP1all.xml | Bin 184622 -> 184684 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 228150 -> 228856 bytes PROMS/VEPROMS User Interface/VEPROMS.gclicx | 1 + .../VEPROMS User Interface/VEPROMS_UI.csproj | 2 ++ .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 10 ++++++++-- .../Format/PlantFormat.cs | 8 ++++++++ 6 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 PROMS/VEPROMS User Interface/VEPROMS.gclicx diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index 2c0dddcfb91e5415adc279329239cb37df95716c..d28cf81a07934f0643b4c6497a3e759636366dc4 100644 GIT binary patch delta 82 zcmZ3ti2KbV?hPu2(>H8lV%e-=xQ1!+8dDBsKZa69%aE1(qRE9hTh?o;Y i4nrc4mp#3H9;5E`51$zon)yuH`AitM^O-Oy%mn}}7Z@S{ delta 41 zcmV+^0M`HPq6@B~3$P?HlfW1Vvn(;F0++zM0T7o^%>gQdOf-i~Gy%6vGy))wk-<<9;nH zj?CWjhrp>O&8>RsZEC5?2VMORco^G|XH<`L(s+SFm8mY`Xjm&!$v~raP=wW|z;*UN zhmX!B8DrrxwsZOh?6aBba!ordbhS~_kk^L&X?3ACtUBv{sI`DYHS7MoF4a2Kh#piG zRSuQaCriAdO>~K?R`iRgm3xVHt#sQlaoK8gi9VL3u%n<^w1_A>(x{|&81~%GgEJv> zCWLRNXiTD<&QaLtH1L>bpP-4!o$>&UDL9z9XH6rw5zafAJtyt-y~JrQq%py-AJNUs zck7H_D{vG?Eog`67M)h^>KahwAK zaIx)@=3*p;Ryr5a_~?XYGlPTp3BI1kdER}77EYYh?B;v|>xDFiP_}7yzmxu)FPtJzKnDxza1Vd_RUcbMY;nmj3@r(jwnn#ue*9?XrxKJ18HLt1#uN Q^bIkVlrFRNqPDj8A1h18^#A|> delta 677 zcmYLHUr1AN6h3EnjUjG?t(Z3Lveukyn`1WTi=ig6z;b_j2UJ8#`TiZgY>10EmW_eUcBmbU{HMRe2;$d+Eu_2`cOu1Rgz*fcMGi|8#0K?uIBY` zU1mw@fq?ky32HUuebN<&G-MzJmmmqpV4CYJOfeIKlQ0Iy8C_r{12f``cYk{vCRk0v zAmky;&J;{Sgt?qLLxX3fz2dXC_fVGG^DIwroGPcdAJT><;3AAL%be)<^^0w{UOe-e zTh&ibK~|f|b9fwP*pr34h#uZ!`tKcsjCkohC~Uq>5#H4-^xaM|xx--Lven zgAAjbS74lDl;-3#=MD3Fj-NbhIq2uP0QmSiu5>@7>+jH3T=grfer%keh(~82OH`7* zGVd_W4%MG#l;P|dK6H|6n6u+rpM-g4WxC{VjiRr|LjDT&k-3Nq8WQ!OQCTbDCelC+Pm_NM zn`m(fN0p8h{L`dnTd5Y4TohU6?4vi)tqciF7}a0IN|hpxD+~A0en9Q*^xy{u$h?7% zCElLC-^KzZs=UtpGLF-nMYm6EA2Dd5%Fc6iSSV6Kt1|osCz-8b+sal0m92)(u|jf4 PGSE4{)+gy_iN diff --git a/PROMS/VEPROMS User Interface/VEPROMS.gclicx b/PROMS/VEPROMS User Interface/VEPROMS.gclicx new file mode 100644 index 00000000..4d76eff6 --- /dev/null +++ b/PROMS/VEPROMS User Interface/VEPROMS.gclicx @@ -0,0 +1 @@ +da3d5d14-691f-4908-aa3c-fd3239734232;-8584908724854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MjQyNzYxODZYWFhYWFhYWDAzNg,Sk9ITi1XSU4xMA,RmFsc2U,ODg0Mw,RmFsc2U,MA,MA,djIwMjQuMQ,,;PxeAWRi6mhDqvUMfJhk9Tniu/8ZnOLQv64hLh05xWM+MPyBs3yYfs3vEn5TLW779QNr1k8F6tV3gOAoLG+JSPZoG3NXmdTe6LJya05W+zWyb0H+jj2ReXN2dNR9fbZNDd3ClAeuzNpsM0pw62aYpOe2Tp6fx9gOFx1/0g8g4/8g diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index d511f0be..942dcf26 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -139,6 +139,7 @@ + False ..\VEPROMS.CSLA.Library\bin\Debug\VEPROMS.CSLA.Library.dll @@ -427,6 +428,7 @@ VlnWeb.cs + diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 4d0c494a..0252740d 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4440,7 +4440,7 @@ namespace VEPROMS.CSLA.Library // F2018-025 Westinghouse when a high level step is used as a section number/title, // adjust the step/substep numbering where the first level substep uses the high level step tabbing format // and the following sub-substeps tabbing format are "shifted" accordingly (ex should look like ASS-101 Attachment 1 section 4 tabbing) - if (!IsHigh && MyHLS != null && MyHLS.FormatStepData.AppendDotZero) + if (!IsHigh && MyHLS != null && MyHLS.FormatStepData.AppendDotZero) { if (localPrintLevel > 1) { @@ -4448,7 +4448,13 @@ namespace VEPROMS.CSLA.Library itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex; } } - if (!tbformat.Contains(@"{!C")) + // F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step + else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0) + { + localPrintLevel--; // since parent is a high level step we only need to go back one level + itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex; + } + if (!tbformat.Contains(@"{!C")) tbformat = seqtabs[itmp].PrintTabFormat; // seqtab in 16bit, i.e. '. or )' etc. else tbformat = tbformat.Replace("{seq}", seqtabs[itmp].PrintTabFormat); diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 21a13240..d7a16080 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -4508,6 +4508,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd"); } } + private LazyLoad _ResetSeqNumberingAfterUnnumberedHLS; + public bool ResetSeqNumberingAfterUnnumberedHLS + { + get + { + return LazyLoad(ref _ResetSeqNumberingAfterUnnumberedHLS, "@ResetSeqNumberingAfterUnnumberedHLS"); + } + } } #endregion #region TopOfPage -- 2.47.2 From ccb2bab805c3c3084a200249623bb4b7e5b9fbe1 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 20 Mar 2024 14:11:56 -0400 Subject: [PATCH 4/4] Fixing CSLA references --- PROMS/VEPROMS User Interface/VEPROMS_UI.csproj | 5 ++--- PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj | 5 ++--- PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj | 2 +- PROMS/Volian.Print.Library/Volian.Print.Library.csproj | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index 783a9ba1..942dcf26 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -105,9 +105,8 @@ False - - False - C:\Git\Production\3rdPartyLibraries\CSLA\v3.8.4\Csla.dll + + ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll False diff --git a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj index 8ec4b1b0..67c8b212 100644 --- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj +++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj @@ -83,9 +83,8 @@ false - - False - C:\Git\Production\3rdPartyLibraries\CSLA\v3.8.4\Csla.dll + + ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll False diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj index 5dcfdc83..25057d33 100644 --- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj +++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj @@ -94,7 +94,7 @@ False - C:\Git\Production\3rdPartyLibraries\CSLA\v3.8.4\Csla.dll + ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll False diff --git a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj index 19f169a9..aa5ed78d 100644 --- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj +++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj @@ -69,7 +69,7 @@ False - C:\Git\Production\3rdPartyLibraries\CSLA\v3.8.4\Csla.dll + ..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll ..\FlexableMessageBox\bin\Debug\FlexableMessageBox.dll -- 2.47.2