dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14328
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4832: Add a group which includes dataelements without group into add/update patient aggregation form.
------------------------------------------------------------
revno: 4832
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-10-05 14:36:08 +0700
message:
Add a group which includes dataelements without group into add/update patient aggregation form.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.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/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm 2011-09-29 04:17:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm 2011-10-05 07:36:08 +0000
@@ -29,10 +29,11 @@
<td width="20em"><label for="dataElementGroup">$i18n.getString( "dataelement_group" )</label></td>
<td>
<select id="dataElementGroup" name="dataElementGroup" style="min-width:30.5em" onchange="getAggDataElements();">
- <option value="0">[$i18n.getString('please_select')]</option>
+ <option value="">[$i18n.getString('please_select')]</option>
#foreach( $dataElementGroup in $dataElementGroups)
<option value="$dataElementGroup.id" >$dataElementGroup.name</option>
#end
+ <option value="0">$i18n.getString('others')</option>
</select>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js 2011-09-28 07:11:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js 2011-10-05 07:36:08 +0000
@@ -7,7 +7,7 @@
{
var dataElementGroup = document.getElementById( 'dataElementGroup' );
var dataElementGroupId = dataElementGroup.options[ dataElementGroup.selectedIndex ].value;
- if( dataElementGroupId == 0 ){
+ if( dataElementGroupId == "" ){
clearList( byId('aggregationDataElementId'));
return;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2011-09-29 04:17:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2011-10-05 07:36:08 +0000
@@ -36,6 +36,7 @@
#foreach( $dataElementGroup in $dataElementGroups)
<option value="$dataElementGroup.id" >$dataElementGroup.name</option>
#end
+ <option value="0">$i18n.getString('others')</option>
</select>
</td>
</tr>
