Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5803 [merge]
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Wed 2012-01-25 11:36:27 +0100
message:
(DV) Utilized new chart service method to improve performance when getting
charts.
renamed:
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAllChartsAction.java
=>
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetSystemAndCurrentUserChartsAction.java
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetSystemAndCurrentUserChartsAction.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 '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 2012-01-23 19:44:06 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2012-01-25 10:30:44 +0000
@@ -272,6 +272,8 @@
executeSql( "ALTER TABLE chart DROP CONSTRAINT chart_title_key" );
executeSql( "ALTER TABLE chart DROP CONSTRAINT chart_name_key" );
+ executeSql( "ALTER TABLE chart DROP COLUMN domainaxixlabel" );
+
// remove outdated relative periods
executeSql( "ALTER TABLE reporttable DROP COLUMN last3months" );
=== renamed file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAllChartsAction.java' => 'dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetSystemAndCurrentUserChartsAction.java'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetAllChartsAction.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetSystemAndCurrentUserChartsAction.java 2012-01-25 10:30:44 +0000
@@ -37,7 +37,7 @@
/**
* @author Jan Henrik Overland
*/
-public class GetAllChartsAction
+public class GetSystemAndCurrentUserChartsAction
implements Action
{
// -------------------------------------------------------------------------
@@ -69,7 +69,7 @@
public String execute()
throws Exception
{
- object = chartService.getAllCharts();
+ object = chartService.getSystemAndUserCharts();
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/META-INF/dhis/beans.xml 2012-01-05 20:39:23 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/META-INF/dhis/beans.xml 2012-01-25 10:30:44 +0000
@@ -60,8 +60,8 @@
<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
</bean>
- <bean id="org.hisp.dhis.visualizer.action.GetAllChartsAction"
- class="org.hisp.dhis.visualizer.action.GetAllChartsAction"
+ <bean id="org.hisp.dhis.visualizer.action.GetSystemAndCurrentUserChartsAction"
+ class="org.hisp.dhis.visualizer.action.GetSystemAndCurrentUserChartsAction"
scope="prototype">
<property name="chartService"
ref="org.hisp.dhis.chart.ChartService" />
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/struts.xml 2012-01-18 05:05:02 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/struts.xml 2012-01-25 10:30:44 +0000
@@ -65,8 +65,8 @@
/dhis-web-visualizer/void.vm</result>
</action>
- <action name="getAllCharts"
- class="org.hisp.dhis.visualizer.action.GetAllChartsAction">
+ <action name="getSystemAndCurrentUserCharts"
+ class="org.hisp.dhis.visualizer.action.GetSystemAndCurrentUserChartsAction">
<result name="success" type="velocity-json">
/dhis-web-visualizer/jsonminCharts.vm</result>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2012-01-23 16:05:43 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2012-01-25 10:30:44 +0000
@@ -35,7 +35,7 @@
favorite_addorupdate: 'addOrUpdateChart.action',
favorite_addorupdatesystem: 'addOrUpdateSystemChart.action',
favorite_get: 'charts/',
- favorite_getall: 'getAllCharts.action',
+ favorite_getall: 'getSystemAndCurrentUserCharts.action',
favorite_delete: 'deleteCharts.action'
},
dimension: {
@@ -953,22 +953,15 @@
},
listeners: {
load: function(s) {
- s.filterBy(function(r) {
- if (!r.data.userId || r.data.userId == DV.init.system.user.id) {
- return true;
- }
- return false;
- });
-
+ if (!s.isLoaded) {
+ s.isLoaded = true;
+ }
s.sortStore();
s.each(function(r) {
r.data.lastUpdated = r.data.lastUpdated.substr(0,16);
r.data.icon = '<img src="images/favorite.png" />';
r.commit();
});
- if (!s.isLoaded) {
- s.isLoaded = true;
- }
}
}
})
_______________________________________________
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
