dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8203
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-09-23 14:34:49 +0700
message:
  Remove skipped event when searching by non-skipped status in the tracking screen.
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java
  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/report.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/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-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java	2012-09-22 16:05:05 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java	2012-09-23 07:34:49 +0000
@@ -434,14 +434,14 @@
                         continue;
                     case ProgramStageInstance.FUTURE_VISIT_STATUS:
                         patientWhere += condition + operatorStatus + "("
-                            + " psi.executiondate is null and psi.duedate >= now() and p.organisationunitid=" + keys[4]
+                            + " psi.status is null and psi.executiondate is null and psi.duedate >= now() and p.organisationunitid=" + keys[4]
                             + ")";
                         operatorStatus = " OR ";
                         condition = "";
                         continue;
                     case ProgramStageInstance.LATE_VISIT_STATUS:
                         patientWhere += condition + operatorStatus + "("
-                            + " psi.executiondate is null and psi.duedate < now() and p.organisationunitid=" + keys[4]
+                            + " psi.status is null and psi.executiondate is null and psi.duedate < now() and p.organisationunitid=" + keys[4]
                             + ")";
                         operatorStatus = " OR ";
                         condition = "";
@@ -527,7 +527,7 @@
         {
             sql += statementBuilder.limitRecord( min, max );
         }
-System.out.println( "\n\n === \n " + sql );
+        
         return sql;
     }
 

=== 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-22 15:52:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-09-23 07:34:49 +0000
@@ -924,7 +924,8 @@
 	$('.stage-flow').css('width', w-width); 
 	$('.table-flow').css('width', w-width); 
 	$('.table-flow tr').each(function(){
-		jQuery(this).find('td').attr("width", "10px");
+		jQuery(this).find('td:visible').attr("width", "10px");
+		jQuery(this).find('td:hidden').removeAttr("width");
 		jQuery(this).find('td:last').removeAttr("width");
 	});
 }

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js	2012-09-23 05:47:37 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js	2012-09-23 07:34:49 +0000
@@ -52,6 +52,7 @@
 		jQuery( "[name=newEncounterBtn]" ).removeClass("show-new-event");
 		jQuery( "[status=3]" ).attr("disabled", true);
 		jQuery( "[status=4]" ).attr("disabled", true);
+		jQuery( "[status=5]" ).attr("disabled", true);
 		hideLoader();
 		hideById( 'message' );
 		showById( 'contentDiv' );

=== 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-21 07:05:52 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2012-09-23 07:34:49 +0000
@@ -367,8 +367,8 @@
 		{
 			if( jQuery("#tb_" + programInstanceId + " .searched").length > 0 ){
 				jQuery("#ps_" + id ).addClass("stage-object-selected searched");
-				hideById("ps_" + id )
 				hideById('arrow_' + id );
+				hideById("ps_" + id );
 			}
 			jQuery("#ps_" + id ).addClass("stage-object-selected searched");
 		}

=== 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-20 14:02:14 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-09-23 07:34:49 +0000
@@ -331,19 +331,19 @@
 .stage-container
 {
 	width:100%;
-	height:125px;
+	height:70px;
 }
 
 .stage-flow
 {
-	height:145px;
+	height:70px;
 	overflow-x:hidden;
 	overflow-y:hidden;
 }
 
 .table-flow
 {
-	height:145px;
+	height:70px;
 	overflow-x:hidden;
 	overflow-y:hidden;
 }