Merge pull request 'Development' (#226 ) from Development into master

Merging F2024-010, F2024-011, F2024-008, B2024-002, F2024-012 and B2024-005 from development into master after successful testing.
Merge pull request 'B2024-005: Vogtle Alarm pagination' (#225 ) from B2024-005 into Development
2024-02-08 11:38:49 -05:00 · 2024-02-08 08:56:58 -05:00 · 2024-02-08 06:50:10 -05:00 · 2024-02-07 09:17:54 -05:00 · 2024-02-06 16:30:35 -05:00 · 2024-02-06 11:55:48 -05:00
15 changed files with 41 additions and 2 deletions
@@ -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")]
+
+
+
+
+
+
+
+
+
+



@@ -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<ItemInfo> FromSections = GetSections(tb._FromItem.ActiveSection);
 			List<ItemInfo> 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);
 			}
@@ -7103,6 +7103,7 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _Cap1stCharTrans, "@Cap1stCharTrans");
 			}
 		}
+		// Title Case section title
 		private LazyLoad<bool> _Cap1stCharTransSection;
 		public bool Cap1stCharTransSection
 		{
@@ -7111,6 +7112,24 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _Cap1stCharTransSection, "@Cap1stCharTransSection");
 			}
 		}
+		// Title Case section number
+		private LazyLoad<bool> _Cap1stCharTransSectionNumber;
+		public bool Cap1stCharTransSectionNumber
+		{
+			get
+			{
+				return LazyLoad(ref _Cap1stCharTransSectionNumber, "@Cap1stCharTransSectionNumber");
+			}
+		}
+		// Parens around section title
+		private LazyLoad<bool> _ParensAroundSectionTitle;
+		public bool ParensAroundSectionTitle
+		{
+			get
+			{
+				return LazyLoad(ref _ParensAroundSectionTitle, "@ParensAroundSectionTitle");
+			}
+		}
 		private LazyLoad<bool> _UseTransitionModifier;
 		public bool UseTransitionModifier
 		{
@@ -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));
@@ -1836,6 +1836,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(@"<U")) title1 = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(section.MyDocVersion, title1);
 					plstr = SplitCoverTitle(svgGroup, pageItem, title1, (int)coverlinelen, token, plstr);//, rowAdj);
 					break;
 				case "{TITLE&UNIT}":
Author	SHA1	Message	Date
djankowski	9bb7b044a8	Merge pull request 'Development' (#226 ) from Development into master Merging F2024-010, F2024-011, F2024-008, B2024-002, F2024-012 and B2024-005 from development into master after successful testing.	2024-02-08 11:38:49 -05:00
Kathy Ruffing	b94fb7988d	Merge pull request 'B2024-005: Vogtle Alarm pagination' (#225 ) from B2024-005 into Development Reviewed-on: #225	2024-02-08 08:56:58 -05:00
Kathy Ruffing	8903d2a53e	B2024-005: Vogtle Alarm pagination	2024-02-08 06:50:10 -05:00
Kathy Ruffing	cec3b70fbf	Merge pull request 'F2024-012 - Adjusted the Cover Page title spacing in all of the Vogtle Units 3 & 4 formats' (#224 ) from Vogtle3&4 into Development Code change reviewed successfully.	2024-02-07 09:17:54 -05:00
jjenko	fa10fe4190	F2024-012 - Adjusted the Cover Page title spacing in all of the Vogtle Units 3 & 4 formats	2024-02-06 16:30:35 -05:00
jjenko	0a327a3d81	Merge pull request 'B2024-002: save step before update ROs from Step Ribbon' (#223 ) from B2024-002 into Development Code changes are good. OK to test.	2024-02-06 11:55:48 -05:00
Kathy Ruffing	41abad1ad9	B2024-002: save step before update ROs from Step Ribbon	2024-02-06 11:47:49 -05:00
Kathy Ruffing	1ca341670e	Merge pull request 'F2024-008 - Updated transition definitions to title case section numbers, section titles, and procedure titles. Also surround section titles with parenthesis.' (#222 ) from Vogtle3&4 into Development Reviewed-on: #222	2024-02-06 08:58:08 -05:00
jjenko	06013afc8b	F2024-008 - Updated transition definitions to title case section numbers, section titles, and procedure titles. Also surround section titles with parenthesis.	2024-02-05 15:43:54 -05:00
jjenko	5112c7caff	Merge pull request 'F2024-011 - Adjusted the Cover Page title length in all of the Vogtle Units 3 & 4 formats' (#221 ) from Vogtle3&4 into Development Format only change	2024-02-05 09:41:36 -05:00
jjenko	de8249b584	F2024-011 - Adjusted the Cover Page title length in all of the Vogtle Units 3 & 4 formats	2024-02-05 09:39:11 -05:00
jjenko	3116729507	Merge pull request 'F2024-010 - Added a Landscaped Word section type to all of the Vogtle Units 3 & 4 formats' (#220 ) from Vogtle3&4 into Development Format only update	2024-02-05 09:00:06 -05:00
jjenko	dd1a8dea33	F2024-010 - Added a Landscaped Word section type to all of the Vogtle Units 3 & 4 formats	2024-02-05 08:59:23 -05:00