diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index 8d525d5e992e4964739ba9bed5ff8f5fc2b752a0..759df71853d03365e0d6d6e6267760b310490df6 100644 --- a/entity/Salesproject_entity/Salesproject_entity.aod +++ b/entity/Salesproject_entity/Salesproject_entity.aod @@ -275,6 +275,7 @@ <name>dependency</name> <entityName>Timetracking_entity</entityName> <fieldName>Timetrackings</fieldName> + <refreshParent>true</refreshParent> </dependency> <children> <entityParameter> diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod index 4c706c5d4b8ff26e71328f761e2bd8de82e497cb..0518ba26e8981fc79ec40dea15c183525455991d 100644 --- a/entity/Timetracking_entity/Timetracking_entity.aod +++ b/entity/Timetracking_entity/Timetracking_entity.aod @@ -23,11 +23,10 @@ <entityField> <name>TRACKINGMINUTES</name> <title>Time</title> - <contentType>TEXT</contentType> + <contentType>NUMBER</contentType> <mandatory v="true" /> <titleProcess>%aditoprj%/entity/Timetracking_entity/entityfields/trackingminutes/titleProcess.js</titleProcess> <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/trackingminutes/displayValueProcess.js</displayValueProcess> - <onValidation>%aditoprj%/entity/Timetracking_entity/entityfields/trackingminutes/onValidation.js</onValidation> </entityField> <entityField> <name>OBJECT_ID</name> diff --git a/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js b/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js index 1e62e7551ccb20b0b0d7aca34f64b6e448b5dda7..4711a17716cf559c48c73cd7ea780b2ffe5e2e03 100644 --- a/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js +++ b/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js @@ -3,5 +3,5 @@ import("system.neon"); import("system.vars"); import("Employee_lib"); -if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) +if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null) result.string(EmployeeUtils.getCurrentContactId()); \ No newline at end of file diff --git a/entity/Timetracking_entity/entityfields/trackingminutes/onValidation.js b/entity/Timetracking_entity/entityfields/trackingminutes/onValidation.js deleted file mode 100644 index 2c109d356e606c0e2306e09a2fef39a4d3a4b3fe..0000000000000000000000000000000000000000 --- a/entity/Timetracking_entity/entityfields/trackingminutes/onValidation.js +++ /dev/null @@ -1,15 +0,0 @@ -import("system.translate"); -import("system.result"); -import("system.vars"); -import("PostalAddress_lib"); -import("Entity_lib"); - -// TODO: displayValue + contentType number crashes so we use TEXT and validate ourselve -// 1035861 - -var minutes = vars.get("local.value"); -var message = ""; -if (!/^\d+$/.test(minutes)) - message = translate.text("Only numbers are allowed."); - -result.string(message); \ No newline at end of file