Merge remote-tracking branch 'origin/Development' into C2024-003

Merge pull request 'B2024-009: Front Matter Notes & Cautions not in global search for step types' (#246 ) from B2024-009 into Development
Reviewed-on: #246
2024-02-27 10:31:20 -05:00 · 2024-02-27 10:22:39 -05:00 · 2024-02-27 09:11:59 -05:00 · 2024-02-27 09:07:18 -05:00 · 2024-02-27 09:02:10 -05:00 · 2024-02-27 07:13:00 -05:00
7 changed files with 13 additions and 1 deletions
--- a/PROMS/Formats/fmtall/VEGP1all.xml
+++ b/PROMS/Formats/fmtall/VEGP1all.xml
--- a/PROMS/Formats/fmtall/VEGP2all.xml
+++ b/PROMS/Formats/fmtall/VEGP2all.xml
--- a/PROMS/Formats/fmtall/VEGPAlrall.xml
+++ b/PROMS/Formats/fmtall/VEGPAlrall.xml
--- a/PROMS/Formats/fmtall/VEGPBckStpsall.xml
+++ b/PROMS/Formats/fmtall/VEGPBckStpsall.xml
--- a/PROMS/Formats/fmtall/VEGPBckall.xml
+++ b/PROMS/Formats/fmtall/VEGPBckall.xml
--- a/PROMS/Formats/genmacall/VEGP2.svg
+++ b/PROMS/Formats/genmacall/VEGP2.svg
--- a/Interface/dlgExportImport.cs
+++ b/Interface/dlgExportImport.cs
@ -4173,7 +4173,19 @@ namespace VEPROMS
 							
 							if (glookFor != greplaceWith)
 							{
-								content.MyGrid.Data = content.MyGrid.Data.Replace(glookFor, greplaceWith);
+								// B2024-011: For unit RO in grid, old grid data had the ROID in the #Link:ReferencedObject ending in '0000'
+								//	so when compared with the newer format "0041" it was not found and not replaced with updated rousageid
+								bool hasNewROID = (content.MyGrid.Data.Contains(glookFor));
+								if (hasNewROID)
+									content.MyGrid.Data = content.MyGrid.Data.Replace(glookFor, greplaceWith);
+								else if (!hasNewROID && glookFor.Contains("0041") && glookFor.Contains("FFFF"))
+								{
+									string newGlookFor = glookFor;
+									newGlookFor = newGlookFor.Replace("0041", "0000");
+									if (content.MyGrid.Data.Contains(newGlookFor)) 
+										content.MyGrid.Data = content.MyGrid.Data.Replace(newGlookFor, greplaceWith);
+
+								}
 							}
 						}
 					}
Author	SHA1	Message	Date
Paul Larsen	3710e871a9	Merge remote-tracking branch 'origin/Development' into C2024-003	2024-02-27 10:31:20 -05:00
Kathy Ruffing	b3c6ce633d	Merge pull request 'B2024-009: Front Matter Notes & Cautions not in global search for step types' (#246 ) from B2024-009 into Development Reviewed-on: #246	2024-02-27 10:22:39 -05:00
Paul Larsen	15048a317f	Merge remote-tracking branch 'origin/Development' into C2024-003	2024-02-27 09:11:59 -05:00
Chris Glavan	527422876a	Merge pull request '~Fixed box location around high level continuous action step number' (#245 ) from B2024-010 into Development Merging into Development. No code review needed for format change.	2024-02-27 09:07:18 -05:00
Chris Glavan	11f307ec0d	~Fixed box location around high level continuous action step number	2024-02-27 09:02:10 -05:00
Kathy Ruffing	77706f22e4	B2024-009: Front Matter Notes & Cautions not in global search for step types	2024-02-27 07:13:00 -05:00
John Jenko	faed1cdfd6	Merge pull request 'F2024-023 - Shortened the section title length in the Vogtle Alarms format.' (#244 ) from Vogtle3&4 into Development format only change	2024-02-26 11:43:31 -05:00
John Jenko	7d5997cd43	F2024-023 - Shortened the section title length in the Vogtle Alarms format.	2024-02-26 11:43:45 -05:00
John Jenko	d55df8beb0	Merge pull request 'B2024-011: Import of unit information ROs not importing correctly' (#243 ) from B2024-011 into Development Code change looks good and is ready for testing	2024-02-26 09:00:31 -05:00
Kathy Ruffing	b2d238f8e1	B2024-011: Import of unit information ROs not importing correctly	2024-02-26 08:19:49 -05:00
John Jenko	2005eab8cb	Merge pull request 'B2024-012' (#242 ) from Vogtle3&4 into Development format only change	2024-02-23 14:22:29 -05:00
John Jenko	f3b5b425c0	B2024-012 Set AllUnits format flag to True so that RO value unit of measures are always displayed when more than on with the same unit of measure is in the same line of text.	2024-02-23 14:21:03 -05:00