From 9130604fa6acacd08b7d33527f1fa5de710365bf Mon Sep 17 00:00:00 2001 From: mschill Date: Thu, 25 Sep 2025 08:01:19 -0400 Subject: [PATCH 01/16] C2015-028 Add Editorial Mode to PROMS Step Editor --- .../VEPROMS.CSLA.Library/Config/StepConfig.cs | 27 ++++++++++ .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 23 ++++++--- .../Generated/ItemInfo.cs | 14 ++++-- .../DisplayTabControl.cs | 46 +++++++++++++----- PROMS/Volian.Controls.Library/RTBItem.cs | 28 ++++++++--- PROMS/Volian.Controls.Library/StepPanel.cs | 9 +++- PROMS/Volian.Controls.Library/StepRTB.cs | 7 ++- PROMS/Volian.Controls.Library/StepTabPanel.cs | 2 +- .../Volian.Controls.Library/StepTabRibbon.cs | 43 +++++++++++++--- .../StepTabRibbon.designer.cs | Bin 575428 -> 577962 bytes 10 files changed, 161 insertions(+), 38 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Config/StepConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/StepConfig.cs index 106e79a2..692a8db3 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/StepConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/StepConfig.cs @@ -394,6 +394,33 @@ namespace VEPROMS.CSLA.Library OnPropertyChanged("Step_ChangeID"); } } + + // C2015-028 Add Editorial Mode to PROMS Step Editor + // was last change made in editorial mode and thus change bars should be disabled? + // will contain userid of user that made last change if it was in Editorial Mode + // if there was not a previous change that would have caused change bars + // will be blank/empty by default + // will get overwritten every time a change is made + public string Step_ChangeIDEditorialMode + { + get + { + string s = _Xp["Step", "ChangeIDEMode"]; + + if (s == string.Empty) return null; + return s; + } + set + { + string s = _Xp["Step", "ChangeIDEMode"]; + + if (value != null && value.ToString() == s) return; + if (value == null && s != null) _Xp["Step", "ChangeIDEMode"] = null; + else _Xp["Step", "ChangeIDEMode"] = value.ToString(); + OnPropertyChanged("Step_ChangeIDEMode"); + } + } + public string Step_Responsibility { get diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index cc68f7d5..62e5ca4a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -3933,9 +3933,7 @@ namespace VEPROMS.CSLA.Library get { bool chg = HasChanges; - StepInfo si = this as StepInfo; - if (si == null) return false; - StepConfig sc = si.MyConfig as StepConfig; + StepConfig sc = this.MyConfig as StepConfig; if (sc == null) return false; // if there is no override & return whether there was a change to the text. if (chg && ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.ChangeIds && @@ -3943,6 +3941,21 @@ namespace VEPROMS.CSLA.Library return false; // No Change ID - No Change Bar if ((sc.Step_SpellCheckerChangedText ?? "") == "NoChangeBar") return false; // Spell Checker, in editorial mode (format flag EditoralSpellCheck) , made the change and there was no change bar prior to that change B2015-024 + // C2015-028 Add Editorial Mode to PROMS Step Editor + // last change was in editorial mode, so ignore it + if (!string.IsNullOrEmpty(sc.Step_ChangeIDEditorialMode)) + return false; + // C2015-028 Add Editorial Mode to PROMS Step Editor + // Add Check for enhanced docs + // If enhanced docs, need to check the step_config for the master + if (sc.MyEnhancedDocuments != null && sc.MyEnhancedDocuments.Count == 1 && sc.MyEnhancedDocuments[0].Type == 0) + { + ItemInfo ii = ItemInfo.Get(sc.MyEnhancedDocuments[0].ItemID, true); + if (ii == null) return false; // when deleting a source step, this was causing a crash (null ii) + return ii.HasChangeBar; + } + + if (sc.Step_CBOverride == null) return chg; return (sc.Step_CBOverride == "On"); @@ -3953,9 +3966,7 @@ namespace VEPROMS.CSLA.Library get { if (this.IsAccPages || this.IsProcedure || this.IsSection) return false; - StepInfo si = this as StepInfo; - if (si == null) return false; - StepConfig sc = si.MyConfig as StepConfig; + StepConfig sc = this.MyConfig as StepConfig; if (sc == null) return false; // go back to source & see what date it has: if (sc.MyEnhancedDocuments != null && sc.MyEnhancedDocuments.Count == 1 && sc.MyEnhancedDocuments[0].Type == 0) diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs index 9dd0926b..ba31fad0 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs @@ -606,12 +606,20 @@ namespace VEPROMS.CSLA.Library _ItemInfoExtension.Refresh(this); OnChange();// raise an event } - public static ItemInfo Get(int itemID) + public static ItemInfo Get(int itemID, bool forcerefresh = false) { - //if (!CanGetObject()) - // throw new System.Security.SecurityException("User not authorized to view a Item"); + try { + // C2015-028 Add Editorial Mode to PROMS Step Editor + // fixes caching issue + // item.myconfig was cached not containing the bypass changebar info + // so this forces a refresh of the cache + if (forcerefresh) + { + _CacheByPrimaryKey.Remove(itemID.ToString()); + } + ItemInfo tmp = GetCachedByPrimaryKey(itemID); if (tmp == null) { diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index c516993f..0b301aaf 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -11,6 +11,7 @@ using DevComponents.DotNetBar; using JR.Utils.GUI.Forms; using Volian.Base.Library; using Microsoft.Win32; +using System.Linq; namespace Volian.Controls.Library { @@ -261,24 +262,45 @@ namespace Volian.Controls.Library get { return _ChgId; } set { _ChgId = value; } } + + // C2015-028 Add Editorial Mode to PROMS Step Editor public bool EditorialChange { get { if (_ChgId == null) return true; if (_ChgId == "") return true; - if (_ChgId.ToUpper() == "EC") return true; - return false; - } - } - #endregion - #region Events - /// - /// This event is raised when a the "Tab" of a DisplayItem is clicked with a mouse. - /// So far this has just been used for demo purposes. It could be used to select a - /// step and it's children for the purpose of copying. - /// - public event StepPanelEvent ItemClick; + if (_ChgId.ToUpper() == "EC") { return true;} + + return IsInEditorialMode; + } + } + + // C2015-028 Add Editorial Mode to PROMS Step Editor + // property to hold if button in ribbon is toggled on or off + public bool IsInEditorialMode { get; set; } = false; + + // C2015-028 Add Editorial Mode to PROMS Step Editor + // This is used when button in the ribbon is toggled on/off + // It iterates through all previously opened tabs + // and updates the "Editorial Mode" button + // and background color to match those of the current tab + public void SetEdititorialModeForAllTabs(bool mode) + { + foreach (DisplayTabItem tabItem in _MyDisplayTabItems.Values.Where(tabItem => tabItem.MyStepTabPanel != null)) + { + tabItem.MyStepTabPanel.MyStepTabRibbon.SetEditorialMode(mode); + } + } + + #endregion + #region Events + /// + /// This event is raised when a the "Tab" of a DisplayItem is clicked with a mouse. + /// So far this has just been used for demo purposes. It could be used to select a + /// step and it's children for the purpose of copying. + /// + public event StepPanelEvent ItemClick; /// /// Checks to see if the ItemClick event is handled and launches it /// diff --git a/PROMS/Volian.Controls.Library/RTBItem.cs b/PROMS/Volian.Controls.Library/RTBItem.cs index 68ef343e..cb52e865 100644 --- a/PROMS/Volian.Controls.Library/RTBItem.cs +++ b/PROMS/Volian.Controls.Library/RTBItem.cs @@ -799,27 +799,41 @@ namespace Volian.Controls.Library // if the plant has the change id option, the change id was entered when the program started. // this should be saved for every piece of edited data. Note that the set of config // item Step_MultipleChangeID has the save built in to it. + if (sc == null) sc = new StepConfig(); if (MyStepRTB.MyItemInfo.IsStep && MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.ChangeIds && !this.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.EditorialChange) { - //StepConfig sc = MyStepRTB.MyItemInfo.MyConfig as StepConfig; - if (sc == null) sc = new StepConfig(); sc.Step_ChangeID = this.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.ChgId; - //if (MyStepRTB.MyItemInfo.MyConfig == null) itm.MyContent.Config = sc.ToString(); + } + // C2015-028 Add Editorial Mode to PROMS Step Editor + // if in Editorial Mode, treat it the same as if the ChangeIds are set in the Format file + if (MyStepPanel.MyStepTabPanel.MyDisplayTabControl.IsInEditorialMode && !existingChangeBar) + { + sc.Step_ChangeIDEditorialMode = Volian.Base.Library.VlnSettings.UserID; + } + else + { + sc.Step_ChangeIDEditorialMode = null; } // B2020-017: If making an editorial change, clear the Change id. Having the change id on // was adding/printing a change bar. + // C2015-028 Add Editorial Mode to PROMS Step Editor + // if in Editorial Mode, treat it the same as if the ChangeIds are set in the Format file if (MyStepRTB.MyItemInfo.IsStep && - MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.ChangeIds - && this.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.EditorialChange - && hasChangeBar == false) + (MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.ChangeIds + || MyStepPanel.MyStepTabPanel.MyDisplayTabControl.IsInEditorialMode + ) + && MyStepPanel.MyStepTabPanel.MyDisplayTabControl.EditorialChange + && !hasChangeBar) { if (sc == null) sc = new StepConfig(); sc.Step_ChangeID = null; } // B2015-024 Have Spell Checker text changes be an editorial change (not assign a change bar but keep existing change bar) - if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.EditData.EditoralSpellCheck) + // C2015-028 Add Editorial Mode to PROMS Step Editor + // if in Editorial Mode, treat it the same as if the Rditorial SprllCheck flag is set in the Format file + if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.EditData.EditoralSpellCheck || this.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.IsInEditorialMode) { if (StepRTB.DidEditorialSpellCheck) { diff --git a/PROMS/Volian.Controls.Library/StepPanel.cs b/PROMS/Volian.Controls.Library/StepPanel.cs index 728ad353..8f509a33 100644 --- a/PROMS/Volian.Controls.Library/StepPanel.cs +++ b/PROMS/Volian.Controls.Library/StepPanel.cs @@ -650,8 +650,13 @@ namespace Volian.Controls.Library /// public Color ActiveColor { - get { return _ActiveColor; } - set { _ActiveColor = value; } + get { + // C2015-028 Add Editorial Mode to PROMS Step Editor + // if in Editorial Mode, use LightGreen background + _ActiveColor = MyStepTabPanel != null && MyStepTabPanel.MyDisplayTabControl.IsInEditorialMode ? Color.LightGreen : Color.SkyBlue; + return _ActiveColor; + } + set { _ActiveColor = value; } } /// /// Gets or Sets the Annotation backcolor for StepRTBs in the Panel diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs index dcd59514..cc20f092 100644 --- a/PROMS/Volian.Controls.Library/StepRTB.cs +++ b/PROMS/Volian.Controls.Library/StepRTB.cs @@ -3760,7 +3760,12 @@ namespace Volian.Controls.Library public bool SpellCheckNext() { int nBad = C1SpellChecker2.CheckControl(this, false, MySpellCheckDlg); - if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.EditData.EditoralSpellCheck) + + // C2015-028 Add Editorial Mode to PROMS Step Editor + // if in Editorial Mode, treat it the same as if the EditorialSpellCheck flag is set in the Format file + bool editorialmode = (this.Parent.Parent.Parent as StepTabPanel).MyDisplayTabControl.IsInEditorialMode; + + if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.EditData.EditoralSpellCheck || editorialmode) DidEditorialSpellCheck = MySpellCheckDlg.DidCorrectSpelling; // B2015-024 spell checker in editoral mode return (nBad >= 0); // nBad = -1 means user pressed Cancel button } diff --git a/PROMS/Volian.Controls.Library/StepTabPanel.cs b/PROMS/Volian.Controls.Library/StepTabPanel.cs index c895ed09..a6d501d0 100644 --- a/PROMS/Volian.Controls.Library/StepTabPanel.cs +++ b/PROMS/Volian.Controls.Library/StepTabPanel.cs @@ -120,7 +120,7 @@ namespace Volian.Controls.Library /// private void SetupStepTabRibbon() { - _MyStepTabRibbon = new StepTabRibbon(); + _MyStepTabRibbon = new StepTabRibbon(_MyDisplayTabControl.IsInEditorialMode); _MyStepTabRibbon.Dock = System.Windows.Forms.DockStyle.Top; _MyStepTabRibbon.Location = new System.Drawing.Point(0, 0); _MyStepTabRibbon.Name = "displayTabRibbon1"; diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 37b57301..8a4a5f47 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -995,7 +995,7 @@ namespace Volian.Controls.Library // SetButtonAndMenuEnabling(true); //} #region Constructor - public StepTabRibbon() + public StepTabRibbon(bool? IsInEditorialMode = false) { InitializeComponent(); this.btnInsSupInfo.Tag = string.Format("{0} {1}", (int)E_FromTypes.SupInfos, 1040); // Make type of rno (40) & special case 1000 @@ -1021,8 +1021,16 @@ namespace Volian.Controls.Library // hide the import from Word file if not running in Debug mode if (!VlnSettings.DebugMode) rbnImpWrd.Visible = false; - } - void _RibbonControl_SizeChanged(object sender, EventArgs e) + + // C2015-028 Add Editorial Mode to PROMS Step Editor + // default Editorial Mode to what is set in the DisplayTabControl + SetEditorialMode(IsInEditorialMode != null && (bool) IsInEditorialMode); + + } + + public void SetEditorialMode(bool mode) => btnEditorialMode.Checked = btnCMEditorialMode.Checked = mode; + + void _RibbonControl_SizeChanged(object sender, EventArgs e) { this.Size = _RibbonControl.Size; } @@ -3125,7 +3133,7 @@ namespace Volian.Controls.Library btnCMRedo.Enabled = btnRedo.Enabled = _MyStepRTB.CanRedo; btnCMUndo.Enabled = btnUndo.Enabled = _MyStepRTB.CanUndo; } - private void btnGoTo_Click(object sender, EventArgs e) + private void btnGoTo_Click(object sender, EventArgs e) { // if on a transition, go to the selected transition 'to'. If on // a referenced object, bring up ReferencedObject Editor (for now, just put up a message box. @@ -3211,7 +3219,29 @@ namespace Volian.Controls.Library System.Diagnostics.Process.Start(roapp, args); } } - private void btnChgTyp_Click(object sender, EventArgs e) + + // C2015-028 Add Editorial Mode to PROMS Step Editor + private void btnEditorialMode_Click(object sender, EventArgs e) + { + //toggle button is selected + SetEditorialMode(!btnEditorialMode.Checked); + + //set the overall flag in the displaytabcontrol + StepTabPanel tmp = Parent as StepTabPanel; + tmp.MyDisplayTabControl.IsInEditorialMode = btnEditorialMode.Checked; + + //refresh the current item so the background color changes (LightGreen=Editorial Mode, SkyBlue=Normal Selected) + if (MyEditItem != null) + { + _MyEditItem.RefreshContent(); + Application.DoEvents(); + } + + //set other preciously opened tabs to match the state of Editorial Mode in the current tab + tmp.MyDisplayTabControl.SetEdititorialModeForAllTabs(btnEditorialMode.Checked); + } + + private void btnChgTyp_Click(object sender, EventArgs e) { StepPanelTabDisplayEventArgs args = new StepPanelTabDisplayEventArgs("Change Step Type"); MyEditItem.MyStepPanel.OnTabDisplay(sender, args); @@ -3279,7 +3309,8 @@ namespace Volian.Controls.Library rtabInsert.Visible = false; rtabAdmin.Visible = false; rtabReview.Select(); - btnCMEditMode1.Enabled = btnEditMode.Enabled = false; // don't allow reviewer toggle out of view mode + btnCMEditMode1.Enabled = btnEditMode.Enabled = btnCMEditorialMode.Enabled = false; // don't allow reviewer toggle out of view mode + btnCMEditorialMode.Visible = false; } } public void SetupROEditorMode() diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs index 33fc65fe5b524d2adb6f050cb1c1792c6312116d..f374745296d67545dc0e0e3210589c9c65294b12 100644 GIT binary patch delta 944 zcmX@oue@rp@&-TU>Cf00HKspkXXW6}XDDLGWJqMlVenNDswC;-J|RlzKV zB!&`(JO)>W6rfW}fX+m5GD9jzB}C8khir_xSUon~(3?e37N-#mN?=FGG6OA~e!iVm z5)Fx3Av1H1np3tzGgLJ7HblZE)yfslgq4(+htvicY^{$HbuscNs$rFt}oX!KVO(;5Y^bIxb)E_p-)fcUhtn zqd02ZOuvxGB!?oT4oWp*?J7x3K+FupEZbF*SnphzE*8qBB#dwo%oRG*1w+~7!6|3E zi7{K9@ANmuY#c~|y0)Fwcv3$Pk_aT2>)C{m#3r_~ickOG$tHp|aU#Nm8{q8P5J zOv4=njz1YKr%woDW0|f4bY}am2Da_H8rV-P28Mya^dNqY7-@`1g9kV$g^Pj|B}|V2 e=AiBGR5G)>2~6ISRWRM4l!<5aJe8cH=>k@49FwPU< z4IA6^5Bh9e%^EYdYs_HGS~6Y2icM;IfjyJRb}3sXE4AqkwyX-%>lm3hrmxEb5-fSl z8X#kZ+8<;v0WmWWvuuBm!FuPybT4jpmFWu%*f_QWEot*@ujyplUen2bVexbc367NM a3#2*Nw)^REOwgQOA;`qHy&!_asuBQ Date: Fri, 26 Sep 2025 09:33:23 -0400 Subject: [PATCH 02/16] B2022-126 F2025-013 F2025-020 F2025-021 F2025-022 Vogtle 3_4 Two Column Format --- PROMS/Formats/fmtall/VEGP2all.xml | Bin 227664 -> 227704 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index b1b34c182e24e4f31d77cdaae517d7d231a5578f..07d9a30624a1f151453fa46940cd5196785ff3b1 100644 GIT binary patch delta 213 zcmccciTB4R-VH1|vOx@f4E_w^44Dim3?&R1430oLi@}ybiNTn`qWQn}_W#<9_FdBx z@|YE-Kj>!EnSNk5%tuD4Y5$m9wojPH)FQ@g$zV8LP?Y)m z^ap`VEYlsHGfkSdhiTRHhA<|T=?h*U@us~(;!IC?jm$gnhAD5`9;QQ6r%S{#^KJi@ p%Djhh`hnSuLem#`FfZBe5W+0M#%cs~qUm(OP-e~TO;OC}?r~qw{V^U#ufoMmoXIs`L{5(0<@c#8gK(vx9~y(asjulQv=Qh Om*8y!Dz~ay1I`|mK`apf From e7f7f28ff1da9bdda4379454e20180cbae9ba42d Mon Sep 17 00:00:00 2001 From: mschill Date: Fri, 26 Sep 2025 09:58:35 -0400 Subject: [PATCH 03/16] B2025-048 Problem with Printing CAS Steps --- PROMS/VEPROMS User Interface/frmPDFStatusForm.cs | 9 +++++++++ PROMS/Volian.Print.Library/PromsPrinter.cs | 16 +++++++++++++++- PROMS/Volian.Print.Library/vlnParagraph.cs | 5 ++++- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs index 9b024af5..14ddb2ab 100644 --- a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs +++ b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs @@ -284,6 +284,15 @@ namespace VEPROMS cachePartInfo = PartInfo.CacheList; } + //B2025-048 Problem with Printing CAS Steps + // skip doing section titles if printing CAS or CTAS + // - was causing it to + // skip/overwrite data + if (OnlyShowContinuousActionSummary) + { MyPromsPrinter.PromsPrinterPrintType = PromsPrinterPrintType.CAS_Only; } + if (OnlyShowTimeCriticalActionSummary) + { MyPromsPrinter.PromsPrinterPrintType = PromsPrinterPrintType.TCAS_only; } + _PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper, MakeContinuousActionSummary, MakeTimeCriticalActionSummary, PrtSectID); ProfileTimer.Pop(profileDepth); diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index 90103d95..e1105806 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -85,6 +85,14 @@ namespace Volian.Print.Library ProgressSetup, LoadVlnParagraph } + + //B2025-048 Problem with Printing CAS Steps + public enum PromsPrinterPrintType + { + Normal, + CAS_Only, + TCAS_only + } public class PromsPrinter { public bool NeedSupInfoBreak = false; @@ -331,6 +339,12 @@ namespace Volian.Print.Library get { return _MergedPdf; } set { _MergedPdf = value; } } + + //B2025-048 Problem with Printing CAS Steps + // default to Normal + // will skip certain logic if CAS Only or CTS Only + public PromsPrinterPrintType PromsPrinterPrintType { get; set; } = PromsPrinterPrintType.Normal; + public PromsPrinter(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, string backgroundFolder, bool openPDF, bool overWrite, ChangeBarDefinition cbd, String pdfFile, bool insertBlankPages, bool batchPrint, string prefix, bool saveLinks, int removeTrailngHardReturnsAndManualPageBreaks, string blankPageText, bool didAll, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1) { @@ -1266,7 +1280,7 @@ namespace Volian.Print.Library set { _MyTimeCriticalActSummary = value; } } - public void CreateWordDocPdf(PdfContentByte cb, SectionInfo mySection) + public void CreateWordDocPdf(PdfContentByte cb, SectionInfo mySection) { if (mySection.PageNumber == -1) // If page num transition goes to a section, need the pagenumber of section. { diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index afacd8a5..4f0885d1 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -2159,7 +2159,10 @@ namespace Volian.Print.Library } // If "doSectionTitleContinued" is true then print the section title with "(Continued)" appended to it // format must have ContinueSectinHeader format flag set to true - if (doSectionTitleContinued) + //B2025-048 Problem with Printing CAS Steps + // skip this if printing CAS or CTAS - was causing it to + // skip/overwrite data + if (doSectionTitleContinued && MyPromsPrinter.PromsPrinterPrintType == PromsPrinterPrintType.Normal) { vlnParagraph sectContPara; string contMsg = (MyItemInfo.ActiveSection != null) ? MyItemInfo.ActiveSection.MyDocStyle.Continue.SectionTitle.AppendToTitle : ""; // C2018-003 fixed use of getting the active section From 1ef6a1d0e4e7912e4da19de44ccdfe5ebe0fbd90 Mon Sep 17 00:00:00 2001 From: mschill Date: Fri, 26 Sep 2025 10:37:30 -0400 Subject: [PATCH 04/16] B2025-051 - Quick Print Section is not automatically working unless the sections have applicability --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 2dc29d4b..5278e3e8 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -1325,12 +1325,17 @@ namespace VEPROMS prnDlg.SetupForProcedure(); // Setup filename if (quickprint) + { + prnDlg.OverwritePDF = false; // turn off overwriting of PDFs B2025-051 prnDlg.QPCreatePDF(); // Create Print report - else - prnDlg.ShowDialog(this); // Create Print report + } + else + { + prnDlg.ShowDialog(this); // Create Print report + } - //B2025-032 Fix Section not Printing Applicability Properly - si2.MyDocVersion.DocVersionConfig.SelectedSlave = 0; + //B2025-032 Fix Section not Printing Applicability Properly + si2.MyDocVersion.DocVersionConfig.SelectedSlave = 0; si2.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0; } } From 808a1ba0ea54e57178909b47d35034f49cd15734 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Mon, 29 Sep 2025 14:01:17 -0400 Subject: [PATCH 05/16] F2025-014 Enabled Parent/Child logic of PSI items on the Cover Page section, as a only once Cover Page style is needed. --- PROMS/Formats/fmtall/VEGP2all.xml | Bin 227704 -> 228334 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 07d9a30624a1f151453fa46940cd5196785ff3b1..6625b2bb13598d8a06718105077d0c74f00f7a5f 100644 GIT binary patch delta 999 zcmaiyJ!n%=6vxj!r^M76Y?3CWNuw`CgNCL_+N9B915HuvV2oO%idfQG@S{y4v0qXV zKL$4o4?HSGa8h(pJKV)V9g2fP2EoBas6!V+ErPm;H!rCj+EgC*ao@fF^Lyui&iS=s zDgLy)SlO+cJGZ^^`Ekop$iOH}vv(ftb^VZq9Grj=7-s8z;ov_BGR=qfv}|W>08M=L zny9Zm07sPI3Z(VBk)WfpF9)g93ks28>o?&L8V7pGO&t)`-`YG?lwN_W%Kb_SEud9c zNf?JQNGV=kQ7dHVfpc&Xx|J>fVF*F26ro$AjgE~pq0Rn0BO1A_mt3nEHf`ud<%c~n_7iogMZZVoljYko6`E`7#o=J**r-ndR_6sBET+weJ6<17!L z!I`QS&fkaelbmhGCHxjpv!e$Ka?H~(lDV`$yXYN)O$po8F%b`igvl9 z2Ma=KJ1JqlXTw9BO3*&}FpFK6WZ@kaYNYu$7D>)7VoM)uHuUjO5nJ7p5LBGJ8kQk7 z68X~Xt_};|$fARj<79fG>TBU<2mM$ZWG)niOXe2QC5*0=zcY_;qLvq$$tmBr(rt^; zBAM%=kK`#ES#M*_1ZU=iiI=kERNWUj%F5*g`B9p>DK4aP^tF?QRQ t`B;QJA|e&+0a6UY{PGm_urEnxIdz&^<(DyP7Mwas30~-+20lDZp}#91`PTpd delta 411 zcmaF&o%hEl-VL8rr>8t*6xgJu!L&I^LxX>EfUCuAenlM}*MHHTSm53^=8xh1H; zpv$1Z5Xz9pkjYR2WEoF?Sj;56eU2#8H0kLAK1}DP7kDwTZLcwAy23O~p6SZ=c@|7B zz^v&&F_GnI`c}_TUqk_K8tyyNL=@ z95akJJwcU;W&0U*CIcpz&~_s&rde#0xukd|*9dYk=>VI&up>XESSkEd;66 Date: Tue, 30 Sep 2025 08:31:40 -0400 Subject: [PATCH 06/16] =?UTF-8?q?B2025-046=20/=20B2025-043=20/=20B2024-082?= =?UTF-8?q?=20=E2=80=93=20Remember=20Tabs=20Changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 14 ++++++++------ PROMS/Volian.Controls.Library/DisplayTabControl.cs | 3 ++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 5278e3e8..e52c6b21 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -1807,14 +1807,15 @@ namespace VEPROMS // Deactivate previous procedure tab state by user VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID); // Save current procedure tab state - foreach (KeyValuePair pgTab in tc._MyDisplayTabItems) + + //B2024-082 Remember Tabs Not opening in correct order + foreach (DisplayTabItem dti in tc.MyBar.Items) { cnt++; - DisplayTabID = pgTab.Key; - TabItemID = Int32.Parse(DisplayTabID.Substring(DisplayTabID.IndexOf("Item - ") + 7)); - DisplayTabName = pgTab.Value.ToString(); - //tc.SelectedDisplayTabItem.MyStepTabPanel.ToString() - VEPROMS.CSLA.Library.Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt); + DisplayTabID = dti.MyKey; + TabItemID = dti.MyItemInfo.ItemID; + DisplayTabName = dti.ToString(); + Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt); } } @@ -2513,6 +2514,7 @@ namespace VEPROMS { SelectedStepTabPanel.Select(); dlgFindReplace.MyEditItem = tc.MyEditItem; + SpellChecker.MyEditItem = tc.MyEditItem; //B2025-043 Remember Tabs is not setting the EditItem for the active window causing a PROMS crash when Spell Check } } } diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index 0b301aaf..bda8b089 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -603,7 +603,8 @@ namespace Volian.Controls.Library { ItemInfo myItemInfo = myItemInfo2; - if (myItemInfo.MyDocVersion == null) // bug fix: B2016-108 disconnected data will not have a MyDocVersion + //B2025-046 Remember Tabs failing when swapping versions of PROMS + if (myItemInfo?.MyDocVersion == null) // bug fix: B2016-108 disconnected data will not have a MyDocVersion { FlexibleMessageBox.Show(this, "Possible disconnected item", "Item Not Found"); return null; From abcf035143fabaa9e71da17b3b31de39109f3c3a Mon Sep 17 00:00:00 2001 From: John Jenko Date: Tue, 30 Sep 2025 16:00:36 -0400 Subject: [PATCH 07/16] =?UTF-8?q?F2025-023=20Fixed=20a=20typo=20in=20the?= =?UTF-8?q?=20ReplaceWords=20list=20in=20the=20Vogtle=20formats.=20Lowerca?= =?UTF-8?q?sed=20=E2=80=9Cassemble=E2=80=9D=20was=20misspelled=20as=20?= =?UTF-8?q?=E2=80=9Cbssemble=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/VEGP1all.xml | Bin 183638 -> 183638 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 228334 -> 228334 bytes PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 209292 -> 209292 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index 29750164de5b19d3a76e3d143e64bde616ce349b..4432611c947151611bd217d1b41bcef76d890f65 100644 GIT binary patch delta 28 kcmcaMi~HIv?hVJ{7!xP&jWurm71#bNj&b|1IHs690L$JDqW}N^ delta 28 kcmcaMi~HIv?hVJ{7?URNjWurm71#bNj&b|1IHs690L$5`3(vH diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index fa17a95ceec7f600c21481742eacdfd60a74e2f9..49932a6bf0c09c05a64983905e3084f4eb54ed3b 100644 GIT binary patch delta 28 jcmeBq%+vFjX9J5DW8!2+Pvd3_uXYPB#_bkfOd-z!m&*z4 delta 28 jcmeBq%+vFjX9J5DW71?sPvd3_uXYPB#_bkfOd-z!m)!~N From dd5c709709814924dfc6fb70518d9382e8abc79a Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 1 Oct 2025 10:58:23 -0400 Subject: [PATCH 08/16] =?UTF-8?q?F2025-024=20Turned=20off=20the=20automati?= =?UTF-8?q?c=20bolding=20of=20RNOs=20in=20Vogtle=E2=80=99s=20Two=20Column?= =?UTF-8?q?=20Format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/VEGP2all.xml | Bin 228334 -> 228334 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 94272c36e3135a2a6b8540f1c9226650b591db2f..b433d29fb0c1bc302d7e07848cb943f30d918468 100644 GIT binary patch delta 36 scmaF&o%h{$-i9rV6LwC&aFtPQdcZUwA#jj!PJ6{J#_bimn92?U09EV}O8@`> delta 36 rcmaF&o%h{$-i9rV6LwBFn82tuJzyG;5ID# Date: Thu, 2 Oct 2025 08:02:33 -0400 Subject: [PATCH 09/16] =?UTF-8?q?C2025-037=20=E2=80=93=20Spell=20Check=20C?= =?UTF-8?q?loses=20after=20one=20section?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Volian.Controls.Library/VlnSpellCheck.cs | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/PROMS/Volian.Controls.Library/VlnSpellCheck.cs b/PROMS/Volian.Controls.Library/VlnSpellCheck.cs index 00261916..e9a71054 100644 --- a/PROMS/Volian.Controls.Library/VlnSpellCheck.cs +++ b/PROMS/Volian.Controls.Library/VlnSpellCheck.cs @@ -27,10 +27,26 @@ namespace Volian.Controls.Library while (MyEditItem.SpellCheckNext()) { ItemInfo next = MyEditItem.MyItemInfo.SearchNext; - if (next == null || !next.IsStep) // B2016-063 check if next is not a step type instead of specifically a section - return; // spell check only current section - MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(next); - } + //C2025-037 Evaluate the way that Spell Check (in step editor sections) is currently closing after one section. + + if (next == null || next.IsProcedure) // B2016-063 check if next is not a step type instead of specifically a section + { + return; // spell check only current procedure + } + + //If it is a word document, find the next non-word document + while (next.HasWordContent) + { + next = next.SearchNext; + + if (next == null || next.IsProcedure) // B2016-063 check if next is not a step type instead of specifically a section + { + return; // spell check only current procedure + } + } + + MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(next); + } MyEditItem.SetFocus(); } From 50977b367fe3d1631a316eb3e968249983f294f2 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Thu, 2 Oct 2025 14:05:04 -0400 Subject: [PATCH 10/16] =?UTF-8?q?F2025-025=20Added=20the=20=E2=80=9CAttach?= =?UTF-8?q?ment=20-=20Single=20Column=20Step=20Editor=E2=80=9D=20section?= =?UTF-8?q?=20type=20to=20the=20Vogtle=20Two=20Column=20format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/VEGP2all.xml | Bin 228334 -> 229308 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index b433d29fb0c1bc302d7e07848cb943f30d918468..91f4a886b779542957f6bf9d3de8010eb6a332bf 100644 GIT binary patch delta 416 zcmaF&op;ZF-VL*urz>bPb4=&RVdismW5{PHVhCnPWhh`s1hNttN`UMDAf3*T$&d%; zX9CsaG57;Yx76sc+DiVeVGT75Z5+t z<_gwr!Av$Uu&bIrZ$2a2^dC9QVvNSq4Re{xr;BMbi)?prU{+(CzAu!SXZov0j3Uz~ z{9vq`uAs=oF+InNxsBPB!F2k;FlNW;1y0Oy)6c~)Yk*XQO)uzWl-jQ2!|cPfJ;9zi Tk7Ig^7PAP7qrSN_|1bssB^7y| delta 660 zcmdn;Z13a!tT#V!z0xrL}f>C&SLOmnPbSDpHDMsVzg3-* Date: Mon, 6 Oct 2025 14:02:22 -0400 Subject: [PATCH 11/16] C2025-053 Upgrade Ro-Editor / Compare Report / Ro To SQL to 64 bits --- .../Exe/RefObj/CmpRpt/CmpRpt.csproj | 7 +- .../Exe/RefObj/ROEditor/AssemblyInfo.cs | 8 +- .../Exe/RefObj/ROEditor/ROEditor.csproj | 7 +- .../DBEncapsulation/DBEncapsulation.csproj | 6 +- .../Org.Mentalis.Files.csproj | 6 +- .../LibSource/RODBInterface/RODBInterface.cs | 2 +- .../RODBInterface/RODBInterface.csproj | 17 +- .../LibSource/ROFST/ROFST.csproj | 6 +- .../LibSource/ROField/ROFields.csproj | 6 +- .../LibSource/Utils/Utils.csproj | 6 +- .../LibSource/VlnProfiler/VlnProfiler.csproj | 6 +- .../LibSource/VlnStatus/VlnStatus.csproj | 6 +- .../ctlXMLEditLib/ctlXMLEditLib.csproj | 6 +- PROMS/RoAccessToSql/RoAccessToSql.cs | 2 +- PROMS/RoAccessToSql/RoAccessToSql.csproj | 11 + PROMS/VEPROMS/VEPROMS.sln | 66 ++--- PROMS/VEPROMS/VlnStatus64/StatusBarFrm.cs | 232 ------------------ PROMS/VEPROMS/VlnStatus64/StatusBarFrm.resx | 157 ------------ PROMS/VEPROMS/VlnStatus64/StatusMessageFrm.cs | 140 ----------- .../VEPROMS/VlnStatus64/StatusMessageFrm.resx | 139 ----------- PROMS/VEPROMS/VlnStatus64/VlnStatus64.csproj | 58 ----- PROMS/VEPROMS/VlnStatus64/VlnStatusBar.cs | 148 ----------- PROMS/VEPROMS/VlnStatus64/VlnStatusMessage.cs | 79 ------ .../Volian.Print.Library.csproj | 4 +- 24 files changed, 109 insertions(+), 1016 deletions(-) delete mode 100644 PROMS/VEPROMS/VlnStatus64/StatusBarFrm.cs delete mode 100644 PROMS/VEPROMS/VlnStatus64/StatusBarFrm.resx delete mode 100644 PROMS/VEPROMS/VlnStatus64/StatusMessageFrm.cs delete mode 100644 PROMS/VEPROMS/VlnStatus64/StatusMessageFrm.resx delete mode 100644 PROMS/VEPROMS/VlnStatus64/VlnStatus64.csproj delete mode 100644 PROMS/VEPROMS/VlnStatus64/VlnStatusBar.cs delete mode 100644 PROMS/VEPROMS/VlnStatus64/VlnStatusMessage.cs diff --git a/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj b/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj index 46a1ce81..69547b19 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj +++ b/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj @@ -59,7 +59,7 @@ 4 full prompt - x86 + x64 false @@ -85,6 +85,7 @@ none prompt false + x64 true @@ -92,7 +93,7 @@ DEBUG;TRACE 285212672 full - x86 + x64 prompt false @@ -103,7 +104,7 @@ true - x86 + x64 prompt false diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs index 893433cd..51591879 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs @@ -23,8 +23,8 @@ using System.Runtime.CompilerServices; // Build YYMM (two digit year, two digit month) // Revision DHH (day - no leading zero, two digit hour - military time // -[assembly: AssemblyVersion("2.3.2410.907")] -[assembly: AssemblyFileVersion("2.3.2410.907")] +[assembly: AssemblyVersion("2.3.2510.208")] +[assembly: AssemblyFileVersion("2.3.2510.208")] // // In order to sign your assembly you must specify a key to use. Refer to the @@ -91,6 +91,10 @@ using System.Runtime.CompilerServices; + + + + diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj index 69260b95..37501190 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj @@ -7,7 +7,7 @@ true - x86 + x64 prompt false @@ -71,7 +71,7 @@ full prompt false - x86 + x64 bin\Release\ @@ -96,6 +96,7 @@ none prompt false + x64 true @@ -103,7 +104,7 @@ DEBUG;TRACE 285212672 full - x86 + x64 prompt false diff --git a/PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj b/PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj index 24c52712..6aeabba3 100644 --- a/PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj +++ b/PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj @@ -62,6 +62,7 @@ full prompt false + x64 bin\Release\ @@ -86,6 +87,7 @@ none prompt false + x64 true @@ -93,7 +95,7 @@ DEBUG;TRACE 285212672 full - x86 + x64 prompt false @@ -104,7 +106,7 @@ true - x86 + x64 prompt false diff --git a/PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj b/PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj index d214040b..5f3e659f 100644 --- a/PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj +++ b/PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj @@ -35,6 +35,7 @@ prompt 4 false + x64 pdbonly @@ -44,13 +45,14 @@ prompt 4 false + x64 true bin\Debug\ DEBUG;TRACE full - x86 + x64 prompt false @@ -59,7 +61,7 @@ TRACE true pdbonly - x86 + x64 prompt false diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs index 2a5d8c8b..e90ede1e 100644 --- a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs +++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs @@ -409,7 +409,7 @@ namespace RODBInterface GetDbServerInfo(ropath); if (!dbProviderType.Equals((int)DB_PROVIDER.SQL_SERVER)) { - strDatabaseConnectionCommand = "Provider=Microsoft.Jet.OLEDB.4.0;Password=\"\";User ID=Admin;Data Source=" + DataConnectionPath + "\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False"; + strDatabaseConnectionCommand = "Provider=Microsoft.ACE.OLEDB.12.0;Password=\"\";User ID=Admin;Data Source=" + DataConnectionPath + "\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False"; } } #endregion diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj index 12e54462..13f15e3f 100644 --- a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj +++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj @@ -62,6 +62,7 @@ full prompt false + x64 bin\Release\ @@ -86,6 +87,7 @@ none prompt false + x64 true @@ -93,7 +95,7 @@ DEBUG;TRACE 285212672 full - x86 + x64 prompt false @@ -104,7 +106,7 @@ true - x86 + x64 prompt false @@ -171,6 +173,17 @@ VlnStatus + + + {4AC9E1DA-5BAD-4AC7-86E3-24F4CDCECA28} + 12 + 0 + 0 + primary + False + True + + diff --git a/PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj b/PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj index 75a2ba87..48570cc2 100644 --- a/PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj +++ b/PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj @@ -62,6 +62,7 @@ full prompt false + x64 bin\Release\ @@ -86,6 +87,7 @@ none prompt false + x64 true @@ -93,7 +95,7 @@ DEBUG;TRACE;Upgrade2005; 285212672 full - x86 + x64 prompt false @@ -104,7 +106,7 @@ true - x86 + x64 prompt false diff --git a/PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj b/PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj index 16950805..a4f28cc5 100644 --- a/PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj +++ b/PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj @@ -62,6 +62,7 @@ full prompt false + x64 bin\Release\ @@ -86,6 +87,7 @@ none prompt false + x64 true @@ -93,7 +95,7 @@ DEBUG;TRACE 285212672 full - x86 + x64 prompt false @@ -104,7 +106,7 @@ true - x86 + x64 prompt false diff --git a/PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj b/PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj index fee231fd..fc072007 100644 --- a/PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj +++ b/PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj @@ -77,6 +77,7 @@ full prompt false + x64 bin\Release\ @@ -101,6 +102,7 @@ none prompt false + x64 true @@ -108,7 +110,7 @@ DEBUG;TRACE 285212672 full - x86 + x64 prompt false @@ -119,7 +121,7 @@ true - x86 + x64 prompt false diff --git a/PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj b/PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj index 5c482323..df4f647e 100644 --- a/PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj +++ b/PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj @@ -7,7 +7,7 @@ true - x86 + x64 prompt false @@ -73,6 +73,7 @@ full prompt false + x64 bin\Release\ @@ -97,6 +98,7 @@ none prompt false + x64 true @@ -104,7 +106,7 @@ DEBUG;TRACE 285212672 full - x86 + x64 prompt false diff --git a/PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj b/PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj index 1b9f33a0..90978560 100644 --- a/PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj +++ b/PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj @@ -62,6 +62,7 @@ full prompt false + x64 bin\Release\ @@ -86,6 +87,7 @@ none prompt false + x64 true @@ -93,7 +95,7 @@ DEBUG;TRACE 285212672 full - x86 + x64 prompt false @@ -104,7 +106,7 @@ true - x86 + x64 prompt false diff --git a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj index e5629e60..2c914674 100644 --- a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj +++ b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj @@ -62,6 +62,7 @@ full prompt false + x64 bin\Release\ @@ -86,6 +87,7 @@ none prompt false + x64 true @@ -93,7 +95,7 @@ DEBUG;TRACE 285212672 full - x86 + x64 prompt false @@ -104,7 +106,7 @@ true - x86 + x64 prompt false diff --git a/PROMS/RoAccessToSql/RoAccessToSql.cs b/PROMS/RoAccessToSql/RoAccessToSql.cs index 9c2a23e4..afe5a3ae 100644 --- a/PROMS/RoAccessToSql/RoAccessToSql.cs +++ b/PROMS/RoAccessToSql/RoAccessToSql.cs @@ -229,7 +229,7 @@ namespace RoAccessToSql if (sqlConnection.State == ConnectionState.Open) { // now try to open access db: - string strDatabaseConnectionCommand = "Provider=Microsoft.Jet.OLEDB.4.0;Password=\"\";User ID=Admin;Data Source=" + MSAccessPath + "\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False"; + string strDatabaseConnectionCommand = "Provider=Microsoft.ACE.OLEDB.12.0;Password=\"\";User ID=Admin;Data Source=" + MSAccessPath + "\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False"; using (OleDbConnection accessConnection = new OleDbConnection(strDatabaseConnectionCommand)) { try diff --git a/PROMS/RoAccessToSql/RoAccessToSql.csproj b/PROMS/RoAccessToSql/RoAccessToSql.csproj index 87f2089f..d956be8a 100644 --- a/PROMS/RoAccessToSql/RoAccessToSql.csproj +++ b/PROMS/RoAccessToSql/RoAccessToSql.csproj @@ -100,6 +100,17 @@ + + + {4AC9E1DA-5BAD-4AC7-86E3-24F4CDCECA28} + 12 + 0 + 0 + primary + False + True + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 1.3 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - False - - - Private - - - Private - - - False - - - Private - - - Private - - - False - - - Private - - - Private - - - False - - - (Default) - - - False - - - False - - - 8, 8 - - - True - - - 80 - - - StatusBarFrm - - - True - - - Private - - \ No newline at end of file diff --git a/PROMS/VEPROMS/VlnStatus64/StatusMessageFrm.cs b/PROMS/VEPROMS/VlnStatus64/StatusMessageFrm.cs deleted file mode 100644 index 386d145c..00000000 --- a/PROMS/VEPROMS/VlnStatus64/StatusMessageFrm.cs +++ /dev/null @@ -1,140 +0,0 @@ -/********************************************************************************************* - * Copyright 2002 - Volian Enterprises, Inc. All rights reserved. - * Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE - * ------------------------------------------------------------------------------ - * $Workfile: StatusMessageFrm.cs $ $Revision: 3 $ - * $Author: Jsj $ $Date: 5/11/04 9:30a $ - * - * $History: StatusMessageFrm.cs $ - * - * ***************** Version 3 ***************** - * User: Jsj Date: 5/11/04 Time: 9:30a - * Updated in $/LibSource/VlnStatus - * - * ***************** Version 2 ***************** - * User: Jsj Date: 11/26/02 Time: 3:38p - * Updated in $/LibSource/VlnStatus - * Added overbounds check - *********************************************************************************************/ - -using System; -using System.Drawing; -using System.Collections; -using System.ComponentModel; -using System.Windows.Forms; - -namespace VlnStatus -{ - /// - /// Create status message window. - /// - public class StatusMessageFrm : System.Windows.Forms.Form - { - private System.Windows.Forms.Label lblStatMsg; - /// - /// Required designer variable. - /// - private System.ComponentModel.Container components = null; - - public StatusMessageFrm() - { - // - // Required for Windows Form Designer support - // - InitializeComponent(); - } - - public StatusMessageFrm(string StatTitle) - { - // - // Required for Windows Form Designer support - // - InitializeComponent(); - - Text = StatTitle; - } - - /// - /// Clean up any resources being used. - /// - protected override void Dispose( bool disposing ) - { - if( disposing ) - { - if(components != null) - { - components.Dispose(); - } - } - base.Dispose( disposing ); - } - - #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.lblStatMsg = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // lblStatMsg - // - this.lblStatMsg.Location = new System.Drawing.Point(19, 20); - this.lblStatMsg.Name = "lblStatMsg"; - this.lblStatMsg.Size = new System.Drawing.Size(420, 81); - this.lblStatMsg.TabIndex = 0; - this.lblStatMsg.Text = "Put Status Message Here"; - this.lblStatMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // StatusMessageFrm - // - this.AutoScaleBaseSize = new System.Drawing.Size(7, 19); - this.ClientSize = new System.Drawing.Size(457, 117); - this.ControlBox = false; - this.Controls.Add(this.lblStatMsg); - this.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "StatusMessageFrm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Status"; - this.TopMost = true; - this.Load += new System.EventHandler(this.StatusMessageFrm_Load); - this.ResumeLayout(false); - - } - #endregion - - private void StatusMessageFrm_Load(object sender, System.EventArgs e) - { - - } - - public string StatusMessage - { - get - { - return lblStatMsg.Text; - } - set - { - lblStatMsg.Text = value; - lblStatMsg.Refresh(); - } - } - - public string StatusBoxTitle - { - get - { - return Text; - } - set - { - Text = value; - } - } - } -} diff --git a/PROMS/VEPROMS/VlnStatus64/StatusMessageFrm.resx b/PROMS/VEPROMS/VlnStatus64/StatusMessageFrm.resx deleted file mode 100644 index 7edd5b3c..00000000 --- a/PROMS/VEPROMS/VlnStatus64/StatusMessageFrm.resx +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 1.3 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - False - - - Private - - - Private - - - False - - - (Default) - - - False - - - False - - - 8, 8 - - - StatusMessageFrm - - - True - - - 80 - - - True - - - Private - - \ No newline at end of file diff --git a/PROMS/VEPROMS/VlnStatus64/VlnStatus64.csproj b/PROMS/VEPROMS/VlnStatus64/VlnStatus64.csproj deleted file mode 100644 index b0ea1627..00000000 --- a/PROMS/VEPROMS/VlnStatus64/VlnStatus64.csproj +++ /dev/null @@ -1,58 +0,0 @@ - - - - - Debug - AnyCPU - {797DE52C-278C-41D4-8B65-B9CFC02DDCD9} - Library - Properties - VlnStatus64 - VlnStatus64 - v4.8.1 - 512 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - x64 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - x64 - - - - - - - - - - - - Form - - - Form - - - - - - - - - - \ No newline at end of file diff --git a/PROMS/VEPROMS/VlnStatus64/VlnStatusBar.cs b/PROMS/VEPROMS/VlnStatus64/VlnStatusBar.cs deleted file mode 100644 index a7a4e2cd..00000000 --- a/PROMS/VEPROMS/VlnStatus64/VlnStatusBar.cs +++ /dev/null @@ -1,148 +0,0 @@ -/********************************************************************************************* - * Copyright 2002 - Volian Enterprises, Inc. All rights reserved. - * Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE - * ------------------------------------------------------------------------------ - * $Workfile: VlnStatusBar.cs $ $Revision: 4 $ - * $Author: Jsj $ $Date: 11/26/02 4:25p $ - * - * $History: VlnStatusBar.cs $ - * - * ***************** Version 4 ***************** - * User: Jsj Date: 11/26/02 Time: 4:25p - * Updated in $/LibSource/VlnStatus - * fixed problem with counter - * - * ***************** Version 3 ***************** - * User: Jsj Date: 11/26/02 Time: 3:38p - * Updated in $/LibSource/VlnStatus - * Added overbounds check - *********************************************************************************************/ -using System; - -namespace VlnStatus -{ - /// - /// Creates a Status Window with a progression bar control. - /// - /// This class has two constructors. One allows you to pass in the title - /// of the Status Box. The Other provides a default title of "Status". - /// The Status Box Title can also be set/changed via the StatusBoxTitle - /// property. - /// - /// - /// - public class VlnStatusBar - { - StatusBarFrm StatBar; - private int Cnt; - - // Create a status window with the default title of "Status" - public VlnStatusBar() - { - StatBar = new StatusBarFrm(); - StatBar.Show(); - } - - // Create a status window with the passed in title - public VlnStatusBar(string Title) - { - StatBar = new StatusBarFrm(Title); - StatBar.Show(); - } - - // Increament the the status bar by the passed in value. - public void PerformStep(int val) - { -// StatBar.Value = val; -// Cnt = val; - BarValue = val; - StatBar.PerformStep(); - } - - // Increament the the status bar by one - public void PerformStep() - { -// StatBar.Value = StatBar.Value + 1; - Cnt++; - BarValue = Cnt; - StatBar.PerformStep(); - } - - // This property gets or sets the current status bar value. - public int BarValue - { - get - { - return StatBar.Value; - } - set - { - StatBar.Value = value; - Cnt = value; - } - } - - // This property sets or gets the maximum value that the - // BarValue property can be. i.e. when BarValue reaches this - // number, the status bar is completely displayed. - public int BarMax - { - get - { - return StatBar.Maximum; - } - set - { - StatBar.Maximum = value; - } - } - - // This property sets or gets the increamenting value used to - // move the status bar. For example, if set to 5, each tick of - // the status bar represents a value of 5. - public int BarStepValue - { - get - { - return StatBar.Step; - } - set - { - StatBar.Step = value; - } - } - - // This property sets or gets the message above the status bar. - public string StatMsg - { - get - { - return StatBar.StatusMessage; - } - set - { - StatBar.StatusMessage = value; - } - } - - // This property sets or gets the Status Window Title - public string StatusBoxTitle - { - get - { - return StatBar.StatusBoxTitle; - } - set - { - StatBar.StatusBoxTitle = value; - } - } - - public void Dispose() - { - StatBar.Dispose(); - } - - } -} - diff --git a/PROMS/VEPROMS/VlnStatus64/VlnStatusMessage.cs b/PROMS/VEPROMS/VlnStatus64/VlnStatusMessage.cs deleted file mode 100644 index e0221ee8..00000000 --- a/PROMS/VEPROMS/VlnStatus64/VlnStatusMessage.cs +++ /dev/null @@ -1,79 +0,0 @@ -/********************************************************************************************* - * Copyright 2002 - Volian Enterprises, Inc. All rights reserved. - * Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE - * ------------------------------------------------------------------------------ - * $Workfile: VlnStatusMessage.cs $ $Revision: 3 $ - * $Author: Jsj $ $Date: 11/26/02 3:38p $ - * - * $History: VlnStatusMessage.cs $ - * - * ***************** Version 3 ***************** - * User: Jsj Date: 11/26/02 Time: 3:38p - * Updated in $/LibSource/VlnStatus - * Added overbounds check - *********************************************************************************************/ - -using System; - -namespace VlnStatus -{ - /// - /// Creates a Status Window to display a status message. - /// - /// This class has two constructors. One allows you to pass in the title - /// of the Status Box. The Other provides a default title of "Status". - /// The Status Box Title can also be set/changed via the StatusBoxTitle - /// property. - /// - /// - public class VlnStatusMessage - { - StatusMessageFrm StatusMessageBox; - - // Create a status window with the default title of "Status" - public VlnStatusMessage() - { - StatusMessageBox = new StatusMessageFrm(); - StatusMessageBox.Show(); - } - - // Create a status window with the passed in title. - public VlnStatusMessage(string StatusBoxTitle) - { - StatusMessageBox = new StatusMessageFrm(StatusBoxTitle); - StatusMessageBox.Show(); - } - - // This property gets or sets the current status message - public string StatusMessage - { - get - { - return StatusMessageBox.StatusMessage; - } - set - { - StatusMessageBox.StatusMessage = value; - } - } - - // This property gets or sets the status box title - public string StatusBoxTitle - { - get - { - return StatusMessageBox.StatusBoxTitle; - } - set - { - StatusMessageBox.StatusBoxTitle = value; - } - } - - public void Dispose() - { - StatusMessageBox.Dispose(); - } - - } -} diff --git a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj index 2f0665a3..d4694ccd 100644 --- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj +++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj @@ -99,8 +99,8 @@ - - ..\VEPROMS\VlnStatus64\bin\Debug\VlnStatus64.dll + + ..\ReferencedObjects\LibSource\VlnStatus\bin\Debug\VlnStatus.dll From 1c766e568c276859518f8e466b0ac0d27b5345c5 Mon Sep 17 00:00:00 2001 From: mschill Date: Mon, 6 Oct 2025 16:01:59 -0400 Subject: [PATCH 12/16] C2025-053 Upgrade RO Editor to 64 bit Adjust build revision and revert AssembloInfo to as-is --- PROMS/AdjustBuildRevision/Program.cs | 4 ++-- .../Exe/RefObj/ROEditor/AssemblyInfo.cs | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/PROMS/AdjustBuildRevision/Program.cs b/PROMS/AdjustBuildRevision/Program.cs index 46f93fe3..73fe118c 100644 --- a/PROMS/AdjustBuildRevision/Program.cs +++ b/PROMS/AdjustBuildRevision/Program.cs @@ -32,9 +32,9 @@ namespace AdjustBuildRevision { // Allow for setting build revision on either proms or the roeditor: if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ")) - outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")"); + outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.4.yyMM.dHH") + "\")"); else - outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")"); + outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.4.yyMM.dHH") + "\")"); // if (outline != line) // { // Console.WriteLine("Before: '{0}'", line); diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs index 51591879..f2e65ff6 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyProduct("Referenced Objects Editor")] [assembly: AssemblyCopyright("2013")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] +[assembly: AssemblyCulture("")] // // Version information for an assembly consists of the following four values: @@ -23,8 +23,8 @@ using System.Runtime.CompilerServices; // Build YYMM (two digit year, two digit month) // Revision DHH (day - no leading zero, two digit hour - military time // -[assembly: AssemblyVersion("2.3.2510.208")] -[assembly: AssemblyFileVersion("2.3.2510.208")] +[assembly: AssemblyVersion("2.3.2410.907")] +[assembly: AssemblyFileVersion("2.3.2410.907")] // // In order to sign your assembly you must specify a key to use. Refer to the @@ -91,10 +91,6 @@ using System.Runtime.CompilerServices; - - - - From 3f618bc970fb198921955a4ea23d64b2f086eeab Mon Sep 17 00:00:00 2001 From: mschill Date: Mon, 6 Oct 2025 16:07:19 -0400 Subject: [PATCH 13/16] C2025-053 Upgrade RO Editor to 64 bit Remove AssemblyInfo changes --- PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs index f2e65ff6..893433cd 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyProduct("Referenced Objects Editor")] [assembly: AssemblyCopyright("2013")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] +[assembly: AssemblyCulture("")] // // Version information for an assembly consists of the following four values: From f6e3c72e9c21023c5ba3682fdb221e8488fca753 Mon Sep 17 00:00:00 2001 From: mschill Date: Mon, 6 Oct 2025 16:17:27 -0400 Subject: [PATCH 14/16] C2025-053 Upgrade RO Editor to 64 bit Adjust Build Revision --- PROMS/AdjustBuildRevision/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PROMS/AdjustBuildRevision/Program.cs b/PROMS/AdjustBuildRevision/Program.cs index 73fe118c..773f3aaf 100644 --- a/PROMS/AdjustBuildRevision/Program.cs +++ b/PROMS/AdjustBuildRevision/Program.cs @@ -34,7 +34,7 @@ namespace AdjustBuildRevision if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ")) outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.4.yyMM.dHH") + "\")"); else - outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.4.yyMM.dHH") + "\")"); + outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")"); // if (outline != line) // { // Console.WriteLine("Before: '{0}'", line); From 091c56ec34a987bd75beaf266310c60fc89f301b Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 8 Oct 2025 13:58:05 -0400 Subject: [PATCH 15/16] F2025-0926 Got Vogtle 3&4 Background formats ready for use. --- PROMS/Formats/fmtall/VEGPBckStpsall.xml | Bin 52936 -> 52778 bytes PROMS/Formats/fmtall/VEGPBckall.xml | Bin 94402 -> 88838 bytes PROMS/Formats/genmacall/VEGPBck.svg | Bin 10888 -> 10828 bytes PROMS/Formats/genmacall/VEGPBckStps.svg | Bin 9628 -> 9568 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml index 68630929027e3657b7d951baf46cd3b2841a2ede..a6dfb8ef121ddcf4f98af6c5104540337da2c3fc 100644 GIT binary patch delta 452 zcmYk0K}cG09LN9fJ++ec7_LcsNkufxDDgSn+RW;C>LB&X5eROSP#yB%!PAKFu#3=X z-%W&EcuCZMbM*K_by2ab-0Popf)muoj@9$w)NBoK7;IADO}gjalX(oU8?o&*L409FEILzsx8Okb zdxn$Y`%y=^Xu)9amEdABE#>NMXqL=vDqCW!Y#I6UXS7@VZA6wNTKV$L0KRCZk<%J4 zxS1P&DwBE-d#PPV7kv~tleqh9%Afz@^)hoZr$#E;!ga?Xa^`^Jk@#Us2dNrEwAzhq Gb?7hPZm|pi delta 393 zcmZ{d%_{_P7{`Azv%A(dySDYxc*$E^h#g}yShkRZ5}|M)IS?0zIcRH<9GsBUSCUvO z%4^8u;1577JKWSBHcGilayG+R&*7=3&*$?TZV0!V!r3h+Ot3M!=Q^`-vFd@Q+3}HS zq59l2CmzCf)TqUjQ8vdzR8}BY=;$kv5SEd?SR`llU8?B!vmVc8(E@G)dTTQGx8g6F@K5$?fDpo`WU^94gYr|}kx%ZyT} zTQn~#B=zS1y$N-Hl05MBm%kib%!7Nu3vF@|`p67vQ+=|vi20Zgue;?)9?Wqnh7aH2 z@k&T;5e_l00J2^>Qv^?eKBqx_O zUj5`%T)dNmgWOjBtZ|Z--aCp-JL&DYe0%ynpT2z`?ZvWjW>H3w4US+5pTS`-b$>f) zchgS(78^0Ij|PdrT9`XT>F*pQ-{gPsz0^l{Wn zk$+uB#0m*IVFqSFhDqp$6GnaSy_DaGqyBOhOI;qwjs#N>fn`{N@n8M7^RTOW ztfX{n0j*Dq>xMW+<`RbV&54ZB2GawC7=0+BKb3|iuz$cc;9}d|~Hn`|FdEVhElQWKrY<4@s z!??NQScTB^0%OKAljl8^*&KKK0Mq0NFV0OqaGY&(&Vv_V&gKPA7jR9tabpz0u*n2$ zQ-K@HBw5^Ms@%067^J2LJ#7 delta 76 zcmX>T(h<7h8}H;U9=^$!_%tR*2#HNj;8mF%!&d|qy8@TH#J>j2ZW6cw6_cA>Be)I3 K-fSi$CIJA3u^h_) diff --git a/PROMS/Formats/genmacall/VEGPBckStps.svg b/PROMS/Formats/genmacall/VEGPBckStps.svg index f81f5b071bff3ddbcfc3dc7d622048e7a2e67a63..b5638d3bc16290e4eda6f8c8da422cad75b5c258 100644 GIT binary patch delta 48 xcmbQ^{lII(H{QvQ_;e=g@T~#TH^A%<{2;c@ Date: Thu, 9 Oct 2025 10:06:50 -0400 Subject: [PATCH 16/16] B2025-054 Wrong Page Numbers in CAS Summary --- PROMS/Volian.Print.Library/PromsPrinter.cs | 6 +++++ PROMS/Volian.Print.Library/vlnParagraph.cs | 26 +++++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index e1105806..de678a4b 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -345,6 +345,12 @@ namespace Volian.Print.Library // will skip certain logic if CAS Only or CTS Only public PromsPrinterPrintType PromsPrinterPrintType { get; set; } = PromsPrinterPrintType.Normal; + //B2025-054 Wrong Page Numbers in CAS Summary + // when section title continued and CAS + // Flag for when should build the CAS_CTAS + //to avoid overwriting data + public bool ShouldPrint_CAS_CTAS { get; set; } = true; + public PromsPrinter(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, string backgroundFolder, bool openPDF, bool overWrite, ChangeBarDefinition cbd, String pdfFile, bool insertBlankPages, bool batchPrint, string prefix, bool saveLinks, int removeTrailngHardReturnsAndManualPageBreaks, string blankPageText, bool didAll, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1) { diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 4f0885d1..2f307726 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -2162,12 +2162,12 @@ namespace Volian.Print.Library //B2025-048 Problem with Printing CAS Steps // skip this if printing CAS or CTAS - was causing it to // skip/overwrite data - if (doSectionTitleContinued && MyPromsPrinter.PromsPrinterPrintType == PromsPrinterPrintType.Normal) + if (doSectionTitleContinued) { vlnParagraph sectContPara; string contMsg = (MyItemInfo.ActiveSection != null) ? MyItemInfo.ActiveSection.MyDocStyle.Continue.SectionTitle.AppendToTitle : ""; // C2018-003 fixed use of getting the active section - // For Calvert, the xoffset will be the highest level sections xoffset (there are metasections, - // don't use their xoffset or the continue message is indented too much) + // For Calvert, the xoffset will be the highest level sections xoffset (there are metasections, + // don't use their xoffset or the continue message is indented too much) if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) { float secContinueTabXoff = (float)MyItemInfo.MyDocStyle.Layout.LeftMargin; @@ -2187,6 +2187,12 @@ namespace Volian.Print.Library // get to the correct section for the message, i.e. if on a section, the message should be the parent // section (not the activesection which is myself); if on a step, the message should be the active section ItemInfo sectForCont = MyItemInfo.IsSection && MyItemInfo.MyParent.IsSection ? MyItemInfo.MyParent : MyItemInfo.ActiveSection; + //B2025-054 Wrong Page Numbers in CAS Summary + // when section title continued and CAS + //to avoid overwriting data + // - this will be built at a different call to vlnParagraph + if (MyPromsPrinter.PromsPrinterPrintType != PromsPrinterPrintType.Normal) + MyPromsPrinter.ShouldPrint_CAS_CTAS = false; sectContPara = new vlnParagraph(MyParent.MyParent, cb, sectForCont, MyParent.XOffset, 0, 0, 0, MyParent.MyItemInfo.ActiveFormat, null, (contMsg == null || contMsg == "") ? " (Continued)" : contMsg, 0, false, MyPromsPrinter); if (sectContPara.PartsLeft.Count > 0) { @@ -2197,7 +2203,7 @@ namespace Volian.Print.Library vt.XOffset = secContinueTabXoff; vt.Width = secContinueXoff - secContinueTabXoff; sectContPara.XOffset = secContinueXoff; - if ((wd + 12) > secContinueXoff - secContinueTabXoff) // 12 is 2 characters + if ((wd + 12) > secContinueXoff - secContinueTabXoff) // 12 is 2 characters { float dif = wd + 12 - (secContinueXoff - secContinueTabXoff); vt.Width += dif; @@ -2212,12 +2218,20 @@ namespace Volian.Print.Library } else { + //B2025-054 Wrong Step Numbers + // when section title continued and CAS + //to avoid overwriting data + // - this will be built at a different call to vlnParagraph + if (MyPromsPrinter.PromsPrinterPrintType != PromsPrinterPrintType.Normal) + MyPromsPrinter.ShouldPrint_CAS_CTAS = false; sectContPara = new vlnParagraph(MyParent.MyParent, cb, MyItemInfo.ActiveSection, MyParent.XOffset, 0, 0, 0, MyParent.MyItemInfo.ActiveFormat, null, (contMsg == null || contMsg == "") ? " (Continued)" : contMsg, 0, false, MyPromsPrinter); float mytmpfloat = sectContPara.ParagraphToPdf(cb, yTopMargin, yTopMargin, yBottomMargin); if (sectContPara.SectionContinuePrinted) yPageStart -= sectContPara.Height + SixLinesPerInch; } } + //out of section title section - reset this back to true (default) + MyPromsPrinter.ShouldPrint_CAS_CTAS = true; // see if this hls has footnotes, add to the footnote datastructure for processing at end of page. if (MyItemInfo.IsHigh && MyPageHelper.NotesToFootNotesHLS.ContainsKey(MyItemInfo.ItemID)) AddFootNote(cb); @@ -3596,11 +3610,11 @@ namespace Volian.Print.Library BuildPlacekeeper(parent, itemInfo); // Save step text information to be used to create a Continuous Action Summary - BuildContinuousActionSummary(parent, itemInfo); + if (MyPromsPrinter.ShouldPrint_CAS_CTAS) BuildContinuousActionSummary(parent, itemInfo); // F2022-024 Time Critical Step // Save step text information to be used to create a Time Critical Action Summary - BuildTimeCriticalActionSummary(parent, itemInfo); + if (MyPromsPrinter.ShouldPrint_CAS_CTAS) BuildTimeCriticalActionSummary(parent, itemInfo); if (itemInfo.ActiveFormat.MyStepSectionLayoutData.BoxLeftAdj != null) _MyBoxLeftAdj = float.Parse(itemInfo.ActiveFormat.MyStepSectionLayoutData.BoxLeftAdj);