dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17875
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2015-01-03 12:19:11 +0100
message:
  Detailed meta-data export, added support for category combos
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/filterExportForm.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filteredMetaDataExport.js
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/utils.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-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2015-01-03 10:32:31 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2015-01-03 11:19:11 +0000
@@ -374,6 +374,9 @@
 categories=Categories
 available_categories=Available Categories
 selected_categories=Selected Categories
+category_combos=Category Combinations
+available_category_combos=Available Category Combinations
+selected_category_combos=Selected Category Combinations
 available_charts=Available Charts
 selected_charts=Selected Charts
 available_constants=Available Constants

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/filterExportForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/filterExportForm.vm	2015-01-03 11:05:02 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/filterExportForm.vm	2015-01-03 11:19:11 +0000
@@ -8,6 +8,9 @@
     var i18n_available_categories = '$encoder.jsEscape( $i18n.getString( "available_categories" ), "'" )';
     var i18n_selected_categories = '$encoder.jsEscape( $i18n.getString( "selected_categories" ), "'" )';
 
+    var i18n_available_category_combos = '$encoder.jsEscape( $i18n.getString( "available_category_combos" ), "'" )';
+    var i18n_selected_category_combos = '$encoder.jsEscape( $i18n.getString( "selected_category_combos" ), "'" )';
+
     var i18n_available_charts = '$encoder.jsEscape( $i18n.getString( "available_charts" ), "'" )';
     var i18n_selected_charts = '$encoder.jsEscape( $i18n.getString( "selected_charts" ), "'" )';
 
@@ -149,6 +152,11 @@
 
     <div id="mainDivCategories" style="margin: 5px;"></div>
 
+    <!-- CATEGORY COMBOS SELECTION -->
+    <h6 id="headingCategoryCombos" style="font-size: 10pt;"><label>$i18n.getString( "category_combos" )</label></h6>
+
+    <div id="mainDivCategoryCombos" style="margin: 5px;"></div>
+
     <!-- CHARTS SELECTION -->
     <h6 id="headingCharts" style="font-size: 10pt;"><label>$i18n.getString( "charts" )</label></h6>
 

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filteredMetaDataExport.js'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filteredMetaDataExport.js	2015-01-03 11:05:02 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filteredMetaDataExport.js	2015-01-03 11:19:11 +0000
@@ -1,5 +1,5 @@
 // Global Variables
-var metaDataArray = [ "Attributes", "Categories", "Charts", "Constants", "DataElementGroupSets",
+var metaDataArray = [ "Attributes", "Categories", "CategoryCombos", "Charts", "Constants", "DataElementGroupSets",
     "DataElementGroups", "DataElements", "DataSets", "Documents", "IndicatorGroupSets", "IndicatorGroups", "Indicators",
     "IndicatorTypes", "MapLegendSets", "Maps", "OptionSets", "OrganisationUnitGroupSets", "OrganisationUnitGroups",
     "OrganisationUnitLevels", "OrganisationUnits", "ReportTables", "Reports", "SqlViews", "UserGroups", "UserRoles",

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/utils.js'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/utils.js	2015-01-03 11:05:02 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/utils.js	2015-01-03 11:19:11 +0000
@@ -19,6 +19,8 @@
             return i18n_available_attributeTypes;
         case "Categories":
             return i18n_available_categories;
+        case "CategoryCombos":
+            return i18n_available_category_combos;
         case "Charts":
             return i18n_available_charts;
         case "Constants":
@@ -85,6 +87,8 @@
             return i18n_selected_attributeTypes;
         case "Categories":
             return i18n_selected_categories;
+        case "CategoryCombos":
+            return i18n_selected_category_combos;
         case "Charts":
             return i18n_selected_charts;
         case "Constants":