=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js 2011-03-29 10:07:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js 2011-03-31 11:17:07 +0000
@@ -157,5 +157,15 @@
"name" : {
"rangelength" : [ 2, 160 ]
}
+ },
+ "dataElementGroup" : {
+ "name" : {
+ "rangelength" : [ 3, 150 ]
+ }
+ },
+ "dataElementGroupSet" : {
+ "name" : {
+ "rangelength" : [ 2, 230 ]
+ }
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm 2011-03-18 14:14:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm 2011-03-31 11:17:07 +0000
@@ -1,9 +1,4 @@
-
+
$i18n.getString( "create_new_data_element_group" )
@@ -15,7 +10,7 @@
|
- |
+ |
|
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm 2011-03-18 14:14:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm 2011-03-31 11:17:07 +0000
@@ -1,9 +1,4 @@
-
+
$i18n.getString( "add_dataelementgroupset" )
@@ -15,7 +10,7 @@
|
- |
+ |
|
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupForm.js 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupForm.js 2011-03-31 11:17:07 +0000
@@ -0,0 +1,24 @@
+jQuery(document).ready(function() {
+ var r = getValidationRules();
+
+ var rules = {
+ name : {
+ required : true,
+ rangelength : r.dataElementGroup.name.rangelength,
+ alphanumericwithbasicpuncspaces : true,
+ notOnlyDigits : true,
+ firstletteralphabet : true
+ }
+ };
+
+ validation2('addDataElementGroupForm', function(form) {
+ form.submit()
+ }, {
+ 'beforeValidateHandler' : beforeSubmit,
+ 'rules' : rules
+ });
+
+ jQuery("#name").attr("maxlength", r.dataElementGroup.name.rangelength[1]);
+
+ checkValueIsExist("name", "validateDataElementGroup.action");
+});
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupSet.js 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupSet.js 2011-03-31 11:17:07 +0000
@@ -0,0 +1,21 @@
+jQuery(document).ready(function() {
+ var r = getValidationRules();
+
+ var rules = {
+ name : {
+ required : true,
+ rangelength : r.dataElementGroupSet.name.rangelength
+ }
+ };
+
+ validation2('addDataElementGroupSet', function(form) {
+ form.submit()
+ }, {
+ 'beforeValidateHandler' : beforeSubmit,
+ 'rules' : rules
+ });
+
+ jQuery("#name").attr("maxlength", r.dataElementGroupSet.name.rangelength[1]);
+
+ checkValueIsExist("name", "validateDataElementGroupSet.action");
+});
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupForm.js 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupForm.js 2011-03-31 11:17:07 +0000
@@ -0,0 +1,26 @@
+jQuery(document).ready(function() {
+ var r = getValidationRules();
+
+ var rules = {
+ name : {
+ required : true,
+ rangelength : r.dataElementGroup.name.rangelength,
+ alphanumericwithbasicpuncspaces : true,
+ notOnlyDigits : true,
+ firstletteralphabet : true
+ }
+ };
+
+ validation2('updateDataElementGroupForm', function(form) {
+ form.submit()
+ }, {
+ 'beforeValidateHandler' : beforeSubmit,
+ 'rules' : rules
+ });
+
+ jQuery("#name").attr("maxlength", r.dataElementGroup.name.rangelength[1]);
+
+ checkValueIsExist("name", "validateDataElementGroup.action", {
+ id : getFieldValue('id')
+ });
+});
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupSet.js 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupSet.js 2011-03-31 11:17:07 +0000
@@ -0,0 +1,27 @@
+jQuery(document).ready(function() {
+ var r = getValidationRules();
+
+ var rules = {
+ name : {
+ required : true,
+ rangelength : r.dataElementGroupSet.name.rangelength
+ }
+ };
+
+ validation2('updateDataElementGroupSet', function(form) {
+ form.submit()
+ }, {
+ 'beforeValidateHandler' : beforeSubmit,
+ 'rules' : rules
+ });
+
+ jQuery("#name").attr("maxlength", r.dataElementGroupSet.name.rangelength[1]);
+
+ checkValueIsExist("name", "validateDataElementGroupSet.action", {
+ id : getFieldValue('id')
+ });
+
+ var nameField = document.getElementById('name');
+ nameField.select();
+ nameField.focus();
+});
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm 2011-03-18 14:14:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm 2011-03-31 11:17:07 +0000
@@ -1,9 +1,4 @@
-
+
$i18n.getString( "edit_data_element_group" )
@@ -19,7 +14,7 @@
|
-
+ |
|
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2011-03-18 14:14:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2011-03-31 11:17:07 +0000
@@ -1,13 +1,4 @@
-
+
$i18n.getString( "update_dataelementgroupset" ) : $dataElementGroupSet.name
@@ -19,7 +10,7 @@
|
- |
+ |
|