dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17203
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6769: (DV plugin) Several minor bugs fixed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 6769 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-04-26 19:55:58 +0000
message:
(DV plugin) Several minor bugs fixed.
modified:
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/plugin.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/plugin/index.html'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html 2012-04-13 14:40:16 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html 2012-04-26 19:44:11 +0000
@@ -9,9 +9,9 @@
h1 {font-size: 20px; margin: 20px 0;}
- #chart1 {width: 900px; height: 400px; border: 2px solid #ddd; margin-bottom: 100px;}
+ #chart1 {width: 900px; height: 400px; border: 2px solid #d1d1d1; margin-bottom: 100px; border-radius: 4px}
- #chart2 {width: 1400px; height: 400px; border: 2px solid #ccc; margin-bottom: 100px;}
+ #chart2 {width: 1200px; height: 400px; border: 2px solid #d1d1d1; margin-bottom: 100px;}
</style>
<!--
@@ -47,11 +47,11 @@
var url = 'http://apps.dhis2.org/dev/';
DHIS.getChart({
- uid: 'R0DVGvXDUNP',
+ uid: 'EbRN2VIbPdV',
el: 'chart1',
url: url
});
-
+
DHIS.getChart({
type: 'stackedcolumn',
indicators: ['Uvn6LCg7dVU', 'OdiHJayrsKo'],
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.js 2012-04-26 10:54:19 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.js 2012-04-26 19:33:25 +0000
@@ -239,7 +239,7 @@
height: 47,
renderer: function(item) {
this.setWidth((item.data.x.length * 8) + 15);
- this.setTitle('<span class="dv-chart-tips">' + item.data.x + '<br/><b>' + item.data[DV.store.chart.left[0]] + '</b></span>');
+ this.setTitle('<span class="dv-chart-tips">' + item.data.x + '<br/><b>' + item.data[DHIS.store.left[0]] + '</b></span>');
}
};
}
@@ -405,8 +405,8 @@
if (r.indicators) {
conf.indicators = DHIS.util.dimension.indicator.getIdsFromObjects(r.indicators);
}
- if (r.dataelements) {
- conf.dataelements = DHIS.util.dimension.dataelement.getIdsFromObjects(r.dataelements);
+ if (r.dataElements) {
+ conf.dataelements = DHIS.util.dimension.dataelement.getIdsFromObjects(r.dataElements);
}
this.getState(conf);
@@ -422,6 +422,7 @@
params = params.concat(DHIS.util.dimension[project.state.series.dimension].getUrl());
params = params.concat(DHIS.util.dimension[project.state.category.dimension].getUrl());
params = params.concat(DHIS.util.dimension[project.state.filter.dimension].getUrl(true));
+console.log(params);
var baseUrl = DHIS.util.string.extendUrl(project.state.conf.url) + DHIS.conf.finals.ajax.data_get;
Ext.Array.each(params, function(item) {
@@ -556,7 +557,7 @@
animate: true,
store: project.store,
items: DHIS.util.chart.getTitle(),
- legend: DHIS.util.chart.getLegend(project.store.chart.bottom.length),
+ legend: DHIS.util.chart.getLegend(project.store.bottom.length),
axes: [
{
type: 'Category',
@@ -602,7 +603,7 @@
animate: true,
store: project.store,
items: DHIS.util.chart.getTitle(),
- legend: DHIS.util.chart.getLegend(project.store.chart.left.length),
+ legend: DHIS.util.chart.getLegend(project.store.left.length),
axes: [
{
type: 'Numeric',
@@ -618,7 +619,7 @@
type: 'Category',
position: 'bottom',
fields: project.store.bottom,
- label: DV.util.chart.label.getCategoryLabel()
+ label: DHIS.util.chart.label.getCategoryLabel()
}
],
series: DHIS.util.chart.line.getSeriesArray(project)
@@ -634,7 +635,7 @@
animate: true,
store: project.store,
items: DHIS.util.chart.getTitle(),
- legend: DHIS.util.chart.getLegend(project.store.chart.left.length),
+ legend: DHIS.util.chart.getLegend(project.store.left.length),
axes: [
{
type: 'Numeric',
@@ -667,6 +668,7 @@
DHIS.projects.push(project);
},
pie: function(project) {
+console.log(project.state);
project.chart = Ext.create('Ext.chart.Chart', {
renderTo: project.state.conf.el,
width: project.state.conf.width || this.el.getWidth(),
@@ -675,8 +677,8 @@
shadow: true,
store: project.store,
insetPadding: 60,
- items: DHIS.util.chart.pie.getTitle(project.state.state.filter.names[0], project.store.left[0]),
- legend: DHIS.util.chart.getLegend(project.state.state.category.names.length),
+ items: DHIS.util.chart.pie.getTitle(project.state.filter.names[0], project.store.left[0]),
+ legend: DHIS.util.chart.getLegend(project.state.category.names.length),
series: [{
type: 'pie',
field: project.store.left[0],
