B2024-063-Invalid-Format-message-box-displays-when-rev-date-empty

Merge pull request 'F2024-070 - Add “DEVIATION:” to the enhanced background template after “KNOWLOEDGE/ABILITY”' (#395 ) from F2024-070_Catawba into Development
2024-08-27 10:58:04 -04:00 · 2024-08-27 09:17:32 -04:00 · 2024-08-22 11:26:17 -04:00 · 2024-08-22 11:24:17 -04:00 · 2024-08-21 11:45:10 -04:00 · 2024-08-21 11:37:37 -04:00
3 changed files with 27 additions and 16 deletions
--- a/PROMS/Formats/fmtall/CATEBCKall.xml
+++ b/PROMS/Formats/fmtall/CATEBCKall.xml
--- a/Interface/DlgPrintProcedure.cs
+++ b/Interface/DlgPrintProcedure.cs
@@ -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)
 		{
--- a/PROMS/Volian.Controls.Library/AnnotationDetails.cs
+++ b/PROMS/Volian.Controls.Library/AnnotationDetails.cs
@@ -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.
Author	SHA1	Message	Date
Paul Larsen	6128632186	B2024-063-Invalid-Format-message-box-displays-when-rev-date-empty	2024-08-27 10:58:04 -04:00
Paul Larsen	5db6a984f3	B2024-063-Invalid-Format-message-box-displays-when-rev-date-empty	2024-08-27 09:17:32 -04:00
John Jenko	a43e059733	Merge pull request 'F2024-070 - Add “DEVIATION:” to the enhanced background template after “KNOWLOEDGE/ABILITY”' (#395 ) from F2024-070_Catawba into Development Format only change. ready for testing phase.	2024-08-22 11:26:17 -04:00
John Jenko	0ac79f4e46	F2024-070 - Add “DEVIATION:” to the enhanced background template after “KNOWLOEDGE/ABILITY”	2024-08-22 11:24:17 -04:00
John Jenko	218a2c17a2	Merge pull request 'B2024-061- Added a null reference check in the save annotation code. Need for when Admin deletes the annotation while a user modified the text of it' (#394 ) from B2024-061 into Development null reference check added to the code, tested locally before uploading	2024-08-21 11:45:10 -04:00
John Jenko	a629f6834b	B2024-061- Added a null reference check in the save annotation code. Need for when Admin deletes the annotation while a user modified the text of it	2024-08-21 11:37:37 -04:00
John Jenko	bf5337cf63	B2024-062 printing a procedure that is empty displays the Empty Procedure message. WhenOK button is clicked, PROMS will exit the Print function.. (#393 ) B2024-062 When you attempt to print a procedure that is empty (i.e. none of the sections are applicable to the selected Child to print), the Empty Procedure message appears. When you click the OK button PROMS will now simply exit the Print function instead of displaying the “Try Again” message box. Reviewed-on: #393 Reviewed-by: Paul Larsen <plarsen@volian.com> Co-authored-by: John Jenko <jjenko@volian.com> Co-committed-by: John Jenko <jjenko@volian.com>	2024-08-20 12:25:42 -04:00