Compare commits
1 Commits
B2025-041-
...
B2025-042
Author | SHA1 | Date | |
---|---|---|---|
ca0ae279e0 |
@@ -735,10 +735,13 @@ namespace RODBInterface
|
|||||||
else
|
else
|
||||||
parentValue = nd.InnerText;
|
parentValue = nd.InnerText;
|
||||||
|
|
||||||
|
if (parentName != "#whitespace")
|
||||||
|
{
|
||||||
//applicValues = "";
|
//applicValues = "";
|
||||||
applicValues = string.Format("<APL DefaultVal={0}", parentValue);
|
applicValues = string.Format("<APL DefaultVal={0}", parentValue);
|
||||||
int pcChildIdx = 0;
|
int pcChildIdx = 0;
|
||||||
//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
|
//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)
|
foreach (string c in pcChildern)
|
||||||
{
|
{
|
||||||
//string csufx = CvtUserFldToFld(c);
|
//string csufx = CvtUserFldToFld(c);
|
||||||
@@ -754,6 +757,7 @@ namespace RODBInterface
|
|||||||
applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
|
applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
applicValues += " /APL>";
|
applicValues += " /APL>";
|
||||||
}
|
}
|
||||||
return applicValues;
|
return applicValues;
|
||||||
|
@@ -1245,7 +1245,6 @@ 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
|
||||||
@@ -1603,7 +1602,7 @@ namespace VEPROMS
|
|||||||
{
|
{
|
||||||
using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
|
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.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
|
||||||
|
Reference in New Issue
Block a user