dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24470
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11996: Fix bug - Validation criteria doesn't work in custom registration form.
------------------------------------------------------------
revno: 11996
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-09-10 01:00:50 +0700
message:
Fix bug - Validation criteria doesn't work in custom registration form.
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/patientForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
--
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-09-09 16:11:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-09-09 18:00:50 +0000
@@ -49,15 +49,6 @@
$('#' + container+ ' [id=birthDate]').datepicker("destroy");
jQuery('#' + container + ' [id=birthDate]').css("display","none");
}
- else
- {
- jQuery('#' + container + ' [id=age]').rules("remove");
- jQuery('#' + container + ' [id=age]').css("display","");
-
- jQuery('#' + container + ' [id=birthDate]').rules("remove","required");
- $('#' + container+ ' [id=birthDate]').datepicker("destroy");
- jQuery('#' + container + ' [id=birthDate]').css("display","none");
- }
}
// -----------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2013-09-06 05:27:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2013-09-09 18:00:50 +0000
@@ -273,6 +273,7 @@
if(getFieldValue('dobType')=='A'){
showById('age');
hideById('birthDate');
+ setFieldValue('birthDate',"");
}
else{
hideById('age');
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2013-09-09 16:11:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2013-09-09 18:00:50 +0000
@@ -466,3 +466,4 @@
characters_without_params = Characters without params
scheduled_date = scheduled date
send_message = Send message
+message_is_sent = Message is sent
\ No newline at end of file