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

Merging F2024-029, B2024-009, F2024-023, B2024-011, B2024-012 and F2024-017 from development into master after successful testing.

PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs

@@ -44,8 +44,11 @@ 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.2402.616")]
-[assembly: AssemblyFileVersion("2.1.2402.616")]
+[assembly: AssemblyVersion("2.1.2402.2213")]
+[assembly: AssemblyFileVersion("2.1.2402.2213")]
+
+
+
 
 
 

PROMS/VEPROMS User 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);
+
+								}
 							}
 						}
 					}