dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6866
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-05-05 21:13:56 +0200
message:
  Increased default png chart width
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js


--
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-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java	2012-03-22 15:04:58 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java	2012-05-05 19:13:56 +0000
@@ -140,7 +140,7 @@
 
     @RequestMapping( value = {"/{uid}/data", "/{uid}/data.png"}, method = RequestMethod.GET )
     public void getChart( @PathVariable( "uid" ) String uid,
-                          @RequestParam( value = "width", defaultValue = "700", required = false ) int width,
+                          @RequestParam( value = "width", defaultValue = "800", required = false ) int width,
                           @RequestParam( value = "height", defaultValue = "500", required = false ) int height,
                           HttpServletResponse response ) throws IOException, I18nManagerException
     {
@@ -159,7 +159,7 @@
     public void getChart( @RequestParam( value = "in" ) String indicatorUid,
                           @RequestParam( value = "ou" ) String organisationUnitUid,
                           @RequestParam( value = "periods", required = false ) boolean periods,
-                          @RequestParam( value = "width", defaultValue = "700", required = false ) int width,
+                          @RequestParam( value = "width", defaultValue = "800", required = false ) int width,
                           @RequestParam( value = "height", defaultValue = "500", required = false ) int height,
                           @RequestParam( value = "skipTitle", required = false ) boolean skipTitle,
                           HttpServletResponse response ) throws Exception

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js	2012-02-24 11:28:07 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js	2012-05-05 19:13:56 +0000
@@ -21,15 +21,15 @@
 
 function viewChart( url )
 {
-    var width = 700 + 20;
-    var height = 500 + 20;
+    var width = 820;
+    var height = 520;
 
     $( "#chartImage" ).attr( "src", url );
     $( "#chartView" ).dialog( {
         autoOpen : true,
         modal : true,
         height : height + 65,
-        width : width + 45,
+        width : width + 25,
         resizable : false,
         title : "Viewing Chart"
     } );