dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #43235
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21959: Report table, chart, removed obsolete association to program
------------------------------------------------------------
revno: 21959
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2016-02-12 17:15:54 +0100
message:
Report table, chart, removed obsolete association to program
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.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-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2016-01-20 03:58:55 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2016-02-12 16:15:54 +0000
@@ -340,6 +340,7 @@
executeSql( "ALTER TABLE reporttable DROP COLUMN last12individualmonths" );
executeSql( "ALTER TABLE reporttable DROP COLUMN individualmonthsthisyear" );
executeSql( "ALTER TABLE reporttable DROP COLUMN individualquartersthisyear" );
+ executeSql( "ALTER TABLE reporttable DROP COLUMN programid" );
executeSql( "ALTER TABLE chart DROP COLUMN last6months" );
executeSql( "ALTER TABLE chart DROP COLUMN last9months" );
@@ -352,6 +353,7 @@
executeSql( "ALTER TABLE chart DROP COLUMN individualmonthsthisyear" );
executeSql( "ALTER TABLE chart DROP COLUMN individualquartersthisyear" );
executeSql( "ALTER TABLE chart DROP COLUMN organisationunitgroupsetid" );
+ executeSql( "ALTER TABLE chart DROP COLUMN programid" );
// remove source
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml 2015-09-15 11:43:48 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml 2016-02-12 16:15:54 +0000
@@ -131,9 +131,6 @@
foreign-key="fk_chart_itemorgunitgroups_orgunitgroupid" />
</list>
- <many-to-one name="program" class="org.hisp.dhis.program.Program" column="programid"
- foreign-key="fk_chart_programid" />
-
<property name="userOrganisationUnit" />
<property name="userOrganisationUnitChildren" />
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml 2015-09-22 06:05:39 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml 2016-02-12 16:15:54 +0000
@@ -116,9 +116,6 @@
<element type="string" column="dimension" />
</list>
- <many-to-one name="program" class="org.hisp.dhis.program.Program" column="programid"
- foreign-key="fk_reporttable_programid" />
-
<component name="reportParams">
<property name="paramReportingMonth" />
<property name="paramGrandParentOrganisationUnit" />