dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7130
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-06-01 11:13:48 +0100
message:
  Minor Fixes
modified:
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/nbits/action/NBITSReportResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/portal/action/PortalReportsResultAction.java


--
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 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/nbits/action/NBITSReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/nbits/action/NBITSReportResultAction.java	2012-02-17 07:09:28 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/nbits/action/NBITSReportResultAction.java	2012-06-01 10:13:48 +0000
@@ -421,7 +421,11 @@
                         colCount++;
                         sheet0.addCell( new Label( colCount, rowCount, simpleDateFormat.format( patient.getBirthDate() ), getCellFormat2() ) );
                         colCount++;
-                        sheet0.addCell( new Label( colCount, rowCount, patient.getBloodGroup(), getCellFormat2() ) );
+                        /**
+                         * TODO
+                         * BloodGroup is removed from Patient Object, so need to change this accordingly
+                         */
+                        sheet0.addCell( new Label( colCount, rowCount, ""/*patient.getBloodGroup()*/, getCellFormat2() ) );
                         colCount++;
                         sheet0.addCell( new Label( colCount, rowCount, simpleDateFormat.format( patient.getRegistrationDate() ), getCellFormat2() ) );
                         colCount++;

=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/portal/action/PortalReportsResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/portal/action/PortalReportsResultAction.java	2012-04-04 11:58:27 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/portal/action/PortalReportsResultAction.java	2012-06-01 10:13:48 +0000
@@ -973,7 +973,12 @@
                                         } 
                                         else if ( deCodeString.equalsIgnoreCase( "BloodGroup" ) )
                                         {
-                                            String bloodGroup = patient.getBloodGroup();
+                                            /**
+                                             * TODO
+                                             * BloodGroup is removed from Patient Object, so need to change this accordingly
+                                             */
+                                            String bloodGroup = ""; 
+                                                //patient.getBloodGroup();
                                             if ( !bloodGroup.trim().equalsIgnoreCase( "" ) )
                                             {
                                                 if ( dhisPortalMap.containsKey( bloodGroup ) )
@@ -1669,7 +1674,13 @@
                                         } 
                                         else if ( deCodeString.equalsIgnoreCase( "BloodGroup" ) )
                                         {
-                                            String bloodGroup = patient.getBloodGroup();
+                                            /**
+                                             * TODO
+                                             * BloodGroup is removed from Patient Object, so need to change this accordingly
+                                             */
+
+                                            String bloodGroup = ""; 
+                                                //patient.getBloodGroup();
                                             if ( !bloodGroup.trim().equalsIgnoreCase( "" ) )
                                             {
                                                 if ( dhisPortalMap.containsKey( bloodGroup ) )