From 33881adca570b185fcb91352835e5eb9738352b6 Mon Sep 17 00:00:00 2001 From: Kathy Ruffing Date: Tue, 14 Nov 2023 08:51:39 -0500 Subject: [PATCH 1/3] B2022-072: Unit Designators not resolve on import of procedure set --- PROMS/VEPROMS User Interface/dlgExportImport.cs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS User Interface/dlgExportImport.cs b/PROMS/VEPROMS User Interface/dlgExportImport.cs index 139a5b5a..7a44c9ba 100644 --- a/PROMS/VEPROMS User Interface/dlgExportImport.cs +++ b/PROMS/VEPROMS User Interface/dlgExportImport.cs @@ -2001,19 +2001,34 @@ namespace VEPROMS Application.DoEvents(); string formatFileName = (dvi.MyFormat != null) ? dvi.MyFormat.Name : ""; XmlElement xe = xn.OwnerDocument.CreateElement(nodename); + + // B2022-072: if the exported docversion doesn't have the format set, look up folder tree to find the format used + int tmpFormatID = (dvi.FormatID != null) ? (int)dvi.FormatID : 0; + FolderInfo fi = dvi.MyFolder; + while (formatFileName == "" && fi != null) + { + if (fi.FormatID != null && fi.FormatID != 0) + { + formatFileName = (fi.MyFormat != null) ? fi.MyFormat.Name : ""; + tmpFormatID = (fi.FormatID != null) ? (int)fi.FormatID : 0; + break; + } + fi = fi.MyParent; + } xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "versionid", dvi.VersionID.ToString())); xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "folderid", dvi.FolderID.ToString())); xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "versiontype", dvi.VersionType.ToString())); xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "name", dvi.Name)); xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "title", dvi.Title)); xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "itemid", dvi.ItemID.ToString())); - xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "formatid", dvi.FormatID.ToString())); + xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "formatid", tmpFormatID.ToString()));//dvi.FormatID.ToString())); xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "config", dvi.Config)); xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "dts", dvi.DTS.ToString("MM/dd/yyyy HH:mm:ss.fff"))); xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "userid", dvi.UserID.ToString())); xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "formatfilename", formatFileName)); xn.AppendChild(xe); if (!ValidDocVersionAssociation(dvi)) return; // bug fix: B2017-082 don't export if no RO Path + if (dvi.DocVersionAssociationCount > 0) foreach (AssociationInfo ai in dvi.DocVersionAssociations) ExportAssociation(xe, ai, "association"); -- 2.47.2 From e45c373920ef7362097fc00d7d9f33bac468e6ee Mon Sep 17 00:00:00 2001 From: Kathy Ruffing Date: Mon, 20 Nov 2023 10:21:52 -0500 Subject: [PATCH 2/3] B2023-112: Search All Procedure Sets does not always work --- .../Volian.Controls.Library/DisplaySearch.cs | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 10ab6520..4eb4ead5 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -796,6 +796,10 @@ namespace Volian.Controls.Library node.Checked = pNode.Checked; CheckTreeNodeChildren(node.Nodes); } + // B2023-112: Clear the docversion list - this flags 'All' when the 'All Proc Sets' tree node is checked and 'None' when it isn't. Then + // Use buildSetToSearchPanelTitle to set the text for how many sets are in search. + lstCheckedDocVersions.Clear(); + buildSetToSearchPanelTitle(); } private void AllSectionTypes_clicked(object sender, EventArgs e) @@ -2392,18 +2396,18 @@ namespace Volian.Controls.Library { if (tn.Checked) { - tn.Style = DevComponents.AdvTree.NodeStyles.Apple; // sets green background on selected folder(s) - FolderInfo fi = (FolderInfo)tn.Tag; - + //tn.Style = DevComponents.AdvTree.NodeStyles.Apple; // sets green background on selected folder(s) + //B2023-112: Don't crash if on top 'All' node (did not have associated folder) + FolderInfo fi = tn.Tag as FolderInfo; // if this folder has a docversion, use its id: if (tn.Nodes != null && tn.Nodes.Count > 0 && tn.Nodes[0].Text != DummyNodeText) // Folder has been expanded, so add its docversion list { - if (fi.FolderDocVersionCount > 0) lstCheckedDocVersions.Add(fi.FolderDocVersions[0]); + if (fi != null && fi.FolderDocVersionCount > 0) lstCheckedDocVersions.Add(fi.FolderDocVersions[0]); } else // it has not been expanded process all below. { //B2023-076: Do not process the "Select All" node - if (tn.Text != SelectAllProcedureSetsText) + if (tn.Text != SelectAllProcedureSetsText && fi != null) AddAllChildVersions(fi); } } @@ -2548,7 +2552,16 @@ namespace Volian.Controls.Library private void buildSetToSearchPanelTitle() { - if (lstCheckedDocVersions.Count == 0) + // B2023-112: lstCheckedDocVersions has list of sets, if 'all' it is empty. However, in order to get proc set tree to handle appropriate selections + // and work with this list, check both the list count and the whether the 'all' is checked. + if (lstCheckedDocVersions.Count == 0 && advTreeProcSets.Nodes != null && (advTreeProcSets.Nodes.Count <=1 || (advTreeProcSets.Nodes.Count > 1 && advTreeProcSets.Nodes[0].Nodes != null)) && (advTreeProcSets.Nodes[0].Nodes.Count == 0 || (advTreeProcSets.Nodes[0].Nodes.Count > 0 && !advTreeProcSets.Nodes[0].Nodes[0].Checked))) + { + xpSetToSearch.TitleText = string.Format("No Procedure Sets Selected"); + xpSetToSearch.TitleStyle.BackColor1.Color = Color.PapayaWhip; + btnSearch.Enabled = false; + tabSearchTypes.Enabled = false; // disable all the search tabs + } + else if (lstCheckedDocVersions.Count == 0) { xpSetToSearch.TitleText = string.Format("All Procedure Sets Selected"); xpSetToSearch.TitleStyle.BackColor1.Color = Color.PapayaWhip; @@ -2577,6 +2590,9 @@ namespace Volian.Controls.Library StartAdvTreeStepTypesFillIn();// B2016-258 Hang after selecting a procedure if the Step Type panel is open on the search panel } } + // B2023-112: If unchecking a procedure set, uncheck the 'All' node also + if (n.Checked) + advTreeProcSets.Nodes[0].Nodes[0].Checked = false; } #endregion @@ -2595,7 +2611,7 @@ namespace Volian.Controls.Library if (n.Checked) { - n.Style = DevComponents.AdvTree.NodeStyles.Apple; + //n.Style = DevComponents.AdvTree.NodeStyles.Apple; // B2023-112: coloring of proc set tree nodes was not working correctly if (sd == null) { -- 2.47.2 From 92b5c37a533ba0fbc524d0851f7e1591c81b8802 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Mon, 27 Nov 2023 16:16:52 -0500 Subject: [PATCH 3/3] F2023-143 Vogtle 3&4 Alarm format - Moved setting of footer to folder level, made placement of footer on cover page consistant with rest of alarm document --- PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 201338 -> 200892 bytes PROMS/Formats/genmacall/VEGPAlr.svg | Bin 8122 -> 8378 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index 135f711ed9b4c1cccdd7826d0b7fee46e6ce8bea..484f088fd60a6fd57f99c9149f98e4dabdbe077b 100644 GIT binary patch delta 1602 zcmd^9Ur19?96slF=XB$4yKYnG5O>|CmCWV6Zfn}m{-~fCDU~eE>e&Y)sJAkq2qF;T zK)<^s?iPfV7xq3(f!-t5ls98Nkgmrc|Y2ZtZ9)dV8-}gJe@AsW^zsvb{ zO`f?TPp2pw4B6Qnox%?`$;#$TH8jFLnyOi4NgO-hP&Yed_Mm?S>=o!E$#sJV6L1YE8zO^`a$M4DK-yv25q6f9hRPODgRwexoE zpqVLl6Y2_hP9=jp8KmtmB{2`ReZVmEgU%Z4{7@lV9xh}9BZchN0XUr1P2so>qiBB( z9)7n3JQgWVV*IHcC`c`&m1{02rI@OMG7NWsH&^Qd8%5a#ej4Rz1uPU7w}S~2Zm5xB zLS7&mtq`IZ(Ya=bM4w+cM1Hm8X%}b|)pyi{r-Pv278iWYxi)&iliM(jf)f=dJj2B$ zYG+E=j4227V!s0WvAIVKjuMSqYQRSgv~@ky(d>qd$y)Hz7^b&@3#T{03NAK)6(@ZV zlp-X~=}xH6X%m55O*Je5n`p(2+$EOkV^S z53K`dZbP^aQ%M)ik9L5A;>|{A5ZVYHk>MO>_P|6oF)s2Op#~D!<&nrOk3?p9B=U+< zRP2%!lO@oJ>Ra&KYx!^Tn(Kq`??t8H@qTFh7xKF5_|t^TDNbB~ZXP}cpDaa+@zrPO z<(+5XdJz-2u)ic1>#V*9D_^+*--~e0UR*W)Z+`y)JhW!d@OK`!Zk~Js^Oo#8r*e4# H#-cv~srkE# delta 1465 zcmds1L1+^}6y5)J)pQ$UNK%ZUwnxPhal=?(+Ign58`F`Z~naZ|L4ujv)lIi zU3+Muq7b3s z54_Y1je}E|<*0_&O?dHg8~j*ogCo;z@XicQHMsYMp<}*FO)3fT)(wI>s0@ka9z=)+ zc`*bxXR`Rtx)(upkCJSpHV~hP!NH|{aH$DNlzW?qPx|2Fvxndk)lv9KO2*eRuX^EY z!clA_u5CqVT|!CyW`_IWl|m^#^OLN4?>Y0896aeqwy{icwN4)44ZuON2}7iJAwV2E z2s`JuN$rGU@Ru}Z_|^{0o2AV*z8R9e#g$}Z`|8|v>}7uh2iSQ89!p_m04cI~W8o(6 zN#nSXXn=U6Urw=_N2W1FLIes(Tl4VYM{tYiPPm#0*~b{sZl=@d5#<+t2R~V@(<+L um?ll+9(Fp2LDqd2<>z>*TiyJnug$rPK7B5X&>uWQ8y9cL&tQB7g~TuP;k4%f diff --git a/PROMS/Formats/genmacall/VEGPAlr.svg b/PROMS/Formats/genmacall/VEGPAlr.svg index 1ba8a5a7149cf3f6e54b9f56e48bea0fe6a74fe8..921e5718140c98aedae08b8788583e6e87275217 100644 GIT binary patch delta 50 zcmV-20L}lpKe|D%@&=P25eAcD3LcXJ2gH+b4g`}l2ojU<23`d>05AYHlfeRWli&y- Iv*riX7rWCDQUCw| delta 24 gcmdnxxXXUSC$`B2+yaxu*pEzpz^SnL8OIfI0EK)CR{#J2 -- 2.47.2