Merge branch 'GenWork' of https://git.volian.com/Volian/SourceCode into GenWork

Depending on how Parent/Child Applicability was set up, the Child Applicability Names were not being sent to the RO Editor.  This prevented adding Child specific RO field values.

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -21942,7 +21942,11 @@ GO
 */
 
 /****** Add the ApplicablePlant field to the Formats table ******/
-ALTER TABLE Formats ADD ApplicablePlant int NULL;
+/****** Add the ApplicablePlant field to the Formats table ******/
+IF COL_LENGTH('Formats', 'ApplicablePlant') IS NULL
+BEGIN
+    ALTER TABLE Formats ADD ApplicablePlant int NULL;
+END
 GO
 
 /****** Update the Formats table with the appropriate ApplicablePlant value ******/

PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -4116,6 +4116,11 @@ namespace VEPROMS
 
 					ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
 
+					// B2023-104 use this to replace RO Link information in the imported text
+					//            FormatRoidKey() was creating the roid with the new formatting introduce with B2022-088 & B2022-098
+					//           We need to save the ROID from the imported text in order to update it with the new RO link information
+					string contentROID = roid;
+
 					// B2022-088: [JPR] Find Doc Ro button not working in Word Sections
 					// B2022-098: [JPR] ROs not being resolved in Word Sections
 					roid = ROFSTLookup.FormatRoidKey(roid, true);
@@ -4135,7 +4140,8 @@ namespace VEPROMS
 						rou.Save();
 
 						RoUsageInfo roui = RoUsageInfo.Get(rou.ROUsageID);
-						string lookFor = string.Format("#Link:ReferencedObject:{0} {1} {2}[END>", rousageid, roid, oldRODbID.ToString());
+						//B2023-104 use the ROID from the imported text (contentROID) to create the lookFor string
+						string lookFor = string.Format("#Link:ReferencedObject:{0} {1} {2}[END>", rousageid, contentROID, oldRODbID.ToString());
 						string replaceWith = string.Format("#Link:ReferencedObject:{0} {1} {2}[END>", rou.ROUsageID.ToString(), roid, newRODbID.ToString());
 						_DidProcessROs = content.Text.Contains(lookFor); // B2017-076 RO link in the text so we will be processing it
 						

PROMS/VEPROMS.CSLA.Library/Generated/FormatInfoList.cs

@@ -160,6 +160,14 @@ namespace VEPROMS.CSLA.Library
 			catch (Exception ex)
 			{
 				if (_MyLog.IsErrorEnabled) _MyLog.Error("FormatInfoList.DataPortal_Fetch", ex);
+				System.Text.StringBuilder sbMsg = new System.Text.StringBuilder();
+				sbMsg.Append("The SQL Stored Procedures may need updating.");
+				sbMsg.Append("\n\nPlease have your DBA update the database with the PROMSFixes.sql script file that was delivered with this PROMS executable.");
+				sbMsg.Append("\n\nThe PROMSFixes.sql file is included with the PROMS installation download.");
+				sbMsg.Append("\n\nIt can also be found in your PROMS executable folder:");
+				sbMsg.AppendFormat("\n\t{0}", Volian.Base.Library.ExeInfo.PROMSExecutableFolderPath());
+
+				System.Windows.Forms.MessageBox.Show(sbMsg.ToString(), "Update Stored Procedures", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Exclamation);
 				throw new DbCslaException("FormatInfoList.DataPortal_Fetch", ex);
 			}
 			this.RaiseListChangedEvents = true;

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -544,7 +544,7 @@ namespace Volian.Controls.Library
 				foreach (DocVersionInfo dvi in dvil)
 				{
 					DocVersionConfig dvc = dvi.DocVersionConfig;
-					if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0")
+					if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit
 					{
 						args += " \"PC=" + dvc.Unit_Name + "\"";
 						break;
@@ -1018,7 +1018,7 @@ namespace Volian.Controls.Library
 				{
 					DocVersionConfig jdvc = dvi.DocVersionConfig;
 
-					if (jdvc != null && jdvc.Unit_Name != "" && jdvc.Unit_Name != "0")
+					if (jdvc != null && jdvc.Unit_Name != "" && jdvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit
 					{
 						args += " \"PC=" + jdvc.Unit_Name + "\"";
 						break;

PROMS/Volian.Controls.Library/DisplayReports.cs

@@ -733,7 +733,7 @@ namespace Volian.Controls.Library
 				foreach (DocVersionInfo dvi in dvil)
 				{
 					DocVersionConfig dvc = dvi.DocVersionConfig as DocVersionConfig;
-					if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0")
+					if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit
 						roloc += " \"/PC=" + dvc.Unit_Name + "\"";
 					break;
 				}

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -3112,8 +3112,17 @@ namespace Volian.Controls.Library
 				else
 				{
 					LinkText lt = new LinkText(_MyStepRTB.MyLinkText);
-					myROID = lt.MyRoUsageInfo.ROID.ToLower();
-					myRODB = lt.MyRoUsageInfo.MyRODb;
+					//B2023-104 If we could not get the MyRoUsageInfo then we have a bad RO Link. Tell user to re-link the RO
+					if (lt.MyRoUsageInfo != null)
+					{
+						myROID = lt.MyRoUsageInfo.ROID.ToLower();
+						myRODB = lt.MyRoUsageInfo.MyRODb;
+					}
+					else
+					{
+						FlexibleMessageBox.Show("Invalid RO link information.\n\n Please re-link this RO value.", "Invalid RO Reference", MessageBoxButtons.OK, MessageBoxIcon.Information);
+						return;
+					}
 				}
 				if (myROID == null) return;
 				if (myROID.StartsWith("ffff"))
@@ -3139,7 +3148,7 @@ namespace Volian.Controls.Library
 				foreach (DocVersionInfo dvi in dvil)
 				{
 					DocVersionConfig dvc = dvi.DocVersionConfig as DocVersionConfig;
-					if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0")
+					if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit
 					{
 						args += " \"PC=" + dvc.Unit_Name + "\"";
 						break;
@@ -3309,7 +3318,7 @@ namespace Volian.Controls.Library
 			foreach (DocVersionInfo dvi in dvil)
 			{
 				DocVersionConfig dvc = dvi.DocVersionConfig as DocVersionConfig;
-				if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0")
+				if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit
 				{
 					roloc += " \"PC=" + dvc.Unit_Name + "\"";
 					break;

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -2251,7 +2251,7 @@ namespace Volian.Controls.Library
 			foreach (DocVersionInfo dvi in dvil)
 			{
 				DocVersionConfig dvc = dvi.DocVersionConfig as DocVersionConfig;
-				if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Name != "0")
+				if (dvc != null && dvc.Unit_Name != "" && dvc.Unit_Count > 1) // B2021-089 only pass in applicability info if defined for more than one unit
 				{
 					roloc += " \"PC=" + dvc.Unit_Name + "\"";
 					break;