dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2261
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-09-28 13:10:25 +0700
message:
  Fix bug: Showing no message box when clicking Complete  and Undo buttton into dataentry form.
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.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-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2010-09-27 10:24:51 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2010-09-28 06:10:25 +0000
@@ -126,4 +126,7 @@
 specify_input_date					= Please specify an input date
 specify_valid_input_date			= Please enter a valid input date
 no_outlier_values_found				= No outlier values found.
-save_calculated_data_element_success = Save calculated data elements successfully.
\ No newline at end of file
+save_calculated_data_element_success = Save calculated data elements successfully.
+register_complete_dataset_success = Register complete dataset successfully.
+register_complete_dataset_failed = Register complete dataset failed.
+undo_register_complete_dataset_success = Undo register complete dataset success

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2010-09-01 16:55:23 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2010-09-28 06:10:25 +0000
@@ -285,6 +285,7 @@
     }
     else
     {
+		setMessage(i18n_register_complete_dataset_failed);
         window.open( 'validate.action', '_blank', 'width=800, height=400, scrollbars=yes, resizable=yes' );
     }
 }
@@ -296,6 +297,7 @@
     if ( type=='input' )
     {
 		setHeaderDelayMessage( messageElement.firstChild.nodeValue );
+		setMessage(i18n_register_complete_dataset_failed);
 		return;
 	}
 	
@@ -304,6 +306,7 @@
     document.getElementById( "dateField" ).disabled = true;
     document.getElementById( "dateDiv" ).style.display = "none";
     
+	setMessage(i18n_register_complete_dataset_success);
 	changeInputTextStatus( true );
 }
 
@@ -327,5 +330,6 @@
     document.getElementById( "undoButton" ).disabled = true;
     document.getElementById( "dateField" ).disabled = false;
     document.getElementById( "dateDiv" ).style.display = "inline";
+	setMessage( i18n_undo_register_complete_dataset_success );
 	changeInputTextStatus( false );
 }

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2010-09-27 10:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2010-09-28 06:10:25 +0000
@@ -91,4 +91,7 @@
 
 <script type="text/javascript">
 	var i18n_save_calculated_data_element_success = '$encoder.jsEscape( $i18n.getString( "save_calculated_data_element_success" ) , "'")';
+	var i18n_register_complete_dataset_success = '$encoder.jsEscape( $i18n.getString( "register_complete_dataset_success" ) , "'")';
+	var i18n_register_complete_dataset_failed = '$encoder.jsEscape( $i18n.getString( "register_complete_dataset_failed" ) , "'")';
+	var i18n_undo_register_complete_dataset_success = '$encoder.jsEscape( $i18n.getString( "undo_register_complete_dataset_success" ) , "'")';
 </script>