[Projekt: Entwicklung - Neon][TicketNr.: 1064735][Auswahl von E-Mail-Templates ]

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

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>

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

entity/Email_entity/entityfields/documenttemplates/children/documenttemplatetypeclassification_param/valueProcess.js

+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.documenttemplatetypeclassification"));
\ No newline at end of file

entity/Email_entity/entityfields/documenttemplatetypeclassification/valueProcess.js

+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

entity/Organisation_entity/entityfields/newemail/onActionProcess.js

 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

entity/Person_entity/entityfields/newemail/onActionProcess.js

 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

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)