RA-950: Add LastVisit and EditVisit require an EndDate #275

reagan-meant · 2020-01-22T12:48:07Z

https://issues.openmrs.org/browse/RA-950
I did the following
1.Enabled to add a past visit with a start date but no end date
2.But disabled adding a past visit with a start date but no end date if this would overlap with another existing visit
3.Enabled to edit a closed visit and remove its end date
4.But disabled editing a closed visit and remove its end date if this would overlap with another existing visit
Other changes are in EMR API openmrs/openmrs-module-emrapi#177

sherrif10

@reagan-meant have you recognised the white spaces

dkayiwa · 2020-02-06T18:38:54Z

.../openmrs/module/coreapps/fragment/controller/visit/RetrospectiveVisitFragmentController.java

@@ -31,31 +31,30 @@ public Object create(@SpringBean("adtService") AdtService adtService,
                                       @RequestParam(value = "stopDate", required = false) Date stopDate,
                                       HttpServletRequest request, UiUtils ui) {

-        // if no stop date, set it to start date
-        if (stopDate == null) {


What was the motivation for removing this?

This is because with this enhancement we can allow a user to pass a null stopDate which will make that retrospective visit an active visit....this code was instead forcing any such action to default the end date to startDate

dkayiwa · 2020-02-06T18:40:30Z

omod/src/main/webapp/fragments/patientdashboard/editVisitDatesDialog.gsp

@@ -21,7 +21,7 @@
                        defaultDate: config.defaultStartDate
                ])}
            </p>
-            <% if(config.defaultEndDate != null) { %>


Why change this from defaultEndDate to visitEndDate?

This was really a hack to allow the user to have a null defaultEndDate yet at the same time preventing the user setting an end date on an Active visit which was already in place....

dkayiwa · 2020-02-06T18:41:23Z

omod/src/main/webapp/fragments/patientdashboard/visitIncludes.gsp


-            ${ ui.includeFragment("uicommons", "field/datetimepicker", [
+ <% if(activeVisits){ %>


Any reason for changing the formatting here?

Not an intended change...

dkayiwa · 2020-02-06T18:42:25Z

...nmrs/module/coreapps/fragment/controller/visit/RetrospectiveVisitFragmentControllerTest.java

@@ -95,11 +95,10 @@ public void test_shouldCreateNewRetrospectiveVisit_whenNoStopDateSpecified() thr

        // should round to the time components to the start and end of the days, respectively
        Date expectedStartDate = new DateTime(2012, 1, 1, 0, 0, 0, 0).toDate();
-        Date expectedStopDate = new DateTime(2012, 1, 1, 23, 59, 59, 999).toDate();


Why remove the above line?

This test is to verify what I had changed in the sense that now we can allow the user to pass a null end Date and not default it to the startDate

dkayiwa · 2020-02-06T18:42:58Z

...nmrs/module/coreapps/fragment/controller/visit/RetrospectiveVisitFragmentControllerTest.java

@@ -135,7 +134,7 @@ public void test_shouldReturnConflictingVisits() throws Exception {

        when(ui.format(any())).thenReturn("someDate");

-        List<SimpleObject> result = (List<SimpleObject>) controller.create(adtService, patient, location, startDate, null, request, ui);


Why replace null with stopDate?

This method is to catch any overlaps which was automatically parsing any null endDate to startDate which this enhancement altered and thus for it to pass and still be logical it works only if there is an assigned endDate since i enclosed it in an If condition on line 39 in RetrospectiveVisitFragmentController

dkayiwa · 2020-02-06T18:44:38Z

.../openmrs/module/coreapps/fragment/controller/visit/RetrospectiveVisitFragmentController.java


        // set the startDate time component to the start of day
        startDate = new DateTime(startDate).withTime(0,0,0,0).toDate();

        // if stopDate is today, set stopDate to current datetime, otherwise set time component to end of date
+         if (stopDate != null){


Why enclose these in if stopDate != null?

the methods enclosed here are for formatting the endDate which is not neccessary when the stopDate is null....

dkayiwa · 2020-02-06T18:45:08Z

...java/org/openmrs/module/coreapps/fragment/controller/visit/VisitDatesFragmentController.java

        if (!isSameDay(startDate, visit.getStartDatetime())) {
            visit.setStartDatetime(new DateTime(startDate).toDateMidnight().toDate());
        }

-        if ( (stopDate!=null) && !isSameDay(stopDate, visit.getStopDatetime())) {
+        if(stopDate == null){


What is the motivation for this change?

This same logic is mantained on line 48, which still is for analysing to see if the stopDate is now...And so i introduced this method to allow the retrospective stopdate to be set to null thus make it active and not default it to startDate as it was

dkayiwa · 2020-02-06T18:46:06Z

omod/src/main/webapp/fragments/patientdashboard/visitIncludes.gsp

+            <% } else { %>
+
+            ${ ui.includeFragment("uicommons", "field/datetimepicker", [
+                    id: "noActiveVisitStopDate",


Why are we adding this field/fragment?

From line 81. This is to force the user have a default stop date if they are entering a retrospective Visit yet we are currently having an active visit otherwise if there is no active visit then we can allow them create a retrospective visit that has a null end date thus making it Active(there is already a catch implemented if the restrospective visit is overlaping with another)

dkayiwa · 2020-02-06T18:46:23Z

omod/src/main/webapp/fragments/patientdashboard/visits.gsp

@@ -103,7 +103,8 @@
                startDateLowerLimit: (idx + 1 == visits.size || visits[idx + 1].stopDatetime == null) ? null : editDateFormat.format(org.apache.commons.lang.time.DateUtils.addDays(visits[idx + 1].stopDatetime, 1)),
                startDateUpperLimit: wrapper.oldestEncounter == null && wrapper.stopDatetime == null ? editDateFormat.format(new Date()) : editDateFormat.format(wrapper.oldestEncounter == null ? wrapper.stopDatetime : wrapper.oldestEncounter.encounterDatetime),
                defaultStartDate: wrapper.startDatetime,
-                defaultEndDate: wrapper.stopDatetime
+                defaultEndDate:idx == 0 ? null : wrapper.stopDatetime,


What is the motivation for this change?

This is to allow user to make a most recent Visit endDate null so as to make it an active visit otherwise if the visit is behind another visit in time then you are forced to have a default end Date

reagan-meant force-pushed the RA-950 branch 2 times, most recently from b1d3fa3 to dd320a9 Compare January 23, 2020 09:46

reagan-meant mentioned this pull request Jan 23, 2020

RA-950: Add LastVisit and EditVisit require an EndDate openmrs/openmrs-module-emrapi#177

Merged

reagan-meant force-pushed the RA-950 branch 3 times, most recently from e1c5339 to 32f0d66 Compare January 24, 2020 09:49

sherrif10 reviewed Jan 24, 2020

View reviewed changes

reagan-meant force-pushed the RA-950 branch from 32f0d66 to 8c2f3af Compare January 24, 2020 12:29

dkayiwa reviewed Feb 6, 2020

View reviewed changes

RA-950: Add LastVisit and EditVisit require an EndDate

f625180

reagan-meant force-pushed the RA-950 branch from 8c2f3af to f625180 Compare February 19, 2020 08:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

RA-950: Add LastVisit and EditVisit require an EndDate #275

RA-950: Add LastVisit and EditVisit require an EndDate #275

reagan-meant commented Jan 22, 2020 •

edited

Loading

sherrif10 left a comment

dkayiwa Feb 6, 2020

reagan-meant Feb 7, 2020

dkayiwa Feb 6, 2020

reagan-meant Feb 7, 2020

dkayiwa Feb 6, 2020

reagan-meant Feb 7, 2020

dkayiwa Feb 6, 2020

reagan-meant Feb 7, 2020

dkayiwa Feb 6, 2020

reagan-meant Feb 7, 2020

dkayiwa Feb 6, 2020

reagan-meant Feb 7, 2020

dkayiwa Feb 6, 2020

reagan-meant Feb 7, 2020

dkayiwa Feb 6, 2020

reagan-meant Feb 7, 2020

dkayiwa Feb 6, 2020

reagan-meant Feb 7, 2020


		${ ui.includeFragment("uicommons", "field/datetimepicker", [
		<% if(activeVisits){ %>

		@@ -135,7 +134,7 @@ public void test_shouldReturnConflictingVisits() throws Exception {

		when(ui.format(any())).thenReturn("someDate");

		List<SimpleObject> result = (List<SimpleObject>) controller.create(adtService, patient, location, startDate, null, request, ui);

RA-950: Add LastVisit and EditVisit require an EndDate #275

Are you sure you want to change the base?

RA-950: Add LastVisit and EditVisit require an EndDate #275

Conversation

reagan-meant commented Jan 22, 2020 • edited Loading

sherrif10 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

reagan-meant commented Jan 22, 2020 •

edited

Loading