dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13422
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-12-25 11:10:05 +0700
message:
  fixed bug: Rename Favourite in Tabular Report Results in NPE.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/UpdateAggregateReportNameAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/UpdateTabularReportNameAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularAggregateReport.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.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/report/UpdateAggregateReportNameAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/UpdateAggregateReportNameAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/UpdateAggregateReportNameAction.java	2013-12-25 04:10:05 +0000
@@ -56,9 +56,9 @@
     // Input
     // -------------------------------------------------------------------------
 
-    private Integer id;
+    private String id;
 
-    public void setId( Integer id )
+    public void setId( String id )
     {
         this.id = id;
     }
@@ -78,7 +78,7 @@
     public String execute()
         throws Exception
     {
-        PatientAggregateReport aggregateReport = aggregateReportService.getPatientAggregateReport( id );
+        PatientAggregateReport aggregateReport = aggregateReportService.getPatientAggregateReportByUid( id );
 
         aggregateReport.setName( name );
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/UpdateTabularReportNameAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/UpdateTabularReportNameAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/UpdateTabularReportNameAction.java	2013-12-25 04:10:05 +0000
@@ -56,9 +56,9 @@
     // Input
     // -------------------------------------------------------------------------
 
-    private Integer id;
+    private String id;
 
-    public void setId( Integer id )
+    public void setId( String id )
     {
         this.id = id;
     }
@@ -78,7 +78,7 @@
     public String execute()
         throws Exception
     {
-        PatientTabularReport tabularReport = tabularReportService.getPatientTabularReport( id );
+        PatientTabularReport tabularReport = tabularReportService.getPatientTabularReportByUid(  id );
 
         tabularReport.setName( name );
         

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularAggregateReport.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularAggregateReport.vm	2013-10-11 15:37:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularAggregateReport.vm	2013-12-25 04:10:05 +0000
@@ -2,7 +2,7 @@
 	"id": "${aggregateReport.id}",
 	"name": "$!encoder.jsonEncode( ${aggregateReport.name} )",
 	"lastUpdated": "$!format.formatDate( ${aggregateReport.lastUpdated} )",
-	"programId": "${programStage.program.uid}",
+	"programId": "$!{tabularReport.program.uid}",
 	"singleEvent": 
 		#if($aggregateReport.program.programStages.size() == 1 )
 			"true",

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm	2013-10-12 14:19:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm	2013-12-25 04:10:05 +0000
@@ -2,7 +2,7 @@
 	"id": "${tabularReport.id}",
 	"name": "$!encoder.jsonEncode( ${tabularReport.name} )",
 	"lastUpdated": "$!format.formatDate( ${tabularReport.lastUpdated} )",
-	"programId": "${programStage.program.uid}",
+	"programId": "${tabularReport.program.uid}",
 	"singleEvent": 
 		#if($tabularReport.program.programStages.size() == 1 )
 			"true",
@@ -13,7 +13,7 @@
 		#set($programStage = $tabularReport.programStage)
 	#end
 	
-	"type": "${programStage.program.type}",
+	"type": "$!{programStage.program.type}",
 	"programStageId": "$!{tabularReport.programStage.uid}",
 	"programStages": [
 		#set( $programStages = $tabularReport.program.programStages )