dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11793
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-08-25 22:46:47 +0200
message:
  Data entry, fixed bug related to org unit param
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ValidationAction.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.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-commons-resources/src/main/webapp/cacheManifest.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2013-08-23 16:12:16 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2013-08-25 20:46:47 +0000
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 2.13-SNAPSHOT V10
+# 2.13-SNAPSHOT V11
 NETWORK:
 *
 CACHE:

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ValidationAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ValidationAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ValidationAction.java	2013-08-25 20:46:47 +0000
@@ -186,6 +186,7 @@
     public String execute()
         throws Exception
     {
+        System.out.println("ou " + organisationUnitId);
         OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit( organisationUnitId );
 
         DataSet dataSet = dataSetService.getDataSet( dataSetId );

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2013-08-19 14:27:44 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2013-08-25 20:46:47 +0000
@@ -80,8 +80,9 @@
 
 var DAO = DAO || {};
 
-function getCurrentOrganisationUnit() {
-    if( $.isArray( currentOrganisationUnitId ) ) {
+function getCurrentOrganisationUnit() 
+{
+    if ( $.isArray( currentOrganisationUnitId ) ) {
         return currentOrganisationUnitId[0];
     }
 
@@ -97,7 +98,7 @@
 ( function( $ ) {
     $.safeEach = function( arr, fn ) 
     {
-        if( arr )
+        if ( arr )
         {
             $.each( arr, fn );
         }
@@ -1306,7 +1307,7 @@
 	
 	validate( true, function() {	
 	    var params = storageManager.getCurrentCompleteDataSetParams();
-        params['organisationUnitId'] = selection.getSelected();
+        params['organisationUnitId'] = getCurrentOrganisationUnit();
         params['multiOrganisationUnit'] = multiOrganisationUnit;
 
 		storageManager.saveCompleteDataSet( params );
@@ -1341,7 +1342,7 @@
 {
     var confirmed = confirm( i18n_confirm_undo );
     var params = storageManager.getCurrentCompleteDataSetParams();
-    params[ 'organisationUnitId' ] = selection.getSelected();
+    params[ 'organisationUnitId' ] = getCurrentOrganisationUnit();
     params[ 'multiOrganisationUnit' ] = multiOrganisationUnit;
 
     if ( confirmed )
@@ -1451,7 +1452,7 @@
 	var validCompleteOnly = dataSets[currentDataSetId].validCompleteOnly;
 
     var params = storageManager.getCurrentCompleteDataSetParams();
-	    params['organisationUnitId'] = selection.getSelected();
+	    params['organisationUnitId'] = getCurrentOrganisationUnit();
         params['multiOrganisationUnit'] = multiOrganisationUnit;
 
     $( '#validationDiv' ).load( 'validate.action', params, function( response, status, xhr ) {