dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10446
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-04-02 12:15:55 +0700
message:
  Disable Generate events by enrollment date checkbox in Add new program.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/scheduling.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.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-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js	2013-03-01 07:34:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js	2013-04-02 05:15:55 +0000
@@ -88,6 +88,7 @@
 		if( type == 2 ){
 			disable('ignoreOverdueEvents');
 			disable('onlyEnrollOnce');
+			disable('generatedByEnrollmentDate');
 		}
 		
 		if(byId('displayIncidentDate').checked){

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/scheduling.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/scheduling.js	2013-03-09 15:25:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/scheduling.js	2013-04-02 05:15:55 +0000
@@ -69,14 +69,19 @@
 function executeAggCondTasks()
 {
 	var ok = confirm( i18n_execute_tasks_confirmation );
-	setWaitMessage( i18n_executing );	
 	if ( ok )
 	{
 		$.post( 'scheduleCaseAggTasks.action',{
 			taskStrategy:getFieldValue('taskStrategy'),
 			execute:true
 		},function( json ){
-			setMessage(i18n_execute_success);
+			pingNotificationsTimeout();
 		});
 	}
-}
\ No newline at end of file
+}
+
+function pingNotificationsTimeout()
+{
+	pingNotifications( 'AGGREGATE_QUERY_BUILDER', 'notificationTable' );
+	setTimeout( "pingNotificationsTimeout()", 200 );
+}

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm	2013-03-09 15:25:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm	2013-04-02 05:15:55 +0000
@@ -47,4 +47,8 @@
 </form>
 
 <span id="info">$i18n.getString( "scheduling_is" ) $!i18n.getString( $!status )</span>
-<span id="message"></span>
+
+<table id="notificationTable" class="notificationTable" style="display:none">
+	<col width="120">
+	<col width="380">
+</table>