dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1900
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Wed 2010-08-04 10:54:59 +0200
message:
  Fixed minor bug with report table params
modified:
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.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-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm	2010-07-05 23:45:39 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm	2010-08-04 08:54:59 +0000
@@ -1,7 +1,5 @@
 
-#if ( $!reportParams.isSet() )
-    <h3>$i18n.getString( "report_table_parameters" )</h3>
-#end
+<h3>$i18n.getString( "report_table_parameters" )</h3>
 
 <input type="hidden" id="id" name="id" value="$!id">
 <input type="hidden" id="mode" name="mode" value="$!mode">
@@ -10,20 +8,12 @@
 	<script type="text/javascript">
 	   getTableStatus();
 	</script>
-#end
-
-#if ( $mode == "table" && $!reportParams.isSet() == false ) <!-- Create table, nothing to ask -->
-	<script type="text/javascript">
-		createTable( '$id' );
-	</script>
-#end
+#else <!-- Show input params -->
 
 <table>
 	
 	<!-- Data source -->
 	
-	#if ( $mode == "report" )
-	
     <tr>
         <th>$i18n.getString( "data_source" )</th>
     </tr>
@@ -39,8 +29,6 @@
         <td colspan="4" style="height:10px"></td>
     </tr>
 	
-	#end
-	
     <!-- Reporting month -->
     
     #if ( $!reportParams.isParamReportingMonth() )
@@ -111,7 +99,7 @@
     
     <tr>        
         <td>
-        #if ( $mode == "table" || $mode == "status" )
+        #if ( $mode == "table" )
             <input type="button" value="$i18n.getString( 'ok' )" onclick="createTable( '$id' )" style="width:120px">        
             <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='displayManageTableForm.action'" style="width:120px">
         #end
@@ -124,6 +112,8 @@
     
 </table>
 
+#end
+
 <span id="message"></span>
 
 <script type="text/javascript">

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js	2010-07-05 21:54:20 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js	2010-08-04 08:54:59 +0000
@@ -18,7 +18,7 @@
 
 function createTable( tableId )
 {
-    var url = "createTable.action?id=" + tableId + "&mode=table";
+    var url = "createTable.action?id=" + tableId + "&doDataMart=" + getListValue( "doDataMart" ) + "&mode=table";
     
     if ( document.getElementById( "reportingPeriod" ) != null )
     {