dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #29243
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14741: ER, added line breaking logic for rows.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 14741 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-04-08 15:20:23 +0200
message:
ER, added line breaking logic for rows.
modified:
dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js
dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.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-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-04-08 11:38:43 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-04-08 13:17:49 +0000
@@ -41,16 +41,18 @@
// data items
(function() {
var operatorCmpWidth = 70,
- valueCmpWidth = 304,
+ valueCmpWidth = 306,
buttonCmpWidth = 20,
nameCmpWidth = 400,
- namePadding = '2px 5px';
+ namePadding = '2px 3px',
+ margin = '3px 0 1px';
Ext.define('Ext.ux.panel.DataElementIntegerContainer', {
extend: 'Ext.container.Container',
alias: 'widget.dataelementintegerpanel',
layout: 'column',
bodyStyle: 'border:0 none',
+ style: 'margin: ' + margin,
getRecord: function() {
return {
dimension: this.dataElement.id,
@@ -78,6 +80,7 @@
queryMode: 'local',
editable: false,
width: operatorCmpWidth,
+ style: 'margin-bottom:0',
value: 'EQ',
store: {
fields: ['id', 'name'],
@@ -93,7 +96,8 @@
});
this.valueCmp = Ext.create('Ext.form.field.Number', {
- width: valueCmpWidth
+ width: valueCmpWidth,
+ style: 'margin-bottom:0'
});
this.addCmp = Ext.create('Ext.button.Button', {
@@ -129,6 +133,7 @@
alias: 'widget.dataelementstringpanel',
layout: 'column',
bodyStyle: 'border:0 none',
+ style: 'margin: ' + margin,
getRecord: function() {
return {
dimension: this.dataElement.id,
@@ -156,6 +161,7 @@
queryMode: 'local',
editable: false,
width: operatorCmpWidth,
+ style: 'margin-bottom:0',
value: 'LIKE',
store: {
fields: ['id', 'name'],
@@ -167,7 +173,8 @@
});
this.valueCmp = Ext.create('Ext.form.field.Text', {
- width: valueCmpWidth
+ width: valueCmpWidth,
+ style: 'margin-bottom:0'
});
this.addCmp = Ext.create('Ext.button.Button', {
@@ -203,6 +210,7 @@
alias: 'widget.dataelementdatepanel',
layout: 'column',
bodyStyle: 'border:0 none',
+ style: 'margin: ' + margin,
getRecord: function() {
return {
dimension: this.dataElement.id,
@@ -230,6 +238,7 @@
queryMode: 'local',
editable: false,
width: operatorCmpWidth,
+ style: 'margin-bottom:0',
value: 'EQ',
store: {
fields: ['id', 'name'],
@@ -246,6 +255,7 @@
this.valueCmp = Ext.create('Ext.form.field.Date', {
width: valueCmpWidth,
+ style: 'margin-bottom:0',
format: 'Y-m-d'
});
@@ -282,6 +292,7 @@
alias: 'widget.dataelementbooleanpanel',
layout: 'column',
bodyStyle: 'border:0 none',
+ style: 'margin: ' + margin,
getRecord: function() {
return {
dimension: this.dataElement.id,
@@ -308,6 +319,7 @@
queryMode: 'local',
editable: false,
width: operatorCmpWidth + valueCmpWidth,
+ style: 'margin-bottom:0',
value: 'false',
store: {
fields: ['id', 'name'],
@@ -350,6 +362,7 @@
alias: 'widget.dataelementoptionpanel',
layout: 'column',
bodyStyle: 'border:0 none',
+ style: 'margin: ' + margin,
getRecord: function() {
var valueArray = this.valueCmp.getValue().split(';');
@@ -382,6 +395,7 @@
displayField: 'name',
queryMode: 'local',
editable: false,
+ style: 'margin-bottom:0',
width: operatorCmpWidth,
value: 'IN',
store: {
@@ -436,6 +450,7 @@
this.searchCmp = Ext.create('Ext.form.field.ComboBox', {
width: 62,
+ style: 'margin-bottom:0',
emptyText: 'Search..',
valueField: 'id',
displayField: 'name',
@@ -515,6 +530,7 @@
this.valueCmp = Ext.create('Ext.form.field.Text', {
width: 224,
+ style: 'margin-bottom:0',
addOptionValue: function(option) {
var value = this.getValue();
@@ -3128,13 +3144,14 @@
dataElementSelected = Ext.create('Ext.panel.Panel', {
width: accBaseWidth,
- height: 240,
- bodyStyle: 'padding:2px 0 5px 3px; overflow-y: scroll',
+ height: 242,
+ bodyStyle: 'padding-left:1px',
+ autoScroll: true,
tbar: [
{
xtype: 'label',
text: 'Selected data items',
- style: 'padding-left:6px; color:#222',
+ style: 'padding-left:6px; color:#333',
cls: 'ns-toolbar-multiselect-left-label'
},
'->',
=== modified file 'dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js 2014-04-07 17:22:34 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js 2014-04-08 13:19:05 +0000
@@ -2083,22 +2083,43 @@
// dimension
if (xRowAxis) {
+ var aLineBreak = new Array(xRowAxis.dims);
+
for (var i = 0, row; i < xRowAxis.size; i++) {
row = [];
for (var j = 0, obj, newObj; j < xRowAxis.dims; j++) {
obj = xRowAxis.objects.all[j][i];
obj.type = 'dimension';
- obj.cls = 'pivot-dim td-nobreak' + (service.layout.isHierarchy(xLayout, xResponse, obj.id) ? ' align-left' : '');
+ obj.cls = 'pivot-dim ' + (service.layout.isHierarchy(xLayout, xResponse, obj.id) ? ' align-left' : '');
obj.noBreak = true;
obj.hidden = !(obj.rowSpan || obj.colSpan);
obj.htmlValue = service.layout.getItemName(xLayout, xResponse, obj.id, true);
row.push(obj);
+
+ // allow line break for this dim?
+ if (obj.htmlValue.length > 50) {
+ aLineBreak[j] = true;
+ }
}
axisAllObjects.push(row);
}
+
+ // add nowrap line break cls
+ for (var i = 0, dim; i < aLineBreak.length; i++) {
+ dim = aLineBreak[i];
+
+ if (!dim) {
+ for (var j = 0, obj; j < xRowAxis.size; j++) {
+ obj = axisAllObjects[j][i];
+
+ obj.cls += ' td-nobreak';
+ obj.noBreak = true;
+ }
+ }
+ }
}
//axisAllObjects = [ [ dim, dim ]
// [ dim, dim ]
