B2025-042 RO Editor FST Export ParentChild whitespace

PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs

@@ -735,23 +735,27 @@ namespace RODBInterface
 				else
 					parentValue = nd.InnerText;
 
-				//applicValues = "";
-				applicValues = string.Format("<APL DefaultVal={0}", parentValue);
-				int pcChildIdx = 0;
-				//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
-				foreach (string c in pcChildern)
+				if (parentName != "#whitespace")
 				{
-					//string csufx = CvtUserFldToFld(c);
-					pcChildIdx++;
-					string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
-					//applicValues += ",";
-					XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
-					if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
-						applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
-					else
+					//applicValues = "";
+					applicValues = string.Format("<APL DefaultVal={0}", parentValue);
+					int pcChildIdx = 0;
+					//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
+
+					foreach (string c in pcChildern)
 					{
-						if (parentValue != cn.InnerText)
-							applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
+						//string csufx = CvtUserFldToFld(c);
+						pcChildIdx++;
+						string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
+						//applicValues += ",";
+						XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
+						if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
+							applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
+						else
+						{
+							if (parentValue != cn.InnerText)
+								applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
+						}
 					}
 				}
 				applicValues += " /APL>";

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -1245,7 +1245,6 @@ namespace VEPROMS
 
 				using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
 				{
-					prnDlg.OverwritePDF = false; // turn off overwriting of PDFs B2025-041
 					prnDlg.SelectedSlave = args.UnitIndex;
 					prnDlg.MySessionInfo = MySessionInfo;
 					prnDlg.SetupForProcedure();  // Setup filename
@@ -1603,7 +1602,7 @@ namespace VEPROMS
 			{
 				using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
 				{
-					prnDlg.OverwritePDF = false; // turn off overwriting of PDFs C2025-048.
+					prnDlg.OverwritePDF = false; // turn off overwriting of PDFs.
 					prnDlg.SelectedSlave = pi.ProcedureConfig.SelectedSlave == 0 ? -1 : pi.ProcedureConfig.SelectedSlave; //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
 					prnDlg.MySessionInfo = MySessionInfo;
 					prnDlg.SetupForProcedure();  // Setup filename