dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14831
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5147: (DV) All plugin files added.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5147 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2011-11-12 14:39:49 +0000
message:
(DV) All plugin files added.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedIndicatorValue.java
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedDataValuesPluginAction.java
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedIndicatorValuesPluginAction.java
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/plugin.css
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.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-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java 2011-05-05 21:14:56 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java 2011-11-12 14:18:22 +0000
@@ -58,6 +58,12 @@
private double value;
private Date modified;
+
+ private transient String dataElementName;
+
+ private transient String periodName;
+
+ private transient String organisationUnitName;
// ----------------------------------------------------------------------
// Constructors
@@ -215,6 +221,35 @@
this.modified = modified;
}
+ public String getDataElementName()
+ {
+ return dataElementName;
+ }
+
+ public void setDataElementName( String dataElementName )
+ {
+ this.dataElementName = dataElementName;
+ }
+
+ public String getPeriodName()
+ {
+ return periodName;
+ }
+
+ public void setPeriodName( String periodName )
+ {
+ this.periodName = periodName;
+ }
+
+ public String getOrganisationUnitName()
+ {
+ return organisationUnitName;
+ }
+
+ public void setOrganisationUnitName( String organisationUnitName )
+ {
+ this.organisationUnitName = organisationUnitName;
+ }
// ----------------------------------------------------------------------
// hashCode and equals
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedIndicatorValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedIndicatorValue.java 2011-09-08 22:42:45 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedIndicatorValue.java 2011-11-12 14:18:22 +0000
@@ -64,6 +64,12 @@
private double denominatorValue;
private Date modified;
+
+ private transient String indicatorName;
+
+ private transient String periodName;
+
+ private transient String organisationUnitName;
// ----------------------------------------------------------------------
// Constructors
@@ -280,6 +286,36 @@
this.modified = modified;
}
+ public String getIndicatorName()
+ {
+ return indicatorName;
+ }
+
+ public void setIndicatorName( String indicatorName )
+ {
+ this.indicatorName = indicatorName;
+ }
+
+ public String getPeriodName()
+ {
+ return periodName;
+ }
+
+ public void setPeriodName( String periodName )
+ {
+ this.periodName = periodName;
+ }
+
+ public String getOrganisationUnitName()
+ {
+ return organisationUnitName;
+ }
+
+ public void setOrganisationUnitName( String organisationUnitName )
+ {
+ this.organisationUnitName = organisationUnitName;
+ }
+
// ----------------------------------------------------------------------
// hashCode and equals
// ----------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedDataValuesPluginAction.java'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedDataValuesPluginAction.java 2011-11-10 23:43:10 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedDataValuesPluginAction.java 2011-11-12 14:18:22 +0000
@@ -103,63 +103,63 @@
{
this.organisationUnitIds = organisationUnitIds;
}
-
+
private Boolean lastMonth;
public void setLastMonth( Boolean lastMonth )
{
this.lastMonth = lastMonth;
}
-
+
private Boolean monthsThisYear;
public void setMonthsThisYear( Boolean monthsThisYear )
{
this.monthsThisYear = monthsThisYear;
}
-
+
private Boolean monthsLastYear;
public void setMonthsLastYear( Boolean monthsLastYear )
{
this.monthsLastYear = monthsLastYear;
}
-
+
private Boolean lastQuarter;
public void setLastQuarter( Boolean lastQuarter )
{
this.lastQuarter = lastQuarter;
}
-
+
private Boolean quartersThisYear;
public void setQuartersThisYear( Boolean quartersThisYear )
{
this.quartersThisYear = quartersThisYear;
}
-
+
private Boolean quartersLastYear;
public void setQuartersLastYear( Boolean quartersLastYear )
{
this.quartersLastYear = quartersLastYear;
}
-
+
private Boolean thisYear;
public void setThisYear( Boolean thisYear )
{
this.thisYear = thisYear;
}
-
+
private Boolean lastYear;
public void setLastYear( Boolean lastYear )
{
this.lastYear = lastYear;
}
-
+
private Boolean lastFiveYears;
public void setLastFiveYears( Boolean lastFiveYears )
@@ -185,9 +185,10 @@
public String execute()
throws Exception
{
- if ( dataElementIds != null && organisationUnitIds != null &&
- ( lastMonth || monthsThisYear || monthsLastYear || lastQuarter || quartersThisYear ||
- quartersLastYear || thisYear || lastYear || lastFiveYears ) )
+ if ( dataElementIds != null
+ && organisationUnitIds != null
+ && (lastMonth || monthsThisYear || monthsLastYear || lastQuarter || quartersThisYear || quartersLastYear
+ || thisYear || lastYear || lastFiveYears) )
{
RelativePeriods rp = new RelativePeriods();
rp.setReportingMonth( lastMonth );
@@ -199,27 +200,26 @@
rp.setThisYear( thisYear );
rp.setLastYear( lastYear );
rp.setLast5Years( lastFiveYears );
-
+
Collection<Period> periods = rp.getRelativePeriods();
-
+
Collection<Integer> periodIds = new ArrayList<Integer>();
-
+
for ( Period period : periods )
{
periodIds.add( period.getId() );
}
-
- object = aggregatedDataValueService.getAggregatedDataValues( dataElementIds, periodIds,
- organisationUnitIds );
+
+ object = aggregatedDataValueService
+ .getAggregatedDataValues( dataElementIds, periodIds, organisationUnitIds );
for ( AggregatedDataValue value : object )
{
- /*
value.setDataElementName( dataElementService.getDataElement( value.getDataElementId() ).getName() );
value.setPeriodName( format.formatPeriod( periodService.getPeriod( value.getPeriodId() ) ) );
value.setOrganisationUnitName( organisationUnitService.getOrganisationUnit(
value.getOrganisationUnitId() ).getName() );
- */
+
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedIndicatorValuesPluginAction.java'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedIndicatorValuesPluginAction.java 2011-11-10 23:43:10 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAggregatedIndicatorValuesPluginAction.java 2011-11-12 14:18:22 +0000
@@ -215,12 +215,10 @@
for ( AggregatedIndicatorValue value : object )
{
- /*
value.setIndicatorName( indicatorService.getIndicator( value.getIndicatorId() ).getName() );
value.setPeriodName( format.formatPeriod( periodService.getPeriod( value.getPeriodId() ) ) );
value.setOrganisationUnitName( organisationUnitService.getOrganisationUnit(
value.getOrganisationUnitId() ).getName() );
- */
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/plugin.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/plugin.css 2011-11-10 20:57:29 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/plugin.css 2011-11-12 14:36:30 +0000
@@ -1,9 +1,29 @@
body {
- margin: 100px;
-}
-
-#bar_chart_1 {
- height: 400px;
- width: 600px;
- border: 1px solid #ccc;
+ margin: 0 0 0 60px;
+}
+
+h1 {
+ font-size: 20px;
+ margin: 20px 0;
+}
+
+#chart1 {
+ height: 250px;
+ width: 1400px;
+ border: 2px solid #ccc;
+ margin-bottom: 100px;
+}
+
+#chart2 {
+ height: 250px;
+ width: 1400px;
+ border: 2px solid #ccc;
+ margin-bottom: 100px;
+}
+
+#chart3 {
+ height: 250px;
+ width: 1400px;
+ border: 2px solid #ccc;
+ margin-bottom: 100px;
}
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.html'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.html 2011-11-10 20:57:29 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.html 2011-11-12 14:36:30 +0000
@@ -1,27 +1,64 @@
<html>
<head>
<link rel="stylesheet" type="text/css" href="../lib/ext/resources/css/ext-all-gray.css" />
+ <script type="text/javascript" src="../lib/ext/ext-all.js"></script>
+ <script type="text/javascript" src="plugin.js"></script>
+
<link rel="stylesheet" type="text/css" href="../css/plugin.css" />
- <script type="text/javascript" src="../lib/ext/ext-all.js"></script>
- <script type="text/javascript" src="plugin.js"></script>
</head>
<body>
- <div id="bar_chart_1"></div>
+ <h1>My chart 1</h1>
+ <div id="chart1"></div>
+
+ <h1>My chart 2</h1>
+ <div id="chart2"></div>
+
+ <h1>My chart 3</h1>
+ <div id="chart3"></div>
<script>
Ext.onReady( function() {
+ var url = 'http://localhost:8180/dhis/dhis-web-visualizer/app';
+
DHIS.getChart({
type: 'column',
- indicators: [52486],
- periods: ['monthsThisYear'],
- organisationunits: [525],
- series: 'indicator',
- category: 'period',
- filter: 'organisationunit',
- div: 'bar_chart_1'
- });
+ indicators: [52486, 52487, 52488],
+ periods: ['monthsThisYear'],
+ organisationunits: [525],
+ series: 'indicator',
+ category: 'period',
+ filter: 'organisationunit',
+ div: 'chart1',
+ url: url
+ });
+
+ DHIS.getChart({
+ type: 'line',
+ indicators: [52486, 52487, 52488],
+ periods: ['monthsThisYear'],
+ organisationunits: [525],
+ series: 'indicator',
+ category: 'period',
+ filter: 'organisationunit',
+ div: 'chart2',
+ url: url
+ });
+
+ DHIS.getChart({
+ type: 'area',
+ indicators: [52486, 52487, 52488],
+ periods: ['monthsThisYear'],
+ organisationunits: [525],
+ series: 'indicator',
+ category: 'period',
+ filter: 'organisationunit',
+ div: 'chart3',
+ url: url
+ });
+
+
});
</script>
=== 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 2011-11-10 20:57:29 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/plugin.js 2011-11-12 14:36:30 +0000
@@ -25,7 +25,7 @@
value: 'organisationunit',
rawvalue: 'Organisation unit'
}
- },
+ },
chart: {
x: 'x',
series: 'series',
@@ -39,20 +39,11 @@
area: 'area',
pie: 'pie'
}
- },
- style: {
- label: {
- period_group: 'font:bold 11px arial; color:#444; line-height:20px'
- }
- },
- layout: {
- west_cmp_width: 380,
- west_width: 424,
- east_tbar_height: 27
}
};
Ext.onReady( function() {
+
DHIS.initialize = function() {
DHIS.store.column = DHIS.store.defaultChartStore;
DHIS.store.column_stacked = DHIS.store.defaultChartStore;
@@ -61,237 +52,60 @@
DHIS.store.area = DHIS.store.defaultChartStore;
DHIS.store.pie = DHIS.store.defaultChartStore;
- DHIS.getChart = DHIS.exe.execute;
+ DHIS.getChart = DHIS.exe.addToQueue;
};
+ DHIS.projects = [];
+
DHIS.util = {
- getCmp: function(q) {
- return DHIS.viewport.query(q)[0];
- },
- viewport: {
- getSize: function() {
- var c = Ext.getCmp('center');
- return {x: c.getWidth(), y: c.getHeight()};
- },
- getXY: function() {
- var c = Ext.getCmp('center');
- return {x: c.x + 15, y: c.y + 43};
- }
- },
- multiselect: {
- select: function(a, s) {
- var selected = a.getValue();
- if (selected.length) {
- var array = [];
- Ext.Array.each(selected, function(item) {
- array.push({id: item, shortName: a.store.getAt(a.store.find('id', item)).data.shortName});
- });
- s.store.add(array);
- }
- this.filterAvailable(a, s);
- },
- selectAll: function(a, s) {
- var array = [];
- a.store.each( function(r) {
- array.push({id: r.data.id, shortName: r.data.shortName});
- });
- s.store.add(array);
- this.filterAvailable(a, s);
- },
- unselect: function(a, s) {
- var selected = s.getValue();
- if (selected.length) {
- Ext.Array.each(selected, function(item) {
- s.store.remove(s.store.getAt(s.store.find('id', item)));
- });
- this.filterAvailable(a, s);
- }
- },
- unselectAll: function(a, s) {
- s.store.removeAll();
- a.store.clearFilter();
- },
- filterAvailable: function(a, s) {
- a.store.filterBy( function(r) {
- var filter = true;
- s.store.each( function(r2) {
- if (r.data.id === r2.data.id) {
- filter = false;
- }
- });
- return filter;
- });
- }
- },
- fieldset: {
- collapseOthers: function(name) {
- for (var p in DHIS.conf.finals.dimension) {
- if (DHIS.conf.finals.dimension[p].value !== name) {
- DHIS.util.getCmp('fieldset[name="' + DHIS.conf.finals.dimension[p].value + '"]').collapse();
- }
- }
- },
- toggleIndicator: function() {
- DHIS.util.getCmp('fieldset[name="' + DHIS.conf.finals.dimension.indicator.value + '"]').toggle();
- },
- toggleDataElement: function() {
- DHIS.util.getCmp('fieldset[name="' + DHIS.conf.finals.dimension.dataelement.value + '"]').toggle();
- },
- togglePeriod: function() {
- DHIS.util.getCmp('fieldset[name="' + DHIS.conf.finals.dimension.period.value + '"]').toggle();
- },
- toggleOrganisationUnit: function() {
- DHIS.util.getCmp('fieldset[name="' + DHIS.conf.finals.dimension.organisationunit.value + '"]').toggle();
- }
- },
- button: {
- getValue: function() {
- for (var i = 0; i < DHIS.cmp.charttype.length; i++) {
- if (DHIS.cmp.charttype[i].pressed) {
- return DHIS.cmp.charttype[i].name;
- }
- }
- },
- toggleHandler: function(b) {
- if (!b.pressed) {
- b.toggle();
- }
- }
- },
- store: {
- addToStorage: function(s) {
- s.each( function(r) {
- if (!s.storage[r.data.id]) {
- s.storage[r.data.id] = {id: r.data.id, shortName: r.data.shortName, name: r.data.shortName, parent: s.parent};
- }
- });
- },
- loadFromStorage: function(s) {
- var items = [];
- s.removeAll();
- for (var obj in s.storage) {
- if (s.storage[obj].parent === s.parent) {
- items.push(s.storage[obj]);
- }
- }
- items = Ext.Array.sort(items);
- s.add(items);
- },
- containsParent: function(s) {
- for (var obj in s.storage) {
- if (s.storage[obj].parent === s.parent) {
- return true;
- }
- }
- return false;
- }
- },
dimension: {
indicator: {
getUrl: function(isFilter) {
var a = [];
- Ext.Array.each( DHIS.state.conf.indicators, function(r) {
+ Ext.Array.each(DHIS.state.state.conf.indicators, function(r) {
a.push('indicatorIds=' + r);
});
return (isFilter && a.length > 1) ? a.slice(0,1) : a;
- },
- getNames: function(exception) {
- var a = [];
- DHIS.util.getCmp('multiselect[name="selectedIndicators"]').store.each( function(r) {
- a.push(DHIS.util.chart.getEncodedSeriesName(r.data.shortName));
- });
- if (exception && !a.length) {
- alert('No indicators selected');
- }
- return a;
}
},
dataelement: {
getUrl: function(isFilter) {
var a = [];
- DHIS.state.conf.dataelements.each( function(r) {
+ DHIS.state.state.conf.dataelements.each( function(r) {
a.push('dataElementIds=' + r.data.id);
});
return (isFilter && a.length > 1) ? a.slice(0,1) : a;
- },
- getNames: function(exception) {
- var a = [];
- DHIS.util.getCmp('multiselect[name="selectedDataElements"]').store.each( function(r) {
- a.push(DHIS.util.chart.getEncodedSeriesName(r.data.shortName));
- });
- if (exception && !a.length) {
- alert('No data elements selected');
- }
- return a;
}
},
period: {
getUrl: function(isFilter) {
var a = [];
- Ext.Array.each(DHIS.state.conf.periods, function(r) {
+ Ext.Array.each(DHIS.state.state.conf.periods, function(r) {
a.push(r + '=true')
});
return (isFilter && a.length > 1) ? a.slice(0,1) : a;
- },
- getNames: function(exception) {
- var a = [],
- cmp = DHIS.cmp.dimension.period;
- Ext.Array.each(cmp, function(item) {
- if (item.getValue()) {
- Ext.Array.each(DHIS.init.system.periods[item.paramName], function(item) {
- a.push(DHIS.util.chart.getEncodedSeriesName(item.name));
- });
- }
- });
- if (exception && !a.length) {
- alert('No periods selected');
- }
- return a;
- },
- getNameById: function(id) {
- for (var obj in DHIS.init.system.periods) {
- var a = DHIS.init.system.periods[obj];
- for (var i = 0; i < a.length; i++) {
- if (a[i].id == id) {
- return a[i].name;
- }
- };
- }
}
},
organisationunit: {
getUrl: function(isFilter) {
var a = [];
- Ext.Array.each(DHIS.state.conf.organisationunits, function(r) {
+ Ext.Array.each(DHIS.state.state.conf.organisationunits, function(r) {
a.push('organisationUnitIds=' + r)
});
return (isFilter && a.length > 1) ? a.slice(0,1) : a;
- },
- getNames: function(exception) {
- var a = [],
- treepanel = DHIS.util.getCmp('treepanel'),
- selection = treepanel.getSelectionModel().getSelection();
- if (!selection.length) {
- selection = [treepanel.getRootNode()];
- treepanel.selectRoot();
- }
- Ext.Array.each(selection, function(r) {
- a.push(DHIS.util.chart.getEncodedSeriesName(r.data.text));
- });
- if (exception && !a.length) {
- alert('No organisation units selected');
- }
- return a;
}
}
},
chart: {
getEncodedSeriesName: function(text) {
- return text.replace(/\./g,'');
+ return text.replace(/\./g,'');q
},
- getLegend: function(len) {
+ getLegend: function() {
+ var lp = DHIS.state.state.conf.legendPosition,
+ l = DHIS.state.state.series.data.length,
+ p = lp ? lp : (l > 5 ? 'right' : 'top');
return {
- position: len > 6 ? 'right' : 'top',
+ position: p,
boxStroke: '#ffffff',
boxStrokeWidth: 0
};
@@ -305,92 +119,20 @@
};
},
line: {
- getSeriesArray: function() {
+ getSeriesArray: function(project) {
var a = [];
- for (var i = 0; i < DHIS.store.chart.left.length; i++) {
+ for (var i = 0; i < project.store.left.length; i++) {
a.push({
type: 'line',
axis: 'left',
- xField: DHIS.store.chart.bottom,
- yField: DHIS.store.chart.left[i]
+ xField: project.store.bottom,
+ yField: project.store.left[i]
});
}
return a;
}
}
},
- combobox: {
- filter: {
- clearValue: function(v, cb, i, d) {
- if (v === cb.getValue()) {
- cb.clearValue();
- }
- else if ((v === i || v === d) && (cb.getValue() === i || cb.getValue() === d)) {
- cb.clearValue();
- }
- },
- category: function(vp) {
- var cbs = vp.query('combobox[name="' + DHIS.conf.finals.chart.series + '"]')[0],
- cbc = vp.query('combobox[name="' + DHIS.conf.finals.chart.category + '"]')[0],
- cbf = vp.query('combobox[name="' + DHIS.conf.finals.chart.filter + '"]')[0],
- v = cbs.getValue(),
- i = DHIS.conf.finals.dimension.indicator.value,
- d = DHIS.conf.finals.dimension.dataelement.value,
- p = DHIS.conf.finals.dimension.period.value,
- o = DHIS.conf.finals.dimension.organisationunit.value,
- index = 0;
-
- this.clearValue(v, cbc, i, d);
- this.clearValue(v, cbf, i, d);
-
- cbc.filterArray = [!(v === i || v === d), !(v === i || v === d), !(v === p), !(v === o)];
- cbc.store.filterBy( function(r) {
- return cbc.filterArray[index++];
- });
-
- this.filter(vp);
- },
- filter: function(vp) {
- var cbc = vp.query('combobox[name="' + DHIS.conf.finals.chart.category + '"]')[0],
- cbf = vp.query('combobox[name="' + DHIS.conf.finals.chart.filter + '"]')[0],
- v = cbc.getValue(),
- i = DHIS.conf.finals.dimension.indicator.value,
- d = DHIS.conf.finals.dimension.dataelement.value,
- p = DHIS.conf.finals.dimension.period.value,
- o = DHIS.conf.finals.dimension.organisationunit.value,
- index = 0;
-
- this.clearValue(v, cbf, i, d);
-
- cbf.filterArray = Ext.Array.clone(cbc.filterArray);
- cbf.filterArray[0] = cbf.filterArray[0] ? !(v === i || v === d) : false;
- cbf.filterArray[1] = cbf.filterArray[1] ? !(v === i || v === d) : false;
- cbf.filterArray[2] = cbf.filterArray[2] ? !(v === p) : false;
- cbf.filterArray[3] = cbf.filterArray[3] ? !(v === o) : false;
-
- cbf.store.filterBy( function(r) {
- return cbf.filterArray[index++];
- });
- }
- }
- },
- window: {
- datatable: {
- getHeight: function() {
- if (DHIS.value.values.length) {
- if (Ext.isWindows && Ext.isGecko) {
- return 22 * DHIS.value.values.length + 57;
- }
- else if (Ext.isWindows && Ext.isIE) {
- return 21 * DHIS.value.values.length + 58;
- }
- else {
- return 21 * DHIS.value.values.length + 57;
- }
- }
- }
- }
- },
number: {
isInteger: function(n) {
var str = new String(n);
@@ -408,274 +150,261 @@
}
return true;
},
- getChartAxisFormatRenderer: function() {
- return this.allValuesAreIntegers(DHIS.value.values) ? '0' : '0.0';
+ getChartAxisFormatRenderer: function(values) {
+ return this.allValuesAreIntegers(values) ? '0' : '0.0';
+ }
+ },
+ string: {
+ extendUrl: function(url) {
+ if (url.charAt(url.length-1) !== '/') {
+ url += '/';
+ }
+ return url;
}
}
};
DHIS.store = {
- datatable: null,
- getDataTableStore: function(exe) {
- this.datatable = Ext.create('Ext.data.Store', {
- fields: [
- DHIS.state.getIndiment().value,
- DHIS.conf.finals.dimension.period.value,
- DHIS.conf.finals.dimension.organisationunit.value,
- 'v'
- ],
- data: DHIS.value.values
- });
-
- if (exe) {
- DHIS.datatable.getDataTable(true);
- }
- else {
- return this.datatable;
- }
-
- },
- chart: null,
- getChartStore: function() {
- this[DHIS.state.type]();
- },
- defaultChartStore: function() {
+ getChartStore: function(project) {
+ this[project.state.type](project);
+ },
+ defaultChartStore: function(project) {
var keys = [];
- Ext.Array.each(DHIS.chart.data, function(item) {
+ Ext.Array.each(project.data, function(item) {
keys = Ext.Array.merge(keys, Ext.Object.getKeys(item));
});
- this.chart = Ext.create('Ext.data.Store', {
+ project.store = Ext.create('Ext.data.Store', {
fields: keys,
- data: DHIS.chart.data
+ data: project.data
});
- this.chart.bottom = [DHIS.conf.finals.chart.x];
- this.chart.left = keys.slice(0);
- for (var i = 0; i < this.chart.left.length; i++) {
- if (this.chart.left[i] === DHIS.conf.finals.chart.x) {
- this.chart.left.splice(i, 1);
+ project.store.bottom = [DHIS.conf.finals.chart.x];
+ project.store.left = keys.slice(0);
+ for (var i = 0; i < project.store.left.length; i++) {
+ if (project.store.left[i] === DHIS.conf.finals.chart.x) {
+ project.store.left.splice(i, 1);
}
}
- DHIS.chart.getChart(true);
+ DHIS.chart.getChart(project);
},
- bar: function() {
- var properties = Ext.Object.getKeys(DHIS.chart.data[0]);
- this.chart = Ext.create('Ext.data.Store', {
+ bar: function(project) {
+ var properties = Ext.Object.getKeys(project.data[0]);
+ project.store = Ext.create('Ext.data.Store', {
fields: properties,
- data: DHIS.chart.data
+ data: project.data
});
- this.chart.left = properties.slice(0, 1);
- this.chart.bottom = properties.slice(1, properties.length);
+ project.store.left = properties.slice(0, 1);
+ project.store.bottom = properties.slice(1, properties.length);
- DHIS.chart.getChart(true);
+ DHIS.chart.getChart(project);
}
};
DHIS.state = {
- conf: null,
- type: DHIS.conf.finals.chart.column,
- indiment: [],
- period: [],
- organisationunit: [],
- series: {
- cmp: null,
- dimension: DHIS.conf.finals.dimension.indicator.value,
- data: []
- },
- category: {
- cmp: null,
- dimension: DHIS.conf.finals.dimension.period.value,
- data: []
- },
- filter: {
- cmp: null,
- dimension: DHIS.conf.finals.dimension.organisationunit.value,
- data: []
- },
+ state: null,
getState: function(conf) {
- this.resetState(conf);
-
- this.type = conf.type;
- this.series.dimension = conf.series;
- this.category.dimension = conf.category;
- this.filter.dimension = conf.filter;
-
- //DHIS.getChart({
- //type: 'column',
- //indicators: [359596,359596],
- //periods: ['monthsThisYear'],
- //organisationunits: [525],
- //series: 'i',
- //category: 'p',
- //filter: 'o',
- //div: 'bar_chart_1'
- //});
-
- DHIS.value.getValues();
- },
- getIndiment: function() {
- var i = DHIS.conf.finals.dimension.indicator.value;
- return (this.series.dimension === i || this.category.dimension === i || this.filter.dimension === i) ?
- DHIS.conf.finals.dimension.indicator : DHIS.conf.finals.dimension.dataelement;
- },
- isIndicator: function() {
- var i = DHIS.conf.finals.dimension.indicator.value;
- return (this.series.dimension === i || this.category.dimension === i || this.filter.dimension === i);
- },
- resetState: function(conf) {
- this.conf = conf;
- this.indiment = null;
- this.period = null;
- this.organisationunit = null;
- this.series.dimension = null;
- this.series.data = null;
- this.category.dimension = null;
- this.category.data = null;
- this.filter.dimension = null;
- this.filter.data = null;
+ var project = {
+ state: {
+ conf: null,
+ type: null,
+ series: {
+ dimension: null,
+ data: []
+ },
+ category: {
+ dimension: null,
+ data: []
+ },
+ filter: {
+ dimension: null,
+ data: []
+ },
+ getIndiment: function() {
+ var i = DHIS.conf.finals.dimension.indicator.value;
+ return (this.series.dimension === i || this.category.dimension === i || this.filter.dimension === i) ?
+ DHIS.conf.finals.dimension.indicator : DHIS.conf.finals.dimension.dataelement;
+ },
+ isIndicator: function() {
+ var i = DHIS.conf.finals.dimension.indicator.value;
+ return (this.series.dimension === i || this.category.dimension === i || this.filter.dimension === i);
+ }
+ }
+ };
+
+ var defaultConf = {
+ type: 'column',
+ stacked: false,
+ indicators: [],
+ periods: ['monthsThisYear'],
+ organisationunits: [],
+ series: 'indicator',
+ category: 'period',
+ filter: 'organisationunit',
+ div: '',
+ legendPosition: false,
+ url: ''
+ };
+
+ project.state.conf = Ext.applyIf(conf, defaultConf);
+
+ project.state.type = project.state.conf.type;
+ project.state.series.dimension = project.state.conf.series;
+ project.state.category.dimension = project.state.conf.category;
+ project.state.filter.dimension = project.state.conf.filter;
+
+ DHIS.state.state = project.state;
+
+ DHIS.value.getValues(project);
}
};
DHIS.value = {
- values: [],
- getValues: function() {
+ getValues: function(project) {
var params = [],
indicator = DHIS.conf.finals.dimension.indicator.value,
dataelement = DHIS.conf.finals.dimension.dataelement.value,
- series = DHIS.state.series.dimension,
- category = DHIS.state.category.dimension,
- filter = DHIS.state.filter.dimension,
- indiment = DHIS.state.getIndiment().value,
- url = DHIS.state.isIndicator() ? DHIS.conf.finals.ajax.url_indicator : DHIS.conf.finals.ajax.url_dataelement;
+ series = project.state.series.dimension,
+ category = project.state.category.dimension,
+ filter = project.state.filter.dimension,
+ indiment = project.state.getIndiment().value,
+ url = project.state.isIndicator() ? DHIS.conf.finals.ajax.url_indicator : DHIS.conf.finals.ajax.url_dataelement;
params = params.concat(DHIS.util.dimension[series].getUrl());
params = params.concat(DHIS.util.dimension[category].getUrl());
params = params.concat(DHIS.util.dimension[filter].getUrl(true));
-alert(params);
-
- var baseUrl = DHIS.conf.finals.ajax.url_visualizer + url + '.action';
+
+ var baseUrl = DHIS.util.string.extendUrl(project.state.conf.url) + url + '.action';
Ext.Array.each(params, function(item) {
baseUrl = Ext.String.urlAppend(baseUrl, item);
});
-alert(baseUrl);
Ext.Ajax.request({
url: baseUrl,
success: function(r) {
- DHIS.value.values = Ext.JSON.decode(r.responseText).values;
+ project.values = Ext.JSON.decode(r.responseText).values;
- if (!DHIS.value.values.length) {
+ if (!project.values.length) {
alert('no data values');
return;
}
- Ext.Array.each(DHIS.value.values, function(item) {
+ Ext.Array.each(project.values, function(item) {
+ item.indicator = item.in;
+ item.dataelement = item.in;
+ item.period = item.pn;
+ item.organisationunit = item.on;
+
+ Ext.Array.include(project.state.series.data, item[project.state.series.dimension]);
+ Ext.Array.include(project.state.category.data, item[project.state.category.dimension]);
+ Ext.Array.include(project.state.filter.data, item[project.state.filter.dimension]);
item.v = parseFloat(item.v);
});
- DHIS.chart.getData();
+ DHIS.state.state = project.state;
+
+ DHIS.chart.getData(project);
}
});
}
};
DHIS.chart = {
- data: [],
- getData: function() {
- this.data = [];
+ getData: function(project) {
+ project.data = [];
- Ext.Array.each(DHIS.state.category.data, function(item) {
+ Ext.Array.each(project.state.category.data, function(item) {
var obj = {};
obj[DHIS.conf.finals.chart.x] = item;
- DHIS.chart.data.push(obj);
+ project.data.push(obj);
});
- Ext.Array.each(DHIS.chart.data, function(item) {
- for (var i = 0; i < DHIS.state.series.data.length; i++) {
- for (var j = 0; j < DHIS.value.values.length; j++) {
- if (DHIS.value.values[j][DHIS.state.category.dimension] === item[DHIS.conf.finals.chart.x] && DHIS.value.values[j][DHIS.state.series.dimension] === DHIS.state.series.data[i]) {
- item[DHIS.value.values[j][DHIS.state.series.dimension]] = DHIS.value.values[j].v;
+ Ext.Array.each(project.data, function(item) {
+ for (var i = 0; i < project.state.series.data.length; i++) {
+ for (var j = 0; j < project.values.length; j++) {
+ if (project.values[j][project.state.category.dimension] === item[DHIS.conf.finals.chart.x] && project.values[j][project.state.series.dimension] === project.state.series.data[i]) {
+ item[project.values[j][project.state.series.dimension]] = project.values[j].v;
break;
}
}
}
});
- DHIS.store.getChartStore(true);
- },
- chart: null,
- getChart: function() {
- this[DHIS.state.type]();
- this.reload();
- },
- column: function(stacked) {
- this.chart = Ext.create('Ext.chart.Chart', {
- renderTo: DV.state.conf.div,
- width: DHIS.util.viewport.getSize().x,
- height: DHIS.util.viewport.getSize().y,
+ DHIS.store.getChartStore(project);
+ },
+ el: null,
+ getChart: function(project) {
+ this.el = Ext.get(project.state.conf.div);
+ this[project.state.type](project);
+ DHIS.exe.execute();
+ },
+ column: function(project) {
+ project.chart = Ext.create('Ext.chart.Chart', {
+ renderTo: project.state.conf.div,
+ width: this.el.getWidth(),
+ height: this.el.getHeight(),
animate: true,
- store: DHIS.store.chart,
- legend: DHIS.util.chart.getLegend(DHIS.state.series.data.length),
+ store: project.store,
+ legend: DHIS.util.chart.getLegend(),
axes: [
{
title: 'Value',
type: 'Numeric',
position: 'left',
minimum: 0,
- fields: DHIS.store.chart.left,
+ fields: project.store.left,
grid: {
even: DHIS.util.chart.getGrid()
},
label: {
- renderer: Ext.util.Format.numberRenderer(DHIS.util.number.getChartAxisFormatRenderer())
+ renderer: Ext.util.Format.numberRenderer(DHIS.util.number.getChartAxisFormatRenderer(project.values))
}
},
{
- title: DHIS.init.isInit ? 'Categories' : DHIS.conf.finals.dimension[DHIS.state.category.dimension].rawvalue,
+ title: DHIS.conf.finals.dimension[project.state.category.dimension].rawvalue,
type: 'Category',
position: 'bottom',
- fields: DHIS.store.chart.bottom
+ fields: project.store.bottom
}
],
series: [
{
type: 'column',
axis: 'left',
- xField: DHIS.store.chart.bottom,
- yField: DHIS.store.chart.left,
- stacked: stacked,
+ xField: project.store.bottom,
+ yField: project.store.left,
+ stacked: project.state.conf.stacked,
style: {
opacity: 0.8
}
}
]
});
- },
- column_stacked: function() {
- this.column(true);
- },
- bar: function(stacked) {
- this.chart = Ext.create('Ext.chart.Chart', {
- width: DHIS.util.viewport.getSize().x,
- height: DHIS.util.viewport.getSize().y,
+
+ DHIS.projects.push(project);
+ },
+ bar: function(project) {
+ project.chart = Ext.create('Ext.chart.Chart', {
+ renderTo: project.state.conf.div,
+ width: this.el.getWidth(),
+ height: this.el.getHeight(),
animate: true,
- store: DHIS.store.chart,
- legend: DHIS.util.chart.getLegend(DHIS.state.series.data.length),
+ store: project.store,
+ legend: DHIS.util.chart.getLegend(),
axes: [
{
- title: DHIS.conf.finals.dimension[DHIS.state.category.dimension].rawvalue,
+ title: DHIS.conf.finals.dimension[project.state.category.dimension].rawvalue,
type: 'Category',
position: 'left',
- fields: DHIS.store.chart.left
+ fields: project.store.left
},
{
title: 'Value',
type: 'Numeric',
position: 'bottom',
minimum: 0,
- fields: DHIS.store.chart.bottom,
+ fields: project.store.bottom,
label: {
- renderer: Ext.util.Format.numberRenderer(DHIS.util.number.getChartAxisFormatRenderer())
+ renderer: Ext.util.Format.numberRenderer(DHIS.util.number.getChartAxisFormatRenderer(project.values))
},
grid: {
even: DHIS.util.chart.getGrid()
@@ -686,112 +415,118 @@
{
type: 'bar',
axis: 'bottom',
- xField: DHIS.store.chart.left,
- yField: DHIS.store.chart.bottom,
- stacked: stacked,
+ xField: project.store.left,
+ yField: project.store.bottom,
+ stacked: project.state.conf.stacked,
style: {
opacity: 0.8
}
}
]
});
- },
- bar_stacked: function() {
- this.bar(true);
- },
- line: function() {
- this.chart = Ext.create('Ext.chart.Chart', {
- width: DHIS.util.viewport.getSize().x,
- height: DHIS.util.viewport.getSize().y,
+
+ DHIS.projects.push(project);
+ },
+ line: function(project) {
+ project.chart = Ext.create('Ext.chart.Chart', {
+ renderTo: project.state.conf.div,
+ width: this.el.getWidth(),
+ height: this.el.getHeight(),
animate: true,
- store: DHIS.store.chart,
- legend: DHIS.util.chart.getLegend(DHIS.state.series.data.length),
+ store: project.store,
+ legend: DHIS.util.chart.getLegend(),
axes: [
{
title: 'Value',
type: 'Numeric',
position: 'left',
minimum: 0,
- fields: DHIS.store.chart.left,
+ fields: project.store.left,
label: {
- renderer: Ext.util.Format.numberRenderer(DHIS.util.number.getChartAxisFormatRenderer())
+ renderer: Ext.util.Format.numberRenderer(DHIS.util.number.getChartAxisFormatRenderer(project.values))
},
grid: {
even: DHIS.util.chart.getGrid()
}
},
{
- title: DHIS.conf.finals.dimension[DHIS.state.category.dimension].rawvalue,
+ title: DHIS.conf.finals.dimension[project.state.category.dimension].rawvalue,
type: 'Category',
position: 'bottom',
- fields: DHIS.store.chart.bottom
+ fields: project.store.bottom
}
],
- series: DHIS.util.chart.line.getSeriesArray()
+ series: DHIS.util.chart.line.getSeriesArray(project)
});
+
+ DHIS.projects.push(project);
},
- area: function() {
- this.chart = Ext.create('Ext.chart.Chart', {
- width: DHIS.util.viewport.getSize().x,
- height: DHIS.util.viewport.getSize().y,
+ area: function(project) {
+ project.chart = Ext.create('Ext.chart.Chart', {
+ renderTo: project.state.conf.div,
+ width: this.el.getWidth(),
+ height: this.el.getHeight(),
animate: true,
- store: DHIS.store.chart,
- legend: DHIS.util.chart.getLegend(DHIS.state.series.data.length),
+ store: project.store,
+ legend: DHIS.util.chart.getLegend(),
axes: [
{
title: 'Value',
type: 'Numeric',
position: 'left',
minimum: 0,
- fields: DHIS.store.chart.left,
+ fields: project.store.left,
label: {
- renderer: Ext.util.Format.numberRenderer(DHIS.util.number.getChartAxisFormatRenderer())
+ renderer: Ext.util.Format.numberRenderer(DHIS.util.number.getChartAxisFormatRenderer(project.values))
},
grid: {
even: DHIS.util.chart.getGrid()
}
},
{
- title: DHIS.conf.finals.dimension[DHIS.state.category.dimension].rawvalue,
+ title: DHIS.conf.finals.dimension[project.state.category.dimension].rawvalue,
type: 'Category',
position: 'bottom',
- fields: DHIS.store.chart.bottom
+ fields: project.store.bottom
}
],
series: [{
type: 'area',
axis: 'left',
- xField: DHIS.store.chart.bottom[0],
- yField: DHIS.store.chart.left,
+ xField: project.store.bottom[0],
+ yField: project.store.left,
style: {
opacity: 0.65
}
}]
});
+
+ DHIS.projects.push(project);
},
- pie: function() {
- this.chart = Ext.create('Ext.chart.Chart', {
- width: DHIS.util.viewport.getSize().x,
- height: DHIS.util.viewport.getSize().y,
+ pie: function(project) {
+ project.chart = Ext.create('Ext.chart.Chart', {
+ renderTo: project.state.conf.div,
+ width: this.el.getWidth(),
+ height: this.el.getHeight(),
animate: true,
shadow: true,
- store: DHIS.store.chart,
- legend: DHIS.util.chart.getLegend(DHIS.state.category.data.length),
+ store: project.store,
+ legend: DHIS.util.chart.getLegend(),
insetPadding: 60,
series: [{
type: 'pie',
- field: DHIS.store.chart.left[0],
+ field: project.store.left[0],
showInLegend: true,
tips: {
trackMouse: false,
width: 160,
height: 31,
renderer: function(i) {
- this.setTitle('<span class="DHIS-chart-tips">' + i.data.x + ': <b>' + i.data[DHIS.store.chart.left[0]] + '</b></span>');
+ this.setTitle('<span class="DHIS-chart-tips">' + i.data.x + ': <b>' + i.data[project.store.left[0]] + '</b></span>');
}
},
label: {
- field: DHIS.store.chart.bottom[0]
+ field: project.store.bottom[0]
},
highlight: {
segment: {
@@ -803,69 +538,26 @@
}
}]
});
- },
- reload: function() {
- var c = Ext.getCmp('center');
- c.removeAll(true);
- c.add(this.chart);
+
+ DHIS.projects.push(project);
}
};
- DHIS.datatable = {
- datatable: null,
- getDataTable: function(exe) {
- this.datatable = Ext.create('Ext.grid.Panel', {
- height: DHIS.util.viewport.getSize().y - DHIS.conf.layout.east_tbar_height,
- scroll: 'vertical',
- cls: 'DHIS-datatable',
- columns: [
- {
- text: DHIS.state.getIndiment().rawvalue,
- dataIndex: DHIS.state.getIndiment().value,
- width: 150
- },
- {
- text: DHIS.conf.finals.dimension.period.rawvalue,
- dataIndex: DHIS.conf.finals.dimension.period.value,
- width: 100,
- sortable: false
- },
- {
- text: DHIS.conf.finals.dimension.organisationunit.rawvalue,
- dataIndex: DHIS.conf.finals.dimension.organisationunit.value,
- width: 150
- },
- {
- text: 'Value',
- dataIndex: 'v',
- width: 80
- }
- ],
- store: DHIS.store.datatable,
- listeners: {
- afterrender: function() {
- DHIS.cmp.datatable = this;
- }
- }
- });
-
- if (exe) {
- this.reload();
- }
- else {
- return this.datatable;
- }
- },
- reload: function() {
- var c = DHIS.util.getCmp('panel[region="east"]');
- c.removeAll(true);
- c.add(this.datatable);
- }
- };
-
DHIS.exe = {
- execute: function(conf) {
- DHIS.state.getState(conf);
+ allow: true,
+ queue: [],
+ addToQueue: function(obj) {
+ DHIS.exe.queue.push(obj);
+
+ if (DHIS.exe.allow) {
+ DHIS.exe.allow = false;
+ DHIS.exe.execute();
+ }
+ },
+ execute: function() {
+ if (this.queue.length) {
+ DHIS.state.getState(this.queue.shift());
+ }
}
};
