dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #09683
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2617: Made dataset report selection user interface more consistent with other reporting tools. Removed ...
------------------------------------------------------------
revno: 2617
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-01-18 11:54:09 +0100
message:
Made dataset report selection user interface more consistent with other reporting tools. Removed print button.
modified:
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/previewCustomDataSetReportForm.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-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2011-01-18 10:19:19 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2011-01-18 10:54:09 +0000
@@ -5,7 +5,8 @@
error_in_input_parameters= Not all required parameters are selected!
aggregation_mode= Aggregation mode
reporting_unit= Reporting unit
-reporting_period= Reporting period
+report_period= Report period
+report_parameters
error_startDate = You must enter a valid start date!
error_endDate = You must enter a valid start date!
error_organisationUnitId = You must select an organisation unit!
@@ -14,7 +15,7 @@
select_data_set= Please select a data set
select_period = Please select a period
select_organisation_unit = Please select an organisation unit
-reporting_organisation_unit= Reporting Organisation Unit
+report_organisation_unit= Report organisation unit
dataset_report= Dataset Report
add_selected= Add selected
add_all= Add all
@@ -205,8 +206,7 @@
all_indicator_and_periods = All indicators and periods
all_indicator_and_orgunits = All indicators and orgunits
generating_report = Generating report
-use_data_for = Use data for
-selected_unit_only= selected unit only
+use_data_for_selected_unit_only = Use data for selected unit only
add_to_dashboard = Add to dashboard
confirm_add_to_dashboard = Are you sure want to add this report to the dashboard?
select_organisation_unit_level = Select organisation unit level
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm 2011-01-06 22:25:33 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm 2011-01-18 10:54:09 +0000
@@ -5,10 +5,9 @@
<table>
<tr>
- <th colspan="2">$i18n.getString( "criteria" )</th>
+ <th>$i18n.getString( "dataset" )</th>
</tr>
<tr>
- <td><label for="dataSetId">$i18n.getString( "dataset" )</label></td>
<td>
<select id="dataSetId" name="dataSetId" style="width:325px">
<option value="">[ $i18n.getString( "select" ) ]</option>
@@ -18,9 +17,13 @@
</select>
</td>
</tr>
-
- <tr>
- <td><label for="selectedPeriodIndex">$i18n.getString( "reporting_period" )</label></td>
+ <tr>
+ <td style="height:10px"></td>
+ </tr>
+ <tr>
+ <th>$i18n.getString( "report_period" )</th>
+ </tr>
+ <tr>
<td>
<input type="button" style="width:50px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'periodId', 'periodId', '-1' )"><input
type="button" style="width:50px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'periodId', 'periodId', '1' )">
@@ -34,23 +37,28 @@
<select id="periodId" name="periodId" style="width:325px">
</select>
</td>
- </tr>
+ </tr>
+ <tr>
+ <td style="height:10px"></td>
+ </tr>
+ <tr>
+ <th>$i18n.getString( "report_parameters" )</th>
+ </tr>
<tr>
- <td><label>$i18n.getString( "use_data_for" )<br>$i18n.getString( "selected_unit_only" )</label></td>
- <td><input type="checkbox" id="selectedUnitOnly" name="selectedUnitOnly" value="true"></td>
+ <td><label>$i18n.getString( "use_data_for_selected_unit_only" )</label><input type="checkbox" id="selectedUnitOnly" name="selectedUnitOnly" value="true"></td>
</tr>
<tr>
- <td colspan="2" style="height:10px"></td>
+ <td style="height:10px"></td>
</tr>
</table>
<table>
<tr>
- <td>$i18n.getString( "reporting_organisation_unit" )</td>
+ <th>$i18n.getString( "report_organisation_unit" )</th>
</tr>
<tr>
<td>
- <div id="selectionTree" style="width:40em;height:30em;overflow:auto;border:1px solid #cccccc">
+ <div id="selectionTree" style="width:350px;height:300px;overflow:auto;border:1px solid #cccccc">
<script type="text/javascript">
selectionTreeSelection.setMultipleSelectionAllowed( false );
selectionTree.clearSelectedOrganisationUnits();
@@ -60,7 +68,7 @@
</td>
</tr>
<tr>
- <td><input type="button" value="$i18n.getString( "generate" )" style="width:115px" onclick="validateDataSetReport()"></td>
+ <td><input type="button" value="$i18n.getString( "get_report" )" style="width:115px" onclick="validateDataSetReport()"></td>
<td></td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/previewCustomDataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/previewCustomDataSetReportForm.vm 2010-07-25 13:43:07 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/previewCustomDataSetReportForm.vm 2011-01-18 10:54:09 +0000
@@ -1,7 +1,6 @@
<h3>$i18n.getString('reporting_unit'): $reportingUnit $i18n.getString('reporting_period'): $reportingPeriod</h3>
-<p><input type="button" value="$i18n.getString( 'back' )" style="width:100px" onclick="javascript:window.location.href='showDataSetReportForm.action'"/>
- <input type="button" value="$i18n.getString( 'print' )" style="width:100px" onclick="printDateSetReportPreview();"/></p>
+<p><input type="button" value="$i18n.getString( 'back' )" style="width:100px" onclick="javascript:window.location.href='showDataSetReportForm.action'"/></p>
<div id="printDateSetPreviewDiv">
$customDataEntryFormCode