Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9b7db08fcf | |||
| 6d7cdef223 |
@@ -67,6 +67,7 @@ namespace VEPROMS
|
|||||||
MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
|
MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
|
||||||
_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
|
_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
|
||||||
ApplicabilityIndex = myDocVersion.DocVersionConfig.SelectedSlave;
|
ApplicabilityIndex = myDocVersion.DocVersionConfig.SelectedSlave;
|
||||||
|
_MyApproval.SavedSlave = ApplicabilityIndex;
|
||||||
this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
|
this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
|
||||||
this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
|
this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
|
||||||
_MyDocVersion = myDocVersion;
|
_MyDocVersion = myDocVersion;
|
||||||
@@ -292,6 +293,7 @@ namespace VEPROMS
|
|||||||
expAddProcConChk.Expanded = true;
|
expAddProcConChk.Expanded = true;
|
||||||
_initializing = true;
|
_initializing = true;
|
||||||
ApplicabilityIndex = myDocVersion.DocVersionConfig.SelectedSlave;
|
ApplicabilityIndex = myDocVersion.DocVersionConfig.SelectedSlave;
|
||||||
|
_MyApproval.SavedSlave = ApplicabilityIndex;
|
||||||
InitializePanelApprove();
|
InitializePanelApprove();
|
||||||
InitializePanelSelect();
|
InitializePanelSelect();
|
||||||
_initializing = false;
|
_initializing = false;
|
||||||
@@ -306,6 +308,7 @@ namespace VEPROMS
|
|||||||
_MyDocVersion = myProcedure.MyDocVersion;
|
_MyDocVersion = myProcedure.MyDocVersion;
|
||||||
_MyDocVersion.ResetProcedures(); // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
|
_MyDocVersion.ResetProcedures(); // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
|
||||||
ApplicabilityIndex = _MyDocVersion.DocVersionConfig.SelectedSlave; // B2022-033 set the child being approved or workflow so other procedure list can populate
|
ApplicabilityIndex = _MyDocVersion.DocVersionConfig.SelectedSlave; // B2022-033 set the child being approved or workflow so other procedure list can populate
|
||||||
|
_MyApproval.SavedSlave = ApplicabilityIndex;
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
FlexGridAddEvents();
|
FlexGridAddEvents();
|
||||||
SetupComboBoxes();
|
SetupComboBoxes();
|
||||||
@@ -914,6 +917,11 @@ namespace VEPROMS
|
|||||||
get { return _MyProcedures; }
|
get { return _MyProcedures; }
|
||||||
//set { _MyProcedures = value; }
|
//set { _MyProcedures = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//B2026-058 - If approving multiple procedures at the same time with a multiunit set and one of the procedures is open, PROMS sometimes loses that it is set for an individual unit.
|
||||||
|
// this will save the SectedSlave in case a refresh causes it to get lost
|
||||||
|
public int SavedSlave { get; set; } = 0;
|
||||||
|
|
||||||
public ApprovalInfo(frmVEPROMS myFrmVEPROMS)
|
public ApprovalInfo(frmVEPROMS myFrmVEPROMS)
|
||||||
{
|
{
|
||||||
MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
|
MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
|
||||||
@@ -1173,6 +1181,11 @@ namespace VEPROMS
|
|||||||
string pdfPath = string.Format(@"{0}\{1}", VlnSettings.TemporaryFolder, pdfTmp);
|
string pdfPath = string.Format(@"{0}\{1}", VlnSettings.TemporaryFolder, pdfTmp);
|
||||||
if (!TryToDelete(summaryPDF, "Change Summary")) break;
|
if (!TryToDelete(summaryPDF, "Change Summary")) break;
|
||||||
if (!TryToDelete(pdfPath,revisionStage)) break;
|
if (!TryToDelete(pdfPath,revisionStage)) break;
|
||||||
|
if (SavedSlave > 0 && ap.ProcInfo.MyDocVersion.DocVersionConfig.SelectedSlave < 1)
|
||||||
|
{
|
||||||
|
//B2026-058 - If approving multiple procedures at the same time with a multiunit set and one of the procedures is open, PROMS sometimes loses that it is set for an individual unit.
|
||||||
|
ap.ProcInfo.MyDocVersion.DocVersionConfig.SelectedSlave = SavedSlave;
|
||||||
|
}
|
||||||
procsApproved.Add(ap.ProcInfo.DisplayNumber + " " + ap.ProcInfo.DisplayText);
|
procsApproved.Add(ap.ProcInfo.DisplayNumber + " " + ap.ProcInfo.DisplayText);
|
||||||
RevisionInfo ric = pi.MyDocVersion.DocVersionConfig.SelectedSlave > 0 ? RevisionInfo.GetCurrentByItemIDandUnitID(pi.ItemID, pi.MyDocVersion.DocVersionConfig.SelectedSlave) : RevisionInfo.GetCurrentByItemID(pi.ItemID);
|
RevisionInfo ric = pi.MyDocVersion.DocVersionConfig.SelectedSlave > 0 ? RevisionInfo.GetCurrentByItemIDandUnitID(pi.ItemID, pi.MyDocVersion.DocVersionConfig.SelectedSlave) : RevisionInfo.GetCurrentByItemID(pi.ItemID);
|
||||||
// RevisionInfo rip = RevisionInfo.GetPreviousByItemID(pi.ItemID);
|
// RevisionInfo rip = RevisionInfo.GetPreviousByItemID(pi.ItemID);
|
||||||
|
|||||||
Reference in New Issue
Block a user