dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13519
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-12-31 20:51:09 +0700
message:
  Remove fixed attribute value in data entry form of visit plan function.
modified:
  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/javascript/commons.js
  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/reportDataEntryForm.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/identifierAndAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/identifierAndAttributeForm.vm	2013-07-18 04:01:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/identifierAndAttributeForm.vm	2013-12-31 13:51:09 +0000
@@ -38,6 +38,3 @@
 		</td>		
 	</tr>
 #end
-
-<input type='hidden' id='useBirthDateAsEnrollmentDate' value='$program.useBirthDateAsEnrollmentDate'>
-<input type='hidden' id='useBirthDateAsIncidentDate' value='$program.useBirthDateAsIncidentDate'>

=== 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-12-31 11:58:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-12-31 13:51:09 +0000
@@ -1159,17 +1159,6 @@
         $('#identifierAndAttributeDiv').load("getPatientIdentifierAndAttribute.action", {
 			id:program.val()
 		}, function(){
-			if(getFieldValue('useBirthDateAsEnrollmentDate')=='true'){ 
-				setFieldValue("enrollmentDateField", birthDate)
-			}
-			
-			if(getFieldValue('useBirthDateAsIncidentDate')=='true'){ 
-				setFieldValue("dateOfIncidentField", birthDate)
-			}
-			else{
-				setFieldValue("dateOfIncidentField", "");
-			}
-			
             $("#dateOfIncidentField").datepicker("destroy");
             $("#enrollmentDateField").datepicker("destroy");
 

=== 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-12-28 14:22:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2013-12-31 13:51:09 +0000
@@ -79,5 +79,4 @@
 <script>
 	var i18n_enroll = '$encoder.jsEscape( $i18n.getString( "enroll" ) , "'")';
 	var i18n_program_stage = '$encoder.jsEscape( $i18n.getString( "program_stage" ) , "'")';
-	var birthDate = '$!format.formatDate($!patient.birthDate)';
 </script>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2013-12-18 06:05:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2013-12-31 13:51:09 +0000
@@ -8,8 +8,9 @@
 		<table>
 			<tr>            
 				<td class='coordinates1'>
-					<span class='bold' id="patientName">$i18n.getString( "full_name" ):</span>
+					<span class='bold' id="patientName">$i18n.getString( "full_name" ): </span>
 				</td>
+				<td class='coordinates2'>$patient.name</td>
 				<td class='bold coordinates1'>$i18n.getString('program'):</td>
 				<td class='coordinates2'>$program.displayName</td>
 				<td rowspan='2'>
@@ -17,14 +18,7 @@
 					<a href='javascript:markForFollowup($programStageInstance.programInstance.id, true)' #if( $programStageInstance.programInstance.followup == 'true') class='hidden' #end name='imgUnmarkFollowup' title='$i18n.getString("imgMarkFollowup")' ><img src='images/unrisk_large.png'></a>			
 				</td>
 			</tr>
-			<tr>
-				<td>
-					<span class='bold'>$i18n.getString( "date_of_birth" ):</span>
-				</td>
-				<td>
-					$format.formatDate( $patient.birthDate ) ( $encoder.htmlEncode( $patient.getAge() ) )
-				</td>
-				<td class='bold coordinates1' style="vertical-align:top">$i18n.getString('program_stage'):</td>
+			<tr><td class='bold coordinates1' style="vertical-align:top">$i18n.getString('program_stage'):</td>
 				<td class='coordinates2'>$programStageInstance.programStage.displayName</td>
 			</tr>
 			<tr><td>&nbsp;</td></tr>