dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5591
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-12-25 18:03:35 +0100
message:
  Added function / button for executing tasks immediately in scheduling management
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/scheduling.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.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-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2011-12-25 16:49:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2011-12-25 17:03:35 +0000
@@ -375,5 +375,7 @@
 last_12_months_daily=Last 12 months daily
 last_6_months_daily_6_to_12_months_weekly=Last 6 months daily + 6 to 12 months weekly
 organisation_unit_group_set_aggregation_level=Organisation unit group set aggregation level
-aggregated_org_unit_data_values = Aggregated org unit data values
-aggregated_org_unit_indicator_values = Aggregated org unit indicator values
\ No newline at end of file
+aggregated_org_unit_data_values=Aggregated org unit data values
+aggregated_org_unit_indicator_values=Aggregated org unit indicator values
+execute_now=Execute now
+execute_tasks_confirmation=Are you sure you want to execute all tasks now? Task processing might fully utilize your system resources and slow down other operations.
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/scheduling.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/scheduling.js	2011-11-24 08:27:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/scheduling.js	2011-12-25 17:03:35 +0000
@@ -15,4 +15,14 @@
 {
 	$( '.scheduling' ).removeAttr( 'disabled' );
 	$( '#schedulingForm' ).submit();
+}
+
+function executeTasks()
+{
+	var ok = confirm( i18n_execute_tasks_confirmation );
+	
+	if ( ok )
+	{
+		window.location.href = 'scheduleTasks.action?execute=true';
+	}
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm	2011-03-17 19:31:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm	2011-12-25 17:03:35 +0000
@@ -1,11 +1,5 @@
 <script type="text/javascript">
-    var i18n_generating_resource_tables = '$encoder.jsEscape( $i18n.getString( "generating_resource_tables" ), "'" )';
-    var i18n_resource_tables_generated = '$encoder.jsEscape( $i18n.getString( "resource_tables_generated" ), "'" )';
-    var i18n_regenerating_resource_tables_and_views = '$encoder.jsEscape( $i18n.getString( "regenerating_resource_tables_and_views" ), "'" )';
-    var i18n_regenerating_failed = '$encoder.jsEscape( $i18n.getString( "regenerating_failed" ), "'" )';
-    var i18n_select_options = '$encoder.jsEscape( $i18n.getString( "select_options" ), "'" )';
-    var i18n_select_all = '$encoder.jsEscape( $i18n.getString( "select_all" ), "'" )';
-    var i18n_unselect_all = '$encoder.jsEscape( $i18n.getString( "unselect_all" ), "'" )';
+    var i18n_execute_tasks_confirmation = '$encoder.jsEscape( $i18n.getString( "execute_tasks_confirmation" ), "'" )';
 </script>
 
 <h3>$i18n.getString( "resource_table" ) #openHelp( "resourceTables" )</h3>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.vm	2011-11-25 18:01:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.vm	2011-12-25 17:03:35 +0000
@@ -1,3 +1,6 @@
+<script type="text/javascript">
+    var i18n_execute_tasks_confirmation = '$encoder.jsEscape( $i18n.getString( "execute_tasks_confirmation" ), "'" )';
+</script>
 
 <h3>$i18n.getString( "scheduling_management" )</h3>
 
@@ -60,7 +63,7 @@
 		value="$i18n.getString( 'start' )"
 		#end
 		/>
-		<input type="button" style="width:140px" onclick="window.location.href='viewScheduledTasks.action?statusOnly=true'" value="$i18n.getString( 'refresh' )" />
+		<input type="button" style="width:140px" onclick="executeTasks()" value="$i18n.getString( 'execute_now' )" />
 	</td>
 </tr>
 </table>