← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16333: Minor fix

 

------------------------------------------------------------
revno: 16333
committer: Tran Chau<tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-08-06 22:25:51 +0700
message:
  Minor fix
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js


--
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-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	2014-08-06 15:20:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js	2014-08-06 15:25:51 +0000
@@ -480,15 +480,190 @@
 		"description" : {
 			"required" : true,
 			"rangelength" : [ 2, 255 ]
+		},
+		"attributeList" : {
+			"required" : true
+		}
+	},
+	"relationshipType" : {
+		"aIsToB" : {
+			"required" : true,
+			"rangelength" : [ 2,160 ]
+		},
+		"bIsToA" : {
+			"required" : true,
+			"rangelength" : [ 2, 160 ]
+		},
+		"name" : {
+			"required" : true,
+			"rangelength" : [ 2, 160 ]
+		}
+	},
+	"trackedEntity" : {
+		"name" : {
+			"required" : true,
+			"rangelength" : [ 2,160 ]
+		},
+		"description" : {
+			"required" : true,
+			"minlength" : 2
+		}
+	},
+	"program" : {
+		"name" : {
+			"required" : true,
+			"rangelength" : [ 2,160 ]
+		},
+		"description" : {
+			"required" : true,
+			"minlength" : 2
+		},
+		"trackedEntityId" : {
+			"required" : true
+		},
+		"dateOfIncidentDescription" : {
+			"required" : true,
+			"rangelength" : [ 2,160 ]
+		},
+		"dateOfEnrollmentDescription" : {
+			"required" : true,
+			"rangelength" : [ 2,160 ]
+		},
+		"compulsaryIdentifier" : {
+			"required" : true
+		},
+		"version" : {
+			"required" : true,
+			"integer":true
+		}
+	},
+	"programStage" : {
+		"name" : {
+			"required" : true,
+			"rangelength" : [2,160]
+		},
+		"description" : {
+			"required" : true,
+			"rangelength" : [2,254]
+		},
+		"reportDateDescription" : {
+			"required" : true,
+			"rangelength" : [2,160]
+		},
+		"minDaysFromStart" : {
+			"number" : true,
+			"min" : 0
+		},
+		"reportDateToUse" : {
+			"required" : true
+		},
+		"standardInterval" : {
+			"number" : true
+		}
+	},
+	"trackedEntityInstanceReminder" : {
+		"name" : {
+			"required" : true,
+			"rangelength" : [2,160]
+		},
+		"days" : {
+			"required": true,
+			"number" : true
+		},
+		"sendTo" : {
+			"required": true
+		},
+		"messageType" : {
+			"required": true,
+			"number" : true
+		},
+		"templateMessage" : {
+			"required": true
+		}
+	},
+	"programIndicator" : {
+		"name" : {
+			"required" : true,
+			"rangelength" : [2,160]
+		},
+		"shortName" : {
+			"required" : true,
+			"rangelength" : [2,50]
+		},
+		"code" : {
+			"rangelength" : [2,160]
+		},
+		"rootDate" : {
+			"required" : true
+		},
+		"expression" : {
+			"required" : true,
+			"maxlength" : 254
+		},
+		"valueType" : {
+			"required" : true
+		}
+	},
+	"caseAggregation" : {
+		"name" : {
+			"required" : true,
+			"rangelength" : [2,160]
+		},
+		"aggregationDataElementId" : {
+			"required" : true
+		},
+		"deSumId" : {
+			"required" : true
+		},
+		"aggregationCondition" : {
+			"required" : true,
+			"rangelength" : [2,254]
+		}
+	},
+	"programStageSection" : {
+		"name" : {
+			"required" : true,
+			"rangelength" : [2,160]
+		},
+		"dataElementList" : {
+			"required" : true
+		}
+	},
+	"programValidation" : {
+		"name" : {
+			"required" : true,
+			"rangelength" : [2,160]
+		},
+		"operator" : {
+			"required" : true
+		},
+		"description" : {
+			"required" : true
+		},
+		"expression" : {
+			"required" : true
+		}
+	},
+	"validationCriteria" : {
+		"name" : {
+			"required" : true,
+			"rangelength" : [2,160]
+		},
+		"description" : {
+			"required" : true,
+			"rangelength" : [2,254]
+		},
+		"property" : {
+			"required" : true
+		},
+		"value" : {
+			"required" : true
 		}
 	},
 	"SMSConfig" : {
 		"pollingInterval" : {
 			"required" : true,
 			"digits" : true
-		},
-		"serverPhoneNumber" : {
-			"digits" : true
 		}
 	},
 	"autoUpdateClient" : {