dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3403
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-04-15 17:23:12 +0530
message:
  Merging Code from 2.1
modified:
  local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/action/GenerateMetaDataReportResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportResultAction.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-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java	2011-03-22 10:30:57 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java	2011-04-15 11:53:12 +0000
@@ -279,7 +279,8 @@
         // Load DataSets
         // ---------------------------------------------------------------------
 
-        dataSets = new ArrayList<DataSet>( dataSetService.getDataSetsBySource( organisationUnit ) );
+        dataSets = new ArrayList<DataSet>( organisationUnit.getDataSets() );
+        //dataSets = new ArrayList<DataSet>( dataSetService.getDataSetsBySource( organisationUnit ) );
 System.out.println("\n\n\n +++++++++++++ \n organisationUnit : " + organisationUnit);
 System.out.println("\n  dataSets : " + dataSets);
         // ---------------------------------------------------------------------

=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/action/GenerateMetaDataReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/action/GenerateMetaDataReportResultAction.java	2011-01-13 04:53:40 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/action/GenerateMetaDataReportResultAction.java	2011-04-15 11:53:12 +0000
@@ -899,6 +899,9 @@
                 sheet0.addCell( new Label( colStart + 6, rowStart, "OrganisationUnitCode", getCellFormat1() ) );
                 sheet0.addCell( new Label( colStart + 7, rowStart, "OrganisationUnitUrl", getCellFormat1() ) );
                 sheet0.addCell( new Label( colStart + 8, rowStart, "Last Updated", getCellFormat1() ) );
+                sheet0.addCell( new Label( colStart + 9, rowStart, "Contact Person", getCellFormat1() ) );
+                sheet0.addCell( new Label( colStart + 10, rowStart, "Phone Number", getCellFormat1() ) );
+                sheet0.addCell( new Label( colStart + 11, rowStart, "Email", getCellFormat1() ) );
             }
             else if ( incID.equalsIgnoreCase( SOURCE ) )
             {
@@ -978,6 +981,39 @@
                         lastUpdate = "";
                     }
                     sheet0.addCell( new Label( colStart + 8, rowStart, lastUpdate, wCellformat ) );
+
+                    String contactPerson = new String();
+                    if ( ou.getContactPerson() != null )
+                    {
+                        contactPerson = ou.getContactPerson();
+                    }
+                    else
+                    {
+                        contactPerson = "";
+                    }
+                    sheet0.addCell( new Label( colStart + 9, rowStart, contactPerson, wCellformat ) );
+
+                    String phoneNumber = new String();
+                    if( ou.getPhoneNumber() != null )
+                    {
+                        phoneNumber = ou.getPhoneNumber();
+                    }
+                    else
+                    {
+                        phoneNumber = "";
+                    }
+                    sheet0.addCell( new Label( colStart + 10, rowStart, phoneNumber, wCellformat ) );
+                    
+                    String email = new String();
+                    if( ou.getEmail() != null )
+                    {
+                        email = ou.getEmail();
+                    }
+                    else
+                    {
+                        email = "";
+                    }
+                    sheet0.addCell( new Label( colStart + 11, rowStart, email, wCellformat ) );
                 }
                 else if ( incID.equalsIgnoreCase( SOURCE ) )
                 {

=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportResultAction.java	2011-04-15 11:39:32 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportResultAction.java	2011-04-15 11:53:12 +0000
@@ -239,7 +239,11 @@
                 String deCodeString = report_inDesign.getExpression();
                 String tempStr = "";
 
-                if ( deCodeString.equalsIgnoreCase( "FACILITY" ) || deCodeString.equalsIgnoreCase( "PROGRESSIVE-ORGUNIT" ) )
+                if ( deCodeString.equalsIgnoreCase( "FACILITY" ) )
+                {
+                    tempStr = selectedOrgUnit.getName();
+                }
+                else if( deCodeString.equalsIgnoreCase( "PROGRESSIVE-ORGUNIT" ) )
                 {
                     tempStr = currentOrgUnit.getName();
                 }