dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 8919 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-11-06 22:22:45 +0300
message:
  (DV) Reporting rates order fixed + Trend lines improved.
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.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-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2012-11-05 10:01:10 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2012-11-06 19:17:42 +0000
@@ -861,12 +861,10 @@
 							style: {
 								opacity: 1,
 								lineWidth: 3,
+								'stroke-width': 2,
 								stroke: '#041423'
 							},
-							markerConfig: {
-								type: 'circle',
-								radius: 0
-							},
+							showMarkers: false,
 							title: title
 						};
 					},
@@ -883,10 +881,7 @@
 								lineWidth: 3,
 								stroke: '#041423'
 							},
-							markerConfig: {
-								type: 'circle',
-								radius: 0
-							},
+							showMarkers: false,
 							title: title
 						};
 					},
@@ -900,11 +895,12 @@
 								yField: DV.chart.trendline[i].key,
 								style: {
 									opacity: 0.8,
-									lineWidth: 3
+									lineWidth: 3,
+									'stroke-dasharray': 8
 								},
 								markerConfig: {
 									type: 'circle',
-									radius: 4
+									radius: 0
 								},
 								tips: DV.util.chart.def.series.getTips(),
 								title: DV.chart.trendline[i].name
@@ -2099,8 +2095,12 @@
 					}
 					
                     DV.value.values = DV.util.value.jsonfy(r.v);
-                                        
-					DV.c.data.names = DV.conf.util.jsonEncodeArray(r.d);
+                    
+					DV.c.data.names = [];					
+					for (var i = 0; i < DV.c.data.records.length; i++) {
+						DV.c.data.names.push(DV.c.data.records[i].name);
+					}
+					
 					DV.c.period.names = DV.conf.util.jsonEncodeArray(r.p);
 					DV.c.organisationunit.names = DV.conf.util.jsonEncodeArray(r.o);