dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12303
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3748: local vn - Renaming...
------------------------------------------------------------
revno: 3748
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-05-26 11:53:43 +0700
message:
local vn - Renaming...
removed:
local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/
local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/
local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItem.hbm.xml
local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItemGroup.hbm.xml
added:
local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/importitem/
local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/importitem/hibernate/
local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/importitem/hibernate/ExcelItem.hbm.xml
local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/importitem/hibernate/ExcelItemGroup.hbm.xml
modified:
local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/ExcelItem.java
local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/ExcelItemGroup.java
local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/AddImportItemAction.java
local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/CopyImportItemAction.java
local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/CopyImportItemToImportReportAction.java
--
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-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/ExcelItem.java'
--- local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/ExcelItem.java 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/ExcelItem.java 2011-05-26 04:53:43 +0000
@@ -53,12 +53,12 @@
// Getters and setters
// -------------------------------------------------------------------------
- public ExcelItemGroup getImportReport()
+ public ExcelItemGroup getExcelItemGroup()
{
return excelItemGroup;
}
- public void setImportReport( ExcelItemGroup excelItemGroup )
+ public void setExcelItemGroup( ExcelItemGroup excelItemGroup )
{
this.excelItemGroup = excelItemGroup;
}
=== modified file 'local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/ExcelItemGroup.java'
--- local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/ExcelItemGroup.java 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/ExcelItemGroup.java 2011-05-26 04:53:43 +0000
@@ -223,17 +223,17 @@
// Support method
// -------------------------------------------------------------------------
- public boolean excelItemIsExist( String name )
+ public boolean importItemIsExist( String name )
{
- return getExcelItemByName( name ) != null;
+ return getImportItemByName( name ) != null;
}
public boolean rowAndColumnIsExist( int sheet, int row, int column )
{
- return getExcelItemBySheetRowColumn( sheet, row, column ) != null;
+ return getImportItemBySheetRowColumn( sheet, row, column ) != null;
}
- public ExcelItem getExcelItemByName( String name )
+ public ExcelItem getImportItemByName( String name )
{
for ( ExcelItem e : this.excelItems )
{
@@ -246,7 +246,7 @@
return null;
}
- public ExcelItem getExcelItemBySheetRowColumn( int sheet, int row, int column )
+ public ExcelItem getImportItemBySheetRowColumn( int sheet, int row, int column )
{
for ( ExcelItem e : this.excelItems )
{
=== removed directory 'local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem'
=== removed directory 'local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate'
=== removed file 'local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItem.hbm.xml'
--- local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItem.hbm.xml 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItem.hbm.xml 1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
-
-<hibernate-mapping>
-
- <class name="org.hisp.dhis.reportexcel.importitem.ExcelItem"
- table="excelitem">
-
- <id name="id" column="excelitemid">
- <generator class="native" />
- </id>
-
- <properties name="uniqueKey" unique="true">
-
- <property name="name" column="name" not-null="true" />
-
- <many-to-one name="excelItemGroup" column="excelItemGroupId"
- class="org.hisp.dhis.reportexcel.importitem.ExcelItemGroup"
- foreign-key="fk_exceltitem_group" lazy="false" insert="true" />
- </properties>
-
- <property name="expression" column="expression" not-null="true" />
- <property name="row" column="excelrow" not-null="true" />
- <property name="column" column="excelcolumn" not-null="true" />
- <property name="sheetNo" column="sheetNo" not-null="true" />
-
- </class>
-
-</hibernate-mapping>
=== removed file 'local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItemGroup.hbm.xml'
--- local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItemGroup.hbm.xml 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItemGroup.hbm.xml 1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
-<hibernate-mapping>
- <class name="org.hisp.dhis.reportexcel.importitem.ExcelItemGroup"
- table="excelitemgroup">
-
- <id name="id" column="excelitemgroupid">
- <generator class="native" />
- </id>
-
- <property name="name" />
-
- <property name="type" />
-
- <many-to-one name="periodType" class="org.hisp.dhis.period.PeriodType"
- lazy="false" column="periodtypeid" not-null="true"
- foreign-key="fk_excelitemgroup_periodtypeid" />
-
- <set name="excelItems" lazy="false" cascade="delete">
- <key column="excelitemgroupid" />
- <one-to-many class="org.hisp.dhis.reportexcel.importitem.ExcelItem" />
- </set>
-
- <set name="organisationAssocitions" table="excelgroup_associations"
- lazy="false">
- <key column="excelitemgroupid" />
- <many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnit"
- column="organisationid" foreign-key="fk_excelitemgroup_organisation" />
- </set>
-
- <list name="organisationUnitGroups" table="excelitemgroup_organisationgroup">
- <key column="excelitemgroupid" />
- <list-index column="grouporder" base="0" />
- <many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnitGroup"
- column="oganisationunitgroupid" foreign-key="fk_excelitemgroup_organisationgroup" />
- </list>
-
- <list name="dataElementOrders" table="excelitemgroup_dataelementgrouporder"
- cascade="all" lazy="false">
- <key column="excelitemgroupid" />
- <list-index base="0" column="dataelementgrouporder" />
- <one-to-many class="org.hisp.dhis.reportexcel.DataElementGroupOrder" />
- </list>
-
- </class>
-</hibernate-mapping>
=== added directory 'local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/importitem'
=== added directory 'local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/importitem/hibernate'
=== added file 'local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/importitem/hibernate/ExcelItem.hbm.xml'
--- local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/importitem/hibernate/ExcelItem.hbm.xml 1970-01-01 00:00:00 +0000
+++ local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/importitem/hibernate/ExcelItem.hbm.xml 2011-05-26 04:53:43 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
+
+<hibernate-mapping>
+
+ <class name="org.hisp.dhis.reportexcel.importitem.ExcelItem"
+ table="excelitem">
+
+ <id name="id" column="excelitemid">
+ <generator class="native" />
+ </id>
+
+ <properties name="uniqueKey" unique="true">
+
+ <property name="name" column="name" not-null="true" />
+
+ <many-to-one name="excelItemGroup" column="excelItemGroupId"
+ class="org.hisp.dhis.reportexcel.importitem.ExcelItemGroup"
+ foreign-key="fk_exceltitem_group" lazy="false" insert="true" />
+ </properties>
+
+ <property name="expression" column="expression" not-null="true" />
+ <property name="row" column="excelrow" not-null="true" />
+ <property name="column" column="excelcolumn" not-null="true" />
+ <property name="sheetNo" column="sheetNo" not-null="true" />
+
+ </class>
+
+</hibernate-mapping>
=== added file 'local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/importitem/hibernate/ExcelItemGroup.hbm.xml'
--- local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/importitem/hibernate/ExcelItemGroup.hbm.xml 1970-01-01 00:00:00 +0000
+++ local/vn/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/importitem/hibernate/ExcelItemGroup.hbm.xml 2011-05-26 04:53:43 +0000
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
+<hibernate-mapping>
+ <class name="org.hisp.dhis.reportexcel.importitem.ExcelItemGroup"
+ table="excelitemgroup">
+
+ <id name="id" column="excelitemgroupid">
+ <generator class="native" />
+ </id>
+
+ <property name="name" />
+
+ <property name="type" />
+
+ <many-to-one name="periodType" class="org.hisp.dhis.period.PeriodType"
+ lazy="false" column="periodtypeid" not-null="true"
+ foreign-key="fk_excelitemgroup_periodtypeid" />
+
+ <set name="excelItems" lazy="false" cascade="delete">
+ <key column="excelitemgroupid" />
+ <one-to-many class="org.hisp.dhis.reportexcel.importitem.ExcelItem" />
+ </set>
+
+ <set name="organisationAssocitions" table="excelgroup_associations"
+ lazy="false">
+ <key column="excelitemgroupid" />
+ <many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnit"
+ column="organisationid" foreign-key="fk_excelitemgroup_organisation" />
+ </set>
+
+ <list name="organisationUnitGroups" table="excelitemgroup_organisationgroup">
+ <key column="excelitemgroupid" />
+ <list-index column="grouporder" base="0" />
+ <many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnitGroup"
+ column="oganisationunitgroupid" foreign-key="fk_excelitemgroup_organisationgroup" />
+ </list>
+
+ <list name="dataElementOrders" table="excelitemgroup_dataelementgrouporder"
+ cascade="all" lazy="false">
+ <key column="excelitemgroupid" />
+ <list-index base="0" column="dataelementgrouporder" />
+ <one-to-many class="org.hisp.dhis.reportexcel.DataElementGroupOrder" />
+ </list>
+
+ </class>
+</hibernate-mapping>
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/AddImportItemAction.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/AddImportItemAction.java 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/AddImportItemAction.java 2011-05-26 04:53:43 +0000
@@ -119,7 +119,7 @@
importItem.setColumn( column );
importItem.setExpression( expression );
importItem.setSheetNo( sheetNo );
- importItem.setImportReport( importItemService.getImportReport( importReportId ) );
+ importItem.setExcelItemGroup( importItemService.getImportReport( importReportId ) );
importItemService.addImportItem( importItem );
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/CopyImportItemAction.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/CopyImportItemAction.java 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/CopyImportItemAction.java 2011-05-26 04:53:43 +0000
@@ -127,7 +127,7 @@
importItem.setColumn( itemSource.getColumn() );
importItem.setExpression( itemSource.getExpression() );
importItem.setSheetNo( sheetNo );
- importItem.setImportReport( importItemService.getImportReport( importReportId ) );
+ importItem.setExcelItemGroup( importItemService.getImportReport( importReportId ) );
importItemService.addImportItem( importItem );
}
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/CopyImportItemToImportReportAction.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/CopyImportItemToImportReportAction.java 2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importitem/action/CopyImportItemToImportReportAction.java 2011-05-26 04:53:43 +0000
@@ -117,7 +117,7 @@
importItem.setColumn( itemSource.getColumn() );
importItem.setExpression( itemSource.getExpression() );
importItem.setSheetNo( sheetNo );
- importItem.setImportReport( dest );
+ importItem.setExcelItemGroup( dest );
importItemService.addImportItem( importItem );
}
