=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetOrgUnitsAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetOrgUnitsAction.java	2011-05-27 11:25:15 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/action/GetOrgUnitsAction.java	2011-12-14 10:18:12 +0000
@@ -85,7 +85,8 @@
         }
         
         System.out.println(" orgUnit Id is : " + orgUnit.getId() + " , orgUnit Name is : " + orgUnit.getName() );
-        orgUnitLevel = organisationUnitService.getLevelOfOrganisationUnit( orgUnit );
+        //orgUnitLevel = organisationUnitService.getLevelOfOrganisationUnit( orgUnit );
+        orgUnitLevel = organisationUnitService.getLevelOfOrganisationUnit( orgUnit.getId() );
         maxOrgUnitLevel = organisationUnitService.getNumberOfOrganisationalLevels();
         
         // Hardcoded : if it is Tabular Analysis, Null Reporter
@@ -103,7 +104,7 @@
                 
                 Integer level = orgunitLevelMap.get( orgU.getId() );
                 if( level == null )
-                    level = organisationUnitService.getLevelOfOrganisationUnit( orgU );
+                    level = organisationUnitService.getLevelOfOrganisationUnit( orgU.getId() );
                 if ( level > maxOrgUnitLevel )
                 {
                     maxOrgUnitLevel = level;

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentsResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentsResultAction.java	2011-11-22 07:20:09 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateCommentsResultAction.java	2011-12-14 10:18:12 +0000
@@ -284,7 +284,7 @@
             selectedOrgUnit = organisationUnitService.getOrganisationUnit( Integer.parseInt( orgUnitListCB.get( 0 ) ) );
 
             // This is hard coded to get District and Corporation List
-            if(organisationUnitService.getLevelOfOrganisationUnit( selectedOrgUnit ) == 1)
+            if(organisationUnitService.getLevelOfOrganisationUnit( selectedOrgUnit.getId() ) == 1)
             {                
                 orgUnitList = new ArrayList<OrganisationUnit>();            
                 orgUnitList.add( selectedOrgUnit );
@@ -398,11 +398,11 @@
                 o = orgUnitListIterator.next();
                 orgUnitInfo = ""+o.getId();
                 
-                if(maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o ))
-                    maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+                if(maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o.getId() ))
+                    maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
                 
-                if(minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o ))
-                    minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+                if(minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o.getId() ))
+                    minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
                     
                 dso = ds.getSources();
                 periodIterator = periodList.iterator();

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusDataSetWiseResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusDataSetWiseResultAction.java	2011-07-07 07:32:49 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusDataSetWiseResultAction.java	2011-12-14 10:18:12 +0000
@@ -394,11 +394,11 @@
                 //orgUnit.getChildren().size();
                 
                 orgUnitInfo = "" + orgUnit.getId();
-                if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( orgUnit ) )
-                    maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( orgUnit );
+                if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( orgUnit.getId() ) )
+                    maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( orgUnit.getId() );
     
-                if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( orgUnit ) )
-                    minOULevel = organisationUnitService.getLevelOfOrganisationUnit( orgUnit );
+                if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( orgUnit.getId() ) )
+                    minOULevel = organisationUnitService.getLevelOfOrganisationUnit( orgUnit.getId() );
                 
                 Iterator<Period> periodIterator = periodList.iterator();
                 Period p;

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction.java	2011-10-14 12:26:01 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction.java	2011-12-14 10:18:12 +0000
@@ -514,12 +514,12 @@
         {
             o = orgUnitListIterator.next();
             orgUnitInfo = "" + o.getId();
-
-            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
-
-            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            
+            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
+
+            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
             periodIterator = periodList.iterator();
 

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction_Test.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction_Test.java	2011-10-24 11:27:50 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateDataStatusResultAction_Test.java	2011-12-14 10:18:12 +0000
@@ -525,11 +525,11 @@
             o = orgUnitListIterator.next();
             orgUnitInfo = "" + o.getId();
 
-            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
-            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 /*
             List<OrganisationUnit> childOrgUnits = new ArrayList<OrganisationUnit>();
             

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusResultAction.java	2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusResultAction.java	2011-12-14 10:18:12 +0000
@@ -608,11 +608,11 @@
                 o = orgUnitListIterator.next();
                 orgUnitInfo = "" + o.getId();
 
-                if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                    maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+                if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                    maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
-                if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                    minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+                if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                    minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
                 dso = ds.getSources();
                 periodIterator = periodList.iterator();

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateLastUpdatedDataSetResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateLastUpdatedDataSetResultAction.java	2011-04-27 17:15:13 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateLastUpdatedDataSetResultAction.java	2011-12-14 10:18:12 +0000
@@ -517,11 +517,11 @@
             o = orgUnitListIterator.next();
             orgUnitInfo = "" + o.getId();
 
-            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
-            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
             periodIterator = periodList.iterator();
 

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateSummaryDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateSummaryDataStatusResultAction.java	2011-12-03 07:44:11 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateSummaryDataStatusResultAction.java	2011-12-14 10:18:12 +0000
@@ -419,7 +419,7 @@
             Integer ouL = orgunitLevelMap.get( o.getId() );
             if( ouL == null )
             {
-                ouL = organisationUnitService.getLevelOfOrganisationUnit( o );
+                ouL = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
             }
             if( maxOULevel < ouL )
             {

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateValidationStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateValidationStatusResultAction.java	2011-04-27 17:15:13 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateValidationStatusResultAction.java	2011-12-14 10:18:12 +0000
@@ -423,11 +423,11 @@
             o = orgUnitListIterator.next();
             orgUnitInfo = "" + o.getId();
 
-            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
-            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
             periodIterator = periodList.iterator();
             Period p;

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateGroupWiseMobileDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateGroupWiseMobileDataStatusResultAction.java	2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateGroupWiseMobileDataStatusResultAction.java	2011-12-14 10:18:12 +0000
@@ -648,11 +648,11 @@
                 
                 orgUnitInfo = "" + o.getId();
 
-                if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                    maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+                if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                    maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
-                if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                    minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+                if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                    minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
                 dso = ds.getSources();
                 periodIterator = periodList.iterator();

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateLastUpdatedMobileDataSetResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateLastUpdatedMobileDataSetResultAction.java	2011-04-27 17:15:13 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateLastUpdatedMobileDataSetResultAction.java	2011-12-14 10:18:12 +0000
@@ -552,11 +552,11 @@
             
             orgUnitInfo = "" + o.getId();
 
-            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
-            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
             periodIterator = periodList.iterator();
 

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateMobileDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateMobileDataStatusResultAction.java	2011-04-27 17:15:13 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateMobileDataStatusResultAction.java	2011-12-14 10:18:12 +0000
@@ -582,11 +582,11 @@
             
             orgUnitInfo = "" + o.getId();
 
-            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
-            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
             periodIterator = periodList.iterator();
 

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GeneratePercentageDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GeneratePercentageDataStatusResultAction.java	2011-04-27 17:15:13 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GeneratePercentageDataStatusResultAction.java	2011-12-14 10:18:12 +0000
@@ -535,11 +535,11 @@
             
             orgUnitInfo = "" + o.getId();
 
-            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
-            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
             periodIterator = periodList.iterator();
 

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateSummaryMobileDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateSummaryMobileDataStatusResultAction.java	2011-04-27 17:15:13 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateSummaryMobileDataStatusResultAction.java	2011-12-14 10:18:12 +0000
@@ -530,11 +530,11 @@
             
             orgUnitInfo = "" + o.getId();
 
-            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
-            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
             periodIterator = periodList.iterator();
             Period p;

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateValidationMobileStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateValidationMobileStatusResultAction.java	2011-04-27 17:15:13 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/mobile/action/GenerateValidationMobileStatusResultAction.java	2011-12-14 10:18:12 +0000
@@ -465,11 +465,11 @@
             
             orgUnitInfo = "" + o.getId();
 
-            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
-            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
             periodIterator = periodList.iterator();
             Period p;

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseResultAction.java	2011-04-27 17:15:13 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/orgunitgroupsetwise/action/GenerateDataStatusOrgnisationunitGroupSetWiseResultAction.java	2011-12-14 10:18:12 +0000
@@ -472,11 +472,11 @@
                 o = (OrganisationUnit) orgUnitListIterator.next();
                 orgUnitInfo = "" + o.getId();
 
-                if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                    maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+                if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                    maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
-                if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o ) )
-                    minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o );
+                if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( o.getId() ) )
+                    minOULevel = organisationUnitService.getLevelOfOrganisationUnit( o.getId() );
 
                 periodIterator = periodList.iterator();
                 Period p;

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntryStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntryStatusResultAction.java	2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntryStatusResultAction.java	2011-12-14 10:18:12 +0000
@@ -389,11 +389,11 @@
             OrganisationUnit ou = orgUnitListIterator.next();
             orgUnitInfo += "," + ou.getId();
             
-            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( ou ) )
-                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( ou );
+            if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( ou.getId() ) )
+                maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
 
-            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( ou ) )
-                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( ou );
+            if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( ou.getId() ) )
+                minOULevel = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
         }
 
         // For Level Names

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntrySummaryStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntrySummaryStatusResultAction.java	2011-10-14 12:26:01 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/dsMart/action/GenerateDataEntrySummaryStatusResultAction.java	2011-12-14 10:18:12 +0000
@@ -15,7 +15,6 @@
 import java.util.Set;
 
 import org.hisp.dhis.dataanalyser.util.DashBoardService;
-import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.dataset.DataSetService;
 import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
@@ -477,11 +476,11 @@
                 
                 //List<OrganisationUnit> childOrgUnits = new ArrayList<OrganisationUnit>();
                 
-                if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( ou ) )
-                    maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                if ( maxOULevel < organisationUnitService.getLevelOfOrganisationUnit( ou.getId() ) )
+                    maxOULevel = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
 
-                if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( ou ) )
-                    minOULevel = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                if ( minOULevel > organisationUnitService.getLevelOfOrganisationUnit( ou.getId() ) )
+                    minOULevel = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
                 
                 int result1 = 0;
                 int percentageResult = 0;

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownResultAction.java	2011-04-15 11:34:10 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ga/action/charts/GenerateDrillDownResultAction.java	2011-12-14 10:18:12 +0000
@@ -301,7 +301,7 @@
         String tempStr = "";
         for ( OrganisationUnit ou : orgUnitList )
         {
-            int level = organisationUnitService.getLevelOfOrganisationUnit( ou );
+            int level = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
             ouAndLevel.put( ou, level );
             if ( !levelsList.contains( level ) )
             {
@@ -473,7 +473,7 @@
                 for ( int i = levelsList.size() - 1; i >= 0; i-- )
                 {
                     colNo++;
-                    int level = organisationUnitService.getLevelOfOrganisationUnit( ouname );
+                    int level = organisationUnitService.getLevelOfOrganisationUnit( ouname.getId() );
                     if ( levelsList.get( i ) == level )
                     {
                         sheet0.addCell( new Label( colNo, rowNo, ouname.getName(), wCellformat ) );

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterResultAction.java	2011-11-22 07:20:09 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/nr/action/GenerateNullReporterResultAction.java	2011-12-14 10:18:12 +0000
@@ -354,7 +354,7 @@
             while ( ouIterator.hasNext() )
             {
                 OrganisationUnit orgU = ouIterator.next();
-                if ( organisationUnitService.getLevelOfOrganisationUnit( orgU ) > orgUnitLevelCB )
+                if ( organisationUnitService.getLevelOfOrganisationUnit( orgU.getId() ) > orgUnitLevelCB )
                 {
                     ouIterator.remove();
                 }
@@ -362,7 +362,7 @@
         }
 
         minOULevel = 1;
-        minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ) );
+        minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ).getId() );
 
         int maxOuLevel = 1;
         if ( orgUnitLevelCB != null )
@@ -582,7 +582,7 @@
         {
             for ( OrganisationUnit ou : ouHavingNullValuesWithHigherLevel )
             {
-                int levelOu = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                int levelOu = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
                 if ( levelOu == level )
                 {
                     ouHavingNullValues.remove( ou );

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ta/action/GenerateTabularAnalysisResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ta/action/GenerateTabularAnalysisResultAction.java	2011-11-22 07:20:09 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ta/action/GenerateTabularAnalysisResultAction.java	2011-12-14 10:18:12 +0000
@@ -768,7 +768,7 @@
             
             Integer level = orgunitLevelMap.get( orgU.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( orgU );
+                level = organisationUnitService.getLevelOfOrganisationUnit( orgU.getId() );
             if ( level > orgUnitLevelCB )
             {
                 ouIterator.remove();
@@ -779,7 +779,7 @@
         int maxOuLevel = 1;
         if ( selOUList != null && selOUList.size() > 0 )
         {
-            minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ) );
+            minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ).getId() );
         }
         maxOuLevel = orgUnitLevelCB;
 
@@ -811,7 +811,7 @@
             
             Integer level = orgunitLevelMap.get( ou.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                level = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
             
             colCount = 1 + level - minOULevel;
             sheet0.addCell( new Label( colCount, headerRow + rowCount, ou.getName(), getCellFormat2() ) );
@@ -1029,7 +1029,7 @@
             
             Integer level = orgunitLevelMap.get( ou.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                level = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
             
             colCount = 1 + level - minOULevel;
             sheet0.addCell( new Label( colCount, headerRow + rowCount, ou.getName(), getCellFormat2() ) );
@@ -1954,7 +1954,7 @@
         for ( OrganisationUnit ou : selOUList )
         {
             sheet0.addCell( new Number( headerCol, headerRow + 1 + rowCount, rowCount, getCellFormat2() ) );
-            colCount = 1 + organisationUnitService.getLevelOfOrganisationUnit( ou ) - minOULevel;
+            colCount = 1 + organisationUnitService.getLevelOfOrganisationUnit( ou.getId() ) - minOULevel;
             sheet0.addCell( new Label( colCount, rowCount + 1, ou.getName(), getCellFormat2() ) );
             
             OrganisationUnit orgUnit = new OrganisationUnit();
@@ -2303,7 +2303,7 @@
             
             Integer level = orgunitLevelMap.get( orgU.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( orgU );
+                level = organisationUnitService.getLevelOfOrganisationUnit( orgU.getId() );
             if ( level > orgUnitLevelCB )
             {
                 ouIterator.remove();
@@ -2314,7 +2314,7 @@
         int maxOuLevel = 1;
         if ( selOUList != null && selOUList.size() > 0 )
         {
-            minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ) );
+            minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ).getId() );
         }
         maxOuLevel = orgUnitLevelCB;
 
@@ -2347,7 +2347,7 @@
             
             Integer level = orgunitLevelMap.get( ou.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                level = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
             
             colCount = 1 + level - minOULevel;
             sheet0.addCell( new Label( colCount, headerRow + 1 + rowCount, ou.getName(), getCellFormat2() ) );
@@ -2669,7 +2669,7 @@
             
             Integer level = orgunitLevelMap.get( ou.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                level = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
             
             colCount = 1 + level - minOULevel;
             sheet0.addCell( new Label( colCount, headerRow + 1 + rowCount, ou.getName(), getCellFormat2() ) );
@@ -3404,7 +3404,7 @@
             
             Integer level = orgunitLevelMap.get( orgU.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( orgU );
+                level = organisationUnitService.getLevelOfOrganisationUnit( orgU.getId() );
             if ( level > orgUnitLevelCB )
             {
                 ouIterator.remove();
@@ -3415,7 +3415,7 @@
         int maxOuLevel = 1;
         if ( selOUList != null && selOUList.size() > 0 )
         {
-            minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ) );
+            minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ).getId() );
         }
         maxOuLevel = orgUnitLevelCB;
 
@@ -3442,7 +3442,7 @@
             
             Integer level = orgunitLevelMap.get( ou.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                level = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
             
             colCount = 1 + level - minOULevel;
             sheet0.addCell( new Label( colCount, headerRow + rowCount, ou.getName(), getCellFormat2() ) );
@@ -3677,7 +3677,7 @@
             
             Integer level = orgunitLevelMap.get( ou.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                level = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
             
             colCount = 1 + level - minOULevel;
             sheet0.addCell( new Label( colCount, headerRow + rowCount, ou.getName(), getCellFormat2() ) );
@@ -3899,7 +3899,7 @@
             
             Integer level = orgunitLevelMap.get( orgU.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( orgU );
+                level = organisationUnitService.getLevelOfOrganisationUnit( orgU.getId() );
             if ( level > orgUnitLevelCB )
             {
                 ouIterator.remove();
@@ -3910,7 +3910,7 @@
         int maxOuLevel = 1;
         if ( selOUList != null && selOUList.size() > 0 )
         {
-            minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ) );
+            minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ).getId() );
         }
         maxOuLevel = orgUnitLevelCB;
 
@@ -3938,7 +3938,7 @@
             
             Integer level = orgunitLevelMap.get( ou.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                level = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
             
             colCount = 1 + level - minOULevel;
             sheet0.addCell( new Label( colCount, headerRow + 1 + rowCount, ou.getName(), getCellFormat2() ) );
@@ -4261,7 +4261,7 @@
             
             Integer level = orgunitLevelMap.get( ou.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                level = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
             
             colCount = 1 + level - minOULevel;
             sheet0.addCell( new Label( colCount, headerRow + 1 + rowCount, ou.getName(), getCellFormat2() ) );
@@ -4874,7 +4874,7 @@
             
             Integer level = orgunitLevelMap.get( orgU.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( orgU );
+                level = organisationUnitService.getLevelOfOrganisationUnit( orgU.getId() );
             if ( level > orgUnitLevelCB )
             {
                 ouIterator.remove();
@@ -4885,7 +4885,7 @@
         int maxOuLevel = 1;
         if ( selOUList != null && selOUList.size() > 0 )
         {
-            minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ) );
+            minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ).getId() );
         }
         maxOuLevel = orgUnitLevelCB;
 
@@ -4920,7 +4920,7 @@
             
             Integer level = orgunitLevelMap.get( ou.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                level = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
             
             colCount = 1 + level - minOULevel;
             sheet0.addCell( new Label( colCount, headerRow + 1 + rowCount, ou.getName(), getCellFormat2() ) );
@@ -5244,7 +5244,7 @@
             
             Integer level = orgunitLevelMap.get( ou.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                level = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
             
             colCount = 1 + level - minOULevel;
             sheet0.addCell( new Label( colCount, headerRow + 1 + rowCount, ou.getName(), getCellFormat2() ) );
@@ -5854,7 +5854,7 @@
             
             Integer level = orgunitLevelMap.get( orgU.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( orgU );
+                level = organisationUnitService.getLevelOfOrganisationUnit( orgU.getId() );
             if ( level > orgUnitLevelCB )
             {
                 ouIterator.remove();
@@ -5865,7 +5865,7 @@
         int maxOuLevel = 1;
         if ( selOUList != null && selOUList.size() > 0 )
         {
-            minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ) );
+            minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ).getId() );
         }
         maxOuLevel = orgUnitLevelCB;
 
@@ -5899,7 +5899,7 @@
             
             Integer level = orgunitLevelMap.get( ou.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                level = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
             
             colCount = 1 + level - minOULevel;
             sheet0.addCell( new Label( colCount, headerRow + rowCount, ou.getName(), getCellFormat2() ) );
@@ -6136,7 +6136,7 @@
             
             Integer level = orgunitLevelMap.get( ou.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( ou );
+                level = organisationUnitService.getLevelOfOrganisationUnit( ou.getId() );
             
             colCount = 1 + level - minOULevel;
             sheet0.addCell( new Label( colCount, headerRow + rowCount, ou.getName(), getCellFormat2() ) );
@@ -6573,7 +6573,7 @@
             
             Integer level = orgunitLevelMap.get( orgU.getId() );
             if( level == null )
-                level = organisationUnitService.getLevelOfOrganisationUnit( orgU );
+                level = organisationUnitService.getLevelOfOrganisationUnit( orgU.getId() );
             if ( level > orgUnitLevelCB )
             {
                 ouIterator.remove();
@@ -6584,7 +6584,7 @@
         int maxOuLevel = 1;
         if ( selOUList != null && selOUList.size() > 0 )
         {
-            minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ) );
+            minOULevel = organisationUnitService.getLevelOfOrganisationUnit( selOUList.get( 0 ).getId() );
         }
         maxOuLevel = orgUnitLevelCB;
 
@@ -6615,7 +6615,7 @@
         for ( OrganisationUnit ou : selOUList )
         {
             sheet0.addCell( new Number( headerCol, headerRow + 1 + rowCount, rowCount, getCellFormat2() ) );
-            colCount = 1 + organisationUnitService.getLevelOfOrganisationUnit( ou ) - minOULevel;
+            colCount = 1 + organisationUnitService.getLevelOfOrganisationUnit( ou.getId() ) - minOULevel;
             sheet0.addCell( new Label( colCount, headerRow + 1 + rowCount, ou.getName(), getCellFormat2() ) );
 
             colCount = c1;

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dashBoardMatrixFront.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dashBoardMatrixFront.vm	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dashBoardMatrixFront.vm	2011-12-14 10:18:12 +0000
@@ -21,7 +21,7 @@
 			            var orgUnitLevels = new HashTable();
 			            #foreach($orgUnit in $organisationUnits)
 			                var orgUnitId = ""+$orgUnit.getId();
-			                orgUnitLevels.put(orgUnitId,""+$organisationUnitService.getLevelOfOrganisationUnit( $orgUnit ));
+			                orgUnitLevels.put(orgUnitId,""+$organisationUnitService.getLevelOfOrganisationUnit( $orgUnit.id ));
 			            #end		
 			            
 			            var orgUnitChildren = new HashTable();

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntryStatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntryStatusResult.vm	2011-07-07 07:02:33 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntryStatusResult.vm	2011-12-14 10:18:12 +0000
@@ -108,7 +108,7 @@
 
                         #foreach( $chiildorgUnit in $orgUnitList )
                             #set( $count1 = $minOULevel )
-                            #set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit( $chiildorgUnit ) )
+                            #set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit( $chiildorgUnit.id ) )
                             <tr class="TableHeadingCellStyles">
                                 #foreach( $levelName in $levelNames )
                                     #if( $count1 == $curOrgUnitLevel )

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntrySummaryStatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntrySummaryStatusResult.vm	2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataEntrySummaryStatusResult.vm	2011-12-14 10:18:12 +0000
@@ -96,7 +96,7 @@
 
                         #foreach( $chiildorgUnit in $orgUnitList )
                             #set( $count1 = $minOULevel )
-                            #set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit( $chiildorgUnit ) )
+                            #set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit( $chiildorgUnit.id ) )
                             #set( $orgunitCount = $ouMapForChildDSAssociation.get( $chiildorgUnit ) )
                             <tr class="TableHeadingCellStyles">
                                 #foreach( $levelName in $levelNames )

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusDataSetWiseResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusDataSetWiseResult.vm	2011-07-07 07:32:49 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusDataSetWiseResult.vm	2011-12-14 10:18:12 +0000
@@ -80,7 +80,7 @@
     				 </tr>
 						#foreach($chiildorgUnit in $orgUnitList)
 						#set( $count1 = $minOULevel )
-						#set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit( $chiildorgUnit ) )
+						#set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit( $chiildorgUnit.id ) )
 						##set( $orgunitCount = $ouMapForChildDSAssociation.get( $chiildorgUnit ) )
 						#set( $orgunitChildCount = $ouMaporgChildCount.get( $chiildorgUnit ) )
 						##set( $orgunitColor = $ouDataSetMapColor.get( $chiildorgUnit ) )

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusResult.vm	2011-10-14 12:26:01 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusResult.vm	2011-12-14 10:18:12 +0000
@@ -105,7 +105,7 @@
 
                         #foreach( $chiildorgUnit in $orgUnitList )
                             #set( $count1 = $minOULevel )
-                            #set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit( $chiildorgUnit ) )
+                            #set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit( $chiildorgUnit.id ) )
                             <tr class="TableHeadingCellStyles">
                                 #foreach( $levelName in $levelNames )
                                     #if( $count1 == $curOrgUnitLevel )

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusResult_Test.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusResult_Test.vm	2011-06-15 06:01:50 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/dataStatusResult_Test.vm	2011-12-14 10:18:12 +0000
@@ -99,7 +99,7 @@
 
                         #foreach( $chiildorgUnit in $orgUnitList )
                             #set( $count1 = $minOULevel )
-                            #set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit( $chiildorgUnit ) )
+                            #set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit( $chiildorgUnit.id ) )
                             <tr class="TableHeadingCellStyles">
                                 #foreach( $levelName in $levelNames )
                                     #if( $count1 == $curOrgUnitLevel )

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/groupWiseDataStatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/groupWiseDataStatusResult.vm	2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/groupWiseDataStatusResult.vm	2011-12-14 10:18:12 +0000
@@ -84,7 +84,7 @@
                               </tr>
                               #foreach($chiildorgUnit in $orgUnitList)
                                   #set($count1 = $minOULevel)
-                                  #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit))
+                                  #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit.id))
                                   <tr class="TableHeadingCellStyles">
                                       #foreach($levelName in $levelNames)
                                           #if($count1 == $curOrgUnitLevel)

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/groupWiseMobileDataStatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/groupWiseMobileDataStatusResult.vm	2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/groupWiseMobileDataStatusResult.vm	2011-12-14 10:18:12 +0000
@@ -84,7 +84,7 @@
                               </tr>
                               #foreach($chiildorgUnit in $orgUnitList)
                                   #set($count1 = $minOULevel)
-                                  #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit))
+                                  #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit.id))
                                   <tr class="TableHeadingCellStyles">
                                       #foreach($levelName in $levelNames)
                                           #if($count1 == $curOrgUnitLevel)

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/lastUpdatedDataSetSatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/lastUpdatedDataSetSatusResult.vm	2010-08-31 11:27:36 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/lastUpdatedDataSetSatusResult.vm	2011-12-14 10:18:12 +0000
@@ -66,7 +66,7 @@
   				              
   				              #foreach($chiildorgUnit in $orgUnitList)
   				                  #set($count1 = $minOULevel)
-  				                  #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit))
+  				                  #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit.id))
   				                  <tr class="TableHeadingCellStyles">
   				                      #foreach($levelName in $levelNames)
   				                          #if($count1 == $curOrgUnitLevel)

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/lastUpdatedMobileDataSetSatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/lastUpdatedMobileDataSetSatusResult.vm	2010-11-25 07:50:13 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/lastUpdatedMobileDataSetSatusResult.vm	2011-12-14 10:18:12 +0000
@@ -64,7 +64,7 @@
                               
                               #foreach($chiildorgUnit in $orgUnitList)
                                   #set($count1 = $minOULevel)
-                                  #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit))
+                                  #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit.id))
                                   <tr class="TableHeadingCellStyles">
                                       #foreach($levelName in $levelNames)
                                           #if($count1 == $curOrgUnitLevel)

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/mobileDataStatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/mobileDataStatusResult.vm	2010-11-30 05:48:19 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/mobileDataStatusResult.vm	2011-12-14 10:18:12 +0000
@@ -89,7 +89,7 @@
                               
            #foreach($chiildorgUnit in $orgUnitList)
 	          #set($count1 = $minOULevel)
-	          #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit))
+	          #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit.id))
               <tr class="TableHeadingCellStyles">
 	              #foreach($levelName in $levelNames)
 	                  #if($count1 == $curOrgUnitLevel)

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/percentageWiseDataStatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/percentageWiseDataStatusResult.vm	2010-11-26 12:48:06 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/percentageWiseDataStatusResult.vm	2011-12-14 10:18:12 +0000
@@ -60,7 +60,7 @@
                               
            #foreach($chiildorgUnit in $orgUnitList)
 	          #set($count1 = $minOULevel)
-	          #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit))
+	          #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit.id))
               <tr class="TableHeadingCellStyles">
 	              #foreach($levelName in $levelNames)
 	                  #if($count1 == $curOrgUnitLevel)

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summaryMobileSatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summaryMobileSatusResult.vm	2010-11-25 07:50:13 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summaryMobileSatusResult.vm	2011-12-14 10:18:12 +0000
@@ -77,7 +77,7 @@
                               
                                  #foreach($chiildorgUnit in $orgUnitList)
                                   #set($count1 = $minOULevel)
-                                  #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit))
+                                  #set($curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit.id))
                                   <tr class="TableHeadingCellStyles">
                                       #foreach($levelName in $levelNames)
                                           #if($count1 == $curOrgUnitLevel)

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summarySatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summarySatusResult.vm	2011-04-15 11:35:33 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/summarySatusResult.vm	2011-12-14 10:18:12 +0000
@@ -71,7 +71,7 @@
                               
                     #foreach($chiildorgUnit in $orgUnitList)
                         #set( $count1 = $minOULevel )
-                        #set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit( $chiildorgUnit ) )
+                        #set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit( $chiildorgUnit.id ) )
                         #set( $orgunitCount = $ouMapForChildDSAssociation.get( $chiildorgUnit ) )
                         #set( $orgunitColor = $ouMapForColor.get( $chiildorgUnit ) )
                         

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/validationMobileSatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/validationMobileSatusResult.vm	2010-11-24 09:27:00 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/validationMobileSatusResult.vm	2011-12-14 10:18:12 +0000
@@ -60,7 +60,7 @@
 
                 #foreach( $chiildorgUnit in $orgUnitList )
                     #set( $count1 = $minOULevel )
-                    #set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit) )
+                    #set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit.id) )
                     <tr class="TableHeadingCellStyles" >
                         #foreach($levelName in $levelNames)
                             #if($count1 == $curOrgUnitLevel)

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/validationSatusResult.vm'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/validationSatusResult.vm	2010-11-24 09:27:00 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/validationSatusResult.vm	2011-12-14 10:18:12 +0000
@@ -58,7 +58,7 @@
 
 	            #foreach( $chiildorgUnit in $orgUnitList )
 	                #set( $count1 = $minOULevel )
-	                #set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit) )
+	                #set( $curOrgUnitLevel = $organisationUnitService.getLevelOfOrganisationUnit($chiildorgUnit.id) )
 	                <tr class="TableHeadingCellStyles" >
 	                    #foreach($levelName in $levelNames)
 	                    	#if($count1 == $curOrgUnitLevel)