dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5378
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-12-13 10:18:09 +0700
message:
  Display the description of date of enrollment and date of incident instead of those fields.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm


--
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/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2011-12-06 17:41:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2011-12-13 03:18:09 +0000
@@ -470,9 +470,16 @@
 		disable('enrollBtn');
 		disable('enrollmentDate');
 		disable('dateOfIncident');
+		
 		jQuery('#enrollBtn').attr('value',i18n_enroll_to_program);
+		
 		setFieldValue( 'enrollmentDate', '' );
 		setFieldValue( 'dateOfIncident', '' );
+		setInnerHTML('enrollmentDateDescription', '');
+		setInnerHTML('dateOfIncidentDescription', '');
+		
+		hideById('programEnrollmentDiv');
+		
 		return;
 	}
 		
@@ -491,12 +498,16 @@
 				disable('enrollBtn');
 				disable('enrollmentDate');
 				disable('dateOfIncident');
+				setInnerHTML('enrollmentDateDescription', '');
+				setInnerHTML('dateOfIncidentDescription', '');
 			}
 			else
 			{
 				enable('enrollBtn');
 				enable('enrollmentDate');
 				enable('dateOfIncident');
+				showById('enrollmentDateTD');
+				showById('dateOfIncidentTD');
 			}
 			
 			jQuery('#loaderDiv').hide();

=== 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	2011-10-29 14:16:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2011-12-13 03:18:09 +0000
@@ -50,15 +50,13 @@
 					<td></td>
 					</td></td>
 				</tr>   
-					
-				<tr>
-					<td><label for="enrollmentDate">$i18n.getString( "date_of_enrollment" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-					<td colspan='2' align='left'><input type="text" id="enrollmentDate" name="enrollmentDate" style='width:30em' disabled="disabled" > <i>( <span id='enrollmentDateDescription'></span> )</i></td>
-					</tr>
-				
-				<tr>
-					<td><label for="dateOfIncident">$i18n.getString( "date_of_incident" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-					<td colspan='2'><input type="text" id="dateOfIncident" name="dateOfIncident" style='width:30em' disabled="disabled" ><i>( <span id='dateOfIncidentDescription'></span> )</i></td>
+				<tr>
+					<td><label for="enrollmentDate"><span id='enrollmentDateDescription'></span><em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+					<td colspan='2' align='left'><input type="text" id="enrollmentDate" name="enrollmentDate" style='width:30em' disabled="disabled" ></td>
+				</tr>
+				<tr>
+					<td><label for="dateOfIncident"><span id='dateOfIncidentDescription'></span><em title="$i18n.getString( "required" )" class="required">*</em></label></td>
+					<td colspan='2'><input type="text" id="dateOfIncident" name="dateOfIncident" style='width:30em' disabled="disabled" ></td>
 				</tr>
 				<tr>
 					<td></td>