dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9614
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-01-25 22:45:07 +0200
message:
  Minor
modified:
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java
  dhis-2/dhis-support/dhis-support-system/src/main/resources/html-report-template.html
  dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/GeoUtils.java
  dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/OrganisationUnitToFacilityConverter.java
  dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/ValidationUtils.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderHtmlReport.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-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java	2013-01-25 16:38:21 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java	2013-01-25 20:45:07 +0000
@@ -130,10 +130,12 @@
     {
         List<List<String>> tablePages = new PaginatedList<String>( tables ).setPageSize( getProcessNo() ).getPages();
         
-        log.info( "No of pages: " + tablePages.size() );
+        log.info( "No of table pages: " + tablePages.size() );
         
         for ( List<String> tablePage : tablePages )
         {
+            log.info( "Table page: " + tablePage );
+            
             List<Future<?>> futures = new ArrayList<Future<?>>();
             
             for ( String table : tablePage )

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/resources/html-report-template.html'
--- dhis-2/dhis-support/dhis-support-system/src/main/resources/html-report-template.html	2013-01-25 15:24:37 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/resources/html-report-template.html	2013-01-25 20:45:07 +0000
@@ -6,8 +6,11 @@
 
 <script type="text/javascript">
 
-// Put your javscript here
+// Put your javascript functions here 
 
+jQuery( document ).ready( function() {
+    // Put javascript to be executed after page is loaded here 
+} );
 </script>
 
 <div>
@@ -16,7 +19,7 @@
 
 </div>
 
-<!-- Remove text after this point after reading it -->
+<!-- Remove content after this line after reading it -->
 
 <h3>This is a template for HTML/javascript based reports</h3>
 
@@ -31,25 +34,27 @@
 <p>
 You can utilize the DHIS 2 Web API to render meta-data and data in your report. 
 The Web API can be accessed from ../api. For instance, to retrieve the first page
-of data elements in JSON format you can link to ../api/dataElements.json . To 
+of data elements in JSON format you can link to ../api/dataElements.json. To 
 get access to aggregate data you can utilize the analytics controller at
 ../api/analytics.</p>
 
 <p>
 HTML-based standard reports can use relative periods and report parameters in
-the same way as other standard reports. If you select relative periods or report
+the same way as other types of standard reports. If you select relative periods or report
 parameters for period and organisation unit, you can access the resulting periods
-and organisation unit in the dhis2.report javascript namespace like below. 
+and organisation unit in the dhis2.report javascript namespace like below:
 </p>
 
 <div style="font-family:courier,sans-serif; padding:20px; border: 1px solid #ddd;">
-var organisationUnit = dhis2.report.organisationUnit; // An object<br><br>
-
-var name = organisationUnit.name;<br>
-var shortName = organisationUnit.shortName;<br>
-var code = organisationUnit.code;<br><br>
-
-var periods = dhis2.report.periods; // An array with period identifiers
+var orgUnit = dhis2.report.organisationUnit; // An object<br><br>
+
+var name = orgUnit.name;<br>
+var shortName = orgUnit.shortName;<br>
+var code = orgUnit.code;<br><br>
+
+var periods = dhis2.report.periods; // An array with period identifiers<br><br>
+
+var period = periods[0];
 </div> 
 
 <p>

=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/GeoUtils.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/GeoUtils.java	2012-12-09 13:36:18 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/GeoUtils.java	2013-01-25 20:45:07 +0000
@@ -73,7 +73,7 @@
 
         try
         {
-            List list = new ObjectMapper().readValue( coordinatesString, List.class );
+            List<?> list = new ObjectMapper().readValue( coordinatesString, List.class );
 
             if ( from == CoordinateOrder.COORDINATE_LATLNG )
             {

=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/OrganisationUnitToFacilityConverter.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/OrganisationUnitToFacilityConverter.java	2012-12-18 17:57:10 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/OrganisationUnitToFacilityConverter.java	2013-01-25 20:45:07 +0000
@@ -27,9 +27,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.web.webapi.v1.controller.FacilityController;
 import org.hisp.dhis.web.webapi.v1.domain.Facility;
@@ -38,13 +42,6 @@
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
-
 /**
  * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
  */

=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/ValidationUtils.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/ValidationUtils.java	2012-12-11 13:34:09 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/ValidationUtils.java	2013-01-25 20:45:07 +0000
@@ -55,7 +55,7 @@
     {
         Map<String, String> constraintViolationsMap = new HashMap<String, String>();
 
-        for ( ConstraintViolation constraintViolation : constraintViolations )
+        for ( ConstraintViolation<T> constraintViolation : constraintViolations )
         {
             constraintViolationsMap.put( constraintViolation.getPropertyPath().toString(), constraintViolation.getMessage() );
         }

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderHtmlReport.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderHtmlReport.vm	2013-01-25 15:24:37 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderHtmlReport.vm	2013-01-25 20:45:07 +0000
@@ -11,14 +11,14 @@
 #end
 };
 
-dhis2.report.periods = {
+dhis2.report.periods = [
 #if ( $periods )
 #set( $size = $periods.size() )
 #foreach( $period in $periods )
 "$period.getIsoDate()"#if( $velocityCount < $size ),#end
 #end
 #end
-};
+];
 
 </script>