dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #02518
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 838: Fix bugs Individual Report Excel
------------------------------------------------------------
revno: 838
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2009-10-09 08:47:46 +0700
message:
Fix bugs Individual Report Excel
modified:
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/individualReportExcel.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.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-excel-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2009-10-08 09:18:37 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2009-10-09 01:47:46 +0000
@@ -698,25 +698,23 @@
id="org.hisp.dhis.reportexcel.export.advance.action.GenerateAdvancedReportExcelNormalAction"
class="org.hisp.dhis.reportexcel.export.advance.action.GenerateAdvancedReportExcelNormalAction"
scope="prototype">
- <property name="dataValueService" ref="org.hisp.dhis.dataelement.DataElementService" />
+ <property name="organisationUnitGroupService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
<property name="selectionManager"
- ref="org.hisp.dhis.reportexcel.export.action.SelectionManager" />
- <property name="reportService" ref="org.hisp.dhis.reportexcel.ReportExcelService" />
- <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
- <property name="organisationUnitSelectionManager"
- ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
- <property name="reportLocationManager"
- ref="org.hisp.dhis.reportexcel.ReportLocationManager" />
- <property name="aggregationService" ref="org.hisp.dhis.aggregation.AggregationService" />
- <property name="dataElementCategoryOptionComboService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService" />
- <property name="statementManager" ref="statementManager" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
- <property name="organisationUnitGroupService"
- ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
-
+ ref="org.hisp.dhis.reportexcel.export.action.SelectionManager" />
+ <property name="reportService" ref="org.hisp.dhis.reportexcel.ReportExcelService" />
+ <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+ <property name="organisationUnitSelectionManager"
+ ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+ <property name="reportLocationManager"
+ ref="org.hisp.dhis.reportexcel.ReportLocationManager" />
+ <property name="aggregationService" ref="org.hisp.dhis.aggregation.AggregationService" />
+ <property name="dataElementCategoryOptionComboService"
+ ref="org.hisp.dhis.dataelement.DataElementCategoryOptionComboService" />
+ <property name="statementManager" ref="statementManager" />
+ <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
+ <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
+ <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
</bean>
<bean
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties 2009-10-08 09:18:37 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties 2009-10-09 01:47:46 +0000
@@ -67,7 +67,7 @@
configuration = Configuration
excel_file_directory = Excel template directory
copy_selected_item_to = Copy selected items to
-import_excel_file_manager = Import excel files manager
+import_excel_file_manager = Import excel files
select_excel_file = Select excel file
upload_file = Upload
dataset_completed_report = Data Set completed reports
@@ -131,4 +131,14 @@
sheet_of_excel_file = Sheet of Excel file
generate_report_by_orgunit_group = Generate report by orgunit group
clean_up = Clean temporary directory
-cleanup_success = Clean up successful
\ No newline at end of file
+cleanup_success = Clean up successful
+individual_report = Individual reports
+available_data_elements = Available dataelement
+selected_data_elements = Selected dataelement
+filter = Filter
+category_option_combo = Category option combo list
+all = ALL
+available_periods = Available periods
+selected_periods = Selected periods
+generate = Generate report
+bookmark = Bookmark
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties 2009-10-08 09:18:37 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties 2009-10-09 01:47:46 +0000
@@ -149,4 +149,14 @@
select = [Ch\u1ecdn]
working_in_progress = \u0110ang x\u1eed l\u00fd...
sheet_of_excel_file = Sheet trong file excel
-cleanup_success = \u0110\u00e3 x\u00f3a th\u01b0 m\u1ee5c t\u1ea1m
\ No newline at end of file
+cleanup_success = \u0110\u00e3 x\u00f3a th\u01b0 m\u1ee5c t\u1ea1m
+individual_report = Individual reports
+available_data_elements = Available dataelement
+selected_data_elements = Selected dataelement
+filter = Filter
+category_option_combo = Category option combo list
+all = ALL
+available_periods = Available periods
+selected_periods = Selected periods
+generate = Generate report
+bookmark = Bookmark
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/individualReportExcel.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/individualReportExcel.vm 2009-10-08 07:28:59 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/individualReportExcel.vm 2009-10-09 01:47:46 +0000
@@ -22,7 +22,7 @@
</script>
-<h3>$i18n.getString( "fast_report_excel" )</h3>
+<h3>$i18n.getString( "individual_report" )</h3>
<form id="editDataSetForm" name="editDataSetForm" method="post" onsubmit="submitForm(); return validateEditDataSet()">
<div style="display:inline">
@@ -53,8 +53,11 @@
<col> ## Selected DataElements
<thead>
<tr>
- <td><strong>Select data element</strong></td>
+ <th colspan="3"><strong>Select data element</strong></th>
</tr>
+ <tr>
+ <td colspan="3"> </td>
+ </tr>
<tr>
<th>$i18n.getString( "available_data_elements" )</th>
<th>$i18n.getString( "filter" )</th>
@@ -80,7 +83,7 @@
<tr>
<td><input type="text" id="availableDataElementsFilter" name="availableDataElementsFilter" onKeyUp="filterAvailableDataElements()" style="width:30em"> </td>
<td> </td>
- <td><input type="text" id="dataSetMembersFilter" name="dataSetMembersFilter" onkeyup="filterDataSetMembers()" style="min-width:20em"></td>
+ <td><input type="text" id="dataSetMembersFilter" name="dataSetMembersFilter" onkeyup="filterDataSetMembers()" style="max-width:30em;min-width:30em"></td>
</tr>
<tr>
@@ -89,7 +92,8 @@
<select size="15" id="availableDataElements" name="availableDataElements" style="max-width:30em;min-width:30em;height:10em" onChange="getOptionCombos();">
</select>
- <br>$i18n.getString('option_combo')<br>
+ <br><br>
+ <strong>$i18n.getString('category_option_combo')</strong><br>
<select size="15" id="availableOptionCombos" name="availableOptionCombos" style="max-width:30em;min-width:30em;height:10em" ondblclick="addDataSetMembers();">
</select>
</td>
@@ -100,22 +104,29 @@
</td>
<td>
<!-- List of all selected DataElements -->
- <select size="15" id="selectedDataElements" name="selectedDataElements" style="min-width:20em;height:20em" ondblclick="removeDataSetMembers();">
+ <select size="15" id="selectedDataElements" name="selectedDataElements" style="max-width:30em;min-width:30em;height:22em" ondblclick="removeDataSetMembers();">
</select>
</td>
</tr>
<tr>
- <td>Select period</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <th colspan="3">Select period</th>
</tr>
<tr>
+ <td colspan="3"> </td>
+ </tr>
+ <tr>
<th>$i18n.getString( "available_periods" )</th>
<th>$i18n.getString( "filter" )</th>
<th>$i18n.getString( "selected_periods" )</th>
</tr>
<tr>
<td>
- <select id="availabelPeriodTypes" name="availabelPeriodTypes" style="min-width:20em" onChange="javascript: getPeriods();">
+ <select id="availabelPeriodTypes" name="availabelPeriodTypes" style="width:30em ;" onChange="javascript: getPeriods();">
+ <option value="" ></option>
#foreach ( $periodType in $periodTypes )
<option value="$periodType.name" >$i18n.getString( $periodType.name )</option>
@@ -130,9 +141,9 @@
<tr>
<td>
<!-- List of all available DataElements -->
- <select size="15" id="availablePeriods" name="availablePeriods" multiple="multiple" style="min-width:20em;height:20em" ondblclick="moveSelectedById( 'availablePeriods', 'selectedPeriods' );">
+ <select size="15" id="availablePeriods" name="availablePeriods" multiple="multiple" style="max-width:30em;min-width:30em;height:20em" ondblclick="moveSelectedById( 'availablePeriods', 'selectedPeriods' );">
</select>
- </td>
+</td>
<td>
<input type="button" value=">" title="$i18n.getString('move_selected')" onclick="moveSelectedById( 'availablePeriods', 'selectedPeriods' );">
<br>
@@ -140,7 +151,7 @@
</td>
<td>
<!-- List of all selected DataElements -->
- <select id="selectedPeriods" name="selectedPeriods" multiple="multiple" style="min-width:20em;height:20em" ondblclick="moveSelectedById( 'selectedPeriods', 'availablePeriods' );">
+ <select id="selectedPeriods" name="selectedPeriods" multiple="multiple" style="max-width:30em;min-width:30em;height:20em" ondblclick="moveSelectedById( 'selectedPeriods', 'availablePeriods' );">
</select>
</td>
</tr>
@@ -149,8 +160,6 @@
<td colspan="3">
<input type="button" value="$i18n.getString( "generate" )" style="width:10em" onClick="generateIndividualReportExcel();">
<input type="button" value="$i18n.getString( "bookmark" )" style="width:10em">
- <input type="button"
- onclick="window.location.href='index.action'" value="$i18n.getString( "cancel" )" style="width:10em">
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm 2009-10-07 10:20:08 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm 2009-10-09 01:47:46 +0000
@@ -1,15 +1,16 @@
<h2>$i18n.getString( "generate_report" )</h2>
-<table >
+<table width="100%">
<tr>
- <td ><label>$i18n.getString('group')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td >
+ <td width="264" ><label>$i18n.getString('group')<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td width="555" >
<select type="text" id="group" name="group" style="min-width:20em" onchange="getReportExcelsByGroup()" #if(!$organisationUnit) disabled #end>
#foreach($group in $groups)
<option value='$group'>$encoder.htmlEncode( $group )</option>
#end
</select>
</td>
- <td width="22%" rowspan="4" align="left" style="width:300px;vertical-align:top" >
+ <td width="496" align="left" style="width:300px;vertical-align:top" ><input type="checkbox" id="advancedCheck" name="advancedCheck" onChange="javascript : openGenerateAdvance();" />
+ $i18n.getString('generate_report_by_orgunit_group')
</td>
</tr>
<tr>
@@ -21,7 +22,9 @@
#end
</select>
</td>
- </tr>
+ <td width="496" rowspan="3" align="left" style="width:300px;vertical-align:top" ><select size="5" id="availableOrgunitGroups" name="availableOrgunitGroups" style="min-width:200px; max-width:200px " disabled>
+ </select></td>
+ </tr>
<tr>
<td></td>
<td>
@@ -38,20 +41,6 @@
</select>
</td>
</tr>
- <tr>
- <td> </td>
- <td><input type="checkbox" id="advancedCheck" name="advancedCheck" onChange="javascript : openGenerateAdvance();" />
-$i18n.getString('generate_report_by_orgunit_group') </td>
- <td align="left" style="width:300px;vertical-align:top" > </td>
- </tr>
- <tr>
- <td> </td>
- <td><div id="generateAdvance" style="display:block;width:300px; z-index:10001;background-color: white;">
- <select id="availableOrgunitGroups" name="availableOrgunitGroups" style="min-width:300px; " disabled>
- </select>
-</div> </td>
- <td align="left" style="width:300px;vertical-align:top" > </td>
- </tr>
</table>
<div id="actions" style="width:200px text-align:right">
@@ -66,7 +55,7 @@
<br>
<hr>
<p>
-<input type="button" value='$i18n.getString( "preview_report" )' onclick="javascript: generic_type = 'preview'; openPreviewReport();" #if(!$organisationUnit) disabled #end/>
+<input type="button" value='$i18n.getString( "preview_report" )' onclick="javascript: generic_type = 'preview'; validateGenerateReport('$!i18n.getString("please_wait")');" #if(!$organisationUnit) disabled #end/>
<input name="generate_report" id="generate_report" type="button" onClick="generateReportExcel()" value='$i18n.getString( "generate_report" )' #if(!$organisationUnit) disabled #end/>
