Bulkmail implementation

.liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkmail.xml

@@ -8,6 +8,7 @@
             </column>
             <column name="DOCUMENTTEMPLATE_ID" type="CHAR(36)"/>
             <column name="DESCRIPTION" type="NVARCHAR(500)"/>
+            <column name="SENDER" type="NVARCHAR(50)"/>
             <column name="NAME" type="NVARCHAR(50)"/>
             <column name="SUBJECT" type="NVARCHAR(100)"/>
         </createTable>

.liquibase/Data_alias/basic/2019.1.4/changelog.xml

@@ -199,6 +199,7 @@
     
     <include relativeToChangelogFile="true" file="BulkMail/create_bulkmail.xml"/>
     <include relativeToChangelogFile="true" file="BulkMail/create_bulkMailRecipient.xml"/>
+    <include relativeToChangelogFile="true" file="BulkMail/bulkMail_keywords.xml"/>
     
     <include relativeToChangelogFile="true" file="add_objectRelationIcon.xml"/>
 </databaseChangeLog>

aliasDefinition/Data_alias/Data_alias.aod

@@ -9838,6 +9838,20 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>SENDER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>

entity/Attribute_entity/recordcontainers/jdito/contentProcess.js

-import("system.logging");
-import("system.datetime");
 import("system.translate");
 import("Util_lib");
 import("JditoFilter_lib");
@@ -11,8 +9,6 @@ import("system.result");
 import("Sql_lib");
 import("Attribute_lib");
 
-var t = datetime.date()
-
 var getGroups = vars.exists("$param.GetGroups_param") && vars.get("$param.GetGroups_param");
 var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
 var parentType = vars.exists("$param.AttrParentType_param") && vars.get("$param.AttrParentType_param");
@@ -174,5 +170,3 @@ function _getFullName (pAttributeName, pParent1Name, pParent2Name, pParent3Name,
     
     return pAttributeName;
 }
-
-logging.log(datetime.date() - t)
\ No newline at end of file

entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod

@@ -18,6 +18,7 @@
       <title>Contact</title>
       <consumer>Contacts</consumer>
       <linkedContextProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
+      <mandatory v="true" />
       <displayValueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
@@ -28,7 +29,7 @@
     </entityField>
     <entityProvider>
       <name>BulkMailRecipients</name>
-      <targetContextField>targetContext</targetContextField>
+      <targetContextField>TARGETCONTEXT</targetContextField>
       <targetIdField>CONTACT_ID</targetIdField>
       <dependencies>
         <entityDependency>
@@ -47,8 +48,7 @@
       <name>BULKMAILRECIPIENTID</name>
     </entityField>
     <entityField>
-      <name>targetContext</name>
-      <valueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
+      <name>TARGETCONTEXT</name>
     </entityField>
     <entityConsumer>
       <name>Contacts</name>
@@ -72,20 +72,43 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityField>
+      <name>EMAIL_ADDRESS</name>
+      <title>Email</title>
+    </entityField>
+    <entityField>
+      <name>ICON</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/icon/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PERSON_ID</name>
+    </entityField>
+    <entityField>
+      <name>ORGANISATION_ID</name>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
       <name>db</name>
       <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
       <conditionProcess>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <linkInformation>
         <linkInformation>
-          <name>760deb9b-6b31-48b5-a339-595d3d104bb5</name>
+          <name>6cfe0097-5d5a-4ca1-a0fc-021ffb47013a</name>
           <tableName>BULKMAILRECIPIENT</tableName>
           <primaryKey>BULKMAILRECIPIENTID</primaryKey>
           <isUIDTable v="true" />
           <readonly v="false" />
         </linkInformation>
+        <linkInformation>
+          <name>bae3d575-0e29-47a5-b962-175cc63333f3</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
       </linkInformation>
       <recordFieldMappings>
         <dbRecordFieldMapping>
@@ -104,6 +127,26 @@
           <name>STATUS.value</name>
           <recordfield>BULKMAILRECIPIENT.STATUS</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMAIL_ADDRESS.displayValue</name>
+          <expression>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/email_address.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORGANISATION_ID.value</name>
+          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_ID.value</name>
+          <recordfield>CONTACT.PERSON_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TARGETCONTEXT.value</name>
+          <expression>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/targetcontext.value/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.displayValue</name>
+          <expression>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>

entity/BulkMailRecipient_entity/entityfields/icon/valueProcess.js

+import("system.vars");
+import("system.result");
+import("Contact_lib");
+
+var type = ContactUtils.getContactTypeByPersOrg(vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID"));
+var icon;
+if (type == 1)
+    icon = "VAADIN:BUILDING";
+else if (type >= 2)
+    icon = "VAADIN:USER";
+    
+result.string(icon);
\ No newline at end of file

entity/BulkMailRecipient_entity/entityfields/status/valueProcess.js

+import("system.neon");
+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
 
-//preset pending
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    result.string($KeywordRegistry.bulkMailSentStatus$pending());
\ No newline at end of file

entity/BulkMailRecipient_entity/entityfields/targetcontext/valueProcess.js

-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getContextName("Person"));
\ No newline at end of file

entity/BulkMailRecipient_entity/recordcontainers/db/fromClauseProcess.js

+import("system.result");
+
+result.string("BULKMAILRECIPIENT join CONTACT on BULKMAILRECIPIENT.CONTACT_ID = CONTACT.CONTACTID");
\ No newline at end of file

entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/email_address.displayvalue/expression.js

+import("Sql_lib");
+import("system.result");
+import("Communication_lib");
+
+var condition = SqlCondition.begin()
+    .and("COMMUNICATION.CONTACT_ID = BULKMAILRECIPIENT.CONTACT_ID");
+var res = CommUtil.getStandardSubSqlMail(condition);
+result.string(res);
\ No newline at end of file

entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js

+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.bulkMailSentStatus(), "BULKMAILRECIPIENT.STATUS");
+result.string(sql);

entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/targetcontext.value/expression.js

+import("Context_lib");
+import("system.result");
+
+result.string("case when PERSON_ID is null then '" + ContextUtils.getContextName("Organisation")
+    + "' when CONTACT.ORGANISATION_ID is not null and CONTACT.PERSON_ID is not null then '" + ContextUtils.getContextName("Person") 
+    + "' else '' end");
\ No newline at end of file

entity/BulkMail_entity/BulkMail_entity.aod

@@ -15,6 +15,7 @@
     <entityField>
       <name>NAME</name>
       <title>Name</title>
+      <mandatory v="true" />
     </entityField>
     <entityField>
       <name>SUBJECT</name>
@@ -28,6 +29,7 @@
       <name>DOCUMENTTEMPLATE_ID</name>
       <title>Document Template</title>
       <consumer>Templates</consumer>
+      <mandatory v="true" />
     </entityField>
     <entityConsumer>
       <name>Recipients</name>
@@ -56,20 +58,41 @@
     </entityField>
     <entityField>
       <name>SENDER</name>
+      <title>Sender address</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityActionField>
+      <name>sendMail</name>
+      <title>Send</title>
+      <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:PAPERPLANE</iconId>
+    </entityActionField>
+    <entityField>
+      <name>ICON</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/icon/valueProcess.js</valueProcess>
     </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
       <name>db</name>
       <alias>Data_alias</alias>
+      <fromClauseProcess>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
       <linkInformation>
         <linkInformation>
-          <name>bccfb408-864f-41e3-b9ac-eef18f1f53c4</name>
+          <name>6444866d-42ee-4b7b-8536-6dc8f6437c45</name>
           <tableName>BULKMAIL</tableName>
           <primaryKey>BULKMAILID</primaryKey>
           <isUIDTable v="true" />
           <readonly v="false" />
         </linkInformation>
+        <linkInformation>
+          <name>914d6373-4409-44e5-882a-3f795b196d7b</name>
+          <tableName>DOCUMENTTEMPLATE</tableName>
+          <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
       </linkInformation>
       <recordFieldMappings>
         <dbRecordFieldMapping>
@@ -92,6 +115,14 @@
           <name>SUBJECT.value</name>
           <recordfield>BULKMAIL.SUBJECT</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SENDER.value</name>
+          <recordfield>BULKMAIL.SENDER</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DOCUMENTTEMPLATE_ID.displayValue</name>
+          <recordfield>DOCUMENTTEMPLATE.NAME</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>

entity/BulkMail_entity/entityfields/icon/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+//var type = vars.getString("$field.ATTRIBUTE_TYPE");
+//var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(type, $KeywordRegistry.attributeType())
+//var icon = keywordAttributes.defaultAvatarRepresentation;
+
+result.string("VAADIN:ENVELOPE_OPEN");
\ No newline at end of file

entity/BulkMail_entity/entityfields/sendmail/onActionProcess.js

+import("system.vars");
+import("Bulkmail_lib");
+
+BulkMailUtils.sendBulkMail(vars.get("$field.BULKMAILID"));
\ No newline at end of file

entity/BulkMail_entity/recordcontainers/db/fromClauseProcess.js

+import("system.result");
+
+result.string("BULKMAIL join DOCUMENTTEMPLATE on BULKMAIL.DOCUMENTTEMPLATE_ID = DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID");
\ No newline at end of file

neonView/BulkMailEdit_view/BulkMailEdit_view.aod

@@ -29,6 +29,10 @@
           <name>b68c65de-4ecd-4a23-9242-f85e7b708b1e</name>
           <entityField>DOCUMENTTEMPLATE_ID</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>e4ec09c2-3815-4a3b-bce8-c12d5b919b04</name>
+          <entityField>SENDER</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>

neonView/BulkMailFilter_view/BulkMailFilter_view.aod

@@ -12,6 +12,10 @@
       <name>Table</name>
       <entityField>#ENTITY</entityField>
       <columns>
+        <neonTableColumn>
+          <name>55e87c01-8848-494c-9fa6-e6fa401023d1</name>
+          <entityField>ICON</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>4d9c0321-a9d9-409b-8839-d1a5b9a19215</name>
           <entityField>NAME</entityField>

neonView/BulkMailPreview_view/BulkMailPreview_view.aod

@@ -11,7 +11,9 @@
   <children>
     <cardViewTemplate>
       <name>Card</name>
+      <iconField>ICON</iconField>
       <titleField>NAME</titleField>
+      <subtitleField>STATUS</subtitleField>
       <descriptionField>SUBJECT</descriptionField>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
@@ -23,6 +25,10 @@
           <name>edbeea4d-019f-4661-b0d7-c07468e747cc</name>
           <entityField>DOCUMENTTEMPLATE_ID</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>9ef1ecd4-063a-4c18-9def-d395f59a64dc</name>
+          <entityField>SENDER</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>

neonView/BulkMailRecipientFilter_view/BulkMailRecipientFilter_view.aod

@@ -12,10 +12,18 @@
       <name>Table</name>
       <entityField>#ENTITY</entityField>
       <columns>
+        <neonTableColumn>
+          <name>3505ce48-07ac-4091-b18a-42124a10e3a9</name>
+          <entityField>ICON</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>d18adeb8-352a-4b87-83a7-19959c73f718</name>
           <entityField>CONTACT_ID</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>953dbc49-ae13-4328-b0f1-6ed3b5f6fb7b</name>
+          <entityField>EMAIL_ADDRESS</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>f311e8da-4139-48bd-a792-6df572dce7ad</name>
           <entityField>STATUS</entityField>