Compare commits
10 Commits
C2025-045
...
Developmen
Author | SHA1 | Date | |
---|---|---|---|
e8327316dd | |||
3bd7001106 | |||
2e5ad53c6a | |||
ca0ae279e0 | |||
adf1120436 | |||
7879391de0 | |||
11ba9ea418 | |||
0fe84ca17c | |||
1009ca5111 | |||
dba1f4e71c |
@@ -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;
|
||||||
|
@@ -66,6 +66,12 @@ namespace VEPROMS
|
|||||||
set { _prtSectID = value; }
|
set { _prtSectID = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private bool _OverwritePDF;
|
||||||
|
public bool OverwritePDF
|
||||||
|
{
|
||||||
|
get { return cbxOverwritePDF2.Checked; }
|
||||||
|
set { cbxOverwritePDF2.Checked = value; }
|
||||||
|
}
|
||||||
|
|
||||||
// C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic())
|
// C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic())
|
||||||
// This is needed so the the automatic baselines can compare results from different runs of PROMS
|
// This is needed so the the automatic baselines can compare results from different runs of PROMS
|
||||||
|
@@ -1309,7 +1309,7 @@ namespace VEPROMS
|
|||||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||||
if (si.IsApproved == 1)
|
if (si.IsApproved == 1)
|
||||||
{
|
{
|
||||||
dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (E_UCFImportOptions)0); // "true tell export to convert ROs and Transitions to text
|
dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (E_UCFImportOptions)0, selectedSlave); // "true tell export to convert ROs and Transitions to text
|
||||||
dlg.DocReplace = frm.DocReplace; // this tells approval to prepare an export file with resolved transitions and ROs, word sections are saved with resolved ROs during approval PDF creation and saved in DocReplace
|
dlg.DocReplace = frm.DocReplace; // this tells approval to prepare an export file with resolved transitions and ROs, word sections are saved with resolved ROs during approval PDF creation and saved in DocReplace
|
||||||
System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
|
System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
|
||||||
dlg.ExportItem(xd, pi, "procedure");
|
dlg.ExportItem(xd, pi, "procedure");
|
||||||
|
@@ -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,6 +1603,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.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