B2022-083: Support Conditional RO Values (v2.1) [Part-2]
This commit is contained in:
@@ -105,20 +105,21 @@ namespace VEPROMS
|
||||
ProcedureInfo pi = args.Proc as ProcedureInfo;
|
||||
if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
|
||||
|
||||
if (pi == null) return;
|
||||
|
||||
//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave;
|
||||
|
||||
if (pi == null) return;
|
||||
|
||||
DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi);
|
||||
|
||||
//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;
|
||||
prnDlg.SelectedSlave = (pi.ProcedureConfig.SelectedSlave == 0) ? -1 : pi.ProcedureConfig.SelectedSlave;
|
||||
prnDlg.MySessionInfo = MySessionInfo;
|
||||
prnDlg.Automatic = true;
|
||||
prnDlg.CreateContinuousActionSummary = true;
|
||||
prnDlg.OpenAfterCreate = (dr == System.Windows.Forms.DialogResult.Yes);
|
||||
prnDlg.Prefix = "CASTMP_"; // A temporary procedure PDF is created to grab page numbers
|
||||
|
||||
prnDlg.SetupForProcedure();
|
||||
prnDlg.CreatePDF();
|
||||
|
||||
@@ -379,7 +380,6 @@ namespace VEPROMS
|
||||
|
||||
}
|
||||
|
||||
|
||||
void displaySearch1_SearchComplete(object sender, DisplaySearchEventArgs args)
|
||||
{
|
||||
ProgBarText = string.Format("{0} Seconds", args.HowLong.TotalSeconds);
|
||||
@@ -628,7 +628,7 @@ namespace VEPROMS
|
||||
else
|
||||
{
|
||||
int ownerid = MySessionInfo.CheckOutItem(fi.FolderID, CheckOutType.Session);
|
||||
//int ownerid = MySessionInfo.CheckOutItem(fi.FolderID, (args.Index == 0) ? CheckOutType.Folder : CheckOutType.Session);
|
||||
|
||||
dlgExportImport dlg = new dlgExportImport(args.Index == 0 ? "Export" : "Import", fi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter
|
||||
dlg.ShowDialog(this);
|
||||
|
||||
@@ -661,6 +661,7 @@ namespace VEPROMS
|
||||
}
|
||||
|
||||
int ownerid = MySessionInfo.CheckOutItem(dvi.VersionID, CheckOutType.DocVersion);
|
||||
|
||||
dlgExportImport dlg = new dlgExportImport("Import", dvi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter
|
||||
dlg.MyNewProcedure = null;
|
||||
dlg.ExternalTransitionItem = null;
|
||||
@@ -894,6 +895,7 @@ namespace VEPROMS
|
||||
}
|
||||
|
||||
tc.SaveCurrentEditItem();
|
||||
|
||||
string message = string.Empty;
|
||||
|
||||
if (!MySessionInfo.CanCheckOutItem(dvi.VersionID, CheckOutType.DocVersion, ref message))
|
||||
@@ -904,13 +906,15 @@ namespace VEPROMS
|
||||
|
||||
int ownerid = MySessionInfo.CheckOutItem(dvi.VersionID, CheckOutType.DocVersion);
|
||||
dvi.DocVersionConfig.SelectedSlave = args.UnitIndex;
|
||||
|
||||
dlgApproveProcedure dlg = new dlgApproveProcedure(dvi, true, this);
|
||||
dlg.MySessionInfo = MySessionInfo;
|
||||
dlg.ShowDialog(this);
|
||||
|
||||
displayHistory.RefreshList();
|
||||
dvi.DocVersionConfig.SelectedSlave = 0;
|
||||
MySessionInfo.CheckInItem(ownerid);
|
||||
|
||||
dvi.DocVersionConfig.SelectedSlave = 0;
|
||||
}
|
||||
|
||||
void tv_ApproveAllProcedures(object sender, vlnTreeEventArgs args)
|
||||
@@ -924,11 +928,12 @@ namespace VEPROMS
|
||||
// C2020-036 display list of duplicate procedure numbers
|
||||
FlexibleMessageBox.Show("This procedure set has two or more procedures with the same procedure number.\n\n" +
|
||||
"Please make each procedure number unique before approving.\n\n" +
|
||||
"Below is a list of the dupicate procedure numbers:\n\n" + dupProcList, "Approve All Procedures", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||
"Below is a list of the duplicate procedure numbers:\n\n" + dupProcList, "Approve All Procedures", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
tc.SaveCurrentEditItem();
|
||||
|
||||
string message = string.Empty;
|
||||
|
||||
if (!MySessionInfo.CanCheckOutItem(dvi.VersionID, CheckOutType.DocVersion, ref message))
|
||||
@@ -939,13 +944,15 @@ namespace VEPROMS
|
||||
|
||||
int ownerid = MySessionInfo.CheckOutItem(dvi.VersionID, CheckOutType.DocVersion);
|
||||
dvi.DocVersionConfig.SelectedSlave = args.UnitIndex;
|
||||
|
||||
dlgApproveProcedure dlg = new dlgApproveProcedure(dvi, this);//Added frmVEPROMS Parameter
|
||||
dlg.MySessionInfo = MySessionInfo;
|
||||
dlg.ShowDialog(this);
|
||||
|
||||
displayHistory.RefreshList();
|
||||
dvi.DocVersionConfig.SelectedSlave = 0;
|
||||
MySessionInfo.CheckInItem(ownerid);
|
||||
|
||||
dvi.DocVersionConfig.SelectedSlave = 0;
|
||||
}
|
||||
|
||||
void tv_RefreshCheckedOutProcedures(object sender, vlnTreeEventArgs args)
|
||||
@@ -1020,7 +1027,6 @@ namespace VEPROMS
|
||||
void tv_ApproveProcedure(object sender, vlnTreeEventArgs args)
|
||||
{
|
||||
ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
|
||||
if (pi == null) return;
|
||||
|
||||
// B2017-242 added check for duplicate procedure numbers in a procedure set?
|
||||
@@ -1033,6 +1039,7 @@ namespace VEPROMS
|
||||
}
|
||||
|
||||
tc.SaveCurrentEditItem(pi);
|
||||
|
||||
string message = string.Empty;
|
||||
|
||||
if (!MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref message))
|
||||
@@ -1042,13 +1049,16 @@ namespace VEPROMS
|
||||
}
|
||||
|
||||
int ownerid = MySessionInfo.CheckOutItem(pi.ItemID, 0);
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
|
||||
|
||||
dlgApproveProcedure dlg = new dlgApproveProcedure(pi, this);//Added frmVEPROMS Parameter
|
||||
dlg.MySessionInfo = MySessionInfo;
|
||||
dlg.ShowDialog(this);
|
||||
|
||||
displayHistory.RefreshList();
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||
MySessionInfo.CheckInItem(ownerid);
|
||||
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||
}
|
||||
|
||||
void tv_PrintAllProcedures(object sender, vlnTreeEventArgs args)
|
||||
@@ -1058,23 +1068,28 @@ namespace VEPROMS
|
||||
|
||||
tc.SaveCurrentEditItem();
|
||||
|
||||
dvi.DocVersionConfig.SelectedSlave = args.UnitIndex;
|
||||
|
||||
DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi);
|
||||
prnDlg.MySessionInfo = MySessionInfo;
|
||||
prnDlg.SelectedSlave = args.UnitIndex;
|
||||
prnDlg.MySessionInfo = MySessionInfo;
|
||||
prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
|
||||
|
||||
dvi.DocVersionConfig.SelectedSlave = 0;
|
||||
}
|
||||
|
||||
void tv_PrintProcedure(object sender, vlnTreeEventArgs args)
|
||||
{
|
||||
ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
|
||||
if (pi == null) return;
|
||||
|
||||
tc.SaveCurrentEditItem(pi);
|
||||
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
|
||||
|
||||
DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi);
|
||||
prnDlg.MySessionInfo = MySessionInfo;
|
||||
prnDlg.SelectedSlave = args.UnitIndex;
|
||||
prnDlg.MySessionInfo = MySessionInfo;
|
||||
prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
|
||||
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||
@@ -1083,12 +1098,14 @@ namespace VEPROMS
|
||||
void tv_CreateContinuousActionSummary(object sender, vlnTreeEventArgs args)
|
||||
{
|
||||
DialogResult dr = System.Windows.Forms.DialogResult.Yes;
|
||||
|
||||
ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
|
||||
if (pi == null) return;
|
||||
|
||||
tc.SaveCurrentEditItem(pi);
|
||||
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
|
||||
|
||||
DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi, true);
|
||||
prnDlg.MySessionInfo = MySessionInfo;
|
||||
prnDlg.SelectedSlave = args.UnitIndex;
|
||||
@@ -1096,7 +1113,6 @@ namespace VEPROMS
|
||||
prnDlg.CreateContinuousActionSummary = true;
|
||||
prnDlg.OpenAfterCreate = (dr == System.Windows.Forms.DialogResult.Yes);
|
||||
prnDlg.Prefix = "CASTMP_"; // prefix the temporary procedure PDF file that is generated (to grab page numbers)
|
||||
|
||||
prnDlg.SetupForProcedure();
|
||||
prnDlg.CreatePDF();
|
||||
|
||||
@@ -1264,21 +1280,17 @@ namespace VEPROMS
|
||||
ProcedureInfo pi = args.Proc as ProcedureInfo;
|
||||
if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
|
||||
|
||||
//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave;
|
||||
|
||||
// Check if Procedure Info is null
|
||||
if (pi == null) return;
|
||||
|
||||
|
||||
DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi);
|
||||
|
||||
//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;
|
||||
prnDlg.MySessionInfo = MySessionInfo;
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave;
|
||||
|
||||
// RHM 20120925 - Center dialog over PROMS window
|
||||
prnDlg.ShowDialog(this);
|
||||
DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi);
|
||||
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.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
|
||||
|
||||
//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||
@@ -2291,16 +2303,15 @@ namespace VEPROMS
|
||||
{
|
||||
ProcedureInfo proc = dicProcs[key];
|
||||
|
||||
//Console.WriteLine("{0}", proc.ShortPath);
|
||||
DlgPrintProcedure prnDlg = new DlgPrintProcedure(proc, true);
|
||||
prnDlg.MySessionInfo = MySessionInfo;
|
||||
|
||||
//prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
|
||||
prnDlg.Prefix = proc.MyDocVersion.VersionID.ToString() + "_";
|
||||
prnDlg.Automatic = true;
|
||||
prnDlg.OpenAfterCreate = (dr == System.Windows.Forms.DialogResult.Yes);
|
||||
prnDlg.SetupForProcedure();
|
||||
prnDlg.CreatePDF();
|
||||
|
||||
//prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2625,7 +2636,7 @@ namespace VEPROMS
|
||||
- Jess- Volian0
|
||||
- John- Volian0
|
||||
- Kathy- Volian0
|
||||
- Jake- Volian0
|
||||
- Jake- Volian0
|
||||
- Jim- JCB2-HP
|
||||
- Rich- WINDOWS7-RHM
|
||||
- Rich - RICH-WINDOWS10
|
||||
@@ -2699,6 +2710,7 @@ namespace VEPROMS
|
||||
void btnUserControlOfFormatsExport_Click(object sender, EventArgs e)
|
||||
{
|
||||
DocVersionInfo dvi = null;
|
||||
|
||||
dlgExportImport dlg = new dlgExportImport("Export Formats", dvi, this, (E_UCFImportOptions)0);
|
||||
dlg.MyNewProcedure = null;
|
||||
dlg.ExternalTransitionItem = null;
|
||||
@@ -2708,6 +2720,7 @@ namespace VEPROMS
|
||||
void btnUserControlOfFormatsImport_Click(object sender, EventArgs e)
|
||||
{
|
||||
DocVersionInfo dvi = null;
|
||||
|
||||
dlgExportImport dlg = new dlgExportImport("Import Formats", dvi, this, (E_UCFImportOptions)0);
|
||||
dlg.MyNewProcedure = null;
|
||||
dlg.ExternalTransitionItem = null;
|
||||
@@ -2879,14 +2892,13 @@ namespace VEPROMS
|
||||
|
||||
foreach (string dvstr in dvstrs)
|
||||
{
|
||||
if (dvstr != "")
|
||||
if (dvstr != string.Empty)
|
||||
{
|
||||
DocVersionInfo dvi = DocVersionInfo.Get(int.Parse(dvstr));
|
||||
|
||||
if (dvi != null)
|
||||
{
|
||||
DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi, true);
|
||||
|
||||
if (dvi.MultiUnitCount == 0) prnDlg.SelectedSlave = -1;
|
||||
prnDlg.AllowDateTimePrefixSuffix = false; //C2018-033 don't append any selected date/time pdf file prefix or suffix (defined in working draft properties)
|
||||
prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
|
||||
|
Reference in New Issue
Block a user