dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8631
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-10-22 14:21:56 +0700
message:
  Only display one event satisfied the search criteria for each program instance.
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


--
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-10-22 06:58:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2012-10-22 07:21:56 +0000
@@ -45,7 +45,7 @@
 						<input type='button' class='patient-object' value='$value' onclick='javascript:showPatientHistory( "$programInstance.patient.id" );' title='$i18n.getString( "patient_dashboard" )'>
 					</td>
 					<td class='bold' name="toggleFlowBtn" style='cursor:pointer;font-size:25px' onclick="eventFlowToggle($programInstance.id)">
-						<a href='#'>&raquo;</a>
+						<a>&raquo;</a>
 					</td>
 					#set( $programStageInstances = $programInstance.programStageInstances )
 					<td>

=== 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-10-22 06:58:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2012-10-22 07:21:56 +0000
@@ -91,31 +91,6 @@
 	window.location.href = url;
 }
 
-
-function eventFlowToggle( programInstanceId )
-{
-	jQuery("#tb_" + programInstanceId + " .stage-object").each( function(){
-			var programStageInstance = this.id.split('_')[1];
-			jQuery('#arrow_' + programStageInstance ).toggle();
-			jQuery('#ps_' + programStageInstance ).toggle();
-			jQuery(this).removeClass("stage-object-selected");
-		});
-	
-	if( jQuery("#tb_" + programInstanceId + " .searched").length>0)
-	{	
-		var id = jQuery("#tb_" + programInstanceId + " .searched").attr('id').split('_')[1];
-		showById("arrow_" + id);
-		showById("ps_" + id );
-	}
-	
-	jQuery("#tb_" + programInstanceId + " .table-flow").each( function(){
-		var scheduledEvent = jQuery(this).find("[status='3']:first");
-		scheduledEvent.focus();
-	});
-	
-	resize();
-}
-
 // --------------------------------------------------------------------
 // Patient program tracking
 // --------------------------------------------------------------------
@@ -259,6 +234,10 @@
 	var y= date.getFullYear();
 }
 
+// --------------------------------------------------------------------
+// Cosmetic UI
+// --------------------------------------------------------------------
+
 function reloadRecordList()
 {
 	var startDate = getFieldValue('startDueDate');
@@ -275,11 +254,8 @@
 		{
 			jQuery("#ps_" + id ).addClass("stage-object-selected searched");
 		}
-		else
-		{
-			hideById('arrow_' + id );
-			hideById('ps_' + id );
-		}
+		hideById('arrow_' + id );
+		hideById('ps_' + id );
 	});
 	
 	jQuery(".table-flow").each( function(){
@@ -287,7 +263,35 @@
 		scheduledEvent.addClass("stage-scheduled");
 		scheduledEvent.css('border-color', MARKED_VISIT_COLOR);
 		scheduledEvent.focus();
-	});
-	
-	resize();
-}
\ No newline at end of file
+		
+		jQuery(this).find(".searched:first").show();
+	});
+	
+	resize();
+}
+
+
+
+function eventFlowToggle( programInstanceId )
+{
+	jQuery("#tb_" + programInstanceId + " .stage-object").each( function(){
+			var programStageInstance = this.id.split('_')[1];
+			jQuery('#arrow_' + programStageInstance ).toggle();
+			jQuery('#ps_' + programStageInstance ).toggle();
+			jQuery(this).removeClass("stage-object-selected");
+		});
+	
+	if( jQuery("#tb_" + programInstanceId + " .searched").length>0)
+	{	
+		var id = jQuery("#tb_" + programInstanceId + " .searched").attr('id').split('_')[1];
+		showById("arrow_" + id);
+		showById("ps_" + id );
+	}
+	
+	jQuery("#tb_" + programInstanceId + " .table-flow").each( function(){
+		var scheduledEvent = jQuery(this).find("[status='3']:first");
+		scheduledEvent.focus();
+	});
+	
+	resize();
+}