dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #02668
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 900: fixed copy report items and change colapse/expand images of organisation unit tree
------------------------------------------------------------
revno: 900
committer: Tran Thanh Tri <Tran Thanh Tri@compaq>
branch nick: trunk
timestamp: Fri 2009-10-23 00:22:15 +0700
message:
fixed copy report items and change colapse/expand images of organisation unit tree
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/colapse.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/expand.png
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcel.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelItem.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelOganiztionGroupListing.java
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcel.hbm.xml
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcelItem.hbm.xml
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/orgunittree.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/AddReportExcelItemAction.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/CopyReportExcelItemAction.java
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_vi_VN.properties
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importData.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm
dhis-2/dhis-web/dhis-web-portal/pom.xml
local/vn/dhis-web-gis/pom.xml
--
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-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcel.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcel.java 2009-10-16 09:22:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcel.java 2009-10-22 17:22:15 +0000
@@ -49,9 +49,9 @@
private int organisationColumn;
- private Set<ReportExcelItem> reportExcelItems = new HashSet<ReportExcelItem>();
+ private Set<ReportExcelItem> reportExcelItems;
- private Set<OrganisationUnit> organisationAssocitions = new HashSet<OrganisationUnit>();
+ private Set<OrganisationUnit> organisationAssocitions;
private String group;
@@ -63,7 +63,8 @@
public ReportExcel()
{
- super();
+ this.reportExcelItems = new HashSet<ReportExcelItem>();
+ this.organisationAssocitions = new HashSet<OrganisationUnit>();
}
public ReportExcelItem getReportExcelItem( String name )
@@ -99,6 +100,8 @@
return this.getReportType().equalsIgnoreCase( TYPE.NORMAL );
}
+
+
// -------------------------------------------------------------------------
// Abstract methods
// -------------------------------------------------------------------------
@@ -251,4 +254,6 @@
{
this.excelTemplateFile = excelTemplateFile;
}
+
+
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelItem.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelItem.java 2009-10-01 08:28:21 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelItem.java 2009-10-22 17:22:15 +0000
@@ -34,7 +34,7 @@
public class ReportExcelItem
{
private int id;
-
+
private String name;
private String itemType;
@@ -45,9 +45,11 @@
private String expression;
- private String periodType;
-
- private int sheetNo;
+ private String periodType;
+
+ private int sheetNo;
+
+ private ReportExcel reportExcel;
// -------------------------------------------------------------------------
// Constructors
@@ -58,13 +60,13 @@
}
public ReportExcelItem( String name, String itemType, int row, int column, String expression )
- {
+ {
this.itemType = itemType;
this.row = row;
this.column = column;
this.expression = expression;
this.name = name;
- }
+ }
// -------------------------------------------------------------------------
// Getters and setters
@@ -75,6 +77,16 @@
return id;
}
+ public ReportExcel getReportExcel()
+ {
+ return reportExcel;
+ }
+
+ public void setReportExcel( ReportExcel reportExcel )
+ {
+ this.reportExcel = reportExcel;
+ }
+
public void setId( int id )
{
this.id = id;
@@ -184,24 +196,37 @@
public static class TYPE
{
- public static final String DATAELEMENT = "dataelement";
- public static final String ORGANISATION = "organisation";
+ public static final String DATAELEMENT = "dataelement";
+
+ public static final String ORGANISATION = "organisation";
+
public static final String INDICATOR = "indicator";
- public static final String CALCULATION = "calculation";
- public static final String DATAELEMENT_CODE = "dataelement_code";
- public static final String DATAELEMENT_NAME = "dataelement_name";
- public static final String SERIAL = "serial";
- public static final String FORMULA_EXCEL = "formulaexcel";
+
+ public static final String CALCULATION = "calculation";
+
+ public static final String DATAELEMENT_CODE = "dataelement_code";
+
+ public static final String DATAELEMENT_NAME = "dataelement_name";
+
+ public static final String SERIAL = "serial";
+
+ public static final String FORMULA_EXCEL = "formulaexcel";
}
public static class PERIODTYPE
{
public static final String SELECTED_MONTH = "selected_month";
+
public static final String LAST_3_MONTH = "last_3_month";
- public static final String SO_FAR_THIS_YEAR = "so_far_this_year";
- public static final String LAST_6_MONTH = "last_6_month";
- public static final String QUATERLY = "quaterly";
- public static final String SIX_MONTH = "6_month";
+
+ public static final String SO_FAR_THIS_YEAR = "so_far_this_year";
+
+ public static final String LAST_6_MONTH = "last_6_month";
+
+ public static final String QUATERLY = "quaterly";
+
+ public static final String SIX_MONTH = "6_month";
+
public static final String YEARLY = "yealy";
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelOganiztionGroupListing.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelOganiztionGroupListing.java 2009-10-19 03:34:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelOganiztionGroupListing.java 2009-10-22 17:22:15 +0000
@@ -27,8 +27,10 @@
package org.hisp.dhis.reportexcel;
+import java.util.HashSet;
import java.util.List;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
/**
@@ -47,7 +49,7 @@
public ReportExcelOganiztionGroupListing()
{
- super();
+ super();
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcel.hbm.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcel.hbm.xml 2009-09-26 05:31:47 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcel.hbm.xml 2009-10-22 17:22:15 +0000
@@ -15,7 +15,7 @@
<property name="organisationColumn" column="organisationcolumn" />
<property name="group" column="reportgroup" />
- <set name="reportExcelItems" cascade="all" lazy="false">
+ <set name="reportExcelItems" lazy="false" cascade="delete">
<key column="reportexcelid" />
<one-to-many class="org.hisp.dhis.reportexcel.ReportExcelItem" />
</set>
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcelItem.hbm.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcelItem.hbm.xml 2009-09-14 03:19:36 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/hibernate/ReportExcelItem.hbm.xml 2009-10-22 17:22:15 +0000
@@ -14,5 +14,8 @@
<property name="expression" column="itemexpression" />
<property name="periodType" column="periodtype" />
<property name="sheetNo" column="sheetno" />
+ <many-to-one name="reportExcel" column="reportexcelid"
+ class="org.hisp.dhis.reportexcel.ReportExcel" foreign-key="pk_reportitem_report"
+ lazy="false" insert="true"/>
</class>
</hibernate-mapping>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2009-07-07 18:41:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2009-10-22 17:22:15 +0000
@@ -219,7 +219,7 @@
#leftBar
{
background-color: #7B0A0F;
- height: 472px;
+ height: 100%;
width: 250px;
float: left;
position: absolute;
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js 2009-10-22 17:22:15 +0000
@@ -293,7 +293,7 @@
function getToggleExpand()
{
var imgTag = getToggleImage();
- imgTag.src = '../images/plus.png';
+ imgTag.src = '../images/colapse.png';
imgTag.alt = '[+]';
return imgTag;
}
@@ -301,7 +301,7 @@
function getToggleCollapse()
{
var imgTag = getToggleImage();
- imgTag.src = '../images/minus.png';
+ imgTag.src = '../images/expand.png';
imgTag.alt = '[-]';
return imgTag;
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/orgunittree.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/orgunittree.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/orgunittree.vm 2009-10-22 17:22:15 +0000
@@ -2,9 +2,9 @@
#macro( parseNode $node )
#if( $node.hasChildren )
#if( $node.children )
- #set( $toggle = '<img src="../images/minus.png" width="9" height="9" alt="[-]">' )
+ #set( $toggle = '<img src="../images/expand.png" width="9" height="9" alt="[-]">' )
#else
- #set( $toggle = '<img src="../images/plus.png" width="9" height="9" alt="[+]">' )
+ #set( $toggle = '<img src="../images/colapse.png" width="9" height="9" alt="[+]">' )
#end
#else
#set( $toggle = '<img src="../images/transparent.gif" width="9" height="9" alt="">' )
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js 2009-10-22 17:22:15 +0000
@@ -299,7 +299,7 @@
function getToggleExpand()
{
var imgTag = getToggleImage();
- imgTag.src = '../images/plus.png';
+ imgTag.src = '../images/colapse.png';
imgTag.alt = '[+]';
return imgTag;
}
@@ -307,7 +307,7 @@
function getToggleCollapse()
{
var imgTag = getToggleImage();
- imgTag.src = '../images/minus.png';
+ imgTag.src = '../images/expand.png';
imgTag.alt = '[-]';
return imgTag;
}
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/colapse.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/colapse.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/colapse.png 2009-10-22 17:22:15 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/expand.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/expand.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/expand.png 2009-10-22 17:22:15 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties 2009-10-22 17:22:15 +0000
@@ -1,84 +1,90 @@
#Resource generated by I18n Resource Editor
#Fri Jul 13 23:34:28 GMT+07:00 2007
-validate=Ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-saving_comment_failed_status_code=L\u01B0u ch\u00FA th\u00EDch kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 tr\u1EA1ng th\u00E1i
-use_short_names=S\u1EED d\u1EE5ng t\u00EAn vi\u1EBFt t\u1EAFt
-saving_value_failed_error_code=L\u01B0u gi\u00E1 tr\u1ECB kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 l\u1ED7i
-entry=Gi\u00E1 tr\u1ECB
-data_set=T\u1EADp h\u1EE3p d\u1EEF li\u1EC7u
-successful_validation=Gi\u00E1 tr\u1ECB h\u1EE3p l\u1EC7
-stored_by=Ng\u01B0\u1EDDi nh\u1EADp li\u1EC7u
-order_by_entry=Th\u1EE9 t\u1EF1 theo \u0111\u0103ng k\u00FD
-saving_value_failed_status_code=L\u01B0u gi\u00E1 tr\u1ECB kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 tr\u1EA1ng th\u00E1i
-max_limit=Gi\u1EDBi h\u1EA1n cao nh\u1EA5t
-delete_min_max_values=X\u00F3a gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t / l\u1EDBn nh\u1EA5t
-saving_comment_failed_error_code=L\u01B0u ch\u00FA th\u00EDch kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 l\u1ED7i
-organisation_unit=\u0110\u01A1n v\u1ECB
-value_of_data_element_greater=Gi\u00E1 tr\u1ECB c\u1EE7a th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u sau l\u1EDBn h\u01A1n gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t cho ph\u00E9p
-yes=C\u00F3
-max=L\u1EDBn nh\u1EA5t
-validation_result=K\u1EBFt qu\u1EA3 ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-down=Xu\u1ED1ng
-value_of_data_element_less=Gi\u00E1 tr\u1ECB c\u1EE7a th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u th\u1EA5p h\u01A1n gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t cho ph\u00E9p
-save=L\u01B0u
-saving_minmax_failed_error_code=L\u01B0u gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t/nh\u1ECF nh\u1EA5t kh\u00F4ng th\u00E0nh c\u00F4ng v\u1EDBi m\u00E3 l\u1ED7i
-left_description=M\u00F4 t\u1EA3 v\u1EBF tr\u00E1i
-comment=Ch\u00FA th\u00EDch
-dataelement_history=L\u1ECBch s\u1EED ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-minimum_must_less_than_maximum=Gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t ph\u1EA3i nh\u1ECF h\u01A1n gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t
-unsuccessful_validation=Gi\u00E1 tr\u1ECB kh\u00F4ng h\u1EE3p l\u1EC7. C\u1EE5 th\u1EC3 nh\u01B0 sau\:
-specify_minimum_value=Vui l\u00F2ng ch\u1EC9 \u0111\u1ECBnh gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t
-code=M\u00E3 ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-value=Gi\u00E1 tr\u1ECB
-specify_maximum_value=Vui l\u00F2ng ch\u1EC9 \u0111\u1ECBnh gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t
-operator=To\u00E1n t\u1EED
-no_dataelement_selected=Kh\u00F4ng th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
-min_max_values=Gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t/nh\u1ECF nh\u1EA5t
-data_element=Ph\u1EA7n t\u1EED d\u1EEF li\u1EC7u
-data_element_order=Th\u1EE9 t\u1EF1 th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u
-up=L\u00EAn
-minimum_value_must_integer=Gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t ph\u1EA3i l\u00E0 m\u1ED9t s\u1ED1 nguy\u00EAn
-yes_no=Kh\u00F4ng/c\u00F3
-close=\u0110\u00F3ng
-save_calculated=L\u01B0u c\u00E1c gi\u00E1 tr\u1ECB \u0111\u00E3 \u0111\u01B0\u1EE3c t\u00EDnh to\u00E1n
-generate_values=Ph\u00E1t sinh gi\u00E1 tr\u1ECB
-type=Ki\u1EC3u d\u1EEF li\u1EC7u
-no_organisationunit_selected=Kh\u00F4ng \u0111\u01A1n v\u1ECB n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
-nr=S\u1ED1
-no=Kh\u00F4ng
-edit_min_max_for=Ch\u1EC9nh s\u1EEDa gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t / l\u1EDBn nh\u1EA5t cho
-min_limit=Gi\u1EDBi h\u1EA1n th\u1EA5p nh\u1EA5t
-custom_comment=Ch\u00FA th\u00EDch ng\u1EABu nhi\u00EAn
-period=Th\u1EDDi \u0111i\u1EC3m
-calculated_data_elements=C\u00E1c th\u00E0nh ph\u1EA7n d\u1EEF li\u1EC7u \u0111\u00E3 \u0111\u01B0\u1EE3c t\u00EDnh to\u00E1n
-order_by_code=Th\u1EE9 t\u1EF1 theo m\u00E3
-name=T\u00EAn
-generate_missing_values=Ph\u00E1t sinh nh\u1EEFng gi\u00E1 tr\u1ECB ch\u01B0a c\u00F3
-timestamp=Th\u1EDDi \u0111i\u1EC3m
-change=Thay \u0111\u1ED5i
-move=Chuy\u1EC3n
-right_description=M\u00F4 t\u1EA3 v\u1EBF ph\u1EA3i
-move_up=Di chuy\u1EC3n l\u00EAn tr\u00EAn
-reset_order_inherit=Thi\u1EBFt l\u1EADp th\u1EE9 t\u1EF1/th\u1EEBa k\u1EBF t\u1EEB cha
-generate_missing_value=Ph\u00E1t sinh gi\u00E1 tr\u1ECB ch\u01B0a c\u00F3
-no_value=Kh\u00F4ng c\u00F3 gi\u00E1 tr\u1ECB
-expression=Bi\u1EC3u th\u1EE9c
-not_set=Ch\u01B0a thi\u1EBFt l\u1EADp
-average=Trung b\u00ECnh
-validation_rule=Quy lu\u1EADt ki\u1EC3m tra t\u00EDnh h\u1EE3p l\u1EC7
-text=Chu\u1ED7i
-edit_min_max=Ch\u1EC9nh s\u1EEDa gi\u00E1 tr\u1ECB nh\u1ECF nh\u1EA5t / l\u1EDBn nh\u1EA5t
-maximum_value_must_integer=Gi\u00E1 tr\u1ECB l\u1EDBn nh\u1EA5t ph\u1EA3i l\u00E0 m\u1ED9t s\u1ED1 nguy\u00EAn
-no_comment=Kh\u00F4ng c\u00F3 ch\u00FA th\u00EDch
-maximum=L\u1EDBn nh\u1EA5t
-value_must_integer=Gi\u00E1 tr\u1ECB ph\u1EA3i l\u00E0 m\u1ED9t s\u1ED1 nguy\u00EAn
-order_by_name=Th\u1EE9 t\u1EF1 theo t\u00EAn
-select=Ch\u1ECDn
-number=S\u1ED1
-move_down=Di chuy\u1EC3n xu\u1ED1ng d\u01B0\u1EDBi
-minimum=Nh\u1ECF nh\u1EA5t
-min=Nh\u1ECF nh\u1EA5t
-cancel=H\u1EE7y b\u1ECF
-no_period_selected=Kh\u00F4ng th\u1EDDi \u0111i\u1EC3m n\u00E0o \u0111\u01B0\u1EE3c ch\u1ECDn
-use_section_form=Kiểu dùng section
-use_standard_form=Kiểu thông thường
+validate=Ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+saving_comment_failed_status_code=L\u01b0u ch\u00fa th\u00edch kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 tr\u1ea1ng th\u00e1i
+use_short_names=S\u1eed d\u1ee5ng t\u00ean vi\u1ebft t\u1eaft
+saving_value_failed_error_code=L\u01b0u gi\u00e1 tr\u1ecb kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 l\u1ed7i
+entry=Gi\u00e1 tr\u1ecb
+data_set=T\u1eadp h\u1ee3p d\u1eef li\u1ec7u
+successful_validation=Gi\u00e1 tr\u1ecb h\u1ee3p l\u1ec7
+stored_by=Ng\u01b0\u1eddi nh\u1eadp li\u1ec7u
+order_by_entry=Th\u1ee9 t\u1ef1 theo \u0111\u0103ng k\u00fd
+saving_value_failed_status_code=L\u01b0u gi\u00e1 tr\u1ecb kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 tr\u1ea1ng th\u00e1i
+max_limit=Gi\u1edbi h\u1ea1n cao nh\u1ea5t
+delete_min_max_values=X\u00f3a gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t / l\u1edbn nh\u1ea5t
+saving_comment_failed_error_code=L\u01b0u ch\u00fa th\u00edch kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 l\u1ed7i
+organisation_unit=\u0110\u01a1n v\u1ecb
+value_of_data_element_greater=Gi\u00e1 tr\u1ecb c\u1ee7a th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u sau l\u1edbn h\u01a1n gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t cho ph\u00e9p
+yes=C\u00f3
+max=L\u1edbn nh\u1ea5t
+validation_result=K\u1ebft qu\u1ea3 ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+down=Xu\u1ed1ng
+value_of_data_element_less=Gi\u00e1 tr\u1ecb c\u1ee7a th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u th\u1ea5p h\u01a1n gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t cho ph\u00e9p
+save=L\u01b0u
+saving_minmax_failed_error_code=L\u01b0u gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t/nh\u1ecf nh\u1ea5t kh\u00f4ng th\u00e0nh c\u00f4ng v\u1edbi m\u00e3 l\u1ed7i
+left_description=M\u00f4 t\u1ea3 v\u1ebf tr\u00e1i
+comment=Ch\u00fa th\u00edch
+dataelement_history=L\u1ecbch s\u1eed ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+minimum_must_less_than_maximum=Gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t ph\u1ea3i nh\u1ecf h\u01a1n gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t
+unsuccessful_validation=Gi\u00e1 tr\u1ecb kh\u00f4ng h\u1ee3p l\u1ec7. C\u1ee5 th\u1ec3 nh\u01b0 sau\:
+specify_minimum_value=Vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t
+code=M\u00e3 ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+value=Gi\u00e1 tr\u1ecb
+specify_maximum_value=Vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t
+operator=To\u00e1n t\u1eed
+no_dataelement_selected=Kh\u00f4ng th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
+min_max_values=Gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t/nh\u1ecf nh\u1ea5t
+data_element=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+data_element_order=Th\u1ee9 t\u1ef1 th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u
+up=L\u00ean
+minimum_value_must_integer=Gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t ph\u1ea3i l\u00e0 m\u1ed9t s\u1ed1 nguy\u00ean
+yes_no=Kh\u00f4ng/c\u00f3
+close=\u0110\u00f3ng
+save_calculated=L\u01b0u c\u00e1c gi\u00e1 tr\u1ecb \u0111\u00e3 \u0111\u01b0\u1ee3c t\u00ednh to\u00e1n
+generate_values=Ph\u00e1t sinh gi\u00e1 tr\u1ecb
+type=Ki\u1ec3u d\u1eef li\u1ec7u
+no_organisationunit_selected=Kh\u00f4ng \u0111\u01a1n v\u1ecb n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
+nr=S\u1ed1
+no=Kh\u00f4ng
+edit_min_max_for=Ch\u1ec9nh s\u1eeda gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t / l\u1edbn nh\u1ea5t cho
+min_limit=Gi\u1edbi h\u1ea1n th\u1ea5p nh\u1ea5t
+custom_comment=Ch\u00fa th\u00edch ng\u1eabu nhi\u00ean
+period=Th\u1eddi \u0111i\u1ec3m
+calculated_data_elements=C\u00e1c th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u \u0111\u00e3 \u0111\u01b0\u1ee3c t\u00ednh to\u00e1n
+order_by_code=Th\u1ee9 t\u1ef1 theo m\u00e3
+name=T\u00ean
+generate_missing_values=Ph\u00e1t sinh nh\u1eefng gi\u00e1 tr\u1ecb ch\u01b0a c\u00f3
+timestamp=Th\u1eddi \u0111i\u1ec3m
+change=Thay \u0111\u1ed5i
+move=Chuy\u1ec3n
+right_description=M\u00f4 t\u1ea3 v\u1ebf ph\u1ea3i
+move_up=Di chuy\u1ec3n l\u00ean tr\u00ean
+reset_order_inherit=Thi\u1ebft l\u1eadp th\u1ee9 t\u1ef1/th\u1eeba k\u1ebf t\u1eeb cha
+generate_missing_value=Ph\u00e1t sinh gi\u00e1 tr\u1ecb ch\u01b0a c\u00f3
+no_value=Kh\u00f4ng c\u00f3 gi\u00e1 tr\u1ecb
+expression=Bi\u1ec3u th\u1ee9c
+not_set=Ch\u01b0a thi\u1ebft l\u1eadp
+average=Trung b\u00ecnh
+validation_rule=Quy lu\u1eadt ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
+text=Chu\u1ed7i
+edit_min_max=Ch\u1ec9nh s\u1eeda gi\u00e1 tr\u1ecb nh\u1ecf nh\u1ea5t / l\u1edbn nh\u1ea5t
+maximum_value_must_integer=Gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t ph\u1ea3i l\u00e0 m\u1ed9t s\u1ed1 nguy\u00ean
+no_comment=Kh\u00f4ng c\u00f3 ch\u00fa th\u00edch
+maximum=L\u1edbn nh\u1ea5t
+value_must_integer=Gi\u00e1 tr\u1ecb ph\u1ea3i l\u00e0 m\u1ed9t s\u1ed1 nguy\u00ean
+order_by_name=Th\u1ee9 t\u1ef1 theo t\u00ean
+select=Ch\u1ecdn
+number=S\u1ed1
+move_down = Di chuy\u1ec3n xu\u1ed1ng d\u01b0\u1edbi
+minimum = Nh\u1ecf nh\u1ea5t
+min = Nh\u1ecf nh\u1ea5t
+cancel = H\u1ee7y b\u1ecf
+no_period_selected = Kh\u00f4ng th\u1eddi \u0111i\u1ec3m n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
+use_section_form = Nh\u1eadp theo t\u1eeb ph\u1ea7n
+use_standard_form = Nh\u1eadp theo m\u1eabu chu\u1ea9n
+data_entry = Nh\u1eadp d\u1eef li\u1ec7u
+complete = Ho\u00e0n Ch\u1ec9nh
+undo = S\u1eeda l\u1ea1i b\u00e1o c\u00e1o
+generate_min_max = T\u1ea1o gi\u1edbi b\u1ea1n min/max
+run_validation = Ki\u1ec3m tra d\u1eef li\u1ec7u
+change_order = \u0110\u1ed5i t\u1ee9 t\u1ef1
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css 2009-04-17 00:20:52 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css 2009-10-22 17:22:15 +0000
@@ -7,6 +7,9 @@
border: 1px solid black;
font-size: 14px;
text-align: right;
+ position:fixed;
+ top:80px;
+ right:10px;
}
#selectForm
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/AddReportExcelItemAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/AddReportExcelItemAction.java 2009-09-21 07:40:48 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/AddReportExcelItemAction.java 2009-10-22 17:22:15 +0000
@@ -28,6 +28,7 @@
import java.util.Set;
+import org.amplecode.quick.StatementManager;
import org.hisp.dhis.reportexcel.ReportExcel;
import org.hisp.dhis.reportexcel.ReportExcelItem;
import org.hisp.dhis.reportexcel.ReportExcelService;
@@ -47,6 +48,8 @@
private ReportExcelService reportService;
+ private StatementManager statementManager;
+
// -------------------------------------------
// Input & Output
// -------------------------------------------
@@ -78,6 +81,11 @@
this.reportService = reportService;
}
+ public void setStatementManager( StatementManager statementManager )
+ {
+ this.statementManager = statementManager;
+ }
+
public void setSheetNo( Integer sheetNo )
{
this.sheetNo = sheetNo;
@@ -131,6 +139,8 @@
public String execute()
throws Exception
{
+ statementManager.initialise();
+
reportItem = new ReportExcelItem();
reportItem.setName( name );
reportItem.setItemType( itemType.trim() );
@@ -138,17 +148,23 @@
reportItem.setColumn( column );
reportItem.setExpression( expression.trim() );
reportItem.setPeriodType( periodType.trim() );
- reportItem.setSheetNo( (sheetNo == null ? 0 : sheetNo) );
-
- ReportExcel reportExcel = reportService.getReportExcel( reportId );
-
- Set<ReportExcelItem> reportItems = reportExcel.getReportExcelItems();
-
- reportItems.add( reportItem );
-
- reportExcel.setReportExcelItems( reportItems );
-
- reportService.updateReportExcel( reportExcel );
+ reportItem.setSheetNo( (sheetNo == null ? 1 : sheetNo) );
+ reportItem.setReportExcel( reportService.getReportExcel( reportId ) );
+
+
+ reportService.addReportExcelItem( reportItem );
+//
+// ReportExcel reportExcel = reportService.getReportExcel( reportId );
+//
+// Set<ReportExcelItem> reportItems = reportExcel.getReportExcelItems();
+//
+// reportItems.add( reportItem );
+//
+// reportExcel.setReportExcelItems( reportItems );
+//
+// reportService.updateReportExcel( reportExcel );
+
+ statementManager.destroy();
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/CopyReportExcelItemAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/CopyReportExcelItemAction.java 2009-10-22 05:37:47 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/item/action/CopyReportExcelItemAction.java 2009-10-22 17:22:15 +0000
@@ -27,8 +27,8 @@
package org.hisp.dhis.reportexcel.item.action;
import java.util.Collection;
-import java.util.Set;
+import org.amplecode.quick.StatementManager;
import org.hisp.dhis.reportexcel.ReportExcel;
import org.hisp.dhis.reportexcel.ReportExcelItem;
import org.hisp.dhis.reportexcel.ReportExcelService;
@@ -39,87 +39,92 @@
* @author Tran Thanh Tri
* @version $Id$
*/
-public class CopyReportExcelItemAction implements Action {
-
- // -------------------------------------------
- // Dependency
- // -------------------------------------------
-
- private ReportExcelService reportService;
-
- // -------------------------------------------
- // Input
- // -------------------------------------------
-
- private Integer reportId;
-
- private Integer sheetNo;
-
- private Collection<String> reportItems;
-
- // -------------------------------------------
- // Getter & Setter
- // -------------------------------------------
-
- public void setReportService(ReportExcelService reportService) {
- this.reportService = reportService;
- }
-
- public Integer getReportId() {
- return reportId;
- }
-
- public Integer getSheetNo() {
- return sheetNo;
- }
-
- public void setReportId(Integer reportId) {
- this.reportId = reportId;
- }
-
- public void setReportItems(Collection<String> reportItems) {
- this.reportItems = reportItems;
- }
-
- public void setSheetNo(Integer sheetNo) {
- this.sheetNo = sheetNo;
- }
-
- public String execute() throws Exception {
-
- ReportExcel reportExcel = reportService.getReportExcel(reportId);
-
- Set<ReportExcelItem> reportItems = reportExcel.getReportExcelItems();
-
- for (String itemId : this.reportItems) {
-
- ReportExcelItem reportItem = reportService
- .getReportExcelItem(Integer.parseInt(itemId));
-
- ReportExcelItem newReportItem = new ReportExcelItem();
-
- newReportItem.setName(reportItem.getName());
-
- newReportItem.setItemType(reportItem.getItemType());
-
- newReportItem.setPeriodType(reportItem.getPeriodType());
-
- newReportItem.setExpression(reportItem.getExpression());
-
- newReportItem.setRow(reportItem.getRow());
-
- newReportItem.setColumn(reportItem.getColumn());
-
- newReportItem.setSheetNo(sheetNo);
-
- reportItems.add(newReportItem);
-
- reportExcel.getReportExcelItems().add(newReportItem);
-
- }
-
- reportService.updateReportExcel(reportExcel);
-
- return SUCCESS;
- }
+
+public class CopyReportExcelItemAction
+ implements Action
+{
+ // -------------------------------------------
+ // Dependency
+ // -------------------------------------------
+
+ private ReportExcelService reportService;
+
+ private StatementManager statementManager;
+
+ // -------------------------------------------
+ // Input
+ // -------------------------------------------
+
+ private Integer reportId;
+
+ private Integer sheetNo;
+
+ private Collection<String> reportItems;
+
+ // -------------------------------------------
+ // Getter & Setter
+ // -------------------------------------------
+
+ public void setReportService( ReportExcelService reportService )
+ {
+ this.reportService = reportService;
+ }
+
+ public void setStatementManager( StatementManager statementManager )
+ {
+ this.statementManager = statementManager;
+ }
+
+ public Integer getReportId()
+ {
+ return reportId;
+ }
+
+ public Integer getSheetNo()
+ {
+ return sheetNo;
+ }
+
+ public void setReportId( Integer reportId )
+ {
+ this.reportId = reportId;
+ }
+
+ public void setReportItems( Collection<String> reportItems )
+ {
+ this.reportItems = reportItems;
+ }
+
+ public void setSheetNo( Integer sheetNo )
+ {
+ this.sheetNo = sheetNo;
+ }
+
+ public String execute()
+ throws Exception
+ {
+ statementManager.initialise();
+
+ ReportExcel reportExcel = reportService.getReportExcel( reportId );
+
+ for ( String itemId : this.reportItems )
+ {
+ ReportExcelItem reportItem = reportService.getReportExcelItem( Integer.parseInt( itemId ) );
+ ReportExcelItem newReportItem = new ReportExcelItem();
+ newReportItem.setName( reportItem.getName() );
+ newReportItem.setItemType( reportItem.getItemType() );
+ newReportItem.setPeriodType( reportItem.getPeriodType() );
+ newReportItem.setExpression( reportItem.getExpression() );
+ newReportItem.setRow( reportItem.getRow() );
+ newReportItem.setColumn( reportItem.getColumn() );
+ newReportItem.setSheetNo( sheetNo );
+ newReportItem.setReportExcel( reportExcel );
+ reportService.addReportExcelItem( newReportItem );
+ }
+
+ statementManager.destroy();
+
+ return SUCCESS;
+ }
+
}
=== 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-19 07:07:13 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2009-10-22 17:22:15 +0000
@@ -225,6 +225,7 @@
class="org.hisp.dhis.reportexcel.item.action.AddReportExcelItemAction"
scope="prototype">
<property name="reportService" ref="org.hisp.dhis.reportexcel.ReportExcelService" />
+ <property name="statementManager" ref="statementManager" />
</bean>
<bean
@@ -265,6 +266,7 @@
class="org.hisp.dhis.reportexcel.item.action.CopyReportExcelItemAction"
scope="prototype">
<property name="reportService" ref="org.hisp.dhis.reportexcel.ReportExcelService" />
+ <property name="statementManager" ref="statementManager" />
</bean>
<bean id="org.hisp.dhis.reportexcel.item.action.GetListSheetAction"
=== 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-09 06:06:43 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/i18n_module_vi_VN.properties 2009-10-22 17:22:15 +0000
@@ -127,9 +127,9 @@
icd_code = M\u00e3 ICD
serial = S\u1ed1 th\u1ee9 t\u1ef1
jumping_step = D\u00f2ng tr\u1ed1ng
-rename = Rename
-template_excel_file = Template excel file
-import = Import data
+rename = \u0110\u1ed5i t\u00ean
+template_excel_file = T\u1eadp tin excel m\u1eabu
+import = Import d\u1eef li\u1ec7u
update_sort_dataelement_success = S\u1eafp x\u1ebfp th\u1ee9 t\u1ef1 ph\u1ea7n t\u1eed d\u1eef li\u1ec7u th\u00e0nh c\u00f4ng
sort_dataelement = s\u1eafp x\u1ebfp ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
dataelement_groups = Nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
@@ -142,7 +142,7 @@
selected_dataelementgroups = Nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c ch\u1ecdn
success = th\u00e0nh c\u00f4ng
selected_dataelementgroups = Nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c ch\u1ecdn
-preview = Xem tr\u01b0\u1edbc
+preview = Xem tr\u01b0\u1edbc gi\u00e1 tr\u1ecb
code = M\u00e3 s\u1ed1
update_order = C\u1eadp nh\u1eadt th\u1ee9 t\u1ef1
sort_order_help = D\u00f9ng chu\u1ed9t k\u00e9o m\u1ee5c mu\u1ed1n s\u1eafp x\u1ebfp t\u1edbi v\u1ecb tr\u00ed c\u1ea7n thi\u1ebft, sau \u0111\u00f3 ch\u1ecdn C\u1eadp nh\u1eadt th\u1ee9 t\u1ef1
@@ -150,14 +150,14 @@
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
-individual_report = Individual reports
-available_data_elements = Available dataelement
-selected_data_elements = Selected dataelement
-filter = Filter
+individual_report = B\u00e1o c\u00e1o t\u00f9y ch\u1ecdn
+available_data_elements = Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u hi\u1ec7n c\u00f3
+selected_data_elements = Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c ch\u1ecdn
+filter = L\u1ecdc
category_option_combo = Category option combo list
all = ALL
-available_periods = Available periods
-selected_periods = Selected periods
-generate = Generate report
+available_periods = Th\u1eddi \u0111i\u1ec3m hi\u1ec7n c\u00f3
+selected_periods = Th\u1eddi \u0111i\u1ec3m \u0111\u01b0\u1ee3c ch\u1ecdn
+generate = Xu\u1ea5t b\u00e1o c\u00e1o
bookmark = Bookmark
-generate_advanced_report = Generate advanced report
\ No newline at end of file
+generate_advanced_report = B\u00e1o c\u00e1o theo nh\u00f3m \u0111\u01a1n v\u1ecb
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importData.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importData.vm 2009-09-25 08:20:25 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importData.vm 2009-10-22 17:22:15 +0000
@@ -3,7 +3,6 @@
<div id="messageUpload"> $!message </div>
<span id="message" style="top:70px;right:5px;position:fixed;width:200px;z-index:100009" onclick="hideById(this.id);"></span>
<input type="hidden" name="uploadFileName" id="uploadFileName" value="$!fileExcel">
-<!-- <input type="hidden" name="uploadFileName" id="uploadFileName">-->
#end
<h2>$!encoder.htmlEncode($!organisationUnit.name)</h2>
<table width="50%">
@@ -16,7 +15,7 @@
</form>
</tr>
<tr>
- <td>$i18n.getString( 'template_excel_file' )</td>
+ <td>$i18n.getString( 'reports' )</td>
<td><select type="text" id="reportId" name="reportId" style="min-width:20em; width:100%" #if(!$!fileExcel) disabled #end onChange="javascript: document.getElementById('lastYear').disabled=false; document.getElementById('nextYear').disabled=false; document.getElementById('period').disabled=false; document.getElementById('preview').disabled=false; document.getElementById('import').disabled=false;">
<option value="">$i18n.getString('select')</option>
#foreach($reportExcel in $reportExcels)
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm 2009-10-09 06:06:43 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm 2009-10-22 17:22:15 +0000
@@ -4,7 +4,7 @@
<ul>
<li><a href="selectExportReportParam.action">$i18n.getString( "generate_report" ) </a></li>
<li><a href="selectAdvancedExportForm.action">$i18n.getString( "generate_advanced_report" ) </a></li>
- <li><a href="getInformation.action">$i18n.getString( "import_excel_file_manager" ) </a></li>
+ <li><a href="getInformation.action">$i18n.getString( "import" ) </a></li>
<li><a href="selectDataSetCompletedReport.action">$i18n.getString( "dataset_completed_report" ) </a></li>
<li><a href="viewDataEntryStatus.action">$i18n.getString( "data_status" )</a></li>
<li><a href="openIndividualReportExcel.action">$i18n.getString( "individual_report" )</a></li>
=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml 2009-10-19 07:07:13 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2009-10-22 17:22:15 +0000
@@ -107,14 +107,16 @@
<artifactId>dhis-web-dashboard-integration</artifactId>
<version>${version}</version>
<type>war</type>
- </dependency>
+ </dependency>
+
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-mapping</artifactId>
<version>${version}</version>
<type>war</type>
- </dependency>
- <dependency>
+ </dependency>
+
+ <dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-excel-reporting</artifactId>
<version>${version}</version>
@@ -152,15 +154,15 @@
-->
<!-- Vietnam modules -->
- <!--
-
+
+ <!--
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-gis</artifactId>
<version>${version}</version>
<type>war</type>
</dependency>
- -->
+ -->
<!-- South Africa modules -->
<!--
=== modified file 'local/vn/dhis-web-gis/pom.xml'
--- local/vn/dhis-web-gis/pom.xml 2009-09-11 11:46:20 +0000
+++ local/vn/dhis-web-gis/pom.xml 2009-10-22 17:22:15 +0000
@@ -9,7 +9,7 @@
</parent>
<artifactId>dhis-web-gis</artifactId>
- <packaging>jar</packaging>
+ <packaging>war</packaging>
<name>DHIS GIS</name>
<build>
