=== modified file 'local/in/dhis-web-maintenance-ccem/pom.xml' --- local/in/dhis-web-maintenance-ccem/pom.xml 2013-10-18 05:57:53 +0000 +++ local/in/dhis-web-maintenance-ccem/pom.xml 2013-11-25 07:09:17 +0000 @@ -50,11 +50,11 @@ dhis-web-commons-resources war - + org.hisp.dhis dhis-support-external @@ -80,12 +80,17 @@ jxl - - ar.com.fdvs - DynamicJasper - 4.0.0 + + ar.com.fdvs + DynamicJasper + 4.0.0 - + + + net.sf.opencsv + opencsv + 2.3 + ../../ === modified file 'local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module.properties' --- local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module.properties 2013-10-18 05:57:53 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module.properties 2013-11-25 07:09:17 +0000 @@ -162,3 +162,5 @@ transfer_facility_data = Transfer facility data option_set = Option Set +import_export_data = Import / Export Data +import_data = Import Data === modified file 'local/in/dhis-web-maintenance-ccem/src/main/resources/struts.xml' --- local/in/dhis-web-maintenance-ccem/src/main/resources/struts.xml 2013-09-30 12:17:15 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/resources/struts.xml 2013-11-25 07:09:17 +0000 @@ -690,5 +690,12 @@ F_TRANSFER_FACILITY_DATA + + + /main.vm + /dhis-web-maintenance-ccem/importDataForm.vm + /dhis-web-maintenance-ccem/menu.vm + + \ No newline at end of file === added file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/importDataForm.vm' --- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/importDataForm.vm 1970-01-01 00:00:00 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/importDataForm.vm 2013-11-25 07:09:17 +0000 @@ -0,0 +1,48 @@ + +$i18n.getString( "Import Data" ) + + + + + Upload CSV File : + + + + + Upload zip compress csv file for: + RefrigeratorCatalog + Refrigerators + Facility + Coldrooms + AssetList + AdministrativeHierarchy + + + + + + + + + + + + + === added file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/importData.js' --- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/importData.js 1970-01-01 00:00:00 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/importData.js 2013-11-25 07:09:17 +0000 @@ -0,0 +1,5 @@ + +function fileValidations() +{ + +} \ No newline at end of file === modified file 'local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/menu.vm' --- local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/menu.vm 2013-09-05 11:11:36 +0000 +++ local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/menu.vm 2013-11-25 07:09:17 +0000 @@ -17,7 +17,10 @@ $i18n.getString( "equipment_manager" ) - +$i18n.getString( "import_export_data" ) + + $i18n.getString( "import_data" ) +