dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14550
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-03-31 13:54:16 +0700
message:
  expose orgUnitIdScheme in UI of event import
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.java
  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/eventImportForm.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 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.java	2014-03-31 06:54:16 +0000
@@ -90,6 +90,13 @@
         this.jsonInput = jsonInput;
     }
 
+    private String orgUnitIdScheme = "UID";
+
+    public void setOrgUnitIdScheme( String orgUnitIdScheme )
+    {
+        this.orgUnitIdScheme = orgUnitIdScheme;
+    }
+
     // -------------------------------------------------------------------------
     // Action Implementation
     // -------------------------------------------------------------------------
@@ -106,6 +113,7 @@
 
         ImportOptions importOptions = new ImportOptions();
         importOptions.setDryRun( dryRun );
+        importOptions.setOrgUnitIdScheme( orgUnitIdScheme );
 
         scheduler.executeTask( new ImportEventTask( in, eventService, importOptions, taskId, jsonInput ) );
 

=== 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	2014-02-17 18:48:08 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2014-03-31 06:54:16 +0000
@@ -315,6 +315,7 @@
 programs=Programs
 program_stages=Program Stages
 format=Format
+orgunit_scheme=OrgUnit Scheme
 compression=Compression
 compression_gzip=Gzip
 compression_zip=Zip

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventImportForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventImportForm.vm	2014-01-22 09:30:14 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventImportForm.vm	2014-03-31 06:54:16 +0000
@@ -24,6 +24,15 @@
 		<option value="true">$i18n.getString( "json" )</option>
     </select></td>
 </tr>
+<tr>
+	<td>$i18n.getString( "orgunit_scheme" )</td>
+	<td><select id="orgUnitIdScheme" name="orgUnitIdScheme" style="width:190px">
+		<option value="UID">$i18n.getString( "UID" )</option>
+		<option value="UUID">$i18n.getString( "UUID" )</option>
+		<option value="CODE">$i18n.getString( "CODE" )</option>
+		<option value="NAME">$i18n.getString( "NAME" )</option>
+    </select></td>
+</tr>
 
 <tr>
 	<td></td>