dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16232
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6125: (DV) Category validation bug fixed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 6125 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-02-27 20:40:54 +0100
message:
(DV) Category validation bug fixed.
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/webapp/dhis-web-visualizer/app/app.js
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css
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-27 16:33:08 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties 2012-02-27 19:24:45 +0000
@@ -93,7 +93,7 @@
em_no_data=Please ensure that there is stored data in the database and that data mart has been run properly.
et_invalid_dimension_setup=Invalid dimension setup
em_invalid_dimension_setup=Please select series/category/filter dimensions.
-et_no_indicators_dataelements_datasets=No indicators, data elements or data sets selected
+et_no_indicators_dataelements_datasets=No data units selected
em_no_indicators_dataelements_datasets=Please select at least one indicator, data element or data set.
et_no_periods=No relative periods selected
em_no_periods=Please select at least one relative period.
=== 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-27 18:10:53 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2012-02-27 19:39:46 +0000
@@ -14,7 +14,7 @@
DV.state.filter.dimension = DV.conf.finals.dimension.organisationunit.value;
DV.state.filter.names = DV.conf.init.example.filter;
DV.state.targetLineValue = 80;
- DV.state.targetLineLabel = 'Target line label';
+ DV.state.targetLineLabel = 'Target label';
DV.state.rangeAxisLabel = 'Range axis label';
DV.state.domainAxisLabel = 'Domain axis label';
},
@@ -1375,7 +1375,11 @@
if (!this.validation.names.call(this)) {
return;
}
-
+
+ if (!this.validation.categories.call(this)) {
+ return;
+ }
+
this.validation.filter.call(this);
this.indicatorIds = DV.util.dimension.indicator.getIds();
@@ -1479,10 +1483,6 @@
return;
}
- if (!this.validation.categories.call(this)) {
- return;
- }
-
this.validation.trendline.call(this);
this.validation.targetline.call(this);
@@ -1528,6 +1528,10 @@
if (!this.validation.names.call(this)) {
return;
}
+
+ if (!this.validation.categories.call(this)) {
+ return;
+ }
this.validation.filter.call(this);
@@ -1615,7 +1619,7 @@
},
names: function() {
if (!this.series.names.length) {
- DV.util.notification.error(DV.i18n.et_no_indicators_dataelements, DV.i18n.em_no_indicators_dataelements);
+ DV.util.notification.error(DV.i18n.et_no_indicators_dataelements_datasets, DV.i18n.em_no_indicators_dataelements_datasets);
return false;
}
if (!this.category.names.length) {
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2012-02-24 02:05:40 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css 2012-02-27 19:24:45 +0000
@@ -67,7 +67,7 @@
-khtml-border-radius: 2px 2px 2px 2px;
border-radius: 2px 2px 2px 2px;
padding-top: 8px;
- padding-bottom: 4px;
+ padding-bottom: 8px;
}
/* Fieldset header */
@@ -624,7 +624,7 @@
/* DV messagebox alert */
.dv-messagebox .x-window-body-default {
background-color: #fff;
- padding: 15px 10px 15px 15px;
+ padding: 14px 10px 15px 15px;
color: #333;
font-size: 11px;
}
=== 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-27 16:35:24 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm 2012-02-27 19:24:45 +0000
@@ -11,9 +11,6 @@
series: '$encoder.jsEscape($i18n.getString( 'series' ) , "'")' ,
category:'$encoder.jsEscape($i18n.getString( 'category' ) , "'")',
filter:'$encoder.jsEscape($i18n.getString( 'filter' ) , "'")',
-alert_no_indicators_selected:'$encoder.jsEscape($i18n.getString( 'alert_no_indicators_selected' ) , "'")',
-no_periods_selected:'$encoder.jsEscape($i18n.getString( 'no_periods_selected' ) , "'")',
-no_orgunits_selected:'$encoder.jsEscape($i18n.getString( 'no_orgunits_selected' ) , "'")',
example_chart:'$encoder.jsEscape($i18n.getString( 'example_chart' ) , "'")',
loading:'$encoder.jsEscape($i18n.getString( 'loading' ) , "'")',
no_data:'$encoder.jsEscape($i18n.getString( 'no_data' ) , "'")',
@@ -71,10 +68,11 @@
example_chart_cannot_be_saved:'$encoder.jsEscape($i18n.getString( 'example_chart_cannot_be_saved' ) , "'")',
overwrite:'$encoder.jsEscape($i18n.getString( 'overwrite' ) , "'")',
download:'$encoder.jsEscape($i18n.getString( 'download' ) , "'")',
-browser_download_alert:'$encoder.jsEscape($i18n.getString( 'browser_download_alert' ) , "'")',
no_svg_format:'$encoder.jsEscape($i18n.getString( 'no_svg_format' ) , "'")',
image_png:'$encoder.jsEscape($i18n.getString( 'image_png' ) , "'")',
hide_data_table:'$encoder.jsEscape($i18n.getString( 'hide_data_table' ) , "'")',
+no_indicators_selected:'$encoder.jsEscape($i18n.getString( 'no_indicators_selected' ) , "'")',
+no_data_elements_selected:'$encoder.jsEscape($i18n.getString( 'no_data_elements_selected' ) , "'")',
saving:'$encoder.jsEscape($i18n.getString( 'saving' ) , "'")',
renaming:'$encoder.jsEscape($i18n.getString( 'renaming' ) , "'")',
deleting:'$encoder.jsEscape($i18n.getString( 'deleting' ) , "'")',
@@ -83,7 +81,6 @@
data_element:'$encoder.jsEscape($i18n.getString( 'data_element' ) , "'")',
period:'$encoder.jsEscape($i18n.getString( 'period' ) , "'")',
organisation_unit:'$encoder.jsEscape($i18n.getString( 'organisation_unit' ) , "'")',
-invalid_uid:'$encoder.jsEscape($i18n.getString( 'invalid_uid' ) , "'")',
system_favorite_overwrite_not_allowed:'$encoder.jsEscape($i18n.getString( 'system_favorite_overwrite_not_allowed' ) , "'")',
favorite_no_orgunits:'$encoder.jsEscape($i18n.getString( 'favorite_no_orgunits' ) , "'")',
this_year:'$encoder.jsEscape($i18n.getString( 'this_year' ) , "'")',
@@ -97,8 +94,8 @@
em_no_data:'$encoder.jsEscape($i18n.getString( 'em_no_data' ) , "'")',
et_invalid_dimension_setup:'$encoder.jsEscape($i18n.getString( 'et_invalid_dimension_setup' ) , "'")',
em_invalid_dimension_setup:'$encoder.jsEscape($i18n.getString( 'em_invalid_dimension_setup' ) , "'")',
-et_no_indicators_dataelements:'$encoder.jsEscape($i18n.getString( 'et_no_indicators_dataelements' ) , "'")',
-em_no_indicators_dataelements:'$encoder.jsEscape($i18n.getString( 'em_no_indicators_dataelements' ) , "'")',
+et_no_indicators_dataelements_datasets:'$encoder.jsEscape($i18n.getString( 'et_no_indicators_dataelements_datasets' ) , "'")',
+em_no_indicators_dataelements_datasets:'$encoder.jsEscape($i18n.getString( 'em_no_indicators_dataelements_datasets' ) , "'")',
et_no_periods:'$encoder.jsEscape($i18n.getString( 'et_no_periods' ) , "'")',
em_no_periods:'$encoder.jsEscape($i18n.getString( 'em_no_periods' ) , "'")',
et_no_orgunits:'$encoder.jsEscape($i18n.getString( 'et_no_orgunits' ) , "'")',
