dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16101
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6037: (DV) Validation and GUI fixes.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 6037 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-02-17 19:17:26 +0100
message:
(DV) Validation and GUI fixes.
modified:
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_fr_FR.properties
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/i18n.vm
--
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-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-02-16 16:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties 2012-02-17 18:15:52 +0000
@@ -46,7 +46,7 @@
user_orgunit=User org unit
domain_axis_label=Domain axis label
range_axis_label=Range axis label
-target_line=Target line
+target=Target
target_line_value=Target line value
target_line_label=Target line label
show_hide_chart_settings=Show/hide chart settings
@@ -91,4 +91,5 @@
this_year=This year
trend=Trend
min_two_categories=Minimum two categories needed
-chart_options=Chart options
\ No newline at end of file
+chart_options=Chart options
+select_dimensions=Please select series/category/filter dimensions
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr_FR.properties 2012-02-16 16:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr_FR.properties 2012-02-17 18:15:52 +0000
@@ -46,7 +46,7 @@
user_orgunit=Unit\u00e9 d'organisation de l'utilisateur
domain_axis_label=Libell\u00e9 axe X
range_axis_label=Libell\u00e9 axe Y
-target_line=Ligne cible
+target=Cible
target_line_value=Valeur de la ligne cible
target_line_label=Libell\u00e9 de la ligne cible
show_hide_chart_settings=Montrer/Masquer les param\u00e8tres du graphique
@@ -91,4 +91,5 @@
this_year=Ann\u00e9e en cours
trend=Tendance
min_two_categories=Minimum de deux cat\u00e9gories est n\u00e9cessaire
-chart_options=Options graphiques
\ No newline at end of file
+chart_options=Options graphiques
+select_dimensions=S'il vous plait s\u00e9lectionner s\u00e9ries/cat\u00e9gories/filtre
\ No newline at end of file
=== 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-02-16 18:09:21 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2012-02-17 18:15:52 +0000
@@ -662,7 +662,7 @@
};
},
getTargetLine: function() {
- var title = DV.state.targetLineLabel || DV.i18n.target_line;
+ var title = DV.state.targetLineLabel || DV.i18n.target;
title += ' (' + DV.state.targetLineValue + ')';
return {
type: 'line',
@@ -1227,12 +1227,17 @@
this.targetLineLabel = DV.cmp.favorite.targetlinelabel.getValue();
this.series.dimension = DV.cmp.settings.series.getValue();
+ this.category.dimension = DV.cmp.settings.category.getValue();
+ this.filter.dimension = DV.cmp.settings.filter.getValue();
+
+ if (!this.series.dimension || !this.category.dimension || !this.filter.dimension) {
+ this.resetState();
+ alert(DV.i18n.select_dimensions);
+ return;
+ }
+
this.series.names = DV.util.dimension[this.series.dimension].getNames(true);
-
- this.category.dimension = DV.cmp.settings.category.getValue();
this.category.names = DV.util.dimension[this.category.dimension].getNames(true);
-
- this.filter.dimension = DV.cmp.settings.filter.getValue();
this.filter.names = DV.util.dimension[this.filter.dimension].getNames(true, true);
if (!this.series.names.length || !this.category.names.length || !this.filter.names.length) {
@@ -2557,9 +2562,9 @@
}
},
expand: function(fs) {
- var h = DV.cmp.region.west.getHeight() - 395;
+ var h = DV.cmp.region.west.getHeight() - 405;
DV.cmp.fieldset.organisationunit.setHeight(h);
- DV.cmp.dimension.organisationunit.treepanel.setHeight(h - 30);
+ DV.cmp.dimension.organisationunit.treepanel.setHeight(h - 40);
DV.util.fieldset.collapseFieldsets([DV.cmp.fieldset.indicator, DV.cmp.fieldset.dataelement, DV.cmp.fieldset.period]);
var tp = DV.cmp.dimension.organisationunit.treepanel;
@@ -3229,7 +3234,7 @@
{
text: DV.i18n.cancel,
handler: function() {
- DV.cmp.favorite.window.close();
+ this.up('window').close();
}
},
'->',
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm 2012-02-16 16:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm 2012-02-17 18:15:52 +0000
@@ -47,7 +47,7 @@
user_orgunit:'$encoder.jsEscape($i18n.getString( 'user_orgunit' ) , "'")',
domain_axis_label:'$encoder.jsEscape($i18n.getString( 'domain_axis_label' ) , "'")',
range_axis_label:'$encoder.jsEscape($i18n.getString( 'range_axis_label' ) , "'")',
-target_line:'$encoder.jsEscape($i18n.getString( 'target_line' ) , "'")',
+target:'$encoder.jsEscape($i18n.getString( 'target' ) , "'")',
target_line_value:'$encoder.jsEscape($i18n.getString( 'target_line_value' ) , "'")',
target_line_label:'$encoder.jsEscape($i18n.getString( 'target_line_label' ) , "'")',
show_hide_chart_settings:'$encoder.jsEscape($i18n.getString( 'show_hide_chart_settings' ) , "'")',
@@ -90,5 +90,7 @@
this_year:'$encoder.jsEscape($i18n.getString( 'this_year' ) , "'")',
trend:'$encoder.jsEscape($i18n.getString( 'trend' ) , "'")',
min_two_categories:'$encoder.jsEscape($i18n.getString( 'min_two_categories' ) , "'")',
-chart_options:'$encoder.jsEscape($i18n.getString( 'chart_options' ) , "'")'
+chart_options:'$encoder.jsEscape($i18n.getString( 'chart_options' ) , "'")',
+select_dimensions:'$encoder.jsEscape($i18n.getString( 'select_dimensions' ) , "'")'
+
};
\ No newline at end of file
