dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8137
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-09-19 20:39:07 +0700
message:
  Improve event-flow information.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.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/programStageInstanceFlow.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.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/activityPlanRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2012-09-15 10:04:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2012-09-19 13:39:07 +0000
@@ -78,6 +78,10 @@
 													#end
 												#end
 												
+												#set($valueDate=$format.formatDate( $programStageInstance.dueDate ))
+												#if($!programStageInstance.executionDate)
+													#set($valueDate=$format.formatDate( $programStageInstance.executionDate ))
+												#end
 												<input type="button" name="programStageBtn"
 													id="ps_$!programStageInstance.id"
 													psid="$programStageInstance.programStage.id"
@@ -90,7 +94,7 @@
 													status='$programStageInstance.getEventStatus()'
 													class="stage-object" 
 													title="$title"
-													value="$programStageInstance.programStage.name&#13;&#10;$format.formatDate( $programStageInstance.dueDate )" 
+													value="$programStageInstance.programStage.name&#13;&#10;$valueDate" 
 													onclick="javascript:loadDataEntry( $programStageInstance.id );">
 												<script>	
 													var status = $statusMap.get( $programStageInstance.id ); 

=== 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-09-07 09:53:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-09-19 13:39:07 +0000
@@ -444,8 +444,10 @@
 					handleResponse (result);
 					
 					var selectedProgramStageInstance = jQuery( '#' + prefixId + getFieldValue('programStageInstanceId') );
-					jQuery(".stage-object-selected").css('border-color', COLOR_LIGHTRED);
-					jQuery(".stage-object-selected").css('background-color', COLOR_LIGHT_LIGHTRED);
+					var box = jQuery(".stage-object-selected");
+					box.val( box.attr('psname') + "  " + executionDate );
+					box.css('border-color', COLOR_LIGHTRED);
+					box.css('background-color', COLOR_LIGHT_LIGHTRED);
 					disableCompletedButton(false);
 					enable('validationBtn');
 					setFieldValue( 'programStageId', selectedProgramStageInstance.attr('psid') );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm	2012-09-13 08:45:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm	2012-09-19 13:39:07 +0000
@@ -10,6 +10,10 @@
 						#foreach( $programStageInstance in $programInstance.programStageInstances )
 						<td style='font-size:25px;'>&rarr;</td>
 						<td>
+							#set($valueDate=$format.formatDate( $programStageInstance.dueDate ))
+							#if($!programStageInstance.executionDate)
+								#set($valueDate=$format.formatDate( $programStageInstance.executionDate ))
+							#end
 							<input type="button" name="programStageBtn"
 								id="ps_$!programStageInstance.id"
 								psid="$programStageInstance.programStage.id"
@@ -20,7 +24,7 @@
 								reportDateDes="$programStageInstance.programStage.reportDateDescription"
 								dueDate="$format.formatDate( $programStageInstance.dueDate )"
 								class="stage-object" 
-								value="$programStageInstance.programStage.name&#13;&#10;$format.formatDate( $programStageInstance.dueDate )" 
+								value="$programStageInstance.programStage.name&#13;&#10;$valueDate" 
 								onclick="javascript:loadDataEntry( $programStageInstance.id );">
 							<script>	
 								var status = $statusMap.get( $programStageInstance.id ); 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2012-09-15 04:18:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2012-09-19 13:39:07 +0000
@@ -77,7 +77,11 @@
 														#set( $index = $index + 1)
 													#end
 												#end
-														
+												
+												#set($valueDate=$format.formatDate( $programStageInstance.dueDate ))
+												#if($!programStageInstance.executionDate)
+													#set($valueDate=$format.formatDate( $programStageInstance.executionDate ))
+												#end												
 												<input type='button' id='box_$programStageInstance.id' name='programStageBtn' 
 													programStageInstanceId='$programStageInstance.id' 
 													programStageName='$programStageInstance.programStage.name' 
@@ -86,7 +90,7 @@
 													dueDate='$format.formatDate( $programStageInstance.dueDate )'
 													status='$statusMap.get( $programStageInstance.id )'
 													class='stage-object'
-													value='$programStageInstance.programStage.name&#13;&#10;$format.formatDate( $programStageInstance.dueDate )' 
+													value='$programStageInstance.programStage.name&#13;&#10;$valueDate' 
 													title="$title" onclick='javascript:getOutboundSmsList( $programStageInstance.id, false );'>
 												<script>
 													var status = $statusMap.get( $programStageInstance.id ); 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-09-19 13:30:52 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-09-19 13:39:07 +0000
@@ -144,7 +144,6 @@
 {
 	width: 20px;
 	height: 60px;
-    white-space: normal;
 	border-color: #bbbbbb;
 	cursor: pointer;
 	border: 1px solid #aaa;
@@ -375,7 +374,6 @@
 	opacity: 1.0;
 	border: 2px solid;
 	margin: 5px;
-	white-space:normal;
 }
 
 input.stage-object[type="button"]:hover
@@ -397,7 +395,6 @@
 {
 	width: 130px;
 	height: 60px;
-    white-space: normal;
 	border-color: #bbbbbb;
 	background-color: #ddd;
 	cursor: pointer;