------------------------------------------------------------ revno: 2320 committer: Tran Chau <tran.hispviet...@gmail.com> branch nick: trunk timestamp: Tue 2010-10-05 18:58:15 +0700 message: Fix bug: After updating a patient successfully, call Programme Enrolement function. modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.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/resources/org/hisp/dhis/patient/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2010-10-01 05:46:30 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2010-10-05 11:58:15 +0000 @@ -416,4 +416,7 @@ confirm_delete_patientIdentifierType = Are you sure you want to delete identifier type ? available_program = Available Program selected_program = Selected Program -object_not_deleted_associated_by_objects = Object not deleted because it is associated by objects of type \ No newline at end of file +object_not_deleted_associated_by_objects = Object not deleted because it is associated by objects of type +specify_dataelememt = Please specify a data elemement. +processing = Processing ... +done = Done \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2010-10-01 05:46:30 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2010-10-05 11:58:15 +0000 @@ -436,7 +436,7 @@ <action name="updatePatient" class="org.hisp.dhis.patient.action.patient.UpdatePatientAction"> - <result name="success" type="redirect">searchPatient.action + <result name="success" type="chain">showProgramEnrollmentForm </result> <param name="requiredAuthorities">F_PATIENT_UPDATE</param> </action> === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js 2010-10-04 11:11:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js 2010-10-05 11:58:15 +0000 @@ -250,8 +250,7 @@ // ----------------------------------------------------------------------------- function validateAddPatient() -{ - +{ var age = document.getElementById( 'age' ); var orgunitcode = document.getElementById('orgunitcode'); if( age.value != '' ) @@ -599,27 +598,9 @@ { var pageSize = jQuery("#sizeOfPage").val(); var currentPage = jQuery("#jumpToPage").val(); - var numberOfPages = jQuery("#numberOfPages").val(); - - if( currentPage > numberOfPages ) - { - //alert( "currentPage is: " +currentPage + " Greater than No of Pages: " +numberOfPages ); - alert("Current Page should be less than No of pages" ); - return false; - } window.location.href = baseLink +"pageSize=" + pageSize +"¤tPage=" +currentPage; } -function toggleRelationshipRow(this_) -{ - if( jQuery(this_).attr("checked") ) - { - jQuery("tr.relationship-row").each(function(){jQuery(this).show()}); - }else { - jQuery("tr.relationship-row").each(function(){jQuery(this).hide()}); - } -} - /** * Overwrite showDetails() of common.js * This method will show details div on a pop up instead of show the div in the main table's column. === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2010-09-26 11:49:41 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2010-10-05 11:58:15 +0000 @@ -29,7 +29,7 @@ // ----------------------------------------------------------------------------- function removePatientAttribute( patientAttributeId, name ) { - removeItem( patientAttributeId, name, i18n_confirm_delete, 'removePatientAttribute.action' ); + removeItem( patientAttributeId, name, i18n_confirm_delete, 'removePatientAttribute.action' ); } ATTRIBUTE_OPTION = === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm 2010-10-04 11:11:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm 2010-10-05 11:58:15 +0000 @@ -24,12 +24,7 @@ <td>$total</td> </tr> </table> - <table> - <tr> - <td><label>$i18n.getString('show_patient_relationships')</label></td> - <td><input type="checkbox" onclick="toggleRelationshipRow(this)"/></td> - </tr> - </table> + <table class="mainPageTable"> <tr> === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm 2010-09-27 07:33:12 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm 2010-10-05 11:58:15 +0000 @@ -31,7 +31,7 @@ </td> <td style="text-align:center"#alternate( $mark )> - <a href="#" onclick="removePatientIdentifierType( '$identifierType.id', '$encoder.jsEncode( $identifierType.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a> + <a href="javascript:removePatientIdentifierType( '$identifierType.id', '$encoder.jsEncode( $identifierType.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a> </td> <td style="text-align:center"#alternate( $mark )> === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2010-09-26 11:49:41 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2010-10-05 11:58:15 +0000 @@ -25,15 +25,15 @@ <td>$encoder.htmlEncode( $patientAttribute.name )</td> - <td style="text-align:center"#alternate( $mark )> + <td style="text-align:center"> <a href="showUpdatePatientAttributeForm.action?id=$patientAttribute.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a> </td> - <td style="text-align:center"#alternate( $mark )> + <td style="text-align:center"> <a href="javascript:removePatientAttribute( '$patientAttribute.id', '$encoder.jsEncode( $patientAttribute.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a> </td> - <td style="text-align:center"#alternate( $mark )> + <td style="text-align:center"> <a href="javascript:showPatientAttributeDetails( $patientAttribute.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a> </td> @@ -59,7 +59,7 @@ </td> </tr> </table> - +<p><span id="message"></span></p> <script type="text/javascript"> var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_patient_attribute" ) , "'" )'; var i18n_adding_patient_atttibute_failed = '$encoder.jsEscape( $i18n.getString( "adding_patient_attribute_failed" ), "'")'; @@ -72,4 +72,6 @@ var i18n_text = '$encoder.jsEscape( $i18n.getString( "text" ) , "'")'; var i18n_date = '$encoder.jsEscape( $i18n.getString( "date" ) , "'")'; var i18n_combo = '$encoder.jsEscape( $i18n.getString( "combo" ) , "'")'; + var i18n_processing = '$encoder.jsEscape( $i18n.getString( "processing" ) , "'")'; + var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ) , "'")'; </script>
_______________________________________________ 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