dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10112
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-03-10 13:38:39 +0100
message:
  Setting default values for display density and font size on report table
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.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 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2013-03-08 15:40:04 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2013-03-10 12:38:39 +0000
@@ -134,6 +134,14 @@
     public static final String TOTAL_COLUMN_NAME = "total";
     public static final String TOTAL_COLUMN_PRETTY_NAME = "Total";
 
+    public static final String DISPLAY_DENSITY_COMFORTABLE = "comfortable";
+    public static final String DISPLAY_DENSITY_NORMAL = "normal";
+    public static final String DISPLAY_DENSITY_COMPACT = "compact";
+    
+    public static final String FONT_SIZE_LARGE = "large";
+    public static final String FONT_SIZE_NORMAL = "normal";
+    public static final String FONT_SIZE_SMALL = "small";
+    
     public static final int ASC = -1;
     public static final int DESC = 1;
     public static final int NONE = 0;

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-03-07 09:42:11 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-03-10 12:38:39 +0000
@@ -424,6 +424,8 @@
         executeSql( "update reporttable set subtotals = false where subtotals is null" );
         executeSql( "update reporttable set userOrganisationUnit = false where userOrganisationUnit is null" );
         executeSql( "update reporttable set userOrganisationUnitChildren = false where userOrganisationUnitChildren is null" );
+        executeSql( "update reporttable set displaydensity = 'normal' where displaydensity is null" );
+        executeSql( "update reporttable set fontsize = 'normal' where fontsize is null" );
 
         executeSql( "update chart set reportingmonth = false where reportingmonth is null" );
         executeSql( "update chart set reportingbimonth = false where reportingbimonth is null" );