dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15750
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5796: (DV) Favorite bugs fixed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5796 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-01-23 17:08:08 +0100
message:
(DV) Favorite bugs fixed.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js
--
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/chart/Chart.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java 2012-01-13 16:42:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java 2012-01-23 16:05:43 +0000
@@ -412,7 +412,7 @@
@JsonProperty
public boolean isTargetLine()
{
- return targetLine;
+ return targetLineValue != null;
}
public void setTargetLine( boolean targetLine )
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java 2012-01-23 12:36:17 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java 2012-01-23 16:05:43 +0000
@@ -316,11 +316,15 @@
{
chart.setFilter( filter );
}
-
- chart.setIndicators( indicatorIds != null ? new ArrayList<Indicator>( indicatorService.getIndicators( indicatorIds ) ) : new ArrayList<Indicator>() );
-
- chart.setDataElements( dataElementIds != null ? new ArrayList<DataElement>( dataElementService
- .getDataElements( dataElementIds ) ) : new ArrayList<DataElement>() );
+
+ if ( indicatorIds != null || dataElementIds != null )
+ {
+ chart.setIndicators( indicatorIds != null ? new ArrayList<Indicator>( indicatorService
+ .getIndicators( indicatorIds ) ) : new ArrayList<Indicator>() );
+
+ chart.setDataElements( dataElementIds != null ? new ArrayList<DataElement>( dataElementService
+ .getDataElements( dataElementIds ) ) : new ArrayList<DataElement>() );
+ }
if ( lastMonth || last12Months || lastQuarter || last4Quarters || lastSixMonth || last2SixMonths || thisYear
|| last5Years )
@@ -381,7 +385,6 @@
if ( targetLineValue != null )
{
- chart.setTargetLine( true );
chart.setTargetLineValue( targetLineValue );
}
@@ -389,6 +392,8 @@
{
chart.setTargetLineLabel( targetLineLabel );
}
+
+ chart.setTargetLine( targetLineValue != null );
chartService.saveOrUpdate( chart );
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties 2012-01-20 13:40:57 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties 2012-01-23 16:05:43 +0000
@@ -62,7 +62,7 @@
rename=Rename
rename_favorite=Rename favorite
cancel=Cancel
-name_already_in_use=*Name already in use
+name_already_in_use=* Name already in use
delete=Delete
delete_favorite=Delete favorite
are_you_sure=Are you sure?
=== 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 08:05:42 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2012-01-23 16:05:43 +0000
@@ -724,31 +724,23 @@
favorite: {
create: function(fn, isUpdate) {
DV.util.mask.setMask(DV.cmp.favorite.window, DV.i18n.saving + '...');
+
var params = DV.state.getParams();
params.name = DV.cmp.favorite.name.getValue();
params.trendLine = DV.cmp.favorite.trendline.getValue();
params.hideSubtitle = DV.cmp.favorite.hidesubtitle.getValue();
params.hideLegend = DV.cmp.favorite.hidelegend.getValue();
params.userOrganisationUnit = DV.cmp.favorite.userorganisationunit.getValue();
- if (DV.cmp.favorite.domainaxislabel.getValue()) {
- params.domainAxisLabel = DV.cmp.favorite.domainaxislabel.getValue();
- }
- if (DV.cmp.favorite.rangeaxislabel.getValue()) {
- params.rangeAxisLabel = DV.cmp.favorite.rangeaxislabel.getValue();
- }
- if (DV.cmp.favorite.targetlinevalue.getValue()) {
- params.targetLineValue = DV.cmp.favorite.targetlinevalue.getValue();
- }
- if (params.targetLineValue && !DV.cmp.favorite.targetlinelabel.isDisabled()) {
- params.targetLineLabel = DV.cmp.favorite.targetlinelabel.getValue();
- }
+ params.domainAxisLabel = DV.cmp.favorite.domainaxislabel.getValue();
+ params.rangeAxisLabel = DV.cmp.favorite.rangeaxislabel.getValue();
+ params.targetLineValue = DV.cmp.favorite.targetlinevalue.getValue();
+ params.targetLineLabel = (params.targetLineValue && !DV.cmp.favorite.targetlinelabel.isDisabled()) ? DV.cmp.favorite.targetlinelabel.getValue() : null;
if (isUpdate) {
- var store = DV.store.favorite;
- params.uid = store.getAt(store.findExact('name', params.name)).data.id;
+ params.uid = DV.store.favorite.getAt(DV.store.favorite.findExact('name', params.name)).data.id;
}
- var url = DV.cmp.favorite.system.getValue() ? DV.conf.finals.ajax.favorite_addorupdatesystem : DV.conf.finals.ajax.favorite_addorupdate;
+ var url = DV.cmp.favorite.system.getValue() ? DV.conf.finals.ajax.favorite_addorupdatesystem : DV.conf.finals.ajax.favorite_addorupdate;
Ext.Ajax.request({
url: DV.conf.finals.ajax.path_visualizer + url,
params: params,
