------------------------------------------------------------
revno: 17873
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Sat 2015-01-03 12:05:02 +0100
message:
Detailed meta-data export, fixed bug with export of categories
modified:
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/detailedMetaDataImport.js
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/webapp/dhis-web-importexport/filterExportForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/filterExportForm.vm 2015-01-03 10:32:31 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/filterExportForm.vm 2015-01-03 11:05:02 +0000
@@ -145,9 +145,9 @@
<div id="mainDivAttributes" style="margin: 5px;"></div>
<!-- CATEGORIES SELECTION -->
- <h6 id="headingDimensions" style="font-size: 10pt;"><label>$i18n.getString( "categories" )</label></h6>
+ <h6 id="headingCategories" style="font-size: 10pt;"><label>$i18n.getString( "categories" )</label></h6>
- <div id="mainDivDimensions" style="margin: 5px;"></div>
+ <div id="mainDivCategories" 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/detailedMetaDataImport.js'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/detailedMetaDataImport.js 2015-01-03 10:32:31 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/detailedMetaDataImport.js 2015-01-03 11:05:02 +0000
@@ -1,5 +1,5 @@
// Global Variables
-var metaDataArray = [ "AttributesTypes", "Dimensions", "Charts", "Constants", "DataElementGroupSets",
+var metaDataArray = [ "AttributesTypes", "Categories", "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/filteredMetaDataExport.js'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filteredMetaDataExport.js 2015-01-03 10:32:31 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filteredMetaDataExport.js 2015-01-03 11:05:02 +0000
@@ -1,5 +1,5 @@
// Global Variables
-var metaDataArray = [ "Attributes", "Dimensions", "Charts", "Constants", "DataElementGroupSets",
+var metaDataArray = [ "Attributes", "Categories", "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 10:32:31 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/utils.js 2015-01-03 11:05:02 +0000
@@ -17,7 +17,7 @@
{
case "Attributes":
return i18n_available_attributeTypes;
- case "Dimensions":
+ case "Categories":
return i18n_available_categories;
case "Charts":
return i18n_available_charts;
@@ -83,7 +83,7 @@
{
case "Attributes":
return i18n_selected_attributeTypes;
- case "Dimensions":
+ case "Categories":
return i18n_selected_categories;
case "Charts":
return i18n_selected_charts;
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
