dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4213
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-07-27 11:18:51 +0700
message:
  Ajax Request stuff don't work does not work with IE9 ( Patient module ) - Finished.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResultDetails.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseagg.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.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/caseAggregationResultDetails.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResultDetails.vm	2011-07-15 03:35:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResultDetails.vm	2011-07-27 04:18:51 +0000
@@ -5,21 +5,23 @@
 			#if( $hasDataValue == true)
 			<tr height='5em'>
 				<th>$i18n.getString( "full_name" )</th>
-				<th>$i18n.getString( "age" )</th>
 				<th>$i18n.getString( "gender" )</th>
+                <th>$i18n.getString( "date_of_birth" )</th>
+                <th>$i18n.getString( "age" )</th>
 			</tr>
 			#end
 			<tr>
 				<td>$!patient.getFullName()</td>
+				<td>$!patient.gender</td>
+				<td>$format.formatDate($!patient.birthDate)</td>
 				<td>$!patient.getAge()</td>
-				<td>$!patient.gender</td>
 			</tr>
 			
 			#set($dataValues = $mapPatients.get($patient) )
 			#if ( $!dataValues.size() == 0 )
 				#set($hasDataValue = false )
 				<tr>
-					<td colspan='3'></td>
+					<td colspan='4'></td>
 				</tr>
 			#else
 				#set($hasDataValue = true )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2011-07-27 03:07:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2011-07-27 04:18:51 +0000
@@ -33,7 +33,7 @@
 						#if( $sortPatientAttribute )
 							<td>$!patientAttributeValueMap.get( $patient.id ).value</td>
 						#end
-                        <td><a href="javascript:showPatientDetails( $programInstance.patient.id )" title="$i18n.getString( 'show_details' )">$patient.getFullName()</a></td>                    
+                        <td><a href="javascript:showPatientDetails( '$programInstance.patient.id' )" title="$i18n.getString( 'show_details' )">$patient.getFullName()</a></td>                    
                         #foreach( $programStageInstance in $programStageInstanceMap.get( $programInstance ) )
                             #if( $programStageInstance.executionDate )
                                 <td style="text-align:center" bgcolor="$colorMap.get( $programStageInstance.id )">
@@ -62,14 +62,14 @@
 	#parse( "/dhis-web-commons/paging/paging.vm" )
 </div>
 
-<div id="detailsArea" style="display:none;overflow:auto;height:250px;width:250px">
+<div id="detailsArea" style="display:none;overflow:auto; height:250px;width:250px">
 	<div style="float:right">
-		<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+		<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
 	</div>
-	<p><label>$i18n.getString( "common_info" ):</label><br><span id="commonInfoField"></span></p>	
-	<p><label>$i18n.getString( "identifier" ):</label><br><span id="identifierField"></span></p>
-	<p><label>$i18n.getString( "attributes" ):</label><br><span id="attributeField"></span></p>
-	<p><label>$i18n.getString( "enrolled_in_program" ):</label><br><span id="programField"></span></p>
+	<p><label><strong>$i18n.getString( "common_info" ):</strong></label><br><span id="commonInfoField"></span></p>	
+	<p><label><strong>$i18n.getString( "identifier" ):</strong></label><br><span id="identifierField"></span></p>
+	<p><label><strong>$i18n.getString( "attributes" ):</strong></label><br><span id="attributeField"></span></p>
+	<p><label><strong>$i18n.getString( "enrolled_in_program" ):</strong></label><br><span id="programField"></span></p>
 </div>
 
 <script>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseagg.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseagg.js	2011-07-08 02:17:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseagg.js	2011-07-27 04:18:51 +0000
@@ -83,20 +83,17 @@
 	
 function validationCaseAggregation( )
 {
-    var request = new Request();
-    request.setResponseTypeXML( 'dataElementGroup' );
-    request.setCallbackSuccess( validationCaseAggregationCompleted );
-	
-	var url  = "sDateLB=" + byId('sDateLB').value;
-		url += "&eDateLB=" + byId('eDateLB').value;
-		
-	request.sendAsPost(url);
-    request.send( 'validateCaseAggregation.action' );
+	$.post( 'validateCaseAggregation.action', 
+		{ 
+			sDateLB:getFieldValue('sDateLB'), 
+			eDateLB:getFieldValue('eDateLB')
+		}, validationCaseAggregationCompleted, 'xml' );
+					
 }
 
 function validationCaseAggregationCompleted( message )
 {
-    var type = message.getAttribute("type");
+    var type = $(message).find('message').attr('type');
 	
     if( type == "success" )
     {
@@ -104,7 +101,7 @@
     }
     else
     {
-        setMessage(message.firstChild.nodeValue);
+        showWarningMessage( $(message).find('message').text() );
     }
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm	2011-03-24 17:27:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm	2011-07-27 04:18:51 +0000
@@ -33,7 +33,7 @@
 	    <th>$i18n.getString( "nr" )</th>
 	    <th>$i18n.getString( "data_element" )</th>                   
 	    <th>$i18n.getString( "entry" )</th>
-	    <th>$i18n.getString( "provided_by_another_facility" )</th>             
+	    <th>$i18n.getString( "facility_provided_data" )</th>             
 	</tr>
 	
 	#set( $dataElementRowCount = 0 )