dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16221
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-07-23 14:49:57 +0200
message:
  PT, added min and max to aggregation operators in options
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n.json
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/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-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2014-07-23 06:59:30 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2014-07-23 12:49:57 +0000
@@ -480,6 +480,8 @@
 average=Average
 stddev=Standard deviation
 variance=Variance
+min=Min
+max=Max
 text=Text
 string=String
 int=Number

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n.json'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n.json	2014-05-22 13:07:04 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n.json	2014-07-23 12:49:57 +0000
@@ -150,6 +150,8 @@
 "aggregation_type",
 "count",
 "sum",
+"min",
+"max",
 "by_data_element",
 "stddev",
 "variance",

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-07-20 23:17:12 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-07-23 12:49:57 +0000
@@ -487,7 +487,9 @@
 					{id: 'count', text: NS.i18n.count},
 					{id: 'sum', text: NS.i18n.sum},
 					{id: 'stddev', text: NS.i18n.stddev},
-					{id: 'variance', text: NS.i18n.variance}
+					{id: 'variance', text: NS.i18n.variance},
+					{id: 'min', text: NS.i18n.min},
+					{id: 'max', text: NS.i18n.max}
 				]
 			})
 		});

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2014-06-25 14:03:47 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2014-07-23 12:49:57 +0000
@@ -1885,7 +1885,9 @@
                         'count': 'COUNT',
                         'sum': 'SUM',
                         'stddev': 'STDDEV',
-                        'variance': 'VARIANCE'
+                        'variance': 'VARIANCE',
+                        'min': 'MIN',
+                        'max': 'MAX'
                     };
 
 				for (var i = 0, dimName, items; i < axisDimensionNames.length; i++) {

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.js	2014-06-20 14:24:06 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.js	2014-07-23 12:49:57 +0000
@@ -1802,7 +1802,9 @@
                         'count': 'COUNT',
                         'sum': 'SUM',
                         'stddev': 'STDDEV',
-                        'variance': 'VARIANCE'
+                        'variance': 'VARIANCE',
+                        'min': 'MIN',
+                        'max': 'MAX'
                     };
 
 				for (var i = 0, dimName, items; i < axisDimensionNames.length; i++) {