dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #36858
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18843: PT DV 'this' relative periods.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 18843 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-04-09 11:30:20 +0200
message:
PT DV 'this' relative periods.
modified:
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-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
--
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-pivot/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties 2015-03-09 13:00:44 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties 2015-04-09 09:18:34 +0000
@@ -176,3 +176,8 @@
user_sub_units=User sub-units
user_sub_x2_units=User sub-x2-units
metadata_id_scheme=Meta-data ID scheme
+this_week=This week
+this_quarter=This quarter
+this_month=This month
+this_sixmonth=This six-month
+this_bimonth=This bi-month
=== 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-04-08 13:50:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-04-09 09:18:34 +0000
@@ -4026,6 +4026,11 @@
},
{
xtype: 'checkbox',
+ relativePeriodId: 'THIS_WEEK',
+ boxLabel: NS.i18n.this_week
+ },
+ {
+ xtype: 'checkbox',
relativePeriodId: 'LAST_WEEK',
boxLabel: NS.i18n.last_week
},
@@ -4059,6 +4064,11 @@
},
{
xtype: 'checkbox',
+ relativePeriodId: 'THIS_QUARTER',
+ boxLabel: NS.i18n.this_quarter
+ },
+ {
+ xtype: 'checkbox',
relativePeriodId: 'LAST_QUARTER',
boxLabel: NS.i18n.last_quarter
},
@@ -4117,6 +4127,11 @@
},
{
xtype: 'checkbox',
+ relativePeriodId: 'THIS_MONTH',
+ boxLabel: NS.i18n.this_month
+ },
+ {
+ xtype: 'checkbox',
relativePeriodId: 'LAST_MONTH',
boxLabel: NS.i18n.last_month
},
@@ -4150,6 +4165,11 @@
},
{
xtype: 'checkbox',
+ relativePeriodId: 'THIS_SIX_MONTH',
+ boxLabel: NS.i18n.this_sixmonth
+ },
+ {
+ xtype: 'checkbox',
relativePeriodId: 'LAST_SIX_MONTH',
boxLabel: NS.i18n.last_sixmonth
},
@@ -4181,6 +4201,11 @@
},
{
xtype: 'checkbox',
+ relativePeriodId: 'THIS_BIMONTH',
+ boxLabel: NS.i18n.this_bimonth
+ },
+ {
+ xtype: 'checkbox',
relativePeriodId: 'LAST_BIMONTH',
boxLabel: NS.i18n.last_bimonth
},
=== 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-04-08 15:38:28 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js 2015-04-09 09:18:34 +0000
@@ -132,7 +132,8 @@
{id: 'FinancialOct', name: NS.i18n.financial_oct},
{id: 'FinancialJuly', name: NS.i18n.financial_july},
{id: 'FinancialApril', name: NS.i18n.financial_april}
- ]
+ ],
+ relativePeriods: []
};
conf.layout = {
@@ -143,7 +144,7 @@
west_fill_accordion_indicator: 56,
west_fill_accordion_dataelement: 59,
west_fill_accordion_dataset: 31,
- west_fill_accordion_period: 275,
+ west_fill_accordion_period: 303,
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-visualizer/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties 2015-03-31 13:02:15 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties 2015-04-09 09:29:10 +0000
@@ -258,3 +258,8 @@
variance=Variance
min=Min
max=Max
+this_week=This week
+this_quarter=This quarter
+this_month=This month
+this_sixmonth=This six-month
+this_bimonth=This bi-month
=== 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-04-08 13:50:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-04-09 09:25:36 +0000
@@ -4206,6 +4206,11 @@
},
{
xtype: 'checkbox',
+ relativePeriodId: 'THIS_WEEK',
+ boxLabel: NS.i18n.this_week
+ },
+ {
+ xtype: 'checkbox',
relativePeriodId: 'LAST_WEEK',
boxLabel: NS.i18n.last_week
},
@@ -4239,6 +4244,11 @@
},
{
xtype: 'checkbox',
+ relativePeriodId: 'THIS_QUARTER',
+ boxLabel: NS.i18n.this_quarter
+ },
+ {
+ xtype: 'checkbox',
relativePeriodId: 'LAST_QUARTER',
boxLabel: NS.i18n.last_quarter
},
@@ -4297,6 +4307,11 @@
},
{
xtype: 'checkbox',
+ relativePeriodId: 'THIS_MONTH',
+ boxLabel: NS.i18n.this_month
+ },
+ {
+ xtype: 'checkbox',
relativePeriodId: 'LAST_MONTH',
boxLabel: NS.i18n.last_month
},
@@ -4330,6 +4345,11 @@
},
{
xtype: 'checkbox',
+ relativePeriodId: 'THIS_SIX_MONTH',
+ boxLabel: NS.i18n.this_sixmonth
+ },
+ {
+ xtype: 'checkbox',
relativePeriodId: 'LAST_SIX_MONTH',
boxLabel: NS.i18n.last_sixmonth
},
@@ -4361,6 +4381,11 @@
},
{
xtype: 'checkbox',
+ relativePeriodId: 'THIS_BIMONTH',
+ boxLabel: NS.i18n.this_bimonth
+ },
+ {
+ xtype: 'checkbox',
relativePeriodId: 'LAST_BIMONTH',
boxLabel: NS.i18n.last_bimonth
},
=== 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-04-07 19:53:23 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2015-04-09 09:29:10 +0000
@@ -673,7 +673,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: 303,
west_fill_accordion_organisationunit: 58,
west_maxheight_accordion_indicator: 350,
west_maxheight_accordion_dataelement: 350,
