dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8071
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-09-13 15:45:57 +0700
message:
  Minor fix for event-flow UI.
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/commons.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.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-13 05:37:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2012-09-13 08:45:57 +0000
@@ -53,7 +53,7 @@
 						<table id='tb_$programInstance.id'>	
 							<tr>
 								<td>
-									<div #if($programInstance.programStageInstances.size()<4) class="arrow-left hidden"  #else class="arrow-left" #end onclick="moveLeft('flow_$programInstance.id')">&nbsp;</div>
+									<div class="arrow-left" onclick="moveLeft('flow_$programInstance.id')">&nbsp;</div>
 								</td>
 								<td>
 									<div id='flow_$programInstance.id' class='stage-flow'>
@@ -102,7 +102,7 @@
 								</td>
 								
 								<td>
-									<div #if($programInstance.programStageInstances.size()<4) class="arrow-right hidden"  #else class="arrow-right" #end onclick="moveRight('flow_$programInstance.id')">&nbsp;</div>
+									<div class="arrow-right" onclick="moveRight('flow_$programInstance.id')">&nbsp;</div>
 								</td>
 							</tr>
 						</table>
@@ -146,7 +146,6 @@
 	}
 	
 	resize();
-	
 	$(window).bind('resize', function(e){ 
 		resize();
 	});

=== 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-09-13 07:55:48 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-09-13 08:45:57 +0000
@@ -238,7 +238,7 @@
 				+ '_' + statusEvent + '_' + startDueDate + '_' + endDueDate;
 		if( statusEvent != '3' && statusEvent != '4' && statusEvent != '0' )
 		{
-			searchTexts	+= "_" + getFieldValue('orgunitId');
+			params += "_" + getFieldValue('orgunitId');
 		}
 	}
 	
@@ -853,14 +853,14 @@
 	}
 	
 	$('.stage-flow').each(function(){
-		var programInstanceId = this.id.split('_')[0];
-		if(jQuery(this).find(".table-flow td").outerWidth() > 0){
-			jQuery('#tb_' + programInstanceId ).find('.arrow-left').show();
-			jQuery('#tb_' + programInstanceId ).find('.arrow-right').show();
+		var programInstanceId = this.id.split('_')[1];
+		if(jQuery(this).find(".table-flow").outerWidth() > jQuery(this).width() ){
+			jQuery('#tb_' + programInstanceId ).find('.arrow-left').removeClass("hidden");
+			jQuery('#tb_' + programInstanceId ).find('.arrow-right').removeClass("hidden");
 		}
 		else{
-			jQuery('#tb_' + programInstanceId ).find('.arrow-left').hide();
-			jQuery('#tb_' + programInstanceId ).find('.arrow-right').hide();
+			jQuery('#tb_' + programInstanceId ).find('.arrow-left').addClass("hidden");
+			jQuery('#tb_' + programInstanceId ).find('.arrow-right').addClass("hidden");
 		}
 	});
 	

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2012-09-13 05:37:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2012-09-13 08:45:57 +0000
@@ -265,15 +265,12 @@
 function eventFlowToggle( programInstanceId )
 {
 	jQuery("#tb_" + programInstanceId + " .stage-object").each( function(){
-			var programStageInstance = this.id.split('_')[1];
-			jQuery('#arrow_' + programStageInstance ).toggle();
-			jQuery('#td_' + programStageInstance ).toggle();
-			jQuery(this).removeClass("stage-object-selected");
-		});
-	
-	
-	jQuery(".arrow-left").css("display", "block");
-	jQuery(".arrow-right").css("display", "block");
+		var programStageInstance = this.id.split('_')[1];
+		jQuery('#arrow_' + programStageInstance ).toggle();
+		jQuery('#td_' + 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];

=== 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-12 13:36:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm	2012-09-13 08:45:57 +0000
@@ -1,7 +1,7 @@
 <table id='tb_$!programInstance.id' class="stage-container">
 	<tr>
 		<td>
-			<div #if($programInstance.programStageInstances.size()<4) class="arrow-left hidden"  #else class="arrow-left" #end onclick="moveLeft('flow_$!programInstance.id')">&nbsp;</div>
+			<div class="arrow-left" onclick="moveLeft('flow_$!programInstance.id')">&nbsp;</div>
 		</td>
 		<td>
 			<div id='flow_$!programInstance.id' class="stage-flow">
@@ -33,7 +33,7 @@
 			</div>
 		</td>
 		<td>
-			<div #if($programInstance.programStageInstances.size()<4) class="arrow-right hidden"  #else class="arrow-right" #end onclick="moveRight('flow_$!programInstance.id')">&nbsp;</div>
+			<div class="arrow-right" onclick="moveRight('flow_$!programInstance.id')">&nbsp;</div>
 		</td>
 		<td>&nbsp;</td>
 		<td align="right">

=== 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-13 05:37:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2012-09-13 08:45:57 +0000
@@ -24,7 +24,7 @@
 #if( $patients && $patients.size()>0 )
 	<p>#parse( "/dhis-web-caseentry/colorHelp.vm" )</p>
 	
-	<table class="listTable mainPageTable" id="patientList">
+	<table class="listTable" id="patientList">
 		#set( $mark = false )                 
 		#foreach( $patient in $patients )
 			#set( $programInstance = '')
@@ -53,7 +53,7 @@
 						<table id='tb_$programInstance.id' class="stage-container">	
 							<tr>
 								<td>
-									<div #if($programInstance.programStageInstances.size()<4) class="arrow-left hidden"  #else class="arrow-left" #end onclick="moveLeft('flow_$programInstance.id')">&nbsp;</div>
+									<div class="arrow-left" onclick="moveLeft('flow_$programInstance.id')">&nbsp;</div>
 								</td>
 								<td>
 									<div id='flow_$!programInstance.id' class="stage-flow">
@@ -98,7 +98,7 @@
 								</td>
 								
 								<td>
-									<div #if($programInstance.programStageInstances.size()<4) class="arrow-right hidden" #else class="arrow-right" #end onclick="moveRight('flow_$programInstance.id')">&nbsp;</div>
+									<div class="arrow-right" onclick="moveRight('flow_$programInstance.id')">&nbsp;</div>
 								</td>
 							</tr>
 						</table>
@@ -128,8 +128,8 @@
 			hideById('td_' + programStageInstance );
 		});
 		
-		jQuery(".arrow-left").css("display", "none");
-		jQuery(".arrow-right").css("display", "none");
+		jQuery(".arrow-left").addClass("hidden");
+		jQuery(".arrow-right").addClass("hidden");
 		#foreach( $id in $programStageInstanceIds )
 			showById('arrow_$id');
 			showById('td_$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-12 13:36:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-09-13 08:45:57 +0000
@@ -337,7 +337,6 @@
 
 .stage-flow
 {
-	width:90%;
 	height:145px;
 	overflow-x:hidden;
 	overflow-y:hidden;
@@ -345,7 +344,6 @@
 
 .table-flow
 {
-	width:100%;
 	height:145px;
 	overflow-x:hidden;
 	overflow-y:hidden;