diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js index 40ced6b7b961dd5616239ee3a8b8ff92f0f7932f..35836fe0a8792eac113906b90ac2e1ecd8b9e57a 100644 --- a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js +++ b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js @@ -15,4 +15,4 @@ if(vars.get("$param.ComingFrom_param")) .and("DOCUMENTTEMPLATEPLACEOFUSE.DOCUMENTTEMPLATE_ID = DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID"), SqlBuilder.EXISTS()); } -result.string(cond); \ No newline at end of file +result.string(cond.toString()); \ No newline at end of file diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod index f0721f5e933e81bc163cb04b1d224ef9a65a24ee..3fae2a234bd2ebccb4ee178dd4c55cbdbacfb054 100644 --- a/entity/Email_entity/Email_entity.aod +++ b/entity/Email_entity/Email_entity.aod @@ -43,6 +43,10 @@ <name>ComingFrom_param</name> <valueProcess>%aditoprj%/entity/Email_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js</valueProcess> </entityParameter> + <entityParameter> + <name>DocumentTemplateTypeClassification_param</name> + <valueProcess>%aditoprj%/entity/Email_entity/entityfields/documenttemplates/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess> + </entityParameter> </children> </entityConsumer> <entityParameter> @@ -136,6 +140,15 @@ <name>#PROVIDER_AGGREGATES</name> <useAggregates v="true" /> </entityProvider> + <entityField> + <name>documenttemplatetypeclassification</name> + <valueProcess>%aditoprj%/entity/Email_entity/entityfields/documenttemplatetypeclassification/valueProcess.js</valueProcess> + </entityField> + <entityParameter> + <name>DocumentTemplateTypeClassification_param</name> + <expose v="true" /> + <description></description> + </entityParameter> </entityFields> <recordContainers> <datalessRecordContainer> diff --git a/entity/Email_entity/entityfields/comingfrom/valueProcess.js b/entity/Email_entity/entityfields/comingfrom/valueProcess.js index e1559e60a161a0cc6323ece8b28b23741043a814..534410568e17af797c3ebace69df84e559fb35c7 100644 --- a/entity/Email_entity/entityfields/comingfrom/valueProcess.js +++ b/entity/Email_entity/entityfields/comingfrom/valueProcess.js @@ -2,4 +2,4 @@ import("system.vars"); import("system.result"); if(vars.get("$param.ComingFrom_param")) -result.string(vars.get("$param.ComingFrom_param")); \ No newline at end of file + result.string(vars.get("$param.ComingFrom_param")); \ No newline at end of file diff --git a/entity/Email_entity/entityfields/documenttemplates/children/documenttemplatetypeclassification_param/valueProcess.js b/entity/Email_entity/entityfields/documenttemplates/children/documenttemplatetypeclassification_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..1ee6655bbafe8bd5e3b1bf5f575de8d793b947cc --- /dev/null +++ b/entity/Email_entity/entityfields/documenttemplates/children/documenttemplatetypeclassification_param/valueProcess.js @@ -0,0 +1,4 @@ +import("system.vars"); +import("system.result"); + +result.string(vars.get("$field.documenttemplatetypeclassification")); \ No newline at end of file diff --git a/entity/Email_entity/entityfields/documenttemplatetypeclassification/valueProcess.js b/entity/Email_entity/entityfields/documenttemplatetypeclassification/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..9e3fc1ddf974f7cee9f02154b923ed44d710f781 --- /dev/null +++ b/entity/Email_entity/entityfields/documenttemplatetypeclassification/valueProcess.js @@ -0,0 +1,5 @@ +import("system.vars"); +import("system.result"); + +if(vars.get("$param.DocumentTemplateTypeClassification_param")) + result.string(vars.get("$param.DocumentTemplateTypeClassification_param")); \ No newline at end of file diff --git a/entity/Organisation_entity/entityfields/newemail/onActionProcess.js b/entity/Organisation_entity/entityfields/newemail/onActionProcess.js index 3909fcec58d0904fdc3644ef78dbb9131439e3e2..a46efc111ddcfd413f0dcfff1c46e9fc6562b64e 100644 --- a/entity/Organisation_entity/entityfields/newemail/onActionProcess.js +++ b/entity/Organisation_entity/entityfields/newemail/onActionProcess.js @@ -1,4 +1,5 @@ import("system.vars"); import("Email_lib"); +import("KeywordRegistry_basic"); -EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"), null, vars.get("$sys.currentcontextname")); \ No newline at end of file +EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"), null, vars.get("$sys.currentcontextname"), null, null, null, null, null, $KeywordRegistry.documentTemplateTypeCategory$single()); \ No newline at end of file diff --git a/entity/Person_entity/entityfields/newemail/onActionProcess.js b/entity/Person_entity/entityfields/newemail/onActionProcess.js index f4fedc1dc3c525360d5572683060ea4ca1c372f6..a4b80166ed668dd700c51c1429cae7aa647edff5 100644 --- a/entity/Person_entity/entityfields/newemail/onActionProcess.js +++ b/entity/Person_entity/entityfields/newemail/onActionProcess.js @@ -1,5 +1,6 @@ import("system.vars"); import("Email_lib"); +import("KeywordRegistry_basic"); -EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"), null, vars.get("$sys.currentcontextname")); +EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"), null, vars.get("$sys.currentcontextname"), null, null, null, null, null, $KeywordRegistry.documentTemplateTypeCategory$single()); \ No newline at end of file diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js index 0a29f110ada7eebcdb36af5aaf40e2bd35a55994..373495625a441019c820af8d3bfc4578ecbe0afc 100644 --- a/process/Email_lib/process.js +++ b/process/Email_lib/process.js @@ -81,8 +81,9 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId, * @param {String} pEmailFilename optional file name of the email. * @param {String} [pAdditionalPlaceholders] additional placeholders for the email * @param {Array[]} [pUpdateStatements] an array with update statements which will be executed after email is downloaded/sent. + * @param {String} pTypeClassification Documenttemplatetypeclassification */ -EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom, pAttachmentArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pUpdateStatements) +EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom, pAttachmentArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pUpdateStatements, pTypeClassification) { var params = { "ContactId_param" : pToContactId, @@ -91,7 +92,8 @@ EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComing "NotificationMsg_param" : pNotificationMsg, "EmailFilename" : pEmailFilename, "AdditionalPlaceholders_param" : JSON.stringify(pAdditionalPlaceholders), - "UpdateStatements_param" : JSON.stringify(pUpdateStatements) + "UpdateStatements_param" : JSON.stringify(pUpdateStatements), + "DocumentTemplateTypeClassification_param" : pTypeClassification }; if (pToEmailAddress)