dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14319
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4825: (DV) Correct category and series order + Minified multiselect js.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 4825 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-10-04 16:57:04 +0200
message:
(DV) Correct category and series order + Minified multiselect js.
added:
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/exit.png
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/css/style.css
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/lib/ext-ux/layout/component/form/MultiSelect.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/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-10-04 10:50:29 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-10-04 14:44:09 +0000
@@ -4,7 +4,9 @@
ajax: {
url_visualizer: '../',
url_commons: '../../dhis-web-commons-ajax-json/',
- url_portal: '../../dhis-web-portal/'
+ url_portal: '../../dhis-web-portal/',
+ url_indicator: 'getAggregatedIndicatorValues',
+ url_dataelement: 'getAggregatedDataValues'
},
dimension: {
indicator: {
@@ -29,17 +31,19 @@
category: 'category',
filter: 'filter',
column: 'column',
+ bar: 'bar',
line: 'line',
pie: 'pie'
}
},
style: {
label: {
- period: 'font:bold 11px arial,ubuntu; color:#444; line-height:20px',
+ period: 'font:bold 11px arial; color:#444; line-height:20px',
}
},
layout: {
- west_cmp_width: 380
+ west_cmp_width: 380,
+ west_width: 424
}
};
@@ -48,14 +52,15 @@
Ext.require('Ext.ux.form.MultiSelect');
Ext.onReady( function() {
+ Ext.override(Ext.form.FieldSet,{setExpanded:function(a){var b=this,c=b.checkboxCmp,d=b.toggleCmp,e;a=!!a;if(c){c.setValue(a)}if(d){d.setType(a?"up":"down")}if(a){e="expand";b.removeCls(b.baseCls+"-collapsed")}else{e="collapse";b.addCls(b.baseCls+"-collapsed")}b.collapsed=!a;b.doComponentLayout();b.fireEvent(e,b);return b}});
+ Ext.QuickTips.init();
document.body.oncontextmenu = function(){return false;};
- Ext.QuickTips.init();
- Ext.override(Ext.form.FieldSet,{setExpanded:function(a){var b=this,c=b.checkboxCmp,d=b.toggleCmp,e;a=!!a;if(c){c.setValue(a)}if(d){d.setType(a?"up":"down")}if(a){e="expand";b.removeCls(b.baseCls+"-collapsed")}else{e="collapse";b.addCls(b.baseCls+"-collapsed")}b.collapsed=!a;b.doComponentLayout();b.fireEvent(e,b);return b}});
Ext.Ajax.request({
url: DV.conf.finals.ajax.url_visualizer + 'initialize.action',
success: function(r) {
- DV.init = Ext.JSON.decode(r.responseText);
+
+ DV.init = Ext.JSON.decode(r.responseText);
DV.util = {
getCmp: function(q) {
@@ -64,7 +69,7 @@
viewport: {
getSize: function() {
var c = DV.util.getCmp('panel[region="center"]');
- return { x: c.getWidth(), y: c.getHeight() };
+ return {x: c.getWidth(), y: c.getHeight()};
}
},
multiselect: {
@@ -241,10 +246,10 @@
return Ext.create('Ext.data.Store', {
fields: ['id', 'name'],
data: [
- { id: DV.conf.finals.dimension.indicator.value, name: DV.conf.finals.dimension.indicator.rawvalue },
- { id: DV.conf.finals.dimension.dataelement.value, name: DV.conf.finals.dimension.dataelement.rawvalue },
- { id: DV.conf.finals.dimension.period.value, name: DV.conf.finals.dimension.period.rawvalue },
- { id: DV.conf.finals.dimension.organisationunit.value, name: DV.conf.finals.dimension.organisationunit.rawvalue }
+ {id: DV.conf.finals.dimension.indicator.value, name: DV.conf.finals.dimension.indicator.rawvalue},
+ {id: DV.conf.finals.dimension.dataelement.value, name: DV.conf.finals.dimension.dataelement.rawvalue},
+ {id: DV.conf.finals.dimension.period.value, name: DV.conf.finals.dimension.period.rawvalue},
+ {id: DV.conf.finals.dimension.organisationunit.value, name: DV.conf.finals.dimension.organisationunit.rawvalue}
]
});
},
@@ -253,7 +258,6 @@
fields: ['id', 'name', 'shortName'],
proxy: {
type: 'ajax',
- baseUrl: DV.conf.finals.ajax.url_commons + 'getIndicatorsMinified.action',
url: DV.conf.finals.ajax.url_commons + 'getIndicatorsMinified.action',
reader: {
type: 'json',
@@ -287,7 +291,6 @@
fields: ['id', 'name', 'shortName'],
proxy: {
type: 'ajax',
- baseUrl: DV.conf.finals.ajax.url_commons + 'getDataElementsMinified.action',
url: DV.conf.finals.ajax.url_commons + 'getDataElementsMinified.action',
reader: {
type: 'json',
@@ -319,12 +322,10 @@
chart: null,
getChartStore: function(exe) {
var properties = Ext.Object.getKeys(DV.data.data[0]);
-
this.chart = Ext.create('Ext.data.Store', {
fields: properties,
data: DV.data.data
- });
-
+ });
this.chart.bottom = properties.slice(0, 1);
this.chart.left = properties.slice(1, properties.length);
@@ -337,42 +338,48 @@
}
};
- DV.state = {
+ DV.state = {
+ type: DV.conf.finals.chart.column,
indiment: [],
period: [],
organisationunit: [],
series: {
+ cmp: null,
dimension: DV.conf.finals.dimension.indicator.value,
data: []
},
category: {
+ cmp: null,
dimension: DV.conf.finals.dimension.period.value,
data: []
},
filter: {
+ cmp: null,
dimension: DV.conf.finals.dimension.organisationunit.value,
data: []
},
getState: function(exe) {
this.resetState();
- var indicator = DV.conf.finals.dimension.indicator.value,
- indiment = (this.series.dimension === indicator || this.category.dimension === indicator || this.filter.dimension === indicator) ?
- DV.conf.finals.dimension.indicator.value : DV.conf.finals.dimension.dataelement.value,
- period = DV.conf.finals.dimension.period.value,
- organisationunit = DV.conf.finals.dimension.organisationunit.value;
-
- this.indiment = DV.util.dimension[indiment].getNames();
- this.period = DV.util.dimension[period].getNames();
- this.organisationunit = DV.util.dimension[organisationunit].getNames();
+ this.series.dimension = this.series.cmp.getValue();
+ this.category.dimension = this.category.cmp.getValue();
+ this.filter.dimension = this.filter.cmp.getValue();
+
+ var i = this.getIndiment().value,
+ p = DV.conf.finals.dimension.period.value,
+ o = DV.conf.finals.dimension.organisationunit.value;
+
+ this.indiment = DV.util.dimension[i].getNames();
+ this.period = DV.util.dimension[p].getNames();
+ this.organisationunit = DV.util.dimension[o].getNames();
if (!this.indiment.length || !this.period.length || !this.organisationunit.length) {
- alert("form is not complete");
+ alert('form is not complete');
return;
}
- DV.state.indicator = DV.state.indiment;
- DV.state.dataelement = DV.state.indiment;
+ this.indicator = this.indiment;
+ this.dataelement = this.indiment;
this.series.data = this[this.series.dimension];
this.category.data = this[this.category.dimension];
@@ -381,13 +388,25 @@
if (exe) {
DV.data.getValues(true);
}
- },
+ },
+ getIndiment: function() {
+ var i = DV.conf.finals.dimension.indicator.value;
+ return (this.series.dimension === i || this.category.dimension === i || this.filter.dimension === i) ?
+ DV.conf.finals.dimension.indicator : DV.conf.finals.dimension.dataelement;
+ },
+ isIndicator: function() {
+ var i = DV.conf.finals.dimension.indicator.value;
+ return (this.series.dimension === i || this.category.dimension === i || this.filter.dimension === i);
+ },
resetState: function() {
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;
}
};
@@ -401,14 +420,14 @@
series = DV.state.series.dimension,
category = DV.state.category.dimension,
filter = DV.state.filter.dimension,
- indiment = (series === indicator || category === indicator || filter === indicator) ? indicator : dataelement,
- url = (series === indicator || category === indicator || filter === indicator) ? 'Indicator' : 'Data';
-
+ indiment = DV.state.getIndiment().value,
+ url = DV.state.isIndicator() ? DV.conf.finals.ajax.url_indicator : DV.conf.finals.ajax.url_dataelement;
+
params = params.concat(DV.util.dimension[series].getUrl());
params = params.concat(DV.util.dimension[category].getUrl());
params = params.concat(DV.util.dimension[filter].getUrl(true));
- var baseUrl = DV.conf.finals.ajax.url_visualizer + 'getAggregated' + url + 'Values.action';
+ var baseUrl = DV.conf.finals.ajax.url_visualizer + url + '.action';
for (var i = 0; i < params.length; i++) {
baseUrl = Ext.String.urlAppend(baseUrl, params[i]);
}
@@ -417,6 +436,12 @@
url: baseUrl,
success: function(r) {
DV.data.values = Ext.JSON.decode(r.responseText).values;
+
+ if (!DV.data.values.length) {
+ alert('no data values');
+ return;
+ }
+
Ext.Array.each(DV.data.values, function(item) {
item[indiment] = DV.store[indiment].available.storage[item.i].name;
item[DV.conf.finals.dimension.period.value] = DV.util.dimension.period.getNameById(item.p);
@@ -441,9 +466,12 @@
});
Ext.Array.each(DV.data.data, function(item) {
- for (var i = 0; i < DV.data.values.length; i++) {
- if (DV.data.values[i][DV.state.category.dimension] === item.x) {
- item[DV.data.values[i][DV.state.series.dimension]] = DV.data.values[i].v;
+ for (var i = 0; i < DV.state.series.data.length; i++) {
+ for (var j = 0; i < DV.data.values.length; j++) {
+ if (DV.data.values[j][DV.state.category.dimension] === item.x && DV.data.values[j][DV.state.series.dimension] === DV.state.series.data[i]) {
+ item[DV.data.values[j][DV.state.series.dimension]] = DV.data.values[j].v;
+ break;
+ }
}
}
});
@@ -458,9 +486,17 @@
};
DV.chart = {
- type: DV.conf.finals.chart.category,
chart: null,
getChart: function(exe) {
+ this[DV.state.type]();
+ if (exe) {
+ this.reload();
+ }
+ else {
+ return this.chart;
+ }
+ },
+ column: function() {
this.chart = Ext.create('Ext.chart.Chart', {
width: DV.util.viewport.getSize().x,
height: DV.util.viewport.getSize().y,
@@ -497,13 +533,6 @@
}
]
});
-
- if (exe) {
- DV.chart.reload();
- }
- else {
- return DV.chart.chart;
- }
},
reload: function() {
var c = DV.util.getCmp('panel[region="center"]');
@@ -544,7 +573,12 @@
{
icon: 'images/column.png',
tooltip: 'Column chart',
- pressed: true
+ pressed: true,
+ listeners: {
+ click: function() {
+ DV.state.type = DV.conf.finals.chart.column;
+ }
+ }
},
{
icon: 'images/column.png',
@@ -629,9 +663,11 @@
fn(f);
},
listeners: {
+ afterrender: function(cb) {
+ DV.state[cb.name].cmp = cb;
+ },
select: function(cb) {
cb.filter(cb, DV.viewport);
- DV.state.series.dimension = cb.getValue();
}
}
}
@@ -694,6 +730,9 @@
}
},
listeners: {
+ afterrender: function(cb) {
+ DV.state[cb.name].cmp = cb;
+ },
select: function(cb) {
cb.filter(cb, DV.viewport);
DV.state.category.dimension = cb.getValue();
@@ -726,6 +765,9 @@
store: DV.store.dimension(),
value: DV.conf.finals.dimension.organisationunit.value,
listeners: {
+ afterrender: function(cb) {
+ DV.state[cb.name].cmp = cb;
+ },
select: function(cb) {
DV.state.filter.dimension = cb.getValue();
}
@@ -1236,7 +1278,7 @@
' ',
{
xtype: 'button',
- text: 'Update',
+ text: 'Update..',
cls: 'x-btn-text-icon',
icon: 'images/refresh.png',
handler: function() {
@@ -1252,6 +1294,8 @@
{
xtype: 'button',
text: 'Exit..',
+ cls: 'x-btn-text-icon',
+ icon: 'images/exit.png',
handler: function() {
window.location.href = DV.conf.finals.ajax.url_portal + 'redirect.action';
}
@@ -1267,7 +1311,7 @@
c.filter(c, vp);
},
resize: function() {
- this.query('panel[region="west"]')[0].setWidth(424);
+ this.query('panel[region="west"]')[0].setWidth(DV.conf.layout.west_width);
}
}
});
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2011-10-04 10:50:29 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2011-10-04 12:31:54 +0000
@@ -21,7 +21,7 @@
/* Combobox field label font */
.x-form-item-label {
font: 11px arial;
- color: #222;
+ color: #111;
}
/* Splitter column */
@@ -104,12 +104,12 @@
border-style: none;
}
-/* Multiselect (custom) transparent row hover */
-.multiselect .x-boundlist-item-over {
+/* Multiselect /*(custom) transparent row hover */
+.dv-multiselect .x-boundlist-item-over {
background-color: transparent;
border-color: #fff;
}
-.multiselect .x-boundlist-selected {
+.dv-multiselect .x-boundlist-selected {
background-color: #d3d3d3;
border-color: #b3abaa;
}
@@ -167,7 +167,7 @@
***************/
body {
- font: normal 11px arial;
+ font: normal 11px arial,ubuntu;
}
li {
@@ -221,3 +221,7 @@
color:#000;
text-decoration:none;
}
+
+.dv-multiselect {
+ color: #111;
+}
=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/exit.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/exit.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/exit.png 2011-10-04 12:23:55 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/lib/ext-ux/layout/component/form/MultiSelect.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/lib/ext-ux/layout/component/form/MultiSelect.js 2011-09-30 15:07:44 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/lib/ext-ux/layout/component/form/MultiSelect.js 2011-10-04 14:44:09 +0000
@@ -1,42 +1,1 @@
-/*
-
-This file is part of Ext JS 4
-
-Copyright (c) 2011 Sencha Inc
-
-Contact: http://www.sencha.com/contact
-
-GNU General Public License Usage
-This file may be used under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation and appearing in the file LICENSE included in the packaging of this file. Please review the following information to ensure the GNU General Public License version 3.0 requirements will be met: http://www.gnu.org/copyleft/gpl.html.
-
-If you are unsure which license is appropriate for your use, please contact the sales department at http://www.sencha.com/contact.
-
-*/
-/**
- * @private
- * @class Ext.ux.layout.component.form.MultiSelect
- * @extends Ext.layout.component.field.Field
- * Layout class for {@link Ext.ux.form.MultiSelect} fields.
- * @private
- */
-Ext.define('Ext.ux.layout.component.form.MultiSelect', {
- extend: 'Ext.layout.component.field.Field',
- alias: ['layout.multiselectfield'],
-
- type: 'multiselectfield',
-
- /**
- * @cfg {Number} height The height of the field. Defaults to 200.
- */
- defaultHeight: 200,
-
- sizeBodyContents: function(width, height) {
- var me = this;
-
- if (!Ext.isNumber(height)) {
- height = me.defaultHeight;
- }
-
- me.owner.panel.setSize(width, height);
- }
-});
+Ext.define("Ext.ux.layout.component.form.MultiSelect",{extend:"Ext.layout.component.field.Field",alias:["layout.multiselectfield"],type:"multiselectfield",defaultHeight:200,sizeBodyContents:function(a,b){var c=this;if(!Ext.isNumber(b)){b=c.defaultHeight}c.owner.panel.setSize(a,b)}});
