← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #16027

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5963: (patient) Minor fix.

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 5963
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-02-15 14:24:07 +0700
message:
  (patient) Minor fix.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientchart/GetPatientChartListAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationListAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientChartList.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.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-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientchart/GetPatientChartListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientchart/GetPatientChartListAction.java	2011-09-06 02:47:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientchart/GetPatientChartListAction.java	2012-02-15 07:24:07 +0000
@@ -75,11 +75,6 @@
         this.programId = programId;
     }
 
-    public Integer getProgramId()
-    {
-        return programId;
-    }
-
     private Collection<PatientChart> patientCharts;
 
     public Collection<PatientChart> getPatientCharts()
@@ -87,6 +82,13 @@
         return patientCharts;
     }
 
+    private Program program;
+
+    public Program getProgram()
+    {
+        return program;
+    }
+
     // -------------------------------------------------------------------------
     // Implementation Action
     // -------------------------------------------------------------------------
@@ -95,7 +97,7 @@
     public String execute()
         throws Exception
     {
-        Program program = programService.getProgram( programId );
+        program = programService.getProgram( programId );
         Collection<Program> programs = new ArrayList<Program>();
         programs.add( program );
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationListAction.java	2012-01-13 02:14:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationListAction.java	2012-02-15 07:24:07 +0000
@@ -58,7 +58,9 @@
     private Integer programId;
 
     private Collection<ProgramValidation> validations;
-
+    
+    private Program program;
+    
     // -------------------------------------------------------------------------
     // Getter && Setter
     // -------------------------------------------------------------------------
@@ -77,10 +79,10 @@
     {
         this.programValidationService = programValidationService;
     }
-
-    public Integer getProgramId()
+    
+    public Program getProgram()
     {
-        return programId;
+        return program;
     }
 
     public void setProgramId( Integer programId )
@@ -97,7 +99,7 @@
     public String execute()
         throws Exception
     {
-        Program program = programService.getProgram( programId );
+        program = programService.getProgram( programId );
 
         validations = programValidationService.getProgramValidation( program, false );
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientChartList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientChartList.vm	2012-01-11 07:42:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientChartList.vm	2012-02-15 07:24:07 +0000
@@ -1,10 +1,11 @@
 <h3>$i18n.getString( "patient_chart_management" )</h3>
+<h4>$program.name</h4>
 
 <table class="mainPageTable">
 	<tr>
 		<td align="right">
-			<input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddPatientChart.action?programId=$programId'" style="width:100px"><br>
-			<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='program.action'" style="width:100px">
+			<input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddPatientChart.action?programId=$program.id'" style="width:100px"><br>
+			<input type="button" value="$i18n.getString( "back" )" onclick="window.location.href='program.action'" style="width:100px">
 		</td>
 	</tr>
   <tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm	2012-02-15 06:47:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm	2012-02-15 07:24:07 +0000
@@ -1,5 +1,6 @@
 <h3>$i18n.getString( "program_validation_management" )</h3>
-<h4>$i18n.getString( "program_validation_management" )</h4>
+<h4>$program.name</h4>
+
 <table class="mainPageTable">
 	<tr>
 		<td style="vertical-align:top">
@@ -9,9 +10,9 @@
 			  <tr>
 				<td></td>
 				<td>
-					<input type="button" value="$i18n.getString( "create_new_single_validation" )" onclick="window.location.href='showAddSingleProgramValidationForm.action?id=$programId'" style="width:200px">
-					<input type="button" value="$i18n.getString( "create_new_multi_validation" )" onclick="window.location.href='showAddMultiProgramValidationForm.action?id=$programId'" style="width:200px">
-					<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='program.action'" style="width:200px">
+					<input type="button" value="$i18n.getString( "create_new_single_validation" )" onclick="window.location.href='showAddSingleProgramValidationForm.action?id=$program.id'" style="width:200px">
+					<input type="button" value="$i18n.getString( "create_new_multi_validation" )" onclick="window.location.href='showAddMultiProgramValidationForm.action?id=$program.id'" style="width:200px">
+					<input type="button" value="$i18n.getString( "back" )" onclick="window.location.href='program.action'" style="width:200px">
 				</td>
 			  </tr>
 			  <tr>            
@@ -23,7 +24,7 @@
 				<tr id="tr${validation.id}">
 					<td>$i18n.getString( "validation_for_date_data_elements" )</td>
 					<td>
-					  <a href="defineDateProgramValidationForm.action?id=$programId" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>						
+					  <a href="defineDateProgramValidationForm.action?id=$program.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>						
 					</td>
 				</tr>
 				#foreach( $validation in $validations )
@@ -32,9 +33,9 @@
 					<td>$validation.description</td>
 					<td>
 						#if($validation.rightSide=="1==1")
-							<a href="showUpdateSingleProgramValidationForm.action?validationId=$validation.id&id=$programId" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
+							<a href="showUpdateSingleProgramValidationForm.action?validationId=$validation.id&id=$program.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
 						#else
-							<a href="showUpdateMultiProgramValidationForm.action?validationId=$validation.id&id=$programId" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
+							<a href="showUpdateMultiProgramValidationForm.action?validationId=$validation.id&id=$program.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
 						#end
 					  <a href="javascript:removeProgramValidation( '$validation.id', '$encoder.jsEncode( $validation.description )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
 					  <a href="javascript:showProgramValidationDetails( $validation.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
  Thread Previous • Date Previous • • Thread Next