dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5702
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-01-11 15:34:43 +0700
message:
  (patient) Add columns program-stage and Scheduled for program-stage-history.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramStages.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css


--
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/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-01-11 08:15:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-01-11 08:34:43 +0000
@@ -2,7 +2,7 @@
    	
 <table class="mainPageTable" id='patientInfoDiv'> 
 	<tr>
-		<td>
+		<td valign="top">
 	<table>
 		<tr>            
 			<td class="bold">$i18n.getString( "full_name" ):</td>
@@ -21,7 +21,7 @@
 			<td>$encoder.htmlEncode( $patient.getAge() )</td>
 		</tr>
 		</table>
-		<td style="vertical-align:top" rowspan='4'>
+		<td style="vertical-align:top">
 			<div id="currentSelection" style="float:right"></div>
 		</td>
 	</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-01-11 05:31:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-01-11 08:34:43 +0000
@@ -34,14 +34,18 @@
 			// show history / plan
 			setInnerHTML( 'currentSelection', '' ); 
 			var history = '<h4>' + i18n_program_stages_history_plan + '</h4>';
-			history += '<table>';
+			history += '<table class="history">';
+			history += '<tr>';
+            history += '<td class="bold row">' + i18n_program_stage + '</td>';
+            history += '<td class="bold row">' + i18n_scheduled_for + '</td>';
+            history += '</tr>';
 			for ( i in json.programStageInstances ) 
 			{
-				history += '<tr>';
+				history += '<tr bgcolor=' + json.programStageInstances[i].colorMap + '>';
                 history += '<td>';
-                history += '<span class="bold">' + json.programStageInstances[i].name + '</span>';
+                history += '<span>' + json.programStageInstances[i].name + '</span>';
 				history += '</td>';
-                history += '<td style="text-align:center" bgcolor=' + json.programStageInstances[i].colorMap + '>';
+                history += '<td style="text-align:center">';
                 history += json.programStageInstances[i].infor;
                 history += '</td>';
                 history += '</tr>';

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramStages.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramStages.vm	2012-01-11 05:31:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramStages.vm	2012-01-11 08:34:43 +0000
@@ -15,9 +15,9 @@
 		"name": "$programStageInstance.programStage.name",
 		"colorMap": "$colorMap.get( $programStageInstance.id )",
 		"infor": #if( $programStageInstance.completed )
-					"$i18n.getString( 'completed_on' )$format.formatDate( $programStageInstance.executionDate )"
+					"$format.formatDate( $programStageInstance.executionDate )"
 				#else
-					"$i18n.getString( 'scheduled_for' )$format.formatDate( $programStageInstance.dueDate )"
+					"$format.formatDate( $programStageInstance.dueDate )"
 				#end
 	  }#if( $velocityCount < $programInstance.programStageInstances.size() ),#end
 	#end]

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm	2012-01-11 05:31:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm	2012-01-11 08:34:43 +0000
@@ -71,5 +71,5 @@
 	var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
 	var i18n_date_is_greater_then_or_equals_due_date = '$encoder.jsEscape( $i18n.getString( "date_is_greater_then_or_equals_due_date" ) , "'")';
 	
-	var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
-</script>
\ No newline at end of file
+	var i18n_program_stage = '$encoder.jsEscape( $i18n.getString( "program_stage" ) , "'")';
+    var i18n_scheduled_for = '$encoder.jsEscape( $i18n.getString( "scheduled_for" ) , "'")';</script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css	2012-01-11 05:31:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css	2012-01-11 08:34:43 +0000
@@ -64,3 +64,15 @@
   text-align: right;
 }
 
+td.row
+{
+	border-bottom-style:dotted;
+}
+
+table.history
+{
+	margin-top:10px;
+	margin-bottom:10px;
+	margin-right:10px;
+	margin-left:10px;
+}