dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16380: PT DV assigned categories reimplemented.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 11 Aug 2014 15:34:28 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16380 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-08-11 17:34:01 +0200
message:
  PT DV assigned categories reimplemented.
modified:
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.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-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n.json
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/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-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.properties	2014-05-22 13:07:04 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.properties	2014-08-11 15:07:49 +0000
@@ -159,4 +159,5 @@
 open_this_table_as_map=Open this table as map
 open_last_map=Open last map
 show_row_totals=Show row totals
-show_col_totals=Show column totals
\ No newline at end of file
+show_col_totals=Show column totals
+assigned_categories=Assigned categories
\ No newline at end of file

=== 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-07-23 12:49:57 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n.json	2014-08-11 15:07:49 +0000
@@ -162,5 +162,6 @@
 "open_this_table_as_map",
 "open_last_map",
 "show_row_totals",
-"show_col_totals"
+"show_col_totals",
+"assigned_categories"
 ]

=== 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-08-10 12:47:42 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-08-11 15:32:26 +0000
@@ -342,11 +342,13 @@
 			colStore.removeAll();
 			rowStore.removeAll();
 			filterStore.removeAll();
+            dimensionStore.removeAll();
 
 			if (!isAll) {
 				colStore.add({id: dimConf.data.dimensionName, name: dimConf.data.name});
 				rowStore.add({id: dimConf.period.dimensionName, name: dimConf.period.name});
 				filterStore.add({id: dimConf.organisationUnit.dimensionName, name: dimConf.organisationUnit.name});
+				dimensionStore.add({id: dimConf.category.dimensionName, name: dimConf.category.name});
 			}
 		};
 
@@ -1381,7 +1383,7 @@
 		});
 
 		favoriteWindow = Ext.create('Ext.window.Window', {
-			title: NS.i18n.manage_favorites,
+			title: NS.i18n.favorites,
 			bodyStyle: 'padding:1px; background-color:#fff',
 			resizable: false,
 			modal: true,

=== 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-08-10 20:04:11 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2014-08-11 15:07:49 +0000
@@ -38,7 +38,7 @@
 						}
 					},
 					category: {
-						name: NS.i18n.categories,
+						name: NS.i18n.assigned_categories,
 						dimensionName: 'co',
 						objectName: 'co',
 					},
@@ -418,7 +418,7 @@
 
 					// dc and co
 					if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.category.objectName]) {
-						web.message.alert('Categories and detailed data elements cannot be specified together');
+						web.message.alert('Assigned categories and detailed data elements cannot be specified together');
 						return;
 					}
 
@@ -1753,7 +1753,7 @@
 						for (var j = 0, index; j < idIndexOrder.length; j++) {
 							index = idIndexOrder[j];
 
-							id += response.headers[index].name === co ? '.' : '';
+							//id += response.headers[index].name === co ? '.' : '';
 							id += row[index];
 						}
 

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties	2014-06-26 14:37:15 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties	2014-08-11 15:32:26 +0000
@@ -224,4 +224,6 @@
 go_to_maps=Go to maps
 open_this_chart_as_map=Open this chart as map
 open_last_map=Open last map
-dimensions=Dimensions
\ No newline at end of file
+dimensions=Dimensions
+assigned_categories=Assigned categories
+table_layout=Table layout
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n.json'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n.json	2014-06-26 14:37:15 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n.json	2014-08-11 15:32:26 +0000
@@ -224,5 +224,7 @@
 "go_to_maps",
 "open_this_chart_as_map",
 "open_last_map",
-"dimensions"
+"dimensions",
+"table_layout",
+"assigned_categories"
 ]

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2014-08-10 12:47:42 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2014-08-11 15:32:26 +0000
@@ -378,11 +378,13 @@
 			colStore.removeAll();
 			rowStore.removeAll();
 			filterStore.removeAll();
+            dimensionStore.removeAll();
 
 			if (!isAll) {
 				colStore.add({id: dimConf.data.dimensionName, name: dimConf.data.name});
 				rowStore.add({id: dimConf.period.dimensionName, name: dimConf.period.name});
 				filterStore.add({id: dimConf.organisationUnit.dimensionName, name: dimConf.organisationUnit.name});
+				dimensionStore.add({id: dimConf.category.dimensionName, name: dimConf.category.name});
 			}
 		};
 

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js	2014-08-09 13:53:16 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js	2014-08-11 15:32:26 +0000
@@ -68,7 +68,7 @@
                         objectName: 'ds'
                     },
                     category: {
-                        name: DV.i18n.categories,
+                        name: DV.i18n.assigned_categories,
                         dimensionName: 'co',
                         objectName: 'co',
                     },