=== 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-28 17:46:09 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js 2011-03-29 08:15:49 +0000 @@ -36,91 +36,109 @@ }, /* dhis-web-maintenance-organisationunit */ - "organisationUnit": { - "name": { - "rangelength": [2, 160] - }, - "shortName": { - "rangelength": [2, 25] - }, - "code": { - "rangelength": [0, 25] - }, - "url": { - "rangelength": [0, 255] - }, - "contactPerson": { - "rangelength": [0, 255] - }, - "address": { - "rangelength": [0, 255] - }, - "email": { - "rangelength": [0, 250] - }, - "phoneNumber": { - "rangelength": [0, 255] - } - }, - "organisationUnitGroup": { - "name": { - "rangelength": [2, 160] - } - }, - "organisationUnitGroupSet": { - "name": { - "rangelength": [2, 230] - }, - "description": { - "rangelength": [2, 255] - } - }, - + "organisationUnit" : { + "name" : { + "rangelength" : [ 2, 160 ] + }, + "shortName" : { + "rangelength" : [ 2, 25 ] + }, + "code" : { + "rangelength" : [ 0, 25 ] + }, + "url" : { + "rangelength" : [ 0, 255 ] + }, + "contactPerson" : { + "rangelength" : [ 0, 255 ] + }, + "address" : { + "rangelength" : [ 0, 255 ] + }, + "email" : { + "rangelength" : [ 0, 250 ] + }, + "phoneNumber" : { + "rangelength" : [ 0, 255 ] + } + }, + "organisationUnitGroup" : { + "name" : { + "rangelength" : [ 2, 160 ] + } + }, + "organisationUnitGroupSet" : { + "name" : { + "rangelength" : [ 2, 230 ] + }, + "description" : { + "rangelength" : [ 2, 255 ] + } + }, + /* dhis-web-maintenance-dataset */ - "dataEntry": { - "name": { - "rangelength": [4, 100] - } - }, - "section": { - "name": { - "rangelength": [2, 160] - }, - "selectedList": { - - } - }, - "dataSet": { - "name": { - "alphanumericwithbasicpuncspaces": true, - "firstletteralphabet": false, - "rangelength": [4, 150] - }, - "shortName": { - "alphanumericwithbasicpuncspaces": true, - "firstletteralphabet": false, - "rangelength": [2, 20] - }, - "code": { - "alphanumericwithbasicpuncspaces": true, - "notOnlyDigits": false, - "rangelength": [4, 40] - } - }, - + "dataEntry" : { + "name" : { + "rangelength" : [ 4, 100 ] + } + }, + "section" : { + "name" : { + "rangelength" : [ 2, 160 ] + }, + "selectedList" : { + + } + }, + "dataSet" : { + "name" : { + "alphanumericwithbasicpuncspaces" : true, + "firstletteralphabet" : false, + "rangelength" : [ 4, 150 ] + }, + "shortName" : { + "alphanumericwithbasicpuncspaces" : true, + "firstletteralphabet" : false, + "rangelength" : [ 2, 20 ] + }, + "code" : { + "alphanumericwithbasicpuncspaces" : true, + "notOnlyDigits" : false, + "rangelength" : [ 4, 40 ] + } + }, + /* dhis-web-maintenance-dataadmin */ - "sqlView": { - "name": { - "rangelength": [2, 50] - }, - "description": { - "rangelength": [2, 255] - }, - "sqlquery": { - "rangelength": [1, 255] - } - }, - "dataLocking": { }, - "dataBrowser": { }, - "minMax": { } + "sqlView" : { + "name" : { + "rangelength" : [ 2, 50 ] + }, + "description" : { + "rangelength" : [ 2, 255 ] + }, + "sqlquery" : { + "rangelength" : [ 1, 255 ] + } + }, + "dataLocking" : {}, + "dataBrowser" : {}, + "minMax" : {}, + + /* dhis-web-validationrule */ + "validationRule" : { + "name" : { + "rangelength" : [ 2, 160 ] + }, + "description" : { + "rangelength" : [ 2, 160 ] + } + }, + "validationRuleGroup" : { + "name" : { + "rangelength" : [ 2, 160 ] + }, + "description" : { + "rangelength" : [ 2, 160 ] + } + } } === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml 2011-03-01 04:17:29 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml 2011-03-29 08:15:49 +0000 @@ -33,7 +33,7 @@ /main.vm /dhis-web-validationrule/addValidationRuleForm.vm /dhis-web-validationrule/menu.vm - javascript/general.js,javascript/validationForm.js,javascript/expression.js + javascript/general.js,javascript/validationForm.js,javascript/expression.js, javascript/addValidationRuleForm.js F_VALIDATIONRULE_ADD @@ -66,7 +66,7 @@ /main.vm /dhis-web-validationrule/updateValidationRuleForm.vm - javascript/general.js,javascript/validationForm.js,javascript/expression.js + javascript/general.js,javascript/validationForm.js,javascript/expression.js, javascript/updateValidationRuleForm.js F_VALIDATIONRULE_UPDATE @@ -103,10 +103,10 @@ /main.vm /dhis-web-validationrule/addValidationRuleGroupForm.vm - javascript/validationRuleGroup.js + javascript/validationRuleGroup.js, javascript/addValidationRuleGroupForm.js F_VALIDATIONRULEGROUP_ADD - + showValidationRuleGroupForm.action F_VALIDATIONRULEGROUP_ADD @@ -120,7 +120,7 @@ /main.vm /dhis-web-validationrule/updateValidationRuleGroupForm.vm - javascript/validationRuleGroup.js + javascript/validationRuleGroup.js, javascript/updateValidationRuleGroupForm.js === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm 2011-03-18 14:58:26 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm 2011-03-29 08:15:49 +0000 @@ -1,19 +1,3 @@ - -

$encoder.htmlEncode( $i18n.getString( "create_new_validation_rule" ) )

@@ -23,11 +7,11 @@ - + - + @@ -43,7 +27,7 @@ - @@ -59,11 +43,11 @@ - + - + @@ -71,7 +55,8 @@ - + + === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm 2011-03-18 14:58:26 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm 2011-03-29 08:15:49 +0000 @@ -1,19 +1,4 @@ @@ -35,11 +17,11 @@ - + - + @@ -69,10 +51,10 @@ - + - + === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm 2011-03-18 14:58:26 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm 2011-03-29 08:15:49 +0000 @@ -1,19 +1,4 @@