diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod index 2855ca741464f3ca1240c40187a3bd65d15edc59..c43a760ab0121755f0962f11c6031b175c1f1c6c 100644 --- a/entity/Address_entity/Address_entity.aod +++ b/entity/Address_entity/Address_entity.aod @@ -50,7 +50,6 @@ <title>Country</title> <consumer>Countries</consumer> <mandatory v="true" /> - <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/country/mandatoryProcess.js</mandatoryProcess> <valueProcess>%aditoprj%/entity/Address_entity/entityfields/country/valueProcess.js</valueProcess> <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/country/displayValueProcess.js</displayValueProcess> </entityField> @@ -65,7 +64,6 @@ <entityField> <name>CONTACT_ID</name> <mandatory v="true" /> - <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/contact_id/mandatoryProcess.js</mandatoryProcess> <valueProcess>%aditoprj%/entity/Address_entity/entityfields/contact_id/valueProcess.js</valueProcess> </entityField> <entityField> diff --git a/entity/Address_entity/entityfields/address/mandatoryProcess.js b/entity/Address_entity/entityfields/address/mandatoryProcess.js index e3fe2aaca0f62a84aa3be6d632f91b916bc4a435..7c898f01828b8da4b9712687a66dac8914b3b137 100644 --- a/entity/Address_entity/entityfields/address/mandatoryProcess.js +++ b/entity/Address_entity/entityfields/address/mandatoryProcess.js @@ -2,14 +2,4 @@ import("Entity_lib"); import("system.result"); import("AddressEntity_lib"); -result.object(ProcessHandlingUtils.getMandatoryIgnoreAllEmpty([ - "$field.ADDR_TYPE", - "$field.ADDRESS", - "$field.BUILDINGNO", - "$field.ZIP", - "$field.CITY", - "$field.COUNTRY", - "$field.STATE", - "$field.REGION", - "$field.ADDRIDENTIFIER" - ], AddressEntityValidation.isMandatoryField())); \ No newline at end of file +result.object(AddressEntityValidation.isMandatoryField()); \ No newline at end of file diff --git a/entity/Address_entity/entityfields/city/mandatoryProcess.js b/entity/Address_entity/entityfields/city/mandatoryProcess.js index e3fe2aaca0f62a84aa3be6d632f91b916bc4a435..7c898f01828b8da4b9712687a66dac8914b3b137 100644 --- a/entity/Address_entity/entityfields/city/mandatoryProcess.js +++ b/entity/Address_entity/entityfields/city/mandatoryProcess.js @@ -2,14 +2,4 @@ import("Entity_lib"); import("system.result"); import("AddressEntity_lib"); -result.object(ProcessHandlingUtils.getMandatoryIgnoreAllEmpty([ - "$field.ADDR_TYPE", - "$field.ADDRESS", - "$field.BUILDINGNO", - "$field.ZIP", - "$field.CITY", - "$field.COUNTRY", - "$field.STATE", - "$field.REGION", - "$field.ADDRIDENTIFIER" - ], AddressEntityValidation.isMandatoryField())); \ No newline at end of file +result.object(AddressEntityValidation.isMandatoryField()); \ No newline at end of file diff --git a/entity/Address_entity/entityfields/contact_id/mandatoryProcess.js b/entity/Address_entity/entityfields/contact_id/mandatoryProcess.js deleted file mode 100644 index 9f96f58a0fe94f22a96e5daee2f08d6005f54df2..0000000000000000000000000000000000000000 --- a/entity/Address_entity/entityfields/contact_id/mandatoryProcess.js +++ /dev/null @@ -1,15 +0,0 @@ -import("Entity_lib"); -import("system.result"); -import("AddressEntity_lib"); - -result.object(ProcessHandlingUtils.getMandatoryIgnoreAllEmpty([ - "$field.ADDR_TYPE", - "$field.ADDRESS", - "$field.BUILDINGNO", - "$field.ZIP", - "$field.CITY", - "$field.COUNTRY", - "$field.STATE", - "$field.REGION", - "$field.ADDRIDENTIFIER" - ], true)); \ No newline at end of file diff --git a/entity/Address_entity/entityfields/country/mandatoryProcess.js b/entity/Address_entity/entityfields/country/mandatoryProcess.js deleted file mode 100644 index 9f96f58a0fe94f22a96e5daee2f08d6005f54df2..0000000000000000000000000000000000000000 --- a/entity/Address_entity/entityfields/country/mandatoryProcess.js +++ /dev/null @@ -1,15 +0,0 @@ -import("Entity_lib"); -import("system.result"); -import("AddressEntity_lib"); - -result.object(ProcessHandlingUtils.getMandatoryIgnoreAllEmpty([ - "$field.ADDR_TYPE", - "$field.ADDRESS", - "$field.BUILDINGNO", - "$field.ZIP", - "$field.CITY", - "$field.COUNTRY", - "$field.STATE", - "$field.REGION", - "$field.ADDRIDENTIFIER" - ], true)); \ No newline at end of file diff --git a/entity/Address_entity/entityfields/state/mandatoryProcess.js b/entity/Address_entity/entityfields/state/mandatoryProcess.js index e3fe2aaca0f62a84aa3be6d632f91b916bc4a435..7c898f01828b8da4b9712687a66dac8914b3b137 100644 --- a/entity/Address_entity/entityfields/state/mandatoryProcess.js +++ b/entity/Address_entity/entityfields/state/mandatoryProcess.js @@ -2,14 +2,4 @@ import("Entity_lib"); import("system.result"); import("AddressEntity_lib"); -result.object(ProcessHandlingUtils.getMandatoryIgnoreAllEmpty([ - "$field.ADDR_TYPE", - "$field.ADDRESS", - "$field.BUILDINGNO", - "$field.ZIP", - "$field.CITY", - "$field.COUNTRY", - "$field.STATE", - "$field.REGION", - "$field.ADDRIDENTIFIER" - ], AddressEntityValidation.isMandatoryField())); \ No newline at end of file +result.object(AddressEntityValidation.isMandatoryField()); \ No newline at end of file diff --git a/entity/Address_entity/entityfields/zip/mandatoryProcess.js b/entity/Address_entity/entityfields/zip/mandatoryProcess.js index e3fe2aaca0f62a84aa3be6d632f91b916bc4a435..7c898f01828b8da4b9712687a66dac8914b3b137 100644 --- a/entity/Address_entity/entityfields/zip/mandatoryProcess.js +++ b/entity/Address_entity/entityfields/zip/mandatoryProcess.js @@ -2,14 +2,4 @@ import("Entity_lib"); import("system.result"); import("AddressEntity_lib"); -result.object(ProcessHandlingUtils.getMandatoryIgnoreAllEmpty([ - "$field.ADDR_TYPE", - "$field.ADDRESS", - "$field.BUILDINGNO", - "$field.ZIP", - "$field.CITY", - "$field.COUNTRY", - "$field.STATE", - "$field.REGION", - "$field.ADDRIDENTIFIER" - ], AddressEntityValidation.isMandatoryField())); \ No newline at end of file +result.object(AddressEntityValidation.isMandatoryField()); \ No newline at end of file diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js index 8743459e608d7cb1e9195871a64eb5d0868d4ea2..20bdc717713e1706c9e6c86a981b2fb83fc6d0af 100644 --- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js +++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js @@ -1,3 +1,4 @@ +import("system.logging"); import("system.vars"); import("system.db"); import("system.result"); diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod index bac5b4dc39e0682be2a66933ed98eca0e4427193..a49d5d09c50bdab00dca6c131427d0bfae3c02b1 100644 --- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod +++ b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod @@ -13,7 +13,6 @@ <name>Header</name> <iconField>IMAGE</iconField> <titleField>CONTACT_ID</titleField> - <subtitleField>CONTACT_ID</subtitleField> <descriptionField>INFO</descriptionField> <entityField>#ENTITY</entityField> </cardViewTemplate> diff --git a/process/Entity_lib/process.js b/process/Entity_lib/process.js index 5c7dfbf7817a9c55e1dd1f65d57da28eeea873c4..6db3b2deba0ad67d82b693ba8cd5e421a7f547d0 100644 --- a/process/Entity_lib/process.js +++ b/process/Entity_lib/process.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.neon"); import("system.vars"); @@ -48,26 +47,6 @@ ProcessHandlingUtils.initialParamToResult = function(pParamVarName) } -ProcessHandlingUtils.getMandatoryIgnoreAllEmpty = function(pFields, pIsMandatory) -{ - var allEmpty = true; - logging.log("-------------") - pFields.forEach(function(pField) { - logging.log(pField + " " + vars.getString(pField)) - if (vars.getString(pField)) - { - - allEmpty = false; - } - }); - logging.log(allEmpty) - logging.log(pIsMandatory) - logging.log(!allEmpty && pIsMandatory) - - logging.log("-------------") - return !allEmpty && pIsMandatory; -} - /** * Workaround for detecting field changes of fields not managed by record containers. * Should be fixed in the future: Ticket 1030023