diff --git a/PROMS/Formats/fmtall/BVPS1all.xml b/PROMS/Formats/fmtall/BVPS1all.xml index 840a5739..6e2aab97 100644 Binary files a/PROMS/Formats/fmtall/BVPS1all.xml and b/PROMS/Formats/fmtall/BVPS1all.xml differ diff --git a/PROMS/Formats/fmtall/BVPS2all.xml b/PROMS/Formats/fmtall/BVPS2all.xml index 2ea95abe..90971a8b 100644 Binary files a/PROMS/Formats/fmtall/BVPS2all.xml and b/PROMS/Formats/fmtall/BVPS2all.xml differ diff --git a/PROMS/Formats/fmtall/BVPSAOPall.xml b/PROMS/Formats/fmtall/BVPSAOPall.xml index 576e1295..a25e41e1 100644 Binary files a/PROMS/Formats/fmtall/BVPSAOPall.xml and b/PROMS/Formats/fmtall/BVPSAOPall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSAtchall.xml b/PROMS/Formats/fmtall/BVPSAtchall.xml index d2ecf29a..7a6bac26 100644 Binary files a/PROMS/Formats/fmtall/BVPSAtchall.xml and b/PROMS/Formats/fmtall/BVPSAtchall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSBCKall.xml b/PROMS/Formats/fmtall/BVPSBCKall.xml index 365ad2fe..13d90216 100644 Binary files a/PROMS/Formats/fmtall/BVPSBCKall.xml and b/PROMS/Formats/fmtall/BVPSBCKall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSDEVall.xml b/PROMS/Formats/fmtall/BVPSDEVall.xml index fc5b750f..5aa1a90e 100644 Binary files a/PROMS/Formats/fmtall/BVPSDEVall.xml and b/PROMS/Formats/fmtall/BVPSDEVall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSFlexDEVall.xml b/PROMS/Formats/fmtall/BVPSFlexDEVall.xml index 2a7e168d..53162623 100644 Binary files a/PROMS/Formats/fmtall/BVPSFlexDEVall.xml and b/PROMS/Formats/fmtall/BVPSFlexDEVall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSNIBCKall.xml b/PROMS/Formats/fmtall/BVPSNIBCKall.xml index ec0027bf..db96f397 100644 Binary files a/PROMS/Formats/fmtall/BVPSNIBCKall.xml and b/PROMS/Formats/fmtall/BVPSNIBCKall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSSAMGBCKall.xml b/PROMS/Formats/fmtall/BVPSSAMGBCKall.xml index 71e47048..25fdb768 100644 Binary files a/PROMS/Formats/fmtall/BVPSSAMGBCKall.xml and b/PROMS/Formats/fmtall/BVPSSAMGBCKall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSSAMGDEVall.xml b/PROMS/Formats/fmtall/BVPSSAMGDEVall.xml index fb484c4b..bad43d2d 100644 Binary files a/PROMS/Formats/fmtall/BVPSSAMGDEVall.xml and b/PROMS/Formats/fmtall/BVPSSAMGDEVall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSSAMGall.xml b/PROMS/Formats/fmtall/BVPSSAMGall.xml index 9b25771b..a632db64 100644 Binary files a/PROMS/Formats/fmtall/BVPSSAMGall.xml and b/PROMS/Formats/fmtall/BVPSSAMGall.xml differ diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index f0beeefd..cc85c74e 100644 Binary files a/PROMS/Formats/fmtall/VEGP2all.xml and b/PROMS/Formats/fmtall/VEGP2all.xml differ diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index 0752764b..0387eccb 100644 Binary files a/PROMS/Formats/fmtall/VEGPAlrall.xml and b/PROMS/Formats/fmtall/VEGPAlrall.xml differ 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/DisplayTransition.cs b/PROMS/Volian.Controls.Library/DisplayTransition.cs index 1e651cad..21ac3f2f 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.cs +++ b/PROMS/Volian.Controls.Library/DisplayTransition.cs @@ -208,7 +208,7 @@ namespace Volian.Controls.Library // set other procedure related private variables. vlnTreeComboSetsFillIn(_CurrentProcedure); cbTranProcsFillIn(_CurrentProcedure); - if (_CurrentProcedure.Sections != null) + if (_CurrentProcedure.Sections != null && secitm != null) { // if the selected format is using section default, initialize with the section default (find it), // otherwise use current section item. @@ -987,6 +987,7 @@ namespace Volian.Controls.Library if (prcitm.Sections != null) { foreach (SectionInfo sio in prcitm.Sections) + { SectionConfig sc = sio.MyConfig as SectionConfig; if (sc != null && sc.Section_OriginalSteps == "Y") @@ -1115,6 +1116,8 @@ namespace Volian.Controls.Library this.superToolTipDispTran.SetSuperTooltip(this.listBoxTranFmt, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This is where transition types are selected. This also defines how the transition will look in the text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + // B2024-007 color of transition panel was not toggling properly + groupPanelTranFmt.Style.BackColor = !HasDefault && NeedsDefault ? Color.Red : Color.Orange; //btnTranSave.Enabled = allowSave; //if (CurTrans != null && selii != null) //{ 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, "");