------------------------------------------------------------
revno: 11031
committer: Tran Chau <tran.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Tue 2013-05-28 10:16:01 +0700
message:
Auto-select dataset when only one dataset is available in list in Manual
Person Aggregate.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
--
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/webapp/dhis-web-caseentry/caseAggregationForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm 2013-05-03 14:18:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm 2013-05-28 03:16:01 +0000
@@ -19,7 +19,11 @@
</td>
<td>
<select id="dataSetId" name="dataSetId" style="width: 30em">
+ #if( $datasets.size()== 0 )
+ <option value=''>[$i18n.getString('none_dataset')]</option>
+ #elseif( $datasets.size() > 1 )
<option value=''>[$i18n.getString('please_select')]</option>
+ #end
#foreach ( $dataSet in $datasets )
<option value='$dataSet.id' title='$dataSet.displayName'>$dataSet.displayName</option>
#end
@@ -30,14 +34,14 @@
<tr>
<td>$i18n.getString( "from" )</td>
<td>
- <input type='text' id="startDate" name="startDate" style="width:392px;" />
+ <input type='text' id="startDate" name="startDate" style="width:355px;" />
</td>
</tr>
<tr>
<td>$i18n.getString( "to" )</td>
<td>
- <input type='text' id="endDate" name="endDate" style="width:392px;" />
+ <input type='text' id="endDate" name="endDate" style="width:355px;" />
<script>
datePickerInRange( 'startDate','endDate', true, true );
</script>
=== 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 2013-05-28 03:10:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2013-05-28 03:16:01 +0000
@@ -414,4 +414,5 @@
selected_program_stages = Selected program stages
list_events = List events
none_program = None program
-none_dataset = None dataset
\ No newline at end of file
+none_dataset = None dataset
+access_log = Access Log
\ No newline at end of file
_______________________________________________
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
