grantDelete processes optimized

7000311c · S.Listl · 372ea8e8 · 7000311c · 7000311c · 7000311c
Commit 7000311c authored 5 years ago by S.Listl
--- a/.liquibase/Data_alias/basic/2019.2.1/alter_BulkMailRecipient_problem.xml
+++ b/.liquibase/Data_alias/basic/2019.2.1/alter_BulkMailRecipient_problem.xml
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.listl" id="b8a37d10-90db-497a-b2a7-69a25eff27ba">
+        <addColumn tableName="BULKMAILRECIPIENT">
+            <column name="PROBLEM" type="CHAR(36)"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
--- a/.liquibase/Data_alias/basic/2019.2.1/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2.1/changelog.xml
@@ -8,4 +8,7 @@
    <include relativeToChangelogFile="true" file="insert_AttributeType_Theme_keyword.xml"/>
    
    <include relativeToChangelogFile="true" file="alter_Campaign_currency.xml"/>
+    
+    <include relativeToChangelogFile="true" file="alter_BulkMailRecipient_problem.xml"/>
+    <include relativeToChangelogFile="true" file="insert_BulkMailProblem_keyword.xml"/>
 </databaseChangeLog>
--- a/.liquibase/Data_alias/basic/2019.2.1/insert_BulkMailProblem_keyword.xml
+++ b/.liquibase/Data_alias/basic/2019.2.1/insert_BulkMailProblem_keyword.xml
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.listl" id="8f2b7dca-9035-4f0c-a83f-1d16b5e57e81">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="a18e7a37-c5f6-4f7b-8db6-3018dedbd43f"/>
+            <column name="KEYID" value="MAILADDRESSDOESNOTEXIST             "/>
+            <column name="TITLE" value="Email address does not exist"/>
+            <column name="CONTAINER" value="BulkMailProblem"/>
+            <column name="SORTING" valueNumeric="1"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="9f11c52f-4c79-4027-877a-0f6eb828fa22"/>
+            <column name="KEYID" value="MAILBLOCKED                         "/>
+            <column name="TITLE" value="Email blocked"/>
+            <column name="CONTAINER" value="BulkMailProblem"/>
+            <column name="SORTING" valueNumeric="2"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -212,6 +212,13 @@
      <iconId>VAADIN:CURLY_BRACKETS</iconId>
      <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/openadminview/stateProcess.js</stateProcess>
    </entityActionField>
+    <entityActionField>
+      <name>downloadTemplate</name>
+      <title>Download template</title>
+      <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/downloadtemplate/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:FILE_FONT</iconId>
+      <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/downloadtemplate/stateProcess.js</stateProcess>
+    </entityActionField>
  </entityFields>
  <recordContainers>
    <dbRecordContainer>

--- a/entity/BulkMail_entity/entityfields/bindata/onValidation.js
+++ b/entity/BulkMail_entity/entityfields/bindata/onValidation.js
-import("system.translate");
-import("Bulkmail_lib");
-import("system.result");
-import("system.vars");
-import("Document_lib");
+//import("system.translate");
+//import("Bulkmail_lib");
+//import("system.result");
+//import("system.vars");
+//import("Document_lib");
+//
+//var bindata = vars.get("$local.value");
+//if (bindata)
+//{
+//    let mimeType = DocumentUtil.getMimeTypeFromUpload(bindata);
+//    if (!BulkMailUtils.isValidMimeType(mimeType))
+//        result.string(translate.text("Invalid file type"));
+//}

-var bindata = vars.get("$local.value");
-if (bindata)
-{
-    let mimeType = DocumentUtil.getMimeTypeFromUpload(bindata);
-    if (!BulkMailUtils.isValidMimeType(mimeType))
-        result.string(translate.text("Invalid file type"));
-}
\ No newline at end of file
+//TODO: this should be validated with the code above, waiting for ticket #1042587
\ No newline at end of file
--- a/entity/BulkMail_entity/entityfields/downloadtemplate/onActionProcess.js
+++ b/entity/BulkMail_entity/entityfields/downloadtemplate/onActionProcess.js
+import("system.neon");
+import("system.vars");
+import("DocumentTemplate_lib");
+
+var template = DocumentTemplate.loadTemplate(vars.get("$field.DOCUMENTTEMPLATE_ID"));
+if (template.type)
+    neon.download(template.content, template.filename);
\ No newline at end of file
--- a/entity/BulkMail_entity/entityfields/downloadtemplate/stateProcess.js
+++ b/entity/BulkMail_entity/entityfields/downloadtemplate/stateProcess.js
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$field.DOCUMENTTEMPLATE_ID"))
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+    result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
--- a/entity/CampaignStep_entity/grantDeleteProcess.js
+++ b/entity/CampaignStep_entity/grantDeleteProcess.js
+import("system.neon");
 import("Context_lib");
 import("system.vars");
 import("ActivityTask_lib");
 import("system.result");

-result.string(!TaskUtils.hasTasks(vars.get("$field.CAMPAIGNSTEPID"), ContextUtils.getCurrentContextId())
-    && !ActivityUtils.hasActivities(vars.get("$field.CAMPAIGNSTEPID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
+if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
+    result.string(!TaskUtils.hasTasks(vars.get("$field.CAMPAIGNSTEPID"), ContextUtils.getCurrentContextId())
+        && !ActivityUtils.hasActivities(vars.get("$field.CAMPAIGNSTEPID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
--- a/entity/Campaign_entity/grantDeleteProcess.js
+++ b/entity/Campaign_entity/grantDeleteProcess.js
+import("system.neon");
 import("Context_lib");
 import("ActivityTask_lib");
 import("Document_lib");
 import("system.vars");
 import("system.result");

-result.string(!DocumentUtil.hasDocuments("CAMPAIGN", null, vars.get("$field.CAMPAIGNID"))
-    && !TaskUtils.hasTasks(vars.get("$field.CAMPAIGNID"), ContextUtils.getCurrentContextId())
-    && !ActivityUtils.hasActivities(vars.get("$field.CAMPAIGNID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
+if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
+    result.string(!DocumentUtil.hasDocuments("CAMPAIGN", null, vars.get("$field.CAMPAIGNID"))
+        && !TaskUtils.hasTasks(vars.get("$field.CAMPAIGNID"), ContextUtils.getCurrentContextId())
+        && !ActivityUtils.hasActivities(vars.get("$field.CAMPAIGNID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
--- a/entity/Contract_entity/grantDeleteProcess.js
+++ b/entity/Contract_entity/grantDeleteProcess.js
+import("system.neon");
 import("Context_lib");
 import("ActivityTask_lib");
 import("Document_lib");
 import("system.vars");
 import("system.result");

-result.string(!DocumentUtil.hasDocuments("CONTRACT", null, vars.get("$field.CONTRACTID"))
-    && !TaskUtils.hasTasks(vars.get("$field.CONTRACTID"), ContextUtils.getCurrentContextId())
-    && !ActivityUtils.hasActivities(vars.get("$field.CONTRACTID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
+if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
+    result.string(!DocumentUtil.hasDocuments("CONTRACT", null, vars.get("$field.CONTRACTID"))
+        && !TaskUtils.hasTasks(vars.get("$field.CONTRACTID"), ContextUtils.getCurrentContextId())
+        && !ActivityUtils.hasActivities(vars.get("$field.CONTRACTID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -505,6 +505,12 @@
          <fieldName>KeywordDeliveryTerms</fieldName>
          <isConsumer v="false" />
        </entityDependency>
+        <entityDependency>
+          <name>b4238087-6333-453a-a501-760732c68f5d</name>
+          <entityName>SerialLetter_entity</entityName>
+          <fieldName>StatusKeyword</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
      </dependencies>
      <children>
        <entityParameter>

--- a/entity/Offer_entity/grantDeleteProcess.js
+++ b/entity/Offer_entity/grantDeleteProcess.js
+import("system.neon");
 import("Context_lib");
 import("ActivityTask_lib");
 import("Document_lib");
@@ -5,7 +6,8 @@ import("system.vars");
 import("system.result");
 import("Offer_lib");

-result.string(OfferUtils.isDeletable(vars.get("$field.STATUS")) 
-    && !DocumentUtil.hasDocuments("OFFER", null, vars.get("$field.OFFERID"))
-    && !TaskUtils.hasTasks(vars.get("$field.OFFERID"), ContextUtils.getCurrentContextId())
-    && !ActivityUtils.hasActivities(vars.get("$field.OFFERID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
+if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
+    result.string(OfferUtils.isDeletable(vars.get("$field.STATUS")) 
+        && !DocumentUtil.hasDocuments("OFFER", null, vars.get("$field.OFFERID"))
+        && !TaskUtils.hasTasks(vars.get("$field.OFFERID"), ContextUtils.getCurrentContextId())
+        && !ActivityUtils.hasActivities(vars.get("$field.OFFERID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -899,6 +899,11 @@
      <colorProcess>%aditoprj%/entity/Organisation_entity/entityfields/lastactivity/colorProcess.js</colorProcess>
      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/lastactivity/valueProcess.js</valueProcess>
    </entityField>
+    <entityField>
+      <name>OpenTasks</name>
+      <title>Open tasks</title>
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/opentasks/valueProcess.js</valueProcess>
+    </entityField>
  </entityFields>
  <recordContainers>
    <dbRecordContainer>

--- a/entity/Organisation_entity/entityfields/opentasks/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/opentasks/valueProcess.js
+import("system.vars");
+import("Context_lib");
+import("ActivityTask_lib");
+import("system.result");
+
+result.string(TaskUtils.getOpenTaskCount(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
--- a/entity/Organisation_entity/grantDeleteProcess.js
+++ b/entity/Organisation_entity/grantDeleteProcess.js
+import("system.neon");
 import("Context_lib");
 import("ActivityTask_lib");
 import("Document_lib");
 import("system.vars");
 import("system.result");

-result.string(!DocumentUtil.hasDocuments("CONTACT", null, vars.get("$field.CONTACTID"))
-    && !TaskUtils.hasTasks(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId())
-    && !ActivityUtils.hasActivities(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
+if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
+    result.string(!DocumentUtil.hasDocuments("CONTACT", null, vars.get("$field.CONTACTID"))
+        && !TaskUtils.hasTasks(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId())
+        && !ActivityUtils.hasActivities(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
--- a/entity/Person_entity/grantDeleteProcess.js
+++ b/entity/Person_entity/grantDeleteProcess.js
+import("system.neon");
 import("Context_lib");
 import("ActivityTask_lib");
 import("Document_lib");
 import("system.vars");
 import("system.result");

-result.string(!DocumentUtil.hasDocuments("CONTACT", null, vars.get("$field.CONTACTID"))
-    && !TaskUtils.hasTasks(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId())
-    && !ActivityUtils.hasActivities(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
+if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
+    result.string(!DocumentUtil.hasDocuments("CONTACT", null, vars.get("$field.CONTACTID"))
+        && !TaskUtils.hasTasks(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId())
+        && !ActivityUtils.hasActivities(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
--- a/entity/Product_entity/grantDeleteProcess.js
+++ b/entity/Product_entity/grantDeleteProcess.js
@@ -3,6 +3,8 @@ import("ActivityTask_lib");
 import("Document_lib");
 import("system.vars");
 import("system.result");
+import("system.neon");

-result.string(!DocumentUtil.hasDocuments("PRODUCT", null, vars.get("$field.PRODUCTID"))
-    && !ActivityUtils.hasActivities(vars.get("$field.PRODUCTID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
+if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
+    result.string(!DocumentUtil.hasDocuments("PRODUCT", null, vars.get("$field.PRODUCTID"))
+        && !ActivityUtils.hasActivities(vars.get("$field.PRODUCTID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
--- a/entity/Salesproject_entity/grantDeleteProcess.js
+++ b/entity/Salesproject_entity/grantDeleteProcess.js
+import("system.neon");
 import("Context_lib");
 import("ActivityTask_lib");
 import("Document_lib");
 import("system.vars");
 import("system.result");

-result.string(!DocumentUtil.hasDocuments("SALESPROJECT", null, vars.get("$field.SALESPROJECTID"))
-    && !TaskUtils.hasTasks(vars.get("$field.SALESPROJECTID"), ContextUtils.getCurrentContextId())
-    && !ActivityUtils.hasActivities(vars.get("$field.SALESPROJECTID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
+if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
+    result.string(!DocumentUtil.hasDocuments("SALESPROJECT", null, vars.get("$field.SALESPROJECTID"))
+        && !TaskUtils.hasTasks(vars.get("$field.SALESPROJECTID"), ContextUtils.getCurrentContextId())
+        && !ActivityUtils.hasActivities(vars.get("$field.SALESPROJECTID"), ContextUtils.getCurrentContextId()));
\ No newline at end of file
--- a/entity/SerialLetter_entity/SerialLetter_entity.aod
+++ b/entity/SerialLetter_entity/SerialLetter_entity.aod
@@ -101,6 +101,9 @@
    <entityField>
      <name>STATUS</name>
      <title>Status</title>
+      <consumer>StatusKeyword</consumer>
+      <valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/status/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
    </entityField>
    <entityActionField>
      <name>downloadTemplate</name>
@@ -109,6 +112,20 @@
      <iconId>VAADIN:FILE_FONT</iconId>
      <stateProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/downloadtemplate/stateProcess.js</stateProcess>
    </entityActionField>
+    <entityConsumer>
+      <name>StatusKeyword</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/statuskeyword/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
  </entityFields>
  <recordContainers>
    <dbRecordContainer>
@@ -161,6 +178,11 @@
        <dbRecordFieldMapping>
          <name>STATUS.value</name>
          <recordfield>SERIALLETTER.STATUS</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.displayValue</name>
+          <expression>%aditoprj%/entity/SerialLetter_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
        </dbRecordFieldMapping>
      </recordFieldMappings>
    </dbRecordContainer>