dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8620
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-10-22 10:02:27 +0700
message:
  Disable for scheduled-date field of completed/incompled in dashboard.
modified:
  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/entry.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.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/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-10-19 07:45:01 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-10-22 03:02:27 +0000
@@ -791,7 +791,7 @@
 			eventBox.attr('status',status);
 			setEventColorStatus( programStageInstanceId, status );
 			resetActiveEvent( eventBox.attr("pi") );
-			if( status==1){
+			if( status==1 || status==2 ){
 				hideById('del_' + programStageInstanceId);
 			}
 			else{

=== 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-10-18 04:24:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-10-22 03:02:27 +0000
@@ -367,6 +367,7 @@
 					setFieldValue( 'programStageId', selectedProgramStageInstance.attr('psid') );
 					
 					var fieldId = "value_" + programStageInstanceId + "_date";
+					jQuery("#" + fieldId).val(executionDate);
 					jQuery("#" + fieldId).css('background-color', SUCCESS_COLOR);
 					jQuery('#executionDate').val(executionDate);
 					jQuery("#org_" + programStageInstanceId ).html(getFieldValue("orgunitName"));

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm	2012-10-18 05:35:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm	2012-10-22 03:02:27 +0000
@@ -12,7 +12,6 @@
 #set( $tabIndex = 1 )
 #foreach( $programStageDataElement in $programStageDataElements )
 	#set( $dataElementRowCount = $dataElementRowCount + 1 )    
-	#set( $mark = !$mark )
 	#set( $patientDataValue = false )
 	#set( $key = $programStageDataElement.dataElement.id )
 	#set( $patientDataValue = $patientDataValueMap.get( $key ) )    
@@ -84,6 +83,7 @@
 			#end
 		</td>
 	</tr>
+	#set( $mark = !$mark )
 	#set( $tabIndex = $tabIndex + 1 )
 #end	
 </tbody>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2012-10-17 07:23:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2012-10-22 03:02:27 +0000
@@ -58,7 +58,7 @@
 			<td>        
 				<input type="text" id="$duedateId" style='width:80%;' value="$!format.formatDate( $programStageInstance.dueDate )" onchange="saveDueDate( $programInstance.id, $programStageInstance.id, '$encoder.jsEncode( $programStageInstance.programStage.name )' )" />
 				<script type="text/javascript">
-					#if($status==1 || $status==5 )
+					#if($status==1 || $status==2 || $status==5 )
 						disable('$duedateId');
 					#else
 						datePicker( '$duedateId' );