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

Merging all items through B2025-003 from development in master after successful testing.
Merge pull request 'B2025-003 Chronology/Summary of Changes Reports' (#485 ) from B2025-003 into Development
2025-01-09 15:02:16 -05:00 · 2025-01-09 11:14:22 -05:00 · 2025-01-09 11:08:30 -05:00 · 2024-12-17 09:48:30 -05:00 · 2024-12-17 09:46:40 -05:00 · 2024-12-12 08:44:08 -05:00
11 changed files with 12 additions and 2 deletions
--- a/PROMS/Formats/fmtall/FNPCASall.xml
+++ b/PROMS/Formats/fmtall/FNPCASall.xml
--- a/PROMS/Formats/fmtall/FNPDEVall.xml
+++ b/PROMS/Formats/fmtall/FNPDEVall.xml
--- a/PROMS/Formats/fmtall/FNPEBKall.xml
+++ b/PROMS/Formats/fmtall/FNPEBKall.xml
--- a/PROMS/Formats/fmtall/FNPSAM1all.xml
+++ b/PROMS/Formats/fmtall/FNPSAM1all.xml
--- a/PROMS/Formats/fmtall/FNP_00all.xml
+++ b/PROMS/Formats/fmtall/FNP_00all.xml
--- a/PROMS/Formats/fmtall/FNP_01all.xml
+++ b/PROMS/Formats/fmtall/FNP_01all.xml
--- a/PROMS/Formats/fmtall/FNPall.xml
+++ b/PROMS/Formats/fmtall/FNPall.xml
--- a/PROMS/Formats/fmtall/PROMSMan1all.xml
+++ b/PROMS/Formats/fmtall/PROMSMan1all.xml
--- a/PROMS/Formats/fmtall/fnpnmpall.xml
+++ b/PROMS/Formats/fmtall/fnpnmpall.xml
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
@ -1352,6 +1352,16 @@ namespace VEPROMS.CSLA.Library
 						{
 							gg = ItemInfo.ConvertToDisplayText(gg);
 							newvalue = ItemInfo.ConvertToDisplayText(newvalue);
+
+							//CSM B2024-094 - Carats (as Deltas) print as question marks in tables when unit <u> is used in RO Definition Value
+							//If there is a grid, need to keep these as the \u code
+							//Otherwise they will not use the correct font and end up as question marks
+							if (MyGrid != null)
+                            {
+								gg = gg.Replace($"{(char)916}", @"\u916?");
+								newvalue = newvalue.Replace($"{(char)916}", @"\u916?");
+							}
+
 							// Debug  - jsj 5-19-2017 - left in for initial check-in
 							//string xx_gg = gg_org.Replace(@"\'b0", @"\'B0").Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
 							//string xx_nv = newval_org.Replace(@"\'b0", @"\'B0").Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
--- a/PROMS/Volian.Print.Library/PDFChronologyReport.cs
+++ b/PROMS/Volian.Print.Library/PDFChronologyReport.cs
@ -308,7 +308,7 @@ namespace Volian.Print.Library
 				h.Font = f3;
 				string actionWhat = (cai.ActionWhat == "Added" && cai.DTS <= MyProc.ChangeBarDate) ? "Original" : cai.ActionWhat != "Changed" ? cai.ActionWhat : cai.DTS <= maxDTS ? "Restored" : cai.DTS > MyProc.ChangeBarDate ? cai.ActionWhat : "Original";
 				if (actionWhat == "Deleted" || actionWhat == "Restored")
-					h.Add(actionWhat + "\r\n" + cai.ActionWhen.ToString());
+					h.Add(actionWhat + "\r\n" + (cai.ActionWhen < cai.DTS ? cai.DTS.ToString("M/dd/yyyy") : cai.ActionWhen.ToString()));
 				else
 					h.Add(actionWhat);
 				if (cai.DTS > maxDTS)
@ -1465,7 +1465,7 @@ namespace Volian.Print.Library
 				//				h.Add(cai.ActionWhen > MyProc.DTS ? cai.ActionWhat : "Original");
 				string actionWhat = ((cai.ActionWhat == "Added" || cai.ActionWhat == "Changed") && cai.DTS <= MyProc.ChangeBarDate) ? "Original" : cai.ActionWhat;	//(cai.ActionWhat == "Added" && cai.DTS <= MyProc.DTS) ? "Original" : cai.ActionWhat != "Changed" ? cai.ActionWhat : cai.DTS <= maxDTS ? "Restored" : cai.DTS > MyProc.DTS ? cai.ActionWhat : "Original";
 				if (actionWhat == "Deleted" || actionWhat == "Restored")
-					h.Add(actionWhat + "\r\n" + cai.ActionWhen.ToString());
+					h.Add(actionWhat + "\r\n" + (cai.ActionWhen < cai.DTS ? cai.DTS.ToString("M/dd/yyyy") : cai.ActionWhen.ToString()));
 				else
 					h.Add(actionWhat);
 				c = new PdfPCell(h);
Author	SHA1	Message	Date
Devin Jankowski	643e6bc94f	Merge pull request 'Development' (#486 ) from Development into master Merging all items through B2025-003 from development in master after successful testing.	2025-01-09 15:02:16 -05:00
John Jenko	1a889352b8	Merge pull request 'B2025-003 Chronology/Summary of Changes Reports' (#485 ) from B2025-003 into Development ready for testing phase	2025-01-09 11:14:22 -05:00
mschill	5bba126a36	B2025-003 Chronology/Summary of Changes Reports	2025-01-09 11:08:30 -05:00
John Jenko	e01b955d46	Merge pull request 'F2024-088 - Per customer’s request, removed “Using”, “Faulted”, “Intact”, “Normal”, “On”, “Off”, “Locally”, “Manually”, “Fall”, “Rise”, and “Ruptured” from the ReplaceWords list' (#484 ) from F2024-088_FNP into Development Format only change. ready for testing phase	2024-12-17 09:48:30 -05:00
John Jenko	e3431b0e1e	F2024-088 - Per customer’s request, removed “Using”, “Faulted”, “Intact”, “Normal”, “On”, “Off”, “Locally”, “Manually”, “Fall”, “Rise”, and “Ruptured” from the ReplaceWords list	2024-12-17 09:46:40 -05:00
John Jenko	b6d646b910	Merge pull request 'F2024-086 In the PROMS Manual format in the Attachments (Step Editor) With Border section type, the page number needs centered horizontally on the page (it's located between the section number and section title.' (#483 ) from F2024-086 into Development good for testing phase	2024-12-12 08:44:08 -05:00
mschill	bb679a2790	F2024-086 In the PROMS Manual format in the Attachments (Step Editor) With Border section type, the page number needs centered horizontally on the page (it's located between the section number and section title.	2024-12-12 08:36:29 -05:00
John Jenko	e3af0a6426	Merge pull request 'B2024-094 - Carats (as Deltas) print as question marks in tables when unit <u> is used in RO Definition Value' (#482 ) from B2024-094 into Development good for testing phase	2024-12-12 08:33:12 -05:00
mschill	b2108b9e5f	B2024-094 - Carats (as Deltas) print as question marks in tables when unit <u> is used in RO Definition Value	2024-12-11 15:35:29 -05:00