From e83648ec38e8cefdf3294faa933bc402220a5bb1 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Thu, 15 Feb 2024 14:24:50 -0500 Subject: [PATCH 1/4] =?UTF-8?q?B2024-007=20-=20Added=20missing=20settings?= =?UTF-8?q?=20to=20Beaver=20Valley=E2=80=99s=20Transition=20=E2=80=9C{Proc?= =?UTF-8?q?=20Num}=20(Procedure=20Number=20Only)=E2=80=9D=20to=20fix=20a?= =?UTF-8?q?=20null=20reference=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/BVPS1all.xml | Bin 133216 -> 133272 bytes PROMS/Formats/fmtall/BVPS2all.xml | Bin 98754 -> 98810 bytes PROMS/Formats/fmtall/BVPSAOPall.xml | Bin 150650 -> 150706 bytes PROMS/Formats/fmtall/BVPSAtchall.xml | Bin 128246 -> 128302 bytes PROMS/Formats/fmtall/BVPSBCKall.xml | Bin 75388 -> 75444 bytes PROMS/Formats/fmtall/BVPSDEVall.xml | Bin 42060 -> 42116 bytes PROMS/Formats/fmtall/BVPSFlexDEVall.xml | Bin 40324 -> 40380 bytes PROMS/Formats/fmtall/BVPSNIBCKall.xml | Bin 73440 -> 73496 bytes PROMS/Formats/fmtall/BVPSSAMGBCKall.xml | Bin 72486 -> 72542 bytes PROMS/Formats/fmtall/BVPSSAMGDEVall.xml | Bin 42066 -> 42122 bytes PROMS/Formats/fmtall/BVPSSAMGall.xml | Bin 128950 -> 129006 bytes .../DisplayTransition.cs | 5 ++++- 12 files changed, 4 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/BVPS1all.xml b/PROMS/Formats/fmtall/BVPS1all.xml index 840a57390f4eadaea606b8d9fd7daf61cce86418..6e2aab9744531f040798a75e437b8847acfa9592 100644 GIT binary patch delta 34 scmV+-0NwxKkO-KO2(YHIlTfh?lZu`!le%dVlTa%JgS@i0ys`nLRUVBHBLDyZ delta 22 gcmV+x0O|jjkqF?B2(YHIlk!~_gY>eu^s)h@Rf(buDgXcg diff --git a/PROMS/Formats/fmtall/BVPS2all.xml b/PROMS/Formats/fmtall/BVPS2all.xml index 2ea95abed5635793a5de31317264f165be7ea04b..90971a8b63b0f7056866bfeb520784f8049aee55 100644 GIT binary patch delta 26 icmX@q%=W99Z9~VJ$q6$oCQH={O*SZE**tHJ%2fcQ#S7s8 delta 18 acmey>%yy`mZ9~VJ$%_KTHeXw#auonsO$mJf diff --git a/PROMS/Formats/fmtall/BVPSAOPall.xml b/PROMS/Formats/fmtall/BVPSAOPall.xml index 576e1295d68ae918f22360ee408f27cd96ee8e7d..a25e41e1a99348347301623357ef5e42f07e4477 100644 GIT binary patch delta 39 xcmV+?0NDTfmv1e2Pr3WI#Dw|uPu{+@IP5_kXr delta 22 ecmdlqlk?XM&J8hZCqHr#YhJZ>`>M5!9PAq)UIw+F-k diff --git a/PROMS/Formats/fmtall/BVPSFlexDEVall.xml b/PROMS/Formats/fmtall/BVPSFlexDEVall.xml index 2a7e168def5086f1e4949bb6b7f8928cec0f8b5e..531626235804a56fafdbec72a370767b1de243ec 100644 GIT binary patch delta 26 icmZqK&9rAX(}q8tlM||WCO;_EnOx<CB=nJm^ delta 14 Vcmdn9o2g|t(}q8tn@zepgaJ3B2K)d3 diff --git a/PROMS/Formats/fmtall/BVPSNIBCKall.xml b/PROMS/Formats/fmtall/BVPSNIBCKall.xml index ec0027bf734defec4a90e4f1cd2fc82176d98e50..db96f397584b477c7ae48c9b84e23d6695d77b41 100644 GIT binary patch delta 30 ocmV+(0O9}Oy#$!P1h9Inlir;SlU|rClZs^$ldy9HvyiM%a_qehpa1{> delta 14 WcmbQSkLAH$mJL;FHg8&!Rs;Y!!3Vnl diff --git a/PROMS/Formats/fmtall/BVPSSAMGBCKall.xml b/PROMS/Formats/fmtall/BVPSSAMGBCKall.xml index 71e470488c39b6622216ff5d048d93597b932f57..25fdb768946c93119c759df386909920c4c8c887 100644 GIT binary patch delta 30 ocmV+(0O9|pwgld`1hCMklU$_?leCm9lWIy5lYk}!v*xHka_N>1Q2+n{ delta 18 acmcb&jb+(3mJJtHOjcSawpnhaLlFR43kb#l diff --git a/PROMS/Formats/fmtall/BVPSSAMGDEVall.xml b/PROMS/Formats/fmtall/BVPSSAMGDEVall.xml index fb484c4b246ab9501f4d3a75fa51c1b16e5af8c7..bad43d2dcd43769ced70a8cfd711cc6cad649773 100644 GIT binary patch delta 26 icmca~f~o5y(}rUcCKvScOkP!^GdaSIXY-{A4Z;Aid< diff --git a/PROMS/Formats/fmtall/BVPSSAMGall.xml b/PROMS/Formats/fmtall/BVPSSAMGall.xml index 9b25771b6800e42f2a6cb49488eab43ecf766246..a632db644fe7c7287ee22517404983cf2eeb0e53 100644 GIT binary patch delta 38 wcmV+>0NMYx?+5Ph2e3@Bldz%;lQ5kulX`CwlRzZ|lZvqlgKV+4Y_S1KMrzp+A^-pY delta 22 ecmaF&o_*VU_6 Date: Mon, 19 Feb 2024 10:35:40 -0500 Subject: [PATCH 2/4] ~Adjusted width of High-level RNO in 2-column format --- PROMS/Formats/fmtall/VEGP2all.xml | Bin 212606 -> 212646 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 7aec1f8dd58d63ae80866701032da9692be032be..dbc85c589d6d7522ee862bd3c68691642668b4ca 100644 GIT binary patch delta 48 zcmV-00MGya{0yf341lx&Shtt@wgC Date: Mon, 19 Feb 2024 12:09:09 -0500 Subject: [PATCH 3/4] ~Addressed out-of-memory exception being thrown when right-clicking on a procedure with previous revisions --- .../Extension/RevisionInfoExt.cs | 7 +++++++ .../Generated/VersionInfo.cs | 12 ++++++++++++ PROMS/Volian.Controls.Library/vlnTreeView.cs | 16 ++++++++++------ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs index 50b3b2d7..e3cc9d67 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs @@ -597,6 +597,13 @@ namespace VEPROMS.CSLA.Library //if (_RevisionInfoList != null) // return _RevisionInfoList; RevisionInfoList tmp = DataPortal.Fetch(new ItemUnitCriteria(itemID, unitID)); + + foreach (var x in tmp) + { + x.LatestVersion.ApprovedXML = x.RevisionID.ToString(); + x.LatestVersion.PDF = Encoding.ASCII.GetBytes(x.RevisionID.ToString()); + x.LatestVersion.SummaryPDF = Encoding.ASCII.GetBytes(x.RevisionID.ToString()); + } RevisionInfo.AddList(tmp); tmp.AddEvents(); //_RevisionInfoList = tmp; diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/VersionInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/VersionInfo.cs index c7cf43f4..e05166da 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/VersionInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/VersionInfo.cs @@ -153,6 +153,10 @@ namespace VEPROMS.CSLA.Library CanReadProperty("PDF", true); return _PDF; } + set + { + _PDF = value; + } } private byte[] _SummaryPDF; public byte[] SummaryPDF @@ -163,6 +167,10 @@ namespace VEPROMS.CSLA.Library CanReadProperty("SummaryPDF", true); return _SummaryPDF; } + set + { + _SummaryPDF = value; + } } private string _ApprovedXML; public string ApprovedXML @@ -173,6 +181,10 @@ namespace VEPROMS.CSLA.Library CanReadProperty("ApprovedXML", true); return _ApprovedXML; } + set + { + _ApprovedXML = value; + } } private DateTime _DTS = new DateTime(); public DateTime DTS diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index ef52239f..46282f4d 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -1309,25 +1309,26 @@ namespace Volian.Controls.Library if (ri.LatestVersion.PDF != null) { MenuItem mirp = mir.MenuItems.Add("View Procedure"); - mirp.Tag = ri; + mirp.Tag = ri.RevisionID; mirp.Click += new EventHandler(MultiUnitApprovedRevision_Click); } if (ri.LatestVersion.SummaryPDF != null) { MenuItem mirs = mir.MenuItems.Add("View Summary of Changes"); - mirs.Tag = ri; + mirs.Tag = ri.RevisionID; mirs.Click += new EventHandler(MultiUnitSummaryOfChanges_Click); } if (ri.LatestVersion.ApprovedXML != null && ri.LatestVersion.ApprovedXML != "") { MenuItem miri = mir.MenuItems.Add("Create Procedure to Import"); - miri.Tag = ri; + miri.Tag = ri.RevisionID; miri.Click += new EventHandler(ImportProcedure_Click); } //end added jcb 20111031 mv.Tag = lastApprovedRevisionID; } + ril = null; } } public void AddNewNode(IVEDrillDownReadOnly o) @@ -1419,7 +1420,8 @@ namespace Volian.Controls.Library void ImportProcedure_Click(object sender, EventArgs e) { - RevisionInfo ri = (sender as MenuItem).Tag as RevisionInfo; + //RevisionInfo ri = (sender as MenuItem).Tag as RevisionInfo; + RevisionInfo ri = RevisionInfo.Get(int.Parse((sender as MenuItem).Tag.ToString())); RevisionConfig rc = ri.MyConfig as RevisionConfig; // bug fix: B2016-183 - add the child's name (ex Unit 1) to the export file name for Parent/Child procedures. int applIdx = rc.Applicability_Index; @@ -1459,7 +1461,8 @@ namespace Volian.Controls.Library bool superceded = false; MenuItem mi = sender as MenuItem; if (mi == null) return; - RevisionInfo ri = mi.Tag as RevisionInfo; + //RevisionInfo ri = mi.Tag as RevisionInfo; + RevisionInfo ri = RevisionInfo.Get(int.Parse(mi.Tag.ToString())); { MenuItem mip = mi.Parent as MenuItem; //B2021-086 Added the check for the last revision stage is an Approved stage @@ -1485,7 +1488,8 @@ namespace Volian.Controls.Library { MenuItem mi = sender as MenuItem; if (mi == null) return; - RevisionInfo ri = mi.Tag as RevisionInfo; + //RevisionInfo ri = mi.Tag as RevisionInfo; + RevisionInfo ri = RevisionInfo.Get(int.Parse(mi.Tag.ToString())); ItemInfo ii = ItemInfo.Get(ri.ItemID); ii.MyDocVersion.DocVersionConfig.SelectedSlave = ri.MyConfig.Applicability_Index; vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ProcedureInfo.Get(ri.ItemID).PDFNumber + " Summary of Changes"), ri.LatestVersion.SummaryPDF, ""); From e171aa66fefdea2b6d47303367985ef33e704d65 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 21 Feb 2024 10:57:37 -0500 Subject: [PATCH 4/4] =?UTF-8?q?F2024-018=20-=20Adjust=20ReplaceWords=20in?= =?UTF-8?q?=20the=20Vogtle=20Alarm=20format=20so=20that=20that=20works=20?= =?UTF-8?q?=E2=80=9CShutdown:=E2=80=9D=20and=20=E2=80=9CStart:=E2=80=9D=20?= =?UTF-8?q?are=20not=20bolded.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 210286 -> 208848 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index 0752764ba24c1c5ebec1b4a56dc3ac156dfe571a..0387eccb01739ca164653ced4fad7c32e31deeec 100644 GIT binary patch delta 100 zcmaF&is!<8o(0O&6}~eHY<{A-gme0atBhRD0Vdl6Oc+-vFj`GsXe%!m%#guQ%22|P v!jR8U&XC7oH9gRW@!aGw3lG0ci!OJWMW# z!H>b8Aq1$p0%#;ir2$wK#Izt3(;%`sKyxgBrdcrPK-KDlf^@p!K1Si@13KFe=rAr* lm|oz|s4~6Jn~`JtBtJ$Tmgz07jB4#Wf*H5(2xgMF0|1p1WS;;4