From 01ecf47ed2c987904414052a5c8034f2afd8a8ca Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Wed, 2 Oct 2019 10:40:45 +0200
Subject: [PATCH] Bugfix
---
.../BulkMailAddRecipients_entity.aod | 2 +-
entity/BulkMail_entity/BulkMail_entity.aod | 31 ++++++++++++++-----
.../bulkmailstatus_param/valueProcess.js | 4 +++
.../recordcontainers/db/conditionProcess.js | 7 +++++
4 files changed, 35 insertions(+), 9 deletions(-)
create mode 100644 entity/BulkMail_entity/entityfields/bulkmailsnotsent/children/bulkmailstatus_param/valueProcess.js
create mode 100644 entity/BulkMail_entity/recordcontainers/db/conditionProcess.js
diff --git a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
index 6e69569dfe..b22017fc8a 100644
--- a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
+++ b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
@@ -29,7 +29,7 @@
<dependency>
<name>dependency</name>
<entityName>BulkMail_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
+ <fieldName>BulkMailsNotSent</fieldName>
</dependency>
</entityConsumer>
<entityParameter>
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index 5b41f08661..c2a2049670 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -13,14 +13,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>88f8ded7-fe8f-41ef-8e01-030bae0867ee</name>
- <entityName>BulkMailAddRecipients_entity</entityName>
- <fieldName>BulkMails</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>BULKMAILID</name>
@@ -294,12 +286,35 @@
<name>CopyBulkMailId_param</name>
<expose v="true" />
</entityParameter>
+ <entityProvider>
+ <name>BulkMailsNotSent</name>
+ <dependencies>
+ <entityDependency>
+ <name>16cdf326-0b43-4d72-bf19-21434e047e85</name>
+ <entityName>BulkMailAddRecipients_entity</entityName>
+ <fieldName>BulkMails</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>BulkMailStatus_param</name>
+ <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmailsnotsent/children/bulkmailstatus_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>BulkMailStatus_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBInsert>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
diff --git a/entity/BulkMail_entity/entityfields/bulkmailsnotsent/children/bulkmailstatus_param/valueProcess.js b/entity/BulkMail_entity/entityfields/bulkmailsnotsent/children/bulkmailstatus_param/valueProcess.js
new file mode 100644
index 0000000000..5316427104
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/bulkmailsnotsent/children/bulkmailstatus_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic")
+
+result.string($KeywordRegistry.bulkMailStatus$notSent());
\ No newline at end of file
diff --git a/entity/BulkMail_entity/recordcontainers/db/conditionProcess.js b/entity/BulkMail_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000..5898e63c93
--- /dev/null
+++ b/entity/BulkMail_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("Sql_lib");
+
+var cond = new SqlCondition()
+ .andPrepareVars("BULKMAIL.STATUS", "$param.BulkMailStatus_param");
+
+result.string(cond.translate("1=1"));
\ No newline at end of file
--
GitLab