Compare commits
1 Commits
master
...
B2024-062_
Author | SHA1 | Date | |
---|---|---|---|
e5d5528b19 |
@ -295,7 +295,10 @@ namespace VEPROMS
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
while (!MyPromsPrinter.MergeNotIncluded && _PdfFile == null && MessageBox.Show("Try Again?", "PDF Creation Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes);
|
// B2024-062 Added check for EmptyProcedure. We don't need to show the Try Again message if the procedure
|
||||||
|
// is empty, as it would be just be a waste of time for the user.
|
||||||
|
while (!MyPromsPrinter.MergeNotIncluded && _PdfFile == null && !MyPromsPrinter.EmptyProcedure &&
|
||||||
|
MessageBox.Show("Try Again?", "PDF Creation Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes);
|
||||||
|
|
||||||
|
|
||||||
if (_PdfFile == null)
|
if (_PdfFile == null)
|
||||||
|
@ -138,6 +138,15 @@ namespace Volian.Print.Library
|
|||||||
get { return _Prefix; }
|
get { return _Prefix; }
|
||||||
set { _Prefix = value; }
|
set { _Prefix = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// B2024-062 Set to true when the procedure being printed has no content.
|
||||||
|
// When set to true, will prevent the "Try Again" dialog from appearing
|
||||||
|
// and simply exit the print function
|
||||||
|
private bool _EmptyProcedure = false;
|
||||||
|
public bool EmptyProcedure
|
||||||
|
{
|
||||||
|
get { return _EmptyProcedure; }
|
||||||
|
}
|
||||||
private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
public event PromsPrinterStatusEvent StatusChanged;
|
public event PromsPrinterStatusEvent StatusChanged;
|
||||||
internal void OnStatusChanged(object sender, PromsPrintStatusArgs args)
|
internal void OnStatusChanged(object sender, PromsPrintStatusArgs args)
|
||||||
@ -933,6 +942,9 @@ namespace Volian.Print.Library
|
|||||||
{
|
{
|
||||||
MessageBox.Show("This procedure has no content and will not be printed.", "Empty Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
MessageBox.Show("This procedure has no content and will not be printed.", "Empty Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||||
ProfileTimer.Pop(profileDepth);
|
ProfileTimer.Pop(profileDepth);
|
||||||
|
// B2024-062 Added check for EmptyProcedure. This is to prevent the Try Again message
|
||||||
|
// from appearing after the user clicks on the OK button from the Empty Procedure message
|
||||||
|
_EmptyProcedure = true;
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
OnStatusChanged(myProcedure.DisplayNumber, PromsPrinterStatusType.ProgressSetup, myProcedure.Sections.Count);
|
OnStatusChanged(myProcedure.DisplayNumber, PromsPrinterStatusType.ProgressSetup, myProcedure.Sections.Count);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user