dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7500
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-07-03 18:43:55 +0200
message:
  Border collapse in web pivot
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.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/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2012-07-01 11:33:07 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2012-07-03 16:43:55 +0000
@@ -260,7 +260,7 @@
     {
         Chart chart = new Chart();
 
-        chart.setType( TYPE_BAR );
+        chart.setType( TYPE_COLUMN );
         chart.setDimensions( series, category, filter );
         chart.setHideLegend( false );
         chart.setRegression( regression );

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm	2012-07-03 16:16:53 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm	2012-07-03 16:43:55 +0000
@@ -20,15 +20,6 @@
 </script>
 
 <style type="text/css">
-.pivot td
-{
-  border: 1px solid #d0d0d0;
-  padding-top: 2px;
-  padding-bottom: 3px;
-  padding-left: 10px;
-  padding-right: 10px;
-}
-
 div#control
 {
   margin-bottom: 15px;
@@ -47,12 +38,30 @@
   border-radius: 3px;
 }
 
+div#pivotMenu
+{
+  position: absolute;
+  display: none;
+}
+
 div.inputSection
 {
   padding-top: 7px;
   padding-bottom: 5px;
 }
 
+.pivot
+{ 
+  border-collapse: collapse;
+}
+
+.pivot td
+{
+  border: 1px solid #c0c0c0;
+  padding: 3px 10px 10px 3px;
+  padding-bottom: 3px;
+}
+
 td.column
 {
   background-color: #dae6f8;
@@ -72,12 +81,6 @@
   cursor: pointer;
 }
 
-div#pivotMenu
-{
-  position: absolute;
-  display: none;
-}
-
 </style>
 
 <h3>$i18n.getString( "pivot_table" ) #openHelp( "web_pivot_table" )</h3>