dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 6565 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-04-13 16:41:26 +0200
message:
  (DV) Datatable sorting bug fixed.
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html


--
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-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-04-12 14:13:15 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-04-13 14:40:16 +0000
@@ -2202,14 +2202,15 @@
                         text: DV.conf.finals.dimension[DV.c.dimension.series].rawvalue,
                         dataIndex: DV.conf.finals.dimension[DV.c.dimension.series].value,
                         width: 150,
-                        height: DV.conf.layout.east_gridcolumn_height
+                        height: DV.conf.layout.east_gridcolumn_height,
+                        sortable: DV.c.dimension.series != DV.conf.finals.dimension.period.value
                     },
                     {
                         text: DV.conf.finals.dimension[DV.c.dimension.category].rawvalue,
                         dataIndex: DV.conf.finals.dimension[DV.c.dimension.category].value,
                         width: 150,
                         height: DV.conf.layout.east_gridcolumn_height,
-                        sortable: false
+                        sortable: DV.c.dimension.category != DV.conf.finals.dimension.period.value
                     },
                     {
                         text: DV.i18n.value,

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html	2012-03-28 12:26:52 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html	2012-04-13 14:40:16 +0000
@@ -16,6 +16,8 @@
     
 	<!--
 	CONFIG              TYPE            DEFAULT             DESCRIPTION
+
+	uid                 string                              (Optional) A chart uid. If provided, only 'el' and 'url' are required.
 		
 	type                string          'column'            (Optional) Chart types: 'column', 'stackedcolumn', 'bar', 'stackedbar', 'line', 'area', 'pie'
 	indicators          [integer]                           (Required*) Indicator uids. Required if no data elements are provided.
@@ -30,8 +32,6 @@
 	height              integer         <el height>         (Optional) Chart height. Default is the element height.
 	legendPosition      string          'top'               (Optional) Positions: 'top', 'right', 'bottom' or 'left'
 	url                 string                              (Required) The base url of the DHIS instance.
-
-	uid                 string                              (Optional) A chart uid. If provided, only 'el' and 'url' are required.
 	-->
 </head>