dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8549
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-10-17 12:06:03 +0700
message:
  Small change ui for schedule visits in person 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/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-17 03:44:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-10-17 05:06:03 +0000
@@ -784,12 +784,12 @@
 	jQuery.postUTF8( 'setEventStatus.action',
 		{
 			programStageInstanceId:programStageInstanceId,
-			status:field.value
+			status:status
 		}, function ( json )
 		{
 			var eventBox = jQuery('#ps_' + programStageInstanceId);
-			eventBox.attr('status',field.value);
-			setEventColorStatus( programStageInstanceId, field.value );
+			eventBox.attr('status',status);
+			setEventColorStatus( programStageInstanceId, status );
 			resetActiveEvent( eventBox.attr("pi") );
 			if( status==1){
 				hideById('del_' + programStageInstanceId);

=== 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 04:17:37 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2012-10-17 05:06:03 +0000
@@ -23,19 +23,20 @@
 #if( $programStageInstances.size() > 0 )
 	<table class='mainPageTable listTable' id='progarmStageListDiv' name='progarmStageListDiv' >
 		<colgroup>
-			<col width="10px"/>
-			<col width="200px"/>
-			<col width="200px"/>
-			<col width="160px"/>
-			<col/>
-			<col/>  
+			<col width="10px">
+			<col width="200px">
+			<col width="200px">
+			<col width="100px">
+			<col>
+			<col width="60px">  
+			<col>  
 		</colgroup>
 		<tr>
 			<th>$i18n.getString( "nr" )</th>
 			<th>$i18n.getString( "program_stage" )</th>                   
 			<th>$i18n.getString( "reschedule_due_date" )</th>       
 			<th>$i18n.getString( "status" )</th>
-			<th>$i18n.getString( "message" )</th>
+			<th colspan='2'>$i18n.getString( "message" )</th>
 			#if( $auth.hasAccess( "dhis-web-caseentry", "removeCurrentEncounter" ) )
 			<th>$i18n.getString( "remove" )</th>
 			#end
@@ -55,7 +56,7 @@
 			#set( $duedateId = "value_" + $programStageInstance.id + "_date" )        
 			#set($status = $programStageInstance.getEventStatus())
 			<td>        
-				<input type="text" id="$duedateId" style='width:150px;' value="$!format.formatDate( $programStageInstance.dueDate )" onchange="saveDueDate( $programInstance.id, $programStageInstance.id, '$encoder.jsEncode( $programStageInstance.programStage.name )' )" />
+				<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 )
 						disable('$duedateId');
@@ -65,7 +66,7 @@
 				</script> 
 			</td> 
 			<td>
-				<select id="stat_$programStageInstance.id" name="status_$programStageInstance.id" style='width:150px;' onchange="setEventStatus(this, $programStageInstance.id)">
+				<select id="stat_$programStageInstance.id" name="status_$programStageInstance.id" onchange="setEventStatus(this, $programStageInstance.id)" style="width:100%">
 					#if($status==4)
 						<option value='4'>$i18n.getString("overdue")</option>
 						<option value='5'>$i18n.getString("skipped")</option>
@@ -86,7 +87,9 @@
 				</script>
 			</td>
 			<td>
-				<input type='text' id='message_$programStageInstance.id' name='message_$programStageInstance.id' style="width:300px;" class="{validate:{required:true,maxlength:160}}">
+				<input type='text' id='message_$programStageInstance.id' name='message_$programStageInstance.id' class="{validate:{required:true,maxlength:160}}">
+			</td>
+			<td>
 				<input type='button' value="+" class='tiny-button' title='$i18n.getString("post_comment")' onclick="addComment(byId('message_$programStageInstance.id'),'$programStageInstance.id')">
 				<input type="button" value="&raquo;" class='tiny-button' title="$i18n.getString( 'send_message' )" onclick="setFieldValue( 'programStageInstanceId',$programStageInstance.id);sendSmsOnePatient(byId('message_$programStageInstance.id'),'$programStageInstance.id');"/>
 			</td>