dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9073
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-11-16 12:20:34 +0700
message:
  Minor fix for visit schedule.
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/activityPlan.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.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/activityPlanRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2012-11-01 06:22:35 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2012-11-16 05:20:34 +0000
@@ -36,7 +36,7 @@
 						<a>&raquo;</a>
 					</td>
 					#set( $programStageInstances = $programInstance.programStageInstances )
-					<td>
+						<td>
 						<table id='tb_$programInstance.id'>	
 							<tr>
 								<td>
@@ -47,7 +47,9 @@
 										<table class="table-flow">
 										<tr>
 										#set( $flag = "false" )
+										#set( $idx = 0)
 										#foreach( $programStageInstance in $programStageInstances )
+											#set( $idx = $idx + 1)
 											<td id="arrow_$programStageInstance.id" style='font-size:25px;'>&rarr;</td>
 											<td>
 												#set($title="")
@@ -72,6 +74,7 @@
 													reportDateDes="$programStageInstance.programStage.reportDateDescription"
 													dueDate="$format.formatDate( $programStageInstance.dueDate )"
 													status='$programStageInstance.getEventStatus()'
+													index="$idx"
 													class="stage-object" 
 													title="$title"
 													value="$programStageInstance.programStage.name&#13;&#10;$valueDate" 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2012-11-15 15:25:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2012-11-16 05:20:34 +0000
@@ -247,6 +247,7 @@
 	var startDate = getFieldValue('startDueDate');
 	var endDate = getFieldValue('endDueDate');
 	var arrStatus = getFieldValue('statusEvent').split('_');
+	var paddingIndex = 1;
 	
 	jQuery("#patientList .stage-object").each( function(){
 		var id = this.id.split('_')[1];
@@ -256,6 +257,14 @@
 		if( dueDate >= startDate && dueDate <= endDate 
 			&& jQuery.inArray(statusEvent, arrStatus) > -1)
 		{
+			if( jQuery("#tb_" + programInstanceId + " .searched").length == 0 )
+			{
+				jQuery("#arrow_" + id ).addClass("displayed");
+				var index = eval(jQuery("#ps_" + id ).attr("index"));
+				if( paddingIndex < index ){
+					 paddingIndex = index;
+				}
+			}
 			jQuery("#ps_" + id ).addClass("stage-object-selected searched");
 		}
 		hideById('arrow_' + id );
@@ -272,6 +281,11 @@
 		firstEvent.show();
 		var id = firstEvent.attr("id").split('_')[1];
 		showById('arrow_' + id );
+		var index = firstEvent.attr("index");
+		if( index<paddingIndex){
+			var paddingLeft = ( paddingIndex - index ) * 20;
+			jQuery('#arrow_' + id).css("padding-left", paddingLeft + "px");
+		}
 	});
 	
 	resize();

=== 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-11-16 05:08:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2012-11-16 05:20:34 +0000
@@ -77,7 +77,7 @@
 												#if($!programStageInstance.executionDate)
 													#set($valueDate=$format.formatDate( $programStageInstance.executionDate ))
 												#end
-$idx<br>												
+												
 												<input type='button' id='ps_$programStageInstance.id' name='programStageBtn' 
 													programStageInstanceId='$programStageInstance.id' 
 													programStageName='$programStageInstance.programStage.name'