+ |
$i18n.getString( "dataelement_comment" )=== 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 2011-07-28 07:15:09 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2011-07-28 07:34:34 +0000 @@ -501,9 +501,7 @@ } else { - var url = 'validate.action?periodId=' + periodId + '&dataSetId=' + dataSetId; - - window.open( url, '_blank', 'width=800, height=400, scrollbars=yes, resizable=yes' ); + validate(); } } @@ -535,14 +533,26 @@ // Validation // ----------------------------------------------------------------------------- +function displayValidationDialog() +{ + $( '#validationDiv' ).dialog( { + modal: true, + title: 'Validation', + width: 800, + height: 400 + } ); +} + function validate() { var periodId = $( '#selectedPeriodId' ).val(); var dataSetId = $( '#selectedDataSetId' ).val(); - - var url = 'validate.action?periodId=' + periodId + '&dataSetId=' + dataSetId; - window.open( url, '_blank', 'width=800, height=400, scrollbars=yes, resizable=yes' ); + $( '#validationDiv' ).load( 'validate.action', { + periodId: periodId, + dataSetId: dataSetId }, + displayValidationDialog + ); } // ----------------------------------------------------------------------------- === 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 2011-07-28 07:15:09 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2011-07-28 07:34:34 +0000 @@ -111,3 +111,5 @@ + + === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/validationResult.vm' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/validationResult.vm 2011-03-17 11:01:05 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/validationResult.vm 2011-07-28 07:34:34 +0000 @@ -1,13 +1,13 @@ $encoder.htmlEncode( $i18n.getString( "validation_result" ) )#if( $results.size() == 0 && $dataValues.size() == 0 ) -$encoder.htmlEncode( $i18n.getString( "successful_validation" ) ) +$encoder.htmlEncode( $i18n.getString( "successful_validation" ) ) #else -$encoder.htmlEncode( $i18n.getString( "unsuccessful_validation" ) ) +$encoder.htmlEncode( $i18n.getString( "unsuccessful_validation" ) ) #end #if( $results.size() > 0) -$encoder.htmlEncode( $i18n.getString( "the_following_values_violates_rules" ) ) +$encoder.htmlEncode( $i18n.getString( "the_following_values_violate_rules" ) )
|