dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5911
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-02-10 18:32:13 +0100
message:
  Including report orgunit + period in dataset/reporttable excel export
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.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-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java	2012-02-02 20:01:36 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java	2012-02-10 17:32:13 +0000
@@ -82,6 +82,7 @@
     private static final String SEPARATOR = ":";
     private static final String DEFAULT_HEADER = "Value";
     private static final String TOTAL_HEADER = "Total";
+    private static final String SPACE = " ";
 
     // -------------------------------------------------------------------------
     // Dependencies
@@ -148,7 +149,8 @@
 
         for ( Section section : sections )
         {
-            Grid grid = new ListGrid().setTitle( section.getName() );
+            Grid grid = new ListGrid().setTitle( section.getName() ).
+                setSubtitle( unit.getName() + SPACE + format.formatPeriod( period ) );
 
             DataElementCategoryCombo categoryCombo = section.getCategoryCombo();
 
@@ -270,7 +272,7 @@
         // ---------------------------------------------------------------------
 
         Grid grid = new ListGrid().setTitle( dataSet.getName() );
-        grid.setSubtitle( format.formatPeriod( period ) );
+        grid.setSubtitle( unit.getName() + SPACE + format.formatPeriod( period ) );
 
         // ---------------------------------------------------------------------
         // Headers

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java	2012-02-10 17:32:13 +0000
@@ -84,6 +84,9 @@
     
     private static final WritableCellFormat XLS_FORMAT_TTTLE = new WritableCellFormat( new WritableFont(
         WritableFont.TAHOMA, 13, WritableFont.NO_BOLD, false ) );
+
+    private static final WritableCellFormat XLS_FORMAT_SUBTTTLE = new WritableCellFormat( new WritableFont(
+        WritableFont.TAHOMA, 12, WritableFont.NO_BOLD, false ) );
     
     private static final WritableCellFormat XLS_FORMAT_LABEL = new WritableCellFormat( new WritableFont(
         WritableFont.ARIAL, 11, WritableFont.NO_BOLD, true ) );
@@ -210,6 +213,13 @@
 
         rowNumber++;
 
+        if ( StringUtils.isNotEmpty( grid.getSubtitle() ) )
+        {
+            sheet.addCell( new Label( 0, rowNumber++, grid.getSubtitle(), XLS_FORMAT_SUBTTTLE ) );
+            
+            rowNumber++;
+        }
+        
         for ( GridHeader header : grid.getVisibleHeaders() )
         {
             sheet.addCell( new Label( columnIndex++, rowNumber, header.getName(), XLS_FORMAT_LABEL ) );

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm	2011-08-24 21:57:52 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm	2012-02-10 17:32:13 +0000
@@ -1,7 +1,7 @@
 
 <input type="hidden" id="dataSetId" value="${selectedDataSet.id}">
 
-<h3>$i18n.getString('reporting_unit'): $encoder.htmlEncode( $selectedOrgunit.name ) &nbsp; $i18n.getString('reporting_period'): $format.formatPeriod( $selectedPeriod )</h3>
+<h3>$encoder.htmlEncode( $selectedOrgunit.name ) - $format.formatPeriod( $selectedPeriod )</h3>
 
 <div style="margin-bottom:15px">
 <input type="button" value="$i18n.getString( 'get_report_as_xls' )" onclick="exportDataSetReport( 'xls' )" style="width:140px">

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm	2011-09-14 19:00:28 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm	2012-02-10 17:32:13 +0000
@@ -9,7 +9,7 @@
 
 <input type="hidden" id="dataSetId" value="${selectedDataSet.id}">
 
-<h3>$i18n.getString('reporting_unit'): $encoder.htmlEncode( $selectedOrgunit.name ) &nbsp; $i18n.getString('reporting_period'): $format.formatPeriod( $selectedPeriod )</h3>
+<h3>$encoder.htmlEncode( $selectedOrgunit.name ) - $format.formatPeriod( $selectedPeriod )</h3>
 
 <div style="margin-bottom:15px">
 <input type="button" value="$i18n.getString( 'get_report_as_xls' )" onclick="exportDataSetReport( 'xls' )" style="width:140px">
@@ -20,7 +20,6 @@
 <div class="formSection" style="margin-bottom:30px">
 
 <div class="cent"><h3>$!encoder.htmlEncode( $grid.title )</h3></div>
-<div class="cent"><h5>$!encoder.htmlEncode( $grid.subtitle )</h5></div>
 
 <table class="listTable gridTable">
 <thead>