Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Added logic to assure that edits are saved before printing or approval

Browse Source
This commit is contained in:
Rich 2012-04-27 17:14:45 +00:00
parent ea3770fcb8
commit d6b7a34d3b
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -258,6 +258,7 @@ namespace VEPROMS
{ {
DocVersionInfo dvi = (args.Node as VETreeNode).VEObject as DocVersionInfo; DocVersionInfo dvi = (args.Node as VETreeNode).VEObject as DocVersionInfo;
if (dvi == null) return; if (dvi == null) return;
tc.SaveCurrentEditItem();
dlgApproveProcedure dlg = new dlgApproveProcedure(dvi, true); dlgApproveProcedure dlg = new dlgApproveProcedure(dvi, true);
dlg.ShowDialog(this); dlg.ShowDialog(this);
displayHistory.RefreshList(); displayHistory.RefreshList();
@ -267,6 +268,7 @@ namespace VEPROMS
{ {
DocVersionInfo dvi = (args.Node as VETreeNode).VEObject as DocVersionInfo; DocVersionInfo dvi = (args.Node as VETreeNode).VEObject as DocVersionInfo;
if (dvi == null) return; if (dvi == null) return;
tc.SaveCurrentEditItem();
dlgApproveProcedure dlg = new dlgApproveProcedure(dvi); dlgApproveProcedure dlg = new dlgApproveProcedure(dvi);
dlg.ShowDialog(this); dlg.ShowDialog(this);
displayHistory.RefreshList(); displayHistory.RefreshList();
@ -276,6 +278,7 @@ namespace VEPROMS
{ {
ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo; ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
if (pi == null) return; if (pi == null) return;
tc.SaveCurrentEditItem(pi);
dlgApproveProcedure dlg = new dlgApproveProcedure(pi); dlgApproveProcedure dlg = new dlgApproveProcedure(pi);
dlg.ShowDialog(this); dlg.ShowDialog(this);
displayHistory.RefreshList(); displayHistory.RefreshList();
@ -285,6 +288,7 @@ namespace VEPROMS
{ {
DocVersionInfo dvi = (args.Node as VETreeNode).VEObject as DocVersionInfo; DocVersionInfo dvi = (args.Node as VETreeNode).VEObject as DocVersionInfo;
if (dvi == null) return; if (dvi == null) return;
tc.SaveCurrentEditItem();
DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi); DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi);
prnDlg.Show(); prnDlg.Show();
} }
@ -292,6 +296,7 @@ namespace VEPROMS
{ {
ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo; ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
if (pi == null) return; if (pi == null) return;
tc.SaveCurrentEditItem(pi);
DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi); DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi);
prnDlg.Show(); prnDlg.Show();
} }

28
PROMS/Volian.Controls.Library/DisplayTabControl.cs
View File

@ -681,6 +681,34 @@ namespace Volian.Controls.Library
} }
return null; return null;
} }
/// <summary>
/// Save the current EditItem if it is in Edit mode
/// </summary>
/// <param name="pi">ProcedureInfo</param>
public void SaveCurrentEditItem(ProcedureInfo pi)
{
DisplayTabItem dti = GetProcDisplayTabItem(pi);
if (dti == null) return;
EditItem ei = dti.MyStepTabPanel.SelectedEditItem;
if (ei == null) return;
ei.SaveCurrentAndContents();
}
/// <summary>
/// Save the current EditItem if it is in Edit mode
/// </summary>
public void SaveCurrentEditItem()
{
foreach (DisplayTabItem dti in _MyDisplayTabItems.Values)
{
StepTabPanel stp = dti.MyStepTabPanel;
if (stp != null)
{
EditItem ei = stp.SelectedEditItem;
if (ei != null)
ei.SaveCurrentAndContents();
}
}
}
public DisplayTabItem GetProcDisplayTabItem(ItemInfo myItemInfo) public DisplayTabItem GetProcDisplayTabItem(ItemInfo myItemInfo)
{ {
ItemInfo proc = myItemInfo.MyProcedure; // Find procedure Item ItemInfo proc = myItemInfo.MyProcedure; // Find procedure Item