dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10000
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-03-06 11:14:33 +0700
message:
  Don't display re-schedule and set status tab in dashboard
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ProgramEnrollmentAction.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/programStageInstanceFlow.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/java/org/hisp/dhis/caseentry/action/patient/ProgramEnrollmentAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ProgramEnrollmentAction.java	2013-03-05 13:55:46 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ProgramEnrollmentAction.java	2013-03-06 04:14:33 +0000
@@ -91,6 +91,8 @@
 
     private List<PatientAttribute> patientAttributes;
 
+    private ProgramInstance programInstance;
+
     // -------------------------------------------------------------------------
     // Getters/Setters
     // -------------------------------------------------------------------------
@@ -160,6 +162,11 @@
         return patientAttributes;
     }
 
+    public ProgramInstance getProgramInstance()
+    {
+        return programInstance;
+    }
+
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
@@ -173,10 +180,10 @@
         // Load active ProgramInstance, completed = false
         // ---------------------------------------------------------------------
 
-        ProgramInstance programInstance = programInstanceService.getProgramInstance( programInstanceId );
-        
-        programStageInstances = new ArrayList<ProgramStageInstance>(programInstance.getProgramStageInstances());
-        
+        programInstance = programInstanceService.getProgramInstance( programInstanceId );
+
+        programStageInstances = new ArrayList<ProgramStageInstance>( programInstance.getProgramStageInstances() );
+
         Collections.sort( programStageInstances, new ProgramStageInstanceVisitDateComparator() );
 
         loadIdentifierTypes( programInstance );

=== 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	2013-03-05 14:47:06 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-03-06 04:14:33 +0000
@@ -519,7 +519,7 @@
 		closable: true,
 		modal:false,
 		width: 380,
-		height: 270
+		height: 290
 	}).show('fast');
 }
 

=== 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	2013-03-06 03:50:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm	2013-03-06 04:14:33 +0000
@@ -7,7 +7,8 @@
 			<div id='flow_$!programInstance.id' class="stage-flow">
 				<table class="table-flow">											
 					<tr id='programStageIdTR_$!programInstance.id'>
-						#if( $programInstance)
+						#if( $programStageInstances)
+						#else
 							#set( $programStageInstances = $programInstance.programStageInstances)
 						#end
 						#foreach( $programStageInstance in $programStageInstances )