← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18154: DV minor bug fixed.

 

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 18154 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-02-02 17:41:21 +0100
message:
  DV minor bug fixed.
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.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-apps/src/main/webapp/dhis-web-visualizer/plugin.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html	2015-01-26 15:12:42 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html	2015-02-02 16:39:05 +0000
@@ -22,52 +22,38 @@
 			DHIS.getChart({
 				url: url,
 				el: 'chart1',
-				uid: 'LW0O27b7TdD',
-                crossDomain: false,
-                rows: [{dimension: 'ou', items: [{id: 'LEVEL-4'}, {id: 'ENHOJz3UH5L'}]}],
-                baseLineValue: 10,
-                domainAxisStyle: {
-                    labelColor: 'blue',
-                    labelFont: '10px arial',
-                    labelRotation: 70,
-                    
-                    titleFont: 'bold 12px arial',
-                    titleColor: 'blue'
-                },
-                rangeAxisStyle: {
-                    labelFont: '10px arial',
-                    titleFont: 'bold 12px arial'
-                }
+				uid: 'IXF2whoSbRn',
+                crossDomain: false
 			});
 
-			DHIS.getChart({
-				url: url,
-				el: 'chart2',
-                //type: 'pie',
-				columns: [{dimension: 'in', items: [{id: 'Uvn6LCg7dVU'}, {id: 'OdiHJayrsKo'}, {id: 'sB79w2hiLp8'}, {id: 'AUqdhY4mpvp'}]}],
-				rows: [{dimension: 'pe', items: [{id: 'LAST_6_MONTHS'}]}],
-                filters: [{dimension: 'ou', items: [{id: 'USER_ORGUNIT'}]}],
-                domainAxisTitle: 'PERIODS',
-                rangeAxisTitle: 'PERCENT',
-                domainAxisStyle: {
-                    labelFont: '10px sans-serif',
-                    labelRotation: 0,
-                    titleFont: 'bold 10px sans-serif'
-                },
-                rangeAxisStyle: {
-                    labelFont: '10px arial',
-                    titleFont: 'bold 10px sans-serif'
-                },
-                legendStyle: {
-                    labelMaxLength: 9,
-                    labelFontSize: 10,
-                    titleFont: '18px sans-serif'
-                },
-                seriesStyle: {
-                    labelFont: '10px sans-serif',
-                    labelColor: 'black'
-                }
-			});
+			//DHIS.getChart({
+				//url: url,
+				//el: 'chart2',
+                ////type: 'pie',
+				//columns: [{dimension: 'in', items: [{id: 'Uvn6LCg7dVU'}, {id: 'OdiHJayrsKo'}, {id: 'sB79w2hiLp8'}, {id: 'AUqdhY4mpvp'}]}],
+				//rows: [{dimension: 'pe', items: [{id: 'LAST_6_MONTHS'}]}],
+                //filters: [{dimension: 'ou', items: [{id: 'USER_ORGUNIT'}]}],
+                //domainAxisTitle: 'PERIODS',
+                //rangeAxisTitle: 'PERCENT',
+                //domainAxisStyle: {
+                    //labelFont: '10px sans-serif',
+                    //labelRotation: 0,
+                    //titleFont: 'bold 10px sans-serif'
+                //},
+                //rangeAxisStyle: {
+                    //labelFont: '10px arial',
+                    //titleFont: 'bold 10px sans-serif'
+                //},
+                //legendStyle: {
+                    //labelMaxLength: 9,
+                    //labelFontSize: 10,
+                    //titleFont: '18px sans-serif'
+                //},
+                //seriesStyle: {
+                    //labelFont: '10px sans-serif',
+                    //labelColor: 'black'
+                //}
+			//});
 		});
 	</script>
 </head>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js	2015-01-26 15:12:42 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js	2015-02-02 16:39:05 +0000
@@ -2997,7 +2997,8 @@
                         position = 'top',
                         padding = 0,
                         positions = ['top', 'right', 'bottom', 'left'],
-                        series = chartConfig.series;
+                        series = chartConfig.series,
+                        labelMarkerSize = xLayout.legendStyle ? xLayout.legendStyle.labelMarkerSize : null;
 
                     for (var i = 0, title; i < series.length; i++) {
                         title = series[i].title;
@@ -3052,7 +3053,7 @@
                         itemSpacing: 3,
                         labelFont: labelFont,
                         labelColor: labelColor,
-                        labelMarkerSize: xLayout.legendStyle.labelMarkerSize
+                        labelMarkerSize: labelMarkerSize
                     });
                 };
 
@@ -3352,7 +3353,7 @@
                         colors = conf.chart.theme.dv1.slice(0, store.rangeFields.length),
                         seriesTitles = getDefaultSeriesTitle(store);
 
-                    // Series
+                    // series
                     for (var i = 0, line; i < store.rangeFields.length; i++) {
                         line = {
                             type: 'line',
@@ -3381,7 +3382,7 @@
                         series.push(line);
                     }
 
-                    // Options, theme colors
+                    // options, theme colors
                     if (xLayout.showTrendLine) {
                         series = getDefaultTrendLines(store).concat(series);
 
@@ -3400,7 +3401,7 @@
                         colors.push('#051a2e');
                     }
 
-                    // Theme
+                    // theme
                     Ext.chart.theme.dv1 = Ext.extend(Ext.chart.theme.Base, {
                         constructor: function(config) {
                             Ext.chart.theme.Base.prototype.constructor.call(this, Ext.apply({
@@ -4203,6 +4204,7 @@
             };
 
             // init
+            DV.instances.push(ns);
 			ns.core = DV.getCore(Ext.clone(init));
 			extendInstance(ns);
 

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js	2015-01-21 19:53:54 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js	2015-02-02 16:39:05 +0000
@@ -3381,7 +3381,7 @@
                         series.push(line);
                     }
 
-                    // Options, theme colors
+                    // options, theme colors
                     if (xLayout.showTrendLine) {
                         series = getDefaultTrendLines(store).concat(series);
 
@@ -3400,7 +3400,7 @@
                         colors.push('#051a2e');
                     }
 
-                    // Theme
+                    // theme
                     Ext.chart.theme.dv1 = Ext.extend(Ext.chart.theme.Base, {
                         constructor: function(config) {
                             Ext.chart.theme.Base.prototype.constructor.call(this, Ext.apply({
@@ -4106,6 +4106,7 @@
                     }
 
                     if (DV.isDebug) {
+                        console.log('chart', ns.app.chart);
                         console.log('layout', ns.app.layout);
                         console.log('xLayout', ns.app.xLayout);
                         console.log('response', ns.app.response);

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js	2015-01-21 19:52:57 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js	2015-02-02 16:39:05 +0000
@@ -3792,7 +3792,7 @@
                         colors = conf.chart.theme.dv1.slice(0, store.rangeFields.length),
                         seriesTitles = getDefaultSeriesTitle(store);
 
-                    // Series
+                    // series
                     for (var i = 0, line; i < store.rangeFields.length; i++) {
                         line = {
                             type: 'line',
@@ -3821,7 +3821,7 @@
                         series.push(line);
                     }
 
-                    // Options, theme colors
+                    // options, theme colors
                     if (xLayout.showTrendLine) {
                         series = getDefaultTrendLines(store).concat(series);
 
@@ -3840,7 +3840,7 @@
                         colors.push('#051a2e');
                     }
 
-                    // Theme
+                    // theme
                     Ext.chart.theme.dv1 = Ext.extend(Ext.chart.theme.Base, {
                         constructor: function(config) {
                             Ext.chart.theme.Base.prototype.constructor.call(this, Ext.apply({