=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/identifierAndAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/identifierAndAttributeForm.vm 2013-03-08 09:15:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/identifierAndAttributeForm.vm 2013-07-18 04:01:13 +0000
@@ -1,4 +1,5 @@
+
#foreach ($identifierType in $program.patientIdentifierTypes)
|
@@ -36,4 +37,7 @@
#end
-#end
\ No newline at end of file
+#end
+
+
+
=== 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-07-12 04:32:20 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-07-18 04:01:13 +0000
@@ -1272,6 +1272,16 @@
{
id:programId
}, function(){
+ if(getFieldValue('useBirthDateAsEnrollmentDate')=='true'){
+ setFieldValue("enrollmentDateField", birthDate)
+ }
+
+ if(getFieldValue('useBirthDateAsIncidentDate')=='true'){
+ setFieldValue("dateOfIncidentField", birthDate)
+ }
+ else{
+ setFieldValue("dateOfIncidentField", "");
+ }
showById('identifierAndAttributeDiv');
});
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm 2013-05-28 03:10:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm 2013-07-18 04:01:13 +0000
@@ -11,7 +11,7 @@
validateProgramEnrollment();
});
datePickerInRangeValid( 'dateOfIncidentField' , 'enrollmentDateField' );
- setFieldValue("dateOfIncidentField", "");
+
var unSave = false;
});
@@ -42,12 +42,14 @@
|
- |
+
+
+ |
|
- |
+ |
@@ -75,4 +77,5 @@