diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index 54405046..2d2705fe 100644 Binary files a/PROMS/Formats/fmtall/BASEall.xml and b/PROMS/Formats/fmtall/BASEall.xml differ diff --git a/PROMS/Formats/fmtall/CPDEVall.xml b/PROMS/Formats/fmtall/CPDEVall.xml index 49d3f0f5..de28c2d3 100644 Binary files a/PROMS/Formats/fmtall/CPDEVall.xml and b/PROMS/Formats/fmtall/CPDEVall.xml differ diff --git a/PROMS/Formats/fmtall/CPFDEVall.xml b/PROMS/Formats/fmtall/CPFDEVall.xml index 767caa1c..44247a28 100644 Binary files a/PROMS/Formats/fmtall/CPFDEVall.xml and b/PROMS/Formats/fmtall/CPFDEVall.xml differ diff --git a/PROMS/Formats/fmtall/ComPeakFlex11all.xml b/PROMS/Formats/fmtall/ComPeakFlex11all.xml index e3555c41..2b3e2a62 100644 Binary files a/PROMS/Formats/fmtall/ComPeakFlex11all.xml and b/PROMS/Formats/fmtall/ComPeakFlex11all.xml differ diff --git a/PROMS/Formats/fmtall/ComPeakFlexall.xml b/PROMS/Formats/fmtall/ComPeakFlexall.xml index aea04a59..805e795a 100644 Binary files a/PROMS/Formats/fmtall/ComPeakFlexall.xml and b/PROMS/Formats/fmtall/ComPeakFlexall.xml differ diff --git a/PROMS/Formats/fmtall/TUECDEVall.xml b/PROMS/Formats/fmtall/TUECDEVall.xml index 8c8fac49..4d8517db 100644 Binary files a/PROMS/Formats/fmtall/TUECDEVall.xml and b/PROMS/Formats/fmtall/TUECDEVall.xml differ diff --git a/PROMS/Formats/fmtall/TUECSAMG1all.xml b/PROMS/Formats/fmtall/TUECSAMG1all.xml index b2be9c8a..582631a3 100644 Binary files a/PROMS/Formats/fmtall/TUECSAMG1all.xml and b/PROMS/Formats/fmtall/TUECSAMG1all.xml differ diff --git a/PROMS/Formats/fmtall/TUECSAMGall.xml b/PROMS/Formats/fmtall/TUECSAMGall.xml index 67dfbeba..7746c464 100644 Binary files a/PROMS/Formats/fmtall/TUECSAMGall.xml and b/PROMS/Formats/fmtall/TUECSAMGall.xml differ diff --git a/PROMS/Formats/fmtall/TUECall.xml b/PROMS/Formats/fmtall/TUECall.xml index 37f5c0b0..65adcb98 100644 Binary files a/PROMS/Formats/fmtall/TUECall.xml and b/PROMS/Formats/fmtall/TUECall.xml differ diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index 79e4128c..6640b2c8 100644 Binary files a/PROMS/Formats/fmtall/VEGP1all.xml and b/PROMS/Formats/fmtall/VEGP1all.xml differ diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 7aec1f8d..f0beeefd 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 d1d306e4..0752764b 100644 Binary files a/PROMS/Formats/fmtall/VEGPAlrall.xml and b/PROMS/Formats/fmtall/VEGPAlrall.xml differ diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml index 6e484f1f..afdfb3c2 100644 Binary files a/PROMS/Formats/fmtall/VEGPBckStpsall.xml and b/PROMS/Formats/fmtall/VEGPBckStpsall.xml differ diff --git a/PROMS/Formats/fmtall/VEGPBckall.xml b/PROMS/Formats/fmtall/VEGPBckall.xml index bfdc9727..a0005ced 100644 Binary files a/PROMS/Formats/fmtall/VEGPBckall.xml and b/PROMS/Formats/fmtall/VEGPBckall.xml differ diff --git a/PROMS/Formats/genmacall/VEGP1.svg b/PROMS/Formats/genmacall/VEGP1.svg index f81f5b07..f588fadf 100644 Binary files a/PROMS/Formats/genmacall/VEGP1.svg and b/PROMS/Formats/genmacall/VEGP1.svg differ diff --git a/PROMS/Formats/genmacall/VEGP2.svg b/PROMS/Formats/genmacall/VEGP2.svg index 4f504cc3..ea6cf7c3 100644 Binary files a/PROMS/Formats/genmacall/VEGP2.svg and b/PROMS/Formats/genmacall/VEGP2.svg differ diff --git a/PROMS/Formats/genmacall/VEGPAlr.svg b/PROMS/Formats/genmacall/VEGPAlr.svg index 921e5718..d887ab27 100644 Binary files a/PROMS/Formats/genmacall/VEGPAlr.svg and b/PROMS/Formats/genmacall/VEGPAlr.svg differ diff --git a/PROMS/Formats/genmacall/VEGPBck.svg b/PROMS/Formats/genmacall/VEGPBck.svg index 15ffe7db..91f088b6 100644 Binary files a/PROMS/Formats/genmacall/VEGPBck.svg and b/PROMS/Formats/genmacall/VEGPBck.svg differ diff --git a/PROMS/Formats/genmacall/cpdev.svg b/PROMS/Formats/genmacall/cpdev.svg index f7746192..c55e7800 100644 Binary files a/PROMS/Formats/genmacall/cpdev.svg and b/PROMS/Formats/genmacall/cpdev.svg differ diff --git a/PROMS/Formats/genmacall/cpfdev.svg b/PROMS/Formats/genmacall/cpfdev.svg index 980e68dd..49173593 100644 Binary files a/PROMS/Formats/genmacall/cpfdev.svg and b/PROMS/Formats/genmacall/cpfdev.svg differ diff --git a/PROMS/Formats/genmacall/tuec.svg b/PROMS/Formats/genmacall/tuec.svg index ccce882f..2d212c48 100644 Binary files a/PROMS/Formats/genmacall/tuec.svg and b/PROMS/Formats/genmacall/tuec.svg differ diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs b/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs index 98647f8f..82cbd45f 100644 --- a/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs +++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs @@ -746,7 +746,7 @@ namespace RODBInterface string csufx = string.Format("_PCCHILD{0}", pcChildIdx); //applicValues += ","; XmlNode cn = elmnode.SelectSingleNode(parentName + csufx); - if (cn == null) + if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default else { diff --git a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs index 6ade16c3..9e1c5208 100644 --- a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs +++ b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs @@ -473,7 +473,7 @@ namespace ctlXMLEditLib nd = node.SelectSingleNode(str); // if not found with just the string, search the tree. if (nd==null)nd = node.SelectSingleNode("*/"+str); - if (nd == null) + if (nd == null || nd.InnerText.Length==0) // B2024-004 use Parent value if Child text length is zero GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value else { diff --git a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs index f715524d..699a2c37 100644 --- a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs +++ b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs @@ -44,8 +44,18 @@ using System.Runtime.InteropServices; // Revision DHH (day - no leading zero, two digit hour - military time // // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ******** -[assembly: AssemblyVersion("2.1.2311.3014")] -[assembly: AssemblyFileVersion("2.1.2311.3014")] +[assembly: AssemblyVersion("2.1.2402.616")] +[assembly: AssemblyFileVersion("2.1.2402.616")] + + + + + + + + + + diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index d5e9c4ea..59628177 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -36,6 +36,8 @@ namespace VEPROMS this.btnShortCuts = new DevComponents.DotNetBar.ButtonItem(); this.btnHelpVWeb = new DevComponents.DotNetBar.ButtonItem(); this.btnSendErrorLog = new DevComponents.DotNetBar.ButtonItem(); + this.btnShowErrFld = new DevComponents.DotNetBar.ButtonItem(); + this.btnShowPrtFld = new DevComponents.DotNetBar.ButtonItem(); this.btnHelpAbout = new DevComponents.DotNetBar.ButtonItem(); this.office2007StartButton1 = new DevComponents.DotNetBar.Office2007StartButton(); this.itemContainer1 = new DevComponents.DotNetBar.ItemContainer(); @@ -206,11 +208,13 @@ namespace VEPROMS this.btnHelp.KeyTips = "?"; this.btnHelp.Name = "btnHelp"; this.btnHelp.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btnHelpManual, - this.btnShortCuts, - this.btnHelpVWeb, - this.btnSendErrorLog, - this.btnHelpAbout}); + this.btnHelpManual, + this.btnShortCuts, + this.btnHelpVWeb, + this.btnSendErrorLog, + this.btnShowErrFld, + this.btnShowPrtFld, + this.btnHelpAbout}); ; this.btnHelp.Text = "Help"; // // btnHelpManual @@ -244,6 +248,24 @@ namespace VEPROMS this.btnSendErrorLog.Text = "Send Error Log"; this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click); // + // btnShowErrFld + // + //this.btnShowErrFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS; + this.btnShowErrFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowErrFld.Image"))); + this.btnShowErrFld.Name = "btnShowErrFld"; + this.btnShowErrFld.Text = "Open Log Folder"; + this.btnShowErrFld.Click += new System.EventHandler(this.btnShowErrFld_Click); + // + // btnShowPrtFld + // + //this.btnShowPrtFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS; + this.btnShowPrtFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowPrtFld.Image"))); + this.btnShowPrtFld.Name = "btnShowPrtFld"; + this.btnShowPrtFld.Text = "Open Default Print Folder"; + this.btnShowPrtFld.Click += new System.EventHandler(this.btnShowPrtFld_Click); + // + // + // // btnHelpAbout // this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -1733,6 +1755,8 @@ namespace VEPROMS private DevComponents.DotNetBar.TabItem infotabFoldoutMaint; private Volian.Controls.Library.DisplayFoldoutMaint displayFoldoutMaint; private DevComponents.DotNetBar.ButtonItem btnSendErrorLog; + private DevComponents.DotNetBar.ButtonItem btnShowErrFld; + private DevComponents.DotNetBar.ButtonItem btnShowPrtFld; private DevComponents.DotNetBar.TabControlPanel tabControlPanel3; private DevComponents.DotNetBar.TabItem toosTabReports; private Volian.Controls.Library.DisplayReports displayReports; diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 0279dd80..bc046ef3 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -21,6 +21,7 @@ using DescriptiveEnum; using Volian.Base.Library; using Volian.Print.Library; using JR.Utils.GUI.Forms; +using System.Diagnostics; [assembly: log4net.Config.XmlConfigurator(Watch = true)] @@ -4972,6 +4973,26 @@ namespace VEPROMS } } + private void btnShowErrFld_Click(object sender, EventArgs e) + { + string path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); + path = path + @"\Documents\VEPROMS"; + if (Directory.Exists(path)) + { + Process.Start("explorer.exe", path); + } + } + + private void btnShowPrtFld_Click(object sender, EventArgs e) + { + string path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); + path = path + @"\AppData\Local\Temp\VEPROMS"; + if (Directory.Exists(path)) + { + Process.Start("explorer.exe", path); + } + } + private void btnHelpManual_Click(object sender, EventArgs e) { // C2019-024 Display the PROMS User Manual when user click on the option in the Help drop down menu diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.resx b/PROMS/VEPROMS User Interface/frmVEPROMS.resx index d5038add..c950d8f5 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.resx +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.resx @@ -170,6 +170,18 @@ rkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII= + + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII= + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index aa178018..483a321a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -1545,6 +1545,9 @@ namespace VEPROMS.CSLA.Library { //if (tb._FromItem.MyContent.InList(5322)) Console.WriteLine("Here"); string str1 = TranGetSectionNumber(tb._ToItem); + // F2024-008 added flag to title case the section number in transitions + if (tb._FormatData.TransData.Cap1stCharTransSectionNumber) + str1 = CapFirstLetterOnly(str1, 0); if(!tb._ToItem.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) return str1; List FromSections = GetSections(tb._FromItem.ActiveSection); List ToSections = GetSections(tb._ToItem.ActiveSection); @@ -1615,6 +1618,9 @@ namespace VEPROMS.CSLA.Library sectionTitle = (tb._FormatData.TransData.CapsTransitionsSection ? sectionTitle.ToUpper().Replace(@"\U", @"\u") : tb._FormatData.TransData.Cap1stCharTransSection ? CapFirstLetterOnly(sectionTitle, 0) : sectionTitle); + // F2024-008 Added flag to surround the section title with parenthesis in transitions + if (tb._FormatData.TransData.ParensAroundSectionTitle) + sectionTitle = string.Format("({0})", sectionTitle); // B2017-236 Replace embedded returns with spaces and trim the spaces from the end of the section title. return TrimSectionTitle(sectionTitle); } diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 250a4367..2b09e8d5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -7103,6 +7103,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Cap1stCharTrans, "@Cap1stCharTrans"); } } + // Title Case section title private LazyLoad _Cap1stCharTransSection; public bool Cap1stCharTransSection { @@ -7111,6 +7112,24 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Cap1stCharTransSection, "@Cap1stCharTransSection"); } } + // Title Case section number + private LazyLoad _Cap1stCharTransSectionNumber; + public bool Cap1stCharTransSectionNumber + { + get + { + return LazyLoad(ref _Cap1stCharTransSectionNumber, "@Cap1stCharTransSectionNumber"); + } + } + // Parens around section title + private LazyLoad _ParensAroundSectionTitle; + public bool ParensAroundSectionTitle + { + get + { + return LazyLoad(ref _ParensAroundSectionTitle, "@ParensAroundSectionTitle"); + } + } private LazyLoad _UseTransitionModifier; public bool UseTransitionModifier { diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 2cfc387d..5bbbeeee 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -3395,6 +3395,8 @@ namespace Volian.Controls.Library Cursor = Cursors.Default; return; } + // B2024-002: Save any changes to the database so that updating of ROs has current data: + MyEditItem.SaveContents(); using (DocVersion dv = DocVersion.Get(Mydvi.VersionID)) { swROUpdate = new System.IO.StreamWriter(ROFstInfo.ROUpdateResultsPath(Mydvi)); diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 2177bfe1..ea078716 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1846,6 +1846,8 @@ i = 0; float coverlinelen = ((ctlen == 0) ? (int)section.ActiveFormat.PlantFormat.FormatData.ProcData.TitleLength : ctlen) * (float)pageItem.Font.CPI / 12; string title1 = section.MyProcedure.MyContent.Text; if (section.ActiveFormat.PlantFormat.FormatData.ProcData.CapitalizeTitle) title1 = title1.ToUpper(); + // F2024-012 copied this line from above (processing COVERPROCTITLE) to resolve unit designators in the procedure title + if (title1.ToUpper().Contains(@"