dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #35952
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18410: Analysis, added rel period: this financial year.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 18410 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-02-25 15:56:26 +0100
message:
Analysis, added rel period: this financial year.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/styles/style.css
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css
--
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-event-reports/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties 2015-02-19 17:03:12 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties 2015-02-25 14:51:26 +0000
@@ -187,3 +187,4 @@
min=Min
max=Max
number_of_events=Number of events
+this_financial_year=This financial year
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-02-24 15:35:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-02-25 14:51:26 +0000
@@ -4589,8 +4589,6 @@
};
weeks = Ext.create('Ext.container.Container', {
- columnWidth: 0.34,
- bodyStyle: 'border-style:none; padding:0 0 0 8px',
defaults: {
labelSeparator: '',
style: 'margin-bottom:0',
@@ -4626,8 +4624,6 @@
});
months = Ext.create('Ext.container.Container', {
- columnWidth: 0.33,
- bodyStyle: 'border-style:none',
defaults: {
labelSeparator: '',
style: 'margin-bottom:0',
@@ -4664,8 +4660,6 @@
});
biMonths = Ext.create('Ext.container.Container', {
- columnWidth: 0.33,
- bodyStyle: 'border-style:none',
defaults: {
labelSeparator: '',
style: 'margin-bottom:0',
@@ -4691,8 +4685,6 @@
});
quarters = Ext.create('Ext.container.Container', {
- columnWidth: 0.34,
- bodyStyle: 'border-style:none; padding:5px 0 0 8px',
defaults: {
labelSeparator: '',
style: 'margin-bottom:0',
@@ -4718,8 +4710,6 @@
});
sixMonths = Ext.create('Ext.container.Container', {
- columnWidth: 0.33,
- bodyStyle: 'border-style:none; padding:5px 0 0',
defaults: {
labelSeparator: '',
style: 'margin-bottom:0',
@@ -4745,8 +4735,7 @@
});
financialYears = Ext.create('Ext.container.Container', {
- columnWidth: 0.33,
- bodyStyle: 'border-style:none; padding:5px 0 0',
+ style: 'margin-top: 36px',
defaults: {
labelSeparator: '',
style: 'margin-bottom:0',
@@ -4760,6 +4749,11 @@
},
{
xtype: 'checkbox',
+ relativePeriodId: 'THIS_FINANCIAL_YEAR',
+ boxLabel: NS.i18n.this_financial_year
+ },
+ {
+ xtype: 'checkbox',
relativePeriodId: 'LAST_FINANCIAL_YEAR',
boxLabel: NS.i18n.last_financial_year
},
@@ -4772,8 +4766,6 @@
});
years = Ext.create('Ext.container.Container', {
- columnWidth: 0.35,
- bodyStyle: 'border-style:none; padding:5px 0 0 8px',
defaults: {
labelSeparator: '',
style: 'margin-bottom:0',
@@ -4804,36 +4796,45 @@
});
relativePeriod = Ext.create('Ext.container.Container', {
+ layout: 'column',
hideCollapseTool: true,
autoScroll: true,
- style: 'border:0 none; padding:2px 0 0 7px',
+ style: 'border:0 none',
items: [
{
xtype: 'container',
- layout: 'column',
+ columnWidth: 0.34,
+ style: 'margin-left: 8px',
+ defaults: {
+ style: 'margin-top: 4px'
+ },
items: [
weeks,
+ quarters,
+ years
+ ]
+ },
+ {
+ xtype: 'container',
+ columnWidth: 0.33,
+ defaults: {
+ style: 'margin-top: 4px'
+ },
+ items: [
months,
- biMonths
+ sixMonths
]
},
{
xtype: 'container',
- layout: 'column',
- style: 'padding-top:4px',
+ columnWidth: 0.33,
+ defaults: {
+ style: 'margin-top: 4px'
+ },
items: [
- quarters,
- sixMonths,
+ biMonths,
financialYears
]
- },
- {
- xtype: 'container',
- layout: 'column',
- style: 'padding-top:4px',
- items: [
- years
- ]
}
],
getRecords: function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-02-24 15:35:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-02-25 14:51:26 +0000
@@ -137,7 +137,7 @@
west_fill_accordion_indicator: 56,
west_fill_accordion_dataelement: 59,
west_fill_accordion_dataset: 31,
- west_fill_accordion_period: 307,
+ west_fill_accordion_period: 300,
west_fill_accordion_organisationunit: 58,
west_maxheight_accordion_indicator: 450,
west_maxheight_accordion_dataset: 350,
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css 2015-02-24 12:14:13 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css 2015-02-25 14:51:26 +0000
@@ -594,6 +594,10 @@
background-image: url('../images/checkbox.gif');
}
+.x-form-cb-wrap {
+ padding-top: 2px;
+}
+
/*----------------------------------------------------------------------------
* PT Checkbox
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties 2015-02-19 17:03:12 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties 2015-02-25 14:51:26 +0000
@@ -212,4 +212,4 @@
min=Min
max=Max
number_of_events=Number of events
-
+this_financial_year=This financial year
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2015-02-19 17:03:12 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2015-02-25 14:51:26 +0000
@@ -3997,8 +3997,6 @@
};
weeks = Ext.create('Ext.container.Container', {
- columnWidth: 0.34,
- bodyStyle: 'border-style:none; padding:0 0 0 8px',
defaults: {
labelSeparator: '',
style: 'margin-bottom:0',
@@ -4034,8 +4032,6 @@
});
months = Ext.create('Ext.container.Container', {
- columnWidth: 0.33,
- bodyStyle: 'border-style:none',
defaults: {
labelSeparator: '',
style: 'margin-bottom:0',
@@ -4072,8 +4068,6 @@
});
biMonths = Ext.create('Ext.container.Container', {
- columnWidth: 0.33,
- bodyStyle: 'border-style:none',
defaults: {
labelSeparator: '',
style: 'margin-bottom:0',
@@ -4099,8 +4093,6 @@
});
quarters = Ext.create('Ext.container.Container', {
- columnWidth: 0.34,
- bodyStyle: 'border-style:none; padding:5px 0 0 8px',
defaults: {
labelSeparator: '',
style: 'margin-bottom:0',
@@ -4126,8 +4118,6 @@
});
sixMonths = Ext.create('Ext.container.Container', {
- columnWidth: 0.33,
- bodyStyle: 'border-style:none; padding:5px 0 0',
defaults: {
labelSeparator: '',
style: 'margin-bottom:0',
@@ -4153,8 +4143,7 @@
});
financialYears = Ext.create('Ext.container.Container', {
- columnWidth: 0.33,
- bodyStyle: 'border-style:none; padding:5px 0 0',
+ style: 'margin-top: 36px',
defaults: {
labelSeparator: '',
style: 'margin-bottom:0',
@@ -4168,6 +4157,11 @@
},
{
xtype: 'checkbox',
+ relativePeriodId: 'THIS_FINANCIAL_YEAR',
+ boxLabel: NS.i18n.this_financial_year
+ },
+ {
+ xtype: 'checkbox',
relativePeriodId: 'LAST_FINANCIAL_YEAR',
boxLabel: NS.i18n.last_financial_year
},
@@ -4180,8 +4174,6 @@
});
years = Ext.create('Ext.container.Container', {
- columnWidth: 0.35,
- bodyStyle: 'border-style:none; padding:5px 0 0 8px',
defaults: {
labelSeparator: '',
style: 'margin-bottom:0',
@@ -4212,36 +4204,45 @@
});
relativePeriod = Ext.create('Ext.container.Container', {
+ layout: 'column',
hideCollapseTool: true,
autoScroll: true,
- style: 'border:0 none; padding:2px 0 0 7px',
+ style: 'border:0 none',
items: [
{
xtype: 'container',
- layout: 'column',
+ columnWidth: 0.34,
+ style: 'margin-left: 8px',
+ defaults: {
+ style: 'margin-top: 4px'
+ },
items: [
weeks,
+ quarters,
+ years
+ ]
+ },
+ {
+ xtype: 'container',
+ columnWidth: 0.33,
+ defaults: {
+ style: 'margin-top: 4px'
+ },
+ items: [
months,
- biMonths
+ sixMonths
]
},
{
xtype: 'container',
- layout: 'column',
- style: 'padding-top:4px',
+ columnWidth: 0.33,
+ defaults: {
+ style: 'margin-top: 4px'
+ },
items: [
- quarters,
- sixMonths,
+ biMonths,
financialYears
]
- },
- {
- xtype: 'container',
- layout: 'column',
- style: 'padding-top:4px',
- items: [
- years
- ]
}
],
getRecords: function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2015-02-24 15:35:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2015-02-25 14:51:26 +0000
@@ -171,7 +171,7 @@
west_fill_accordion_indicator: 56,
west_fill_accordion_dataelement: 59,
west_fill_accordion_dataset: 31,
- west_fill_accordion_period: 307,
+ west_fill_accordion_period: 300,
west_fill_accordion_organisationunit: 58,
west_maxheight_accordion_indicator: 450,
west_maxheight_accordion_dataset: 350,
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/styles/style.css 2015-02-24 12:15:47 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/styles/style.css 2015-02-25 14:51:26 +0000
@@ -561,6 +561,10 @@
background-image: url('../images/checkbox.gif');
}
+.x-form-cb-wrap {
+ padding-top: 2px;
+}
+
/*----------------------------------------------------------------------------
* PT Checkbox
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties 2015-02-09 17:34:51 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties 2015-02-25 14:51:26 +0000
@@ -420,3 +420,4 @@
manage_favorites=Manage favorites
yes=Yes
no=No
+this_financial_year=This financial year
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2015-02-24 16:06:51 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2015-02-25 14:51:26 +0000
@@ -2742,6 +2742,7 @@
{id: 'LAST_BIMONTH', name: GIS.i18n.last_bimonth},
{id: 'LAST_QUARTER', name: GIS.i18n.last_quarter},
{id: 'LAST_SIX_MONTH', name: GIS.i18n.last_sixmonth},
+ {id: 'THIS_FINANCIAL_YEAR', name: GIS.i18n.this_financial_year},
{id: 'LAST_FINANCIAL_YEAR', name: GIS.i18n.last_financial_year},
{id: 'THIS_YEAR', name: GIS.i18n.this_year},
{id: 'LAST_YEAR', name: GIS.i18n.last_year}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties 2014-11-17 15:42:17 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties 2015-02-25 14:23:23 +0000
@@ -174,3 +174,4 @@
created_by=Created by
initializing=Initializing
clear_pivot_table=Clear pivot table
+this_financial_year=This financial year
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-02-24 15:35:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-02-25 14:23:23 +0000
@@ -2495,7 +2495,7 @@
var xLayout,
paramString,
onFailure;
-
+
if (!layout) {
return;
}
@@ -4001,6 +4001,7 @@
relativePeriod = {
xtype: 'panel',
+ layout: 'column',
hideCollapseTool: true,
autoScroll: true,
bodyStyle: 'border:0 none',
@@ -4008,12 +4009,12 @@
items: [
{
xtype: 'container',
- layout: 'column',
+ columnWidth: 0.34,
bodyStyle: 'border-style:none',
items: [
{
xtype: 'panel',
- columnWidth: 0.34,
+ //columnWidth: 0.34,
bodyStyle: 'border-style:none; padding:0 0 0 8px',
defaults: relativePeriodDefaults,
items: [
@@ -4046,7 +4047,65 @@
},
{
xtype: 'panel',
- columnWidth: 0.33,
+ //columnWidth: 0.34,
+ bodyStyle: 'border-style:none; padding:5px 0 0 8px',
+ defaults: relativePeriodDefaults,
+ items: [
+ {
+ xtype: 'label',
+ text: NS.i18n.quarters,
+ cls: 'ns-label-period-heading'
+ },
+ {
+ xtype: 'checkbox',
+ relativePeriodId: 'LAST_QUARTER',
+ boxLabel: NS.i18n.last_quarter
+ },
+ {
+ xtype: 'checkbox',
+ relativePeriodId: 'LAST_4_QUARTERS',
+ boxLabel: NS.i18n.last_4_quarters
+ }
+ ]
+ },
+ {
+ xtype: 'panel',
+ //columnWidth: 0.35,
+ bodyStyle: 'border-style:none; padding:5px 0 0 8px',
+ defaults: relativePeriodDefaults,
+ items: [
+ {
+ xtype: 'label',
+ text: NS.i18n.years,
+ cls: 'ns-label-period-heading'
+ },
+ {
+ xtype: 'checkbox',
+ relativePeriodId: 'THIS_YEAR',
+ boxLabel: NS.i18n.this_year
+ },
+ {
+ xtype: 'checkbox',
+ relativePeriodId: 'LAST_YEAR',
+ boxLabel: NS.i18n.last_year
+ },
+ {
+ xtype: 'checkbox',
+ relativePeriodId: 'LAST_5_YEARS',
+ boxLabel: NS.i18n.last_5_years
+ }
+ ]
+ }
+ ]
+ },
+ {
+ xtype: 'container',
+ columnWidth: 0.33,
+ bodyStyle: 'border-style:none',
+ items: [
+ {
+ xtype: 'panel',
+ //columnWidth: 0.33,
bodyStyle: 'border-style:none',
defaults: relativePeriodDefaults,
items: [
@@ -4079,8 +4138,39 @@
},
{
xtype: 'panel',
- columnWidth: 0.33,
+ //columnWidth: 0.33,
+ bodyStyle: 'border-style:none; padding:5px 0 0',
+ defaults: relativePeriodDefaults,
+ items: [
+ {
+ xtype: 'label',
+ text: NS.i18n.sixmonths,
+ cls: 'ns-label-period-heading'
+ },
+ {
+ xtype: 'checkbox',
+ relativePeriodId: 'LAST_SIX_MONTH',
+ boxLabel: NS.i18n.last_sixmonth
+ },
+ {
+ xtype: 'checkbox',
+ relativePeriodId: 'LAST_2_SIXMONTHS',
+ boxLabel: NS.i18n.last_2_sixmonths
+ }
+ ]
+ }
+ ]
+ },
+ {
+ xtype: 'container',
+ columnWidth: 0.33,
+ bodyStyle: 'border-style:none',
+ items: [
+ {
+ xtype: 'panel',
+ //columnWidth: 0.33,
bodyStyle: 'border-style:none',
+ style: 'margin-bottom: 32px',
defaults: relativePeriodDefaults,
items: [
{
@@ -4099,63 +4189,10 @@
boxLabel: NS.i18n.last_6_bimonths
}
]
- }
- ]
- },
- {
- xtype: 'container',
- layout: 'column',
- bodyStyle: 'border-style:none',
- items: [
- {
- xtype: 'panel',
- columnWidth: 0.34,
- bodyStyle: 'border-style:none; padding:5px 0 0 8px',
- defaults: relativePeriodDefaults,
- items: [
- {
- xtype: 'label',
- text: NS.i18n.quarters,
- cls: 'ns-label-period-heading'
- },
- {
- xtype: 'checkbox',
- relativePeriodId: 'LAST_QUARTER',
- boxLabel: NS.i18n.last_quarter
- },
- {
- xtype: 'checkbox',
- relativePeriodId: 'LAST_4_QUARTERS',
- boxLabel: NS.i18n.last_4_quarters
- }
- ]
- },
- {
- xtype: 'panel',
- columnWidth: 0.33,
- bodyStyle: 'border-style:none; padding:5px 0 0',
- defaults: relativePeriodDefaults,
- items: [
- {
- xtype: 'label',
- text: NS.i18n.sixmonths,
- cls: 'ns-label-period-heading'
- },
- {
- xtype: 'checkbox',
- relativePeriodId: 'LAST_SIX_MONTH',
- boxLabel: NS.i18n.last_sixmonth
- },
- {
- xtype: 'checkbox',
- relativePeriodId: 'LAST_2_SIXMONTHS',
- boxLabel: NS.i18n.last_2_sixmonths
- }
- ]
- },
- {
- xtype: 'panel',
- columnWidth: 0.33,
+ },
+ {
+ xtype: 'panel',
+ //columnWidth: 0.33,
bodyStyle: 'border-style:none; padding:5px 0 0',
defaults: relativePeriodDefaults,
items: [
@@ -4166,6 +4203,11 @@
},
{
xtype: 'checkbox',
+ relativePeriodId: 'THIS_FINANCIAL_YEAR',
+ boxLabel: NS.i18n.this_financial_year
+ },
+ {
+ xtype: 'checkbox',
relativePeriodId: 'LAST_FINANCIAL_YEAR',
boxLabel: NS.i18n.last_financial_year
},
@@ -4177,41 +4219,6 @@
]
}
]
- },
- {
- xtype: 'container',
- layout: 'column',
- bodyStyle: 'border-style:none',
- items: [
- {
- xtype: 'panel',
- columnWidth: 0.35,
- bodyStyle: 'border-style:none; padding:5px 0 0 8px',
- defaults: relativePeriodDefaults,
- items: [
- {
- xtype: 'label',
- text: NS.i18n.years,
- cls: 'ns-label-period-heading'
- },
- {
- xtype: 'checkbox',
- relativePeriodId: 'THIS_YEAR',
- boxLabel: NS.i18n.this_year
- },
- {
- xtype: 'checkbox',
- relativePeriodId: 'LAST_YEAR',
- boxLabel: NS.i18n.last_year
- },
- {
- xtype: 'checkbox',
- relativePeriodId: 'LAST_5_YEARS',
- boxLabel: NS.i18n.last_5_years
- }
- ]
- }
- ]
}
]
};
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js 2015-02-24 15:35:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js 2015-02-25 14:51:26 +0000
@@ -142,7 +142,7 @@
west_fill_accordion_indicator: 56,
west_fill_accordion_dataelement: 59,
west_fill_accordion_dataset: 31,
- west_fill_accordion_period: 284,
+ west_fill_accordion_period: 275,
west_fill_accordion_organisationunit: 58,
west_maxheight_accordion_indicator: 400,
west_maxheight_accordion_dataelement: 400,
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css 2014-11-19 16:30:33 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css 2015-02-25 14:23:23 +0000
@@ -494,6 +494,10 @@
background-image: url('../images/checkbox.gif');
}
+.x-form-cb-wrap {
+ padding-top: 2px;
+}
+
/*----------------------------------------------------------------------------
* PT Checkbox
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties 2015-02-11 17:02:00 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties 2015-02-25 14:51:26 +0000
@@ -247,3 +247,4 @@
created_by=Created by
initializing=Initializing
clear_chart=Clear chart
+this_financial_year=This financial year
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-02-24 16:10:40 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-02-25 14:51:26 +0000
@@ -4152,6 +4152,7 @@
relativePeriod = {
xtype: 'panel',
+ layout: 'column',
hideCollapseTool: true,
autoScroll: true,
bodyStyle: 'border:0 none',
@@ -4159,12 +4160,12 @@
items: [
{
xtype: 'container',
- layout: 'column',
+ columnWidth: 0.34,
bodyStyle: 'border-style:none',
items: [
{
xtype: 'panel',
- columnWidth: 0.34,
+ //columnWidth: 0.34,
bodyStyle: 'border-style:none; padding:0 0 0 8px',
defaults: relativePeriodDefaults,
items: [
@@ -4197,7 +4198,65 @@
},
{
xtype: 'panel',
- columnWidth: 0.33,
+ //columnWidth: 0.34,
+ bodyStyle: 'border-style:none; padding:5px 0 0 8px',
+ defaults: relativePeriodDefaults,
+ items: [
+ {
+ xtype: 'label',
+ text: NS.i18n.quarters,
+ cls: 'ns-label-period-heading'
+ },
+ {
+ xtype: 'checkbox',
+ relativePeriodId: 'LAST_QUARTER',
+ boxLabel: NS.i18n.last_quarter
+ },
+ {
+ xtype: 'checkbox',
+ relativePeriodId: 'LAST_4_QUARTERS',
+ boxLabel: NS.i18n.last_4_quarters
+ }
+ ]
+ },
+ {
+ xtype: 'panel',
+ //columnWidth: 0.35,
+ bodyStyle: 'border-style:none; padding:5px 0 0 8px',
+ defaults: relativePeriodDefaults,
+ items: [
+ {
+ xtype: 'label',
+ text: NS.i18n.years,
+ cls: 'ns-label-period-heading'
+ },
+ {
+ xtype: 'checkbox',
+ relativePeriodId: 'THIS_YEAR',
+ boxLabel: NS.i18n.this_year
+ },
+ {
+ xtype: 'checkbox',
+ relativePeriodId: 'LAST_YEAR',
+ boxLabel: NS.i18n.last_year
+ },
+ {
+ xtype: 'checkbox',
+ relativePeriodId: 'LAST_5_YEARS',
+ boxLabel: NS.i18n.last_5_years
+ }
+ ]
+ }
+ ]
+ },
+ {
+ xtype: 'container',
+ columnWidth: 0.33,
+ bodyStyle: 'border-style:none',
+ items: [
+ {
+ xtype: 'panel',
+ //columnWidth: 0.33,
bodyStyle: 'border-style:none',
defaults: relativePeriodDefaults,
items: [
@@ -4230,8 +4289,39 @@
},
{
xtype: 'panel',
- columnWidth: 0.33,
+ //columnWidth: 0.33,
+ bodyStyle: 'border-style:none; padding:5px 0 0',
+ defaults: relativePeriodDefaults,
+ items: [
+ {
+ xtype: 'label',
+ text: NS.i18n.sixmonths,
+ cls: 'ns-label-period-heading'
+ },
+ {
+ xtype: 'checkbox',
+ relativePeriodId: 'LAST_SIX_MONTH',
+ boxLabel: NS.i18n.last_sixmonth
+ },
+ {
+ xtype: 'checkbox',
+ relativePeriodId: 'LAST_2_SIXMONTHS',
+ boxLabel: NS.i18n.last_2_sixmonths
+ }
+ ]
+ }
+ ]
+ },
+ {
+ xtype: 'container',
+ columnWidth: 0.33,
+ bodyStyle: 'border-style:none',
+ items: [
+ {
+ xtype: 'panel',
+ //columnWidth: 0.33,
bodyStyle: 'border-style:none',
+ style: 'margin-bottom: 32px',
defaults: relativePeriodDefaults,
items: [
{
@@ -4250,63 +4340,10 @@
boxLabel: NS.i18n.last_6_bimonths
}
]
- }
- ]
- },
- {
- xtype: 'container',
- layout: 'column',
- bodyStyle: 'border-style:none',
- items: [
- {
- xtype: 'panel',
- columnWidth: 0.34,
- bodyStyle: 'border-style:none; padding:5px 0 0 8px',
- defaults: relativePeriodDefaults,
- items: [
- {
- xtype: 'label',
- text: NS.i18n.quarters,
- cls: 'ns-label-period-heading'
- },
- {
- xtype: 'checkbox',
- relativePeriodId: 'LAST_QUARTER',
- boxLabel: NS.i18n.last_quarter
- },
- {
- xtype: 'checkbox',
- relativePeriodId: 'LAST_4_QUARTERS',
- boxLabel: NS.i18n.last_4_quarters
- }
- ]
- },
- {
- xtype: 'panel',
- columnWidth: 0.33,
- bodyStyle: 'border-style:none; padding:5px 0 0',
- defaults: relativePeriodDefaults,
- items: [
- {
- xtype: 'label',
- text: NS.i18n.sixmonths,
- cls: 'ns-label-period-heading'
- },
- {
- xtype: 'checkbox',
- relativePeriodId: 'LAST_SIX_MONTH',
- boxLabel: NS.i18n.last_sixmonth
- },
- {
- xtype: 'checkbox',
- relativePeriodId: 'LAST_2_SIXMONTHS',
- boxLabel: NS.i18n.last_2_sixmonths
- }
- ]
- },
- {
- xtype: 'panel',
- columnWidth: 0.33,
+ },
+ {
+ xtype: 'panel',
+ //columnWidth: 0.33,
bodyStyle: 'border-style:none; padding:5px 0 0',
defaults: relativePeriodDefaults,
items: [
@@ -4317,6 +4354,11 @@
},
{
xtype: 'checkbox',
+ relativePeriodId: 'THIS_FINANCIAL_YEAR',
+ boxLabel: NS.i18n.this_financial_year
+ },
+ {
+ xtype: 'checkbox',
relativePeriodId: 'LAST_FINANCIAL_YEAR',
boxLabel: NS.i18n.last_financial_year
},
@@ -4328,41 +4370,6 @@
]
}
]
- },
- {
- xtype: 'container',
- layout: 'column',
- bodyStyle: 'border-style:none',
- items: [
- {
- xtype: 'panel',
- columnWidth: 0.35,
- bodyStyle: 'border-style:none; padding:5px 0 0 8px',
- defaults: relativePeriodDefaults,
- items: [
- {
- xtype: 'label',
- text: NS.i18n.years,
- cls: 'ns-label-period-heading'
- },
- {
- xtype: 'checkbox',
- relativePeriodId: 'THIS_YEAR',
- boxLabel: NS.i18n.this_year
- },
- {
- xtype: 'checkbox',
- relativePeriodId: 'LAST_YEAR',
- boxLabel: NS.i18n.last_year
- },
- {
- xtype: 'checkbox',
- relativePeriodId: 'LAST_5_YEARS',
- boxLabel: NS.i18n.last_5_years
- }
- ]
- }
- ]
}
]
};
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2015-02-24 15:35:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2015-02-25 14:51:26 +0000
@@ -180,7 +180,7 @@
west_fill_accordion_indicator: 56,
west_fill_accordion_dataelement: 59,
west_fill_accordion_dataset: 31,
- west_fill_accordion_period: 284,
+ west_fill_accordion_period: 275,
west_fill_accordion_organisationunit: 58,
west_maxheight_accordion_indicator: 350,
west_maxheight_accordion_dataelement: 350,
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css 2014-12-11 12:30:40 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css 2015-02-25 14:51:26 +0000
@@ -328,6 +328,10 @@
background-image: url('../images/checkbox.gif');
}
+.x-form-cb-wrap {
+ padding-top: 2px;
+}
+
/*----------------------------------------------------------------------------
* DV Checkbox
