← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #13048

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4114: ImportExport Interface for Human resource

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 4114
committer: John Francis Mukulu <john.f.mukulu@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-07-11 19:20:55 +0300
message:
  ImportExport Interface for Human resource
modified:
  local/tz/dhis-web-hrentry/src/main/resources/org/hisp/dhis/hrentry/i18n_module.properties
  local/tz/dhis-web-hrentry/src/main/resources/struts.xml
  local/tz/dhis-web-hrentry/src/main/webapp/dhis-web-hrentry/index.vm
  local/tz/dhis-web-hrentry/src/main/webapp/dhis-web-hrentry/menu.vm
  local/tz/dhis-web-maintenance-hr/src/main/webapp/dhis-web-maintenance-hr/menu.vm


--
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 'local/tz/dhis-web-hrentry/src/main/resources/org/hisp/dhis/hrentry/i18n_module.properties'
--- local/tz/dhis-web-hrentry/src/main/resources/org/hisp/dhis/hrentry/i18n_module.properties	2011-07-05 07:41:01 +0000
+++ local/tz/dhis-web-hrentry/src/main/resources/org/hisp/dhis/hrentry/i18n_module.properties	2011-07-11 16:20:55 +0000
@@ -112,4 +112,14 @@
 history															= History
 reason															= Reason
 keep_current													= Keep this current record
-confirm_delete_history											= Are you sure you want to delete history?
\ No newline at end of file
+confirm_delete_history											= Are you sure you want to delete history?
+hr_import														= Hr Import
+hr_export														= Hr Export
+hr_metadata_export												= Hr MetaData Export
+intro_import = This is the regular import function which imports data from the DHIS 2 exchange format called DXF.
+intro_data_export = Export data values. This is the regular export function which exports data to the DHIS 2 exchange format called DXF.
+intro_metadata_export = Export meta data to the DHIS 2 exchange format. Meta meta implies data elements and other objects describing the data.
+import = Import
+export = Export
+data_export = DXF Datavalue Export
+metadata_export = DXF Metadata Export
\ No newline at end of file

=== modified file 'local/tz/dhis-web-hrentry/src/main/resources/struts.xml'
--- local/tz/dhis-web-hrentry/src/main/resources/struts.xml	2011-07-05 07:41:01 +0000
+++ local/tz/dhis-web-hrentry/src/main/resources/struts.xml	2011-07-11 16:20:55 +0000
@@ -262,7 +262,59 @@
 	<action name="showProfile" class="org.hisp.dhis.hrentry.action.dataentry.ShowProfileAction">
       <result name="success" type="velocity">/dhis-web-hrentry/showProfile.vm</result>
     </action>
-		
+	
+	<!-- HR Import Export -->
+	<action name="displayHrImportForm" class="org.hisp.dhis.importexport.action.imp.GetHrImportOptionsAction">
+      <result name="dhis14" type="redirect">displayConfigDhis14Form.action</result>
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-importexport/importForm.vm</param>
+      <param name="menu">/dhis-web-importexport/mainMenu.vm</param>
+      <param name="javascripts">javascript/import.js,javascript/process.js</param>
+    </action>
+	<action name="import" class="org.hisp.dhis.importexport.action.imp.ImportAction">
+      <result name="success" type="chain">displayImportForm</result>
+      <interceptor-ref name="fileUploadStack"/>
+    </action>
+    
+    <action name="getImportStatus" class="org.hisp.dhis.importexport.action.imp.GetImportStatusAction">
+      <result name="success" type="velocity-xml">/dhis-web-importexport/responseImportStatus.vm</result>
+      <param name="onExceptionReturn">plainTextError</param>
+    </action>
+	
+	<action name="displayDataValueExportForm" class="org.hisp.dhis.importexport.action.exp.GetExportOptionsAction">
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-importexport/exportDataValueForm.vm</param>
+      <param name="menu">/dhis-web-importexport/mainMenu.vm</param>
+      <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/export.js</param>
+    </action>
+	<action name="displayMetaDataExportForm" class="org.hisp.dhis.importexport.action.exp.GetExportOptionsAction">
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-importexport/exportMetaDataForm.vm</param>
+      <param name="menu">/dhis-web-importexport/mainMenu.vm</param>
+      <param name="javascripts">javascript/export.js</param>
+    </action>
+	<action name="exportMetaData" class="org.hisp.dhis.importexport.action.exp.MetaDataExportAction">
+      <result name="success" type="stream">
+        <param name="contentType">application/zip</param>
+        <param name="inputName">inputStream</param>
+        <param name="contentDisposition">filename="${fileName}"</param>
+        <param name="bufferSize">10240</param>
+      </result>
+    </action>
+	<action name="exportDataValue" class="org.hisp.dhis.importexport.action.exp.DataValueExportAction">
+      <result name="success" type="stream">
+        <param name="contentType">application/zip</param>
+        <param name="inputName">inputStream</param>
+        <param name="contentDisposition">filename="${fileName}"</param>
+        <param name="bufferSize">10240</param>				
+      </result>
+	  <result name="error" type="velocity-xml">/dhis-web-importexport/responseError.vm</result>
+    </action>
+	<action name="getExportStatus" class="org.hisp.dhis.importexport.action.exp.GetExportStatusAction">
+      <result name="success" type="velocity-xml">/dhis-web-importexport/responseExportStatus.vm</result>
+      <param name="onExceptionReturn">plainTextError</param>
+    </action>
+	
 	</package>
  
 </struts>

=== modified file 'local/tz/dhis-web-hrentry/src/main/webapp/dhis-web-hrentry/index.vm'
--- local/tz/dhis-web-hrentry/src/main/webapp/dhis-web-hrentry/index.vm	2011-07-05 07:41:01 +0000
+++ local/tz/dhis-web-hrentry/src/main/webapp/dhis-web-hrentry/index.vm	2011-07-11 16:20:55 +0000
@@ -7,4 +7,8 @@
     #introListImgItem( "showRecordsReportForm.action" "record_data" "summaryreport" )
     #introListImgItem( "showAggregatedReportForm.action" "aggregate_report" "summaryreport" )
     #introListImgItem( "reportSelect.action" "aggregate_data" "summaryreport" )
+    
+    #introListImgItem( "setImportFormat.action?importFormat=DXF" "import" "import" )
+    #introListImgItem( "displayDataValueExportForm.action?exportFormat=DXF" "data_export" "export" )
+    #introListImgItem( "displayMetaDataExportForm.action?exportFormat=DXF" "metadata_export" "export" )
 </ul>
\ No newline at end of file

=== modified file 'local/tz/dhis-web-hrentry/src/main/webapp/dhis-web-hrentry/menu.vm'
--- local/tz/dhis-web-hrentry/src/main/webapp/dhis-web-hrentry/menu.vm	2011-07-05 07:41:01 +0000
+++ local/tz/dhis-web-hrentry/src/main/webapp/dhis-web-hrentry/menu.vm	2011-07-11 16:20:55 +0000
@@ -10,3 +10,13 @@
     <li><a href="showRecordsReportForm.action">$i18n.getString( "record_data" )&nbsp;</a></li>     
     <li><a href="showAggregatedReportForm.action">$i18n.getString( "aggregate_report" )&nbsp;</a></li>
 </ul>
+
+<h2>$i18n.getString( "hr_import" )&nbsp;</h2>
+<ul>
+    <li><a href="hrimport.action">$i18n.getString( "hr_import" )&nbsp;</a></li>
+</ul>
+<h2>$i18n.getString( "hr_export")&nbsp;</h2>
+<ul>
+    <li><a href="hrexport.action">$i18n.getString( "hr_export" )&nbsp;</a></li>    
+    <li><a href="hrmetadata.action">$i18n.getString( "hr_metadata_export" )&nbsp;</a></li>
+</ul>
\ No newline at end of file

=== modified file 'local/tz/dhis-web-maintenance-hr/src/main/webapp/dhis-web-maintenance-hr/menu.vm'
--- local/tz/dhis-web-maintenance-hr/src/main/webapp/dhis-web-maintenance-hr/menu.vm	2011-07-05 07:41:01 +0000
+++ local/tz/dhis-web-maintenance-hr/src/main/webapp/dhis-web-maintenance-hr/menu.vm	2011-07-11 16:20:55 +0000
@@ -17,3 +17,10 @@
     <li><a href="aggregateIndicator.action">$i18n.getString( "aggregated_indicator" )&nbsp;</a></li>    
     <li><a href="criteria.action">$i18n.getString( "criteria" )&nbsp;</a></li>
 </ul>
+
+<h2>$i18n.getString( "hr_importexport" )&nbsp;</h2>
+<ul>
+    <li><a href="hrimport.action">$i18n.getString( "target_indicator" )&nbsp;</a></li>     
+    <li><a href="aggregateIndicator.action">$i18n.getString( "aggregated_indicator" )&nbsp;</a></li>    
+    <li><a href="criteria.action">$i18n.getString( "criteria" )&nbsp;</a></li>
+</ul>
\ No newline at end of file
  Thread Previous • Date Previous • • Thread Next