=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm 2013-03-02 06:07:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm 2013-03-02 15:09:06 +0000
@@ -1,5 +1,5 @@
CACHE MANIFEST
-# 2.11-SNAPSHOT V23
+# 2.11-SNAPSHOT V25
NETWORK:
*
CACHE:
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2013-03-02 06:07:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2013-03-02 15:09:06 +0000
@@ -32,7 +32,7 @@
#if($programStageInstance.programStage.captureCoordinates=='true')
-
+
|
|
=== 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-03-02 06:07:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-03-02 15:09:06 +0000
@@ -674,8 +674,14 @@
function saveDueDate( programInstanceId, programStageInstanceId, programStageInstanceName )
{
- var field = document.getElementById( 'value_' + programStageInstanceId + '_date' );
+ var field = byId( 'value_' + programStageInstanceId + '_date' );
var dateOfIncident = new Date( byId('dateOfIncident').value );
+
+ if(field.value==''){
+ field.style.backgroundColor = '#FFCC00';
+ alert( i18n_insert_a_due_date );
+ return;
+ }
var dueDate = new Date(field.value);
if( dueDate < dateOfIncident )
@@ -693,10 +699,6 @@
function DateDueSaver( programStageInstanceId_, dueDate_, resultColor_ )
{
- if(dueDate_='')
- {
- alert(i18n_insert_a_due_date);
- }
var programStageInstanceId = programStageInstanceId_;
var dueDate = dueDate_;
var resultColor = resultColor_;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm 2013-03-01 09:15:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm 2013-03-02 15:09:06 +0000
@@ -46,6 +46,7 @@
var i18n_error_required_field = '$encoder.jsEscape( $i18n.getString( "error_required_field" ) , "'")';
var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
var i18n_date_less_incident_date = '$encoder.jsEscape( $i18n.getString( "date_less_incident_date" ) , "'")';
+ var i18n_scheduled_in_future = '$encoder.jsEscape( $i18n.getString( "scheduled_in_future" ) , "'")';
var i18n_id = '$encoder.jsEscape( $i18n.getString( "id" ), "'")';
var i18n_full_name = '$encoder.jsEscape( $i18n.getString( "full_name" ), "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2013-03-02 06:07:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2013-03-02 15:09:06 +0000
@@ -30,7 +30,7 @@
#parse( "/dhis-web-caseentry/programStageInstanceFlow.vm" )
-