← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13497: Approval, updating notification when data is approved/unapproved

 

------------------------------------------------------------
revno: 13497
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-12-30 17:37:30 +0100
message:
  Approval, updating notification when data is approved/unapproved
modified:
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.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/javascript/dataSetReport.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js	2013-12-30 16:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js	2013-12-30 16:37:30 +0000
@@ -391,7 +391,8 @@
 		type: "post",
 		success: function() {
 			$( "#approveButton" ).prop( "disabled", true );
-			$( "#unapproveButton" ).prop( "disabled", false );			
+			$( "#unapproveButton" ).prop( "disabled", false );
+			$( "#approvalNotification" ).show().html( i18n_approved );
 		},
 		error: function( xhr, status, error ) {
 			alert( xhr.responseText );
@@ -413,7 +414,8 @@
 		type: "delete",
 		success: function() {
 			$( "#approveButton" ).prop( "disabled", false );
-			$( "#unapproveButton" ).prop( "disabled", true );			
+			$( "#unapproveButton" ).prop( "disabled", true );
+			$( "#approvalNotification" ).show().html( i18n_ready_for_approval );
 		},
 		error: function( xhr, status, error ) {
 			alert( xhr.responseText );