=== modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/exportForm.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/exportForm.vm 2011-12-30 07:17:59 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/exportForm.vm 2011-12-30 08:29:42 +0000
@@ -140,13 +140,15 @@
-
+
+
+
+ |
+
$i18n.getString( "available_periods" ) |
|
- $i18n.getString( "selected_periods" )
-
- |
+ $i18n.getString( "selected_periods" ) |
@@ -185,10 +187,12 @@
|
- $i18n.getString( "relative_periods" ) |
+ $i18n.getString( "relative_periods" )
+
+ |
-
+ |
=== modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/javascript/addUpdateDatamart.js'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/javascript/addUpdateDatamart.js 2011-10-04 05:10:07 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/javascript/addUpdateDatamart.js 2011-12-30 08:29:42 +0000
@@ -15,6 +15,18 @@
listValidator( 'indicatorsValidator', 'selectedIndicators' );
listValidator( 'organisationunitsValidator', 'selectedOrganisationUnits' );
listValidator( 'periodsValidator', 'selectedPeriods' );
+
+ if( byId('selectedPeriods').options.length == 0 )
+ {
+ if( $("input:checked").length > 0 )
+ {
+ $("#periodsValidator").rules("add",{required:false});
+ }
+ else
+ {
+ $("#periodsValidator").rules("add",{required:true});
+ }
+ }
},
'rules': getValidationRules( 'dataMart' )
} );
|