Compare commits

..

1 Commits

Author SHA1 Message Date
3bd7001106 B2025-041-Set-Quick-Print-overwrite-pdf-to-false 2025-08-14 11:23:22 -04:00
2 changed files with 17 additions and 20 deletions

View File

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

View File

@@ -1245,6 +1245,7 @@ namespace VEPROMS
using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi)) using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
{ {
prnDlg.OverwritePDF = false; // turn off overwriting of PDFs B2025-041
prnDlg.SelectedSlave = args.UnitIndex; prnDlg.SelectedSlave = args.UnitIndex;
prnDlg.MySessionInfo = MySessionInfo; prnDlg.MySessionInfo = MySessionInfo;
prnDlg.SetupForProcedure(); // Setup filename prnDlg.SetupForProcedure(); // Setup filename
@@ -1602,7 +1603,7 @@ namespace VEPROMS
{ {
using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi)) using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
{ {
prnDlg.OverwritePDF = false; // turn off overwriting of PDFs. prnDlg.OverwritePDF = false; // turn off overwriting of PDFs C2025-048.
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.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.MySessionInfo = MySessionInfo;
prnDlg.SetupForProcedure(); // Setup filename prnDlg.SetupForProcedure(); // Setup filename