dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #20681
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9583: Set next due-date for repeatable event based on last visit date and the number of days defined.
------------------------------------------------------------
revno: 9583
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-01-23 13:04:08 +0700
message:
Set next due-date for repeatable event based on last visit date and the number of days defined.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-01-23 03:23:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-01-23 06:04:08 +0000
@@ -540,13 +540,24 @@
function setSuggestedDueDate( programInstanceId )
{
- var standardInterval = jQuery('#repeatableProgramStage_' + programInstanceId + ' option:selected').attr('standardInterval');
- var date = new Date();
+ var lastVisit = jQuery('.stage-object-selected').attr('reportDate');
+ jQuery('#tb_' + programInstanceId + ' input').each(function()
+ {
+ var reportDate = jQuery(this).attr('reportDate');
+ if( reportDate > lastVisit )
+ {
+ lastVisit = reportDate;
+ }
+ });
+
+ var standardInterval = jQuery('#repeatableProgramStage_' + programInstanceId + ' option:selected').attr('standardInterval');
+ var date = $.datepicker.parseDate( dateFormat, lastVisit );
var d = date.getDate() + eval(standardInterval);
var m = date.getMonth();
var y = date.getFullYear();
var edate= new Date(y, m, d);
- jQuery( '#dueDateNewEncounter_' + programInstanceId ).datepicker( "setDate" , edate );
+ var sdate = jQuery.datepicker.formatDate( dateFormat , edate ) ;
+ jQuery( '#dueDateNewEncounter_' + programInstanceId ).val(sdate);
}
function closeDueDateDiv( programInstanceId )
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2013-01-23 04:48:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2013-01-23 06:04:08 +0000
@@ -338,6 +338,7 @@
var box = jQuery(".stage-object-selected");
var boxName = box.attr('psname') + "\n" + executionDate;
box.val( boxName );
+ box.attr( 'reportDate', executionDate );
box.css('border-color', COLOR_LIGHTRED);
box.css('background-color', COLOR_LIGHT_LIGHTRED);
disableCompletedButton(false);