=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java 2013-07-02 03:54:01 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java 2013-07-22 04:59:04 +0000
@@ -394,6 +394,7 @@
else if ( fixedAttr.equals( PatientRegistrationForm.FIXED_ATTRIBUTE_PHONE_NUMBER ) )
{
inputHtml += " class=\"{validate:{phone:true}}\" " + hidden + " " + TAG_CLOSE;
+ inputHtml += " ";
}
// Age fields
=== 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-18 04:01:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-07-22 04:59:04 +0000
@@ -2129,7 +2129,7 @@
+ '
| '
+ ' '
+ ' '
- + ' '
+ + ' '
+ ' | '
+ '' );
}
@@ -2137,4 +2137,17 @@
function removePhoneNumberField(_this)
{
$(_this).parent().parent().remove();
-}
\ No newline at end of file
+}
+
+function addCustomPhoneNumberField( phoneNumber )
+{
+ var idx = $('.phoneNumberTR').length + 1;
+ $('.phoneNumberTR').last().after(
+ '
'
+ + ' ');
+}
+
+function removeCustomPhoneNumberField(idx)
+{
+ $('.idxPhoneNumber' + idx).remove();
+}
=== 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-07-12 04:32:20 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2013-07-22 04:59:04 +0000
@@ -63,7 +63,7 @@
|
-
+
|
@@ -258,6 +258,7 @@
#end
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm 2013-07-18 06:02:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm 2013-07-22 04:59:04 +0000
@@ -30,7 +30,6 @@
#if($patient.getFullName()=='')
- |
#if($flag==true)
$i18n.getString('identifier'):
@@ -42,7 +41,6 @@
|
#end
- |
$i18n.getString('gender'): |
#if($patient.gender=='F')
@@ -53,12 +51,10 @@
|
- |
$i18n.getString('date_of_birth'): |
$!format.formatDate($!patient.birthDate) |
- |
$i18n.getString('age'): |
$!patient.getAge() |