------------------------------------------------------------
revno: 3175
committer: Hieu <hieu.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Mon 2011-03-28 13:49:08 +0700
message:
(local vn) Excel reporting - Updated by data element service
modified:
local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExpressionUtils.java
local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties
local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties
local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataSetCompletedByPeriods.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 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExpressionUtils.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExpressionUtils.java 2011-03-25 09:11:30 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExpressionUtils.java 2011-03-28 06:49:08 +0000
@@ -99,11 +99,10 @@
{
CalculatedDataElement calculatedDataElement = (CalculatedDataElement) dataElement;
- int factor = 0;
-
+ double factor = 0;
double value = 0.0;
- Map<String, Integer> factorMap = dataElementService.getOperandFactors( calculatedDataElement );
+ Map<String, Double> factorMap = dataElementService.getOperandFactors( calculatedDataElement );
Collection<String> operandIds = dataElementService.getOperandIds( calculatedDataElement );
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties'
--- local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties 2011-03-28 03:59:21 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module.properties 2011-03-28 06:49:08 +0000
@@ -267,7 +267,7 @@
category = Category
select_paramater_to_draw_chart = Select parameters to draw a chart
draw_chart = Draw Chart
-un_completed = Un completed
+incompleted = Imcompleted
import_excel_items_cannot_be_empty = Excel items for importing cannot be empty
access_denied_to_folder = Access denied to folder on server
access_denied_to_file = Access denied to file on server
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties'
--- local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties 2011-03-28 03:59:21 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties 2011-03-28 06:49:08 +0000
@@ -259,7 +259,7 @@
category = Th\u1ec3 lo\u1ea1i
select_paramater_to_draw_chart = Ch\u1ecdn tham s\u1ed1 \u0111\u1ec3 v\u1ebd bi\u1ec3u \u0111\u1ed3
draw_chart = V\u1ebd bi\u1ec3u \u0111\u1ed3
-un_completed = Ch\u01b0a n\u1ed9p b\u00e1o c\u00e1o
+incompleted = Ch\u01b0a n\u1ed9p b\u00e1o c\u00e1o
import_excel_items_cannot_be_empty = Vui l\u00f2ng t\u1ea1o ph\u1ea7n t\u1eed excel cho import d\u1eef li\u1ec7u
access_denied_to_folder = Ba\u0323n kh\u00f4ng \u0111u\u0309 quy\u00ea\u0300n truy c\u00e2\u0323p va\u0300o th\u01b0 mu\u0323c tr\u00ean ma\u0301y chu\u0309
access_denied_to_file = Truy c\u1eadp b\u1ecb t\u1eeb ch\u1ed1i \u0111\u00ea\u0301n t\u1eadp tin tr\u00ean m\u00e1y ch\u1ee7
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataSetCompletedByPeriods.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataSetCompletedByPeriods.vm 2010-10-07 08:40:58 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataSetCompletedByPeriods.vm 2011-03-28 06:49:08 +0000
@@ -48,7 +48,7 @@
<tr align="right">
<th></th>
<th colspan="$periods.size()-1">
- <img src="../images/warning.png" alt="$i18n.getString( 'no' )" align="absmiddle">$i18n.getString( "un_completed" )
+ <img src="../images/warning.png" alt="$i18n.getString( 'no' )" align="absmiddle">$i18n.getString( "incompleted" )
<img src="../images/check.png" alt="$i18n.getString( 'yes' )" align="absmiddle">$i18n.getString( "completed" )
_______________________________________________
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
