------------------------------------------------------------
revno: 10237
committer: Tran Chau <tran.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Fri 2013-03-15 12:48:16 +0700
message:
Display all programs available into combo box list which belong to the
current user.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.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-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2013-03-14 07:36:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2013-03-15 05:48:16 +0000
@@ -1056,7 +1056,7 @@
<!-- Activity plan -->
<action name="activityPlanSelect"
- class="org.hisp.dhis.caseentry.action.caseentry.MultiDataEntrySelectAction">
+ class="org.hisp.dhis.caseentry.action.patient.SelectAction">
<interceptor-ref name="organisationUnitTreeStack" />
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-caseentry/activityPlanSelect.vm</param>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js 2013-03-05 14:47:06 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js 2013-03-15 05:48:16 +0000
@@ -3,20 +3,8 @@
function orgunitSelected( orgUnits, orgUnitNames )
{
hideById("listPatientDiv");
- clearListById('programIdAddPatient');
- $('#contentDataRecord').html('');
setFieldValue('orgunitName', orgUnitNames[0]);
setFieldValue('orgunitId', orgUnits[0]);
- jQuery( '#programIdAddPatient').append( '<option value="">' + i18n_please_select + '</option>' );
- jQuery.get("getPrograms.action",{},
- function(json)
- {
- for ( i in json.programs ) {
- if(json.programs[i].type==1){
- jQuery( '#programIdAddPatient').append( '<option value="' + json.programs[i].id +'" type="' + json.programs[i].type + '">' + json.programs[i].name + '</option>' );
- }
- }
- });
}
selection.setListenerFunction( orgunitSelected );
_______________________________________________
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
