Compare commits
9 Commits
4a6c0ba447
...
B2024-063-
| Author | SHA1 | Date | |
|---|---|---|---|
| 6128632186 | |||
| 5db6a984f3 | |||
| a43e059733 | |||
| 0ac79f4e46 | |||
| 218a2c17a2 | |||
| a629f6834b | |||
| bf5337cf63 | |||
| 7713f0cd63 | |||
|
|
2711520666 |
Binary file not shown.
@@ -1206,6 +1206,9 @@ namespace VEPROMS
|
||||
private bool validateDate(TextBox txtDate)
|
||||
{
|
||||
DateTime dDate;
|
||||
if (!(txtDate.Text == ""))
|
||||
{
|
||||
|
||||
if (DateTime.TryParse(txtDate.Text, out dDate))
|
||||
{
|
||||
return true;
|
||||
@@ -1219,6 +1222,11 @@ namespace VEPROMS
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
private void txbRevDate_Enter(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -951,7 +951,10 @@ namespace VEPROMS.CSLA.Library
|
||||
// it is pasted into a section without enhanced data, then clear it.
|
||||
|
||||
// config data can only be on hls/notes/cautions for pasted steps.
|
||||
if (!pasteItem.IsHigh && !pasteItem.IsCaution && !pasteItem.IsNote) return;
|
||||
// B2024-059: clear links on a source section. When a paste occurs, the section is copied with the links but not
|
||||
// new section is created in the enhanced document, so the links point to the original section (copied). These
|
||||
// need to be removed.
|
||||
if (!pasteItem.IsHigh && !pasteItem.IsCaution && !pasteItem.IsNote && !pasteItem.IsSection) return;
|
||||
|
||||
// See if the pasted step's section is enhanced with enhanced steps, and if not, clear it
|
||||
// Also, if pasting into a source section, don't clear (B2017-225), the 'isSourceSection' portion of the code.
|
||||
@@ -974,6 +977,12 @@ namespace VEPROMS.CSLA.Library
|
||||
// of the pasted step.
|
||||
if (pasteItem.HasEnhancedLinkedStep) pasteItem.RemoveEnhancedFromConfig();
|
||||
}
|
||||
// B2024-059: clear links on a source section
|
||||
if (isSourceSection)
|
||||
{
|
||||
EnhancedDocuments seleds = pasteItem.GetMyEnhancedDocuments();
|
||||
foreach (EnhancedDocument ed in seleds) pasteItem.DoUnlinkEnhanced(pasteItem, ed.Type, true);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
#region Insert Child
|
||||
|
||||
@@ -673,6 +673,8 @@ namespace Volian.Controls.Library
|
||||
else
|
||||
{
|
||||
using (Annotation annotation = CurrentAnnotation.Get())
|
||||
{
|
||||
if (annotation != null) // B2024-061 check for null reference
|
||||
{
|
||||
annotation.RtfText = rtxbComment.Rtf;
|
||||
annotation.SearchText = rtxbComment.Text;
|
||||
@@ -683,6 +685,7 @@ namespace Volian.Controls.Library
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
AnnotationDirty = false;
|
||||
UpdateAnnotationGrid();
|
||||
AnnotationTypeInfoList.Reset(); // B2018-135: refresh annotation type list to update when annotations are used.
|
||||
|
||||
@@ -138,6 +138,15 @@ namespace Volian.Print.Library
|
||||
get { return _Prefix; }
|
||||
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);
|
||||
public event PromsPrinterStatusEvent StatusChanged;
|
||||
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);
|
||||
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;
|
||||
}
|
||||
OnStatusChanged(myProcedure.DisplayNumber, PromsPrinterStatusType.ProgressSetup, myProcedure.Sections.Count);
|
||||
|
||||
Reference in New Issue
Block a user