HTML-873: Encounter Date should validate that encounter datetime falls within Visit

Author: mogoodrich

api/src/main/java/org/openmrs/module/htmlformentry/element/EncounterDetailSubmissionElement.java

@@ -680,6 +680,15 @@ protected void validateDateWidget(FormEntryContext context, DateWidget dateWidge
 		if (OpenmrsUtil.compare((Date) date, new Date()) > 0) {
 			throw new Exception("htmlformentry.error.cannotBeInFuture");
 		}
+
+        if (context.getVisit() != null) {
+            if (date.before(((Visit) context.getVisit()).getStartDatetime())) {
+                throw new Exception("htmlformentry.error.cannotBeBeforeVisitStart");
+            }
+            if (((Visit) context.getVisit()).getStopDatetime() != null && date.after(((Visit) context.getVisit()).getStopDatetime())) {
+                throw new Exception("htmlformentry.error.cannotBeAfterVisitStop");
+            }
+        }
 	}
 
 	/**

api/src/main/resources/messages.properties

@@ -17,6 +17,8 @@ htmlformentry.error.blockMultipleEncounterOnDate         = This form has already
 htmlformentry.error.cannotBeInFuture                     = Cannot be in the future
 htmlformentry.error.cannotBeAfterEncounterDate           = Cannot be after encounter date
 htmlformentry.error.cannotBeBeforeEncounterDate          = Cannot be before encounter date
+htmlformentry.error.cannotBeBeforeVisitStart             = Cannot be before visit start date
+htmlformentry.error.cannotBeAfterVisitStop               = Cannot be after visit stop date
 htmlformentry.error.cannotChooseADrugHeader              = Oops!  You selected a drug header instead of a specific drug.  
 htmlformentry.error.changedEncounterDate                 = Changing encounter date is not supported with workflow state
 htmlformentry.error.commentWithoutValue                  = Comment without value