------------------------------------------------------------ revno: 6340 committer: Tran Chau <[email protected]> branch nick: dhis2 timestamp: Thu 2012-03-22 10:06:42 +0700 message: (patient) Don't load data element list in Add/Update validation for program. modified: dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseAggDataElement.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.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-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-03-13 06:09:59 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-03-22 03:06:42 +0000 @@ -280,4 +280,7 @@ clear_filter = Clear filter selected_orgunit_no_have_any_child = Selected organisation unit no have any child age_of_patient_must_be_less_or_equals_to_100 = Age of beneficiary must be less or equals to 100 -data_element = Data element \ No newline at end of file +data_element = Data element +V=Verified +D=Declared +A=Approximated \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm 2012-03-15 09:28:38 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm 2012-03-22 03:06:42 +0000 @@ -79,7 +79,3 @@ </td> </tr> </table> - -<script> - getLeftPrgramStageDataElements(); -</script> === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseAggDataElement.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseAggDataElement.vm 2012-03-01 07:16:15 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseAggDataElement.vm 2012-03-22 03:06:42 +0000 @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <dataelements> - #foreach( $ocName in $optionComboNames ) - #set( $count = $velocityCount - 1 ) + #foreach( $dataElement in $dataElementList ) <dataelement> - <id>$optionComboIds.get($count)</id> - <name>$encoder.xmlEncode( $ocName )</name> + <id>[DE:$psId.$dataElement.id]</id> + <name>$encoder.xmlEncode( $dataElement.name )</name> </dataelement> #end </dataelements> \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm 2012-03-15 09:28:38 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm 2012-03-22 03:06:42 +0000 @@ -80,7 +80,3 @@ </tr> </table> - -<script> - getLeftPrgramStageDataElements(); -</script> \ No newline at end of file
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
