------------------------------------------------------------ revno: 2338 committer: Mithilesh Kumar Thakur<mithilesh.h...@gmail.com> branch nick: trunk timestamp: Fri 2010-10-08 15:26:09 +0530 message: Bug Fixed in Data Entry modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.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-dataentry/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml 2010-06-27 15:47:33 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml 2010-10-08 09:56:09 +0000 @@ -188,7 +188,7 @@ <action name="viewHistory" class="org.hisp.dhis.de.action.HistoryAction"> <result name="success" type="velocity">/popup.vm</result> <param name="page">/dhis-web-dataentry/history.vm</param> - <param name="javascripts">javascript/history.js</param> + <param name="javascripts">javascript/history.js,../request.js</param> </action> <action name="minMaxGeneration" class="org.hisp.dhis.de.action.MinMaxGeneratingAction"> === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm 2010-04-05 14:15:54 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm 2010-10-08 09:56:09 +0000 @@ -55,7 +55,7 @@ <tr> <td style="background-color:#2e4e83; height:26px"> </td> <td>$encoder.htmlEncode( $i18n.getString( "max_limit" ) ) </td> - <td><input type="text" id="maxLimit" style="width:10em" value="$maxLimit" + <td><input type="text" id="maxLimit" style="width:10em" value="$maxLimit" class="{validate:{digits:true}}" #if( $auth.hasAccess( "dhis-web-dataentry", "saveMinMaxLimits" ) && $auth.hasAccess( "dhis-web-dataentry", "removeMinMaxLimits" )) onchange="saveMaxLimit( $dataElementHistory.organisationUnit.id, $dataElementHistory.dataElement.id, $dataElementHistory.optionCombo.id )" #else disabled="disabled" #end onfocus="this.select()"></td> === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js 2010-01-28 23:08:44 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js 2010-10-08 09:56:09 +0000 @@ -148,20 +148,24 @@ function saveMaxLimit( organisationUnitId, dataElementId, optionComboId ) { - var minLimitField = document.getElementById( "minLimit" ); + + var minLimitField = document.getElementById( "minLimit" ); var maxLimitField = document.getElementById( "maxLimit" ); - + var request = new Request(); + request.setCallbackSuccess( refreshWindow ); request.setCallbackError( refreshWindow ); if ( maxLimitField.value == '' ) { - request.send( 'removeMinMaxLimits.action?organisationUnitId=' + organisationUnitId + '&dataElementId=' + dataElementId + '&optionComboId=' + optionComboId ); + + request.send( 'removeMinMaxLimits.action?organisationUnitId=' + organisationUnitId + '&dataElementId=' + dataElementId + '&optionComboId=' + optionComboId ); + } else { - var minLimit = Number( minLimitField.value ); + var minLimit = Number( minLimitField.value ); var maxLimit = Number( maxLimitField.value ); if ( maxLimit ) @@ -180,7 +184,8 @@ minLimit = maxLimit - 1; } - request.send( 'saveMinMaxLimits.action?organisationUnitId=' + organisationUnitId + '&dataElementId=' + dataElementId + '&optionComboId=' + optionComboId + '&minLimit=' + minLimit + '&maxLimit=' + maxLimit ); + request.send( 'saveMinMaxLimits.action?organisationUnitId=' + organisationUnitId + '&dataElementId=' + dataElementId + '&optionComboId=' + optionComboId + '&minLimit=' + minLimit + '&maxLimit=' + maxLimit ); + } else {
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp