=== modified file 'dhis-2/dhis-api/src.rar'
Binary files dhis-2/dhis-api/src.rar	2009-09-25 06:10:21 +0000 and dhis-2/dhis-api/src.rar	2009-09-26 05:31:47 +0000 differ
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/pom.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/pom.xml	2009-09-25 21:45:01 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/pom.xml	2009-09-26 05:31:47 +0000
@@ -41,12 +41,13 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-mapping</artifactId>
     </dependency>
-    <!-- 
+	<!--
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-user-hibernate</artifactId>
     </dependency>
-    -->
+	-->
+
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-support-system</artifactId>

=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src.rar'
Binary files dhis-2/dhis-services/dhis-service-excel-reporting/src.rar	2009-09-25 06:10:21 +0000 and dhis-2/dhis-services/dhis-service-excel-reporting/src.rar	2009-09-26 05:31:47 +0000 differ
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcel.hbm.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcel.hbm.xml	2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcel.hbm.xml	2009-09-26 05:31:47 +0000
@@ -11,7 +11,7 @@
 		<property name="excelTemplateFile" column="exceltemplate" />
 		<property name="periodRow" column="periodrow" />
 		<property name="periodColumn" column="periodcolumn" />
-		<property name="organisationRow" column="rganisationrow" />
+		<property name="organisationRow" column="organisationrow" />
 		<property name="organisationColumn" column="organisationcolumn" />
 		<property name="group" column="reportgroup" />
 

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src.rar'
Binary files dhis-2/dhis-web/dhis-web-excel-reporting/src.rar	2009-09-25 06:10:21 +0000 and dhis-2/dhis-web/dhis-web-excel-reporting/src.rar	2009-09-26 05:31:47 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm	2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm	2009-09-26 05:31:47 +0000
@@ -3,7 +3,7 @@
 	<tr>
 		<td><label>$i18n.getString('group')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
-			<select type="text" id="group" name="group" style="min-width:20em" onchange="getReportByGroup()" #if(!$organisationUnit) disabled #end>
+			<select type="text" id="group" name="group" style="min-width:20em" onchange="getReportExcelsByGroup()" #if(!$organisationUnit) disabled #end>
 				#foreach($group in $groups)
 					<option value='$group'>$encoder.htmlEncode( $group )</option>				
 				#end

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddRoleAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddRoleAction.java	2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddRoleAction.java	2009-09-26 05:31:47 +0000
@@ -134,7 +134,7 @@
 
             ReportExcel reportExcel = reportExcelService.getReportExcel( Integer.parseInt( id ) );
 
-            group.getReportExcels().add( reportExcel );
+            //group.getReportExcels().add( reportExcel );
         }
 
         group.getAuthorities().addAll( selectedListAuthority );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleAction.java	2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleAction.java	2009-09-26 05:31:47 +0000
@@ -189,13 +189,13 @@
 
         availableReportExcels = new ArrayList<ReportExcel>( reportExcelService.getALLReportExcel() );
 
-        reportExcels = new ArrayList<ReportExcel>( userAuthorityGroup.getReportExcels() );
+       // reportExcels = new ArrayList<ReportExcel>( userAuthorityGroup.getReportExcels() );
 
-        availableReportExcels.removeAll( reportExcels );
+        //availableReportExcels.removeAll( reportExcels );
 
         Collections.sort( availableReportExcels, new ReportExcelNameComparator() );
         
-        Collections.sort( reportExcels, new ReportExcelNameComparator() );
+        //Collections.sort( reportExcels, new ReportExcelNameComparator() );
 
         return SUCCESS;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java	2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java	2009-09-26 05:31:47 +0000
@@ -131,7 +131,7 @@
 
         group.getDataSets().clear();
         group.getAuthorities().clear();
-        group.getReportExcels().clear();
+        //group.getReportExcels().clear();
 
         for ( String id : selectedList )
         {
@@ -145,7 +145,7 @@
 
             ReportExcel reportExcel = reportExcelService.getReportExcel( Integer.parseInt( id ) );
 
-            group.getReportExcels().add( reportExcel );
+            //group.getReportExcels().add( reportExcel );
         }
 
         group.getAuthorities().addAll( selectedListAuthority );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm	2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm	2009-09-26 05:31:47 +0000
@@ -45,6 +45,7 @@
           </select>
         </td>
 	</tr>
+	<!--
 	<tr>
 		<td><label>$i18n.getString( "excel_reporting" )</label></td>		
 		<td>
@@ -63,6 +64,7 @@
           </select>
         </td>
 	</tr>
+	-->
 	<tr>
 		<td><label>$i18n.getString( "authorities" )</label></td>		
 		<td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/role.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/role.js	2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/role.js	2009-09-26 05:31:47 +0000
@@ -57,7 +57,7 @@
     {
         selectAll( document.getElementById( 'selectedList' ) );
 		selectAll( document.getElementById( 'selectedListAuthority' ) );
-		selectAll( document.getElementById( 'selectedReportExcel' ) );
+		//selectAll( document.getElementById( 'selectedReportExcel' ) );
         var form = document.getElementById( 'addRoleForm' );
         
         form.submit();
@@ -98,7 +98,7 @@
     {
         selectAll( document.getElementById( 'selectedList' ) );
 		selectAll( document.getElementById( 'selectedListAuthority' ) );
-		selectAll( document.getElementById( 'selectedReportExcel' ) );
+		//selectAll( document.getElementById( 'selectedReportExcel' ) );
         var form = document.getElementById( 'updateRoleForm' );
         
         form.submit();

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm	2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm	2009-09-26 05:31:47 +0000
@@ -52,7 +52,8 @@
         		</select>
         	</td>
 		</tr>
-		<tr>
+		<!--
+		<tr>		
 		<td><label>$i18n.getString( "excel_reporting" )</label></td>		
 		<td>
           <select size="15" id="availableExcelReporting" name="availableExcelReporting" multiple="multiple" style="min-width:20em;height:20em" ondblclick="moveSelectedById( 'availableExcelReporting', 'selectedReportExcel' )">
@@ -73,6 +74,7 @@
           </select>
         </td>
 	</tr>
+	-->
 		<tr>
 			<td><label>$i18n.getString( "authorities" )</label></td>
 			<td>

=== modified file 'dhis-2/dhis-web/pom.xml'
--- dhis-2/dhis-web/pom.xml	2009-09-22 22:20:00 +0000
+++ dhis-2/dhis-web/pom.xml	2009-09-26 05:31:47 +0000
@@ -25,7 +25,8 @@
     <module>dhis-web-reporting</module>
     <module>dhis-web-mapping</module>
     <module>dhis-web-dashboard-integration</module>
-    <!--<module>dhis-web-portal</module>-->
+	<module>dhis-web-excel-reporting</module>
+    <module>dhis-web-portal</module>
   </modules>
 
   <distributionManagement>