From 57f5adf0add259277dd3447da5d6f8e123e5e127 Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Fri, 17 Sep 2021 12:54:42 +0000
Subject: [PATCH] =?UTF-8?q?[Projekt:=20xRM-Sales][TicketNr.:=201086832][Pe?=
=?UTF-8?q?rson:=20Verantwortlicher=20von=20Vertriebsprojekt=20beim=20Kont?=
=?UTF-8?q?akt=20in=20der=20360=C2=B0=20mitanzeigen=20und=20FIlter=20auf?=
=?UTF-8?q?=20Ja/nein=20umstellen]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../recordcontainers/jdito/contentProcess.js | 36 ++++++++++++++-----
entity/Person_entity/Person_entity.aod | 12 +++++--
.../filterValuesProcess.js | 8 -----
.../Salesproject_entity.aod | 14 ++++++--
.../member_filter/filterFieldsProcess.js | 3 +-
.../member_filter/filterValuesProcess.js | 11 ------
.../filterConditionProcess.js | 3 +-
.../responsible_filter/filterValuesProcess.js | 4 ---
8 files changed, 53 insertions(+), 38 deletions(-)
delete mode 100644 entity/Person_entity/recordcontainers/db/filterextensions/salesprojectresponsible_filter/filterValuesProcess.js
delete mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js
delete mode 100644 entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/filterValuesProcess.js
diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index 4f61f041a0..709b1c0e19 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -98,19 +98,39 @@ function _get360Data(pContactId, pContextList)
group = row[pContextList[context]["setGroupBy"]]
}
- if(context == "Salesproject" && !ContactUtils.isOrganisation(pContactId))//add roles to the description
+ if(context == "Salesproject")
{
- description = description + " | " + translate.text("Role") + ": "
- if(roleObj.hasOwnProperty(salesProjectId))
+ if(!ContactUtils.isOrganisation(pContactId))//add roles to the description if person dataset
{
- var roles = roleObj[salesProjectId];
- for (let i = 0; i < roles.length; i++)
+ description = description + " | " + translate.text("Role") + ": "
+ if(roleObj.hasOwnProperty(salesProjectId))
{
- if(i != 0)
+ var roles = roleObj[salesProjectId];
+ for (let i = 0; i < roles.length; i++)
{
- description = description + ", ";
+ if(i != 0)
+ {
+ description = description + ", ";
+ }
+ description = description + roles[i];
}
- description = description + roles[i];
+ }
+ }
+
+ //add responsible to the description
+ var responsibleContactId = newSelect("OBJECTMEMBER.CONTACT_ID")
+ .from("OBJECTMEMBER")
+ .where("OBJECTMEMBER.OBJECT_TYPE", "Salesproject")
+ .and("OBJECTMEMBER.OBJECT_ROWID", targetid)
+ .and("OBJECTMEMBER.RESPONSIBLE", "1")
+ .cell();
+
+ if(responsibleContactId)
+ {
+ var responsibleName = ContactUtils.getFullTitleByContactId(responsibleContactId, false);
+ if(!Utils.isNullOrEmpty(responsibleName))
+ {
+ description = description + " | " + translate.text("Responsible") + ": " + responsibleName;
}
}
}
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index b700f6bd1e..e7436815ba 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1328,6 +1328,14 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>Salesprojects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Salesprojects</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1809,8 +1817,8 @@
<name>SalesprojectResponsible_filter</name>
<title>Salesproject: Responsible</title>
<contentType>TEXT</contentType>
- <consumer>Salutations</consumer>
- <filterValuesProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/filterextensions/salesprojectresponsible_filter/filterValuesProcess.js</filterValuesProcess>
+ <useConsumer v="true" />
+ <consumer>Salesprojects</consumer>
<filterConditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/filterextensions/salesprojectresponsible_filter/filterConditionProcess.js</filterConditionProcess>
<filtertype>BASIC</filtertype>
</filterExtension>
diff --git a/entity/Person_entity/recordcontainers/db/filterextensions/salesprojectresponsible_filter/filterValuesProcess.js b/entity/Person_entity/recordcontainers/db/filterextensions/salesprojectresponsible_filter/filterValuesProcess.js
deleted file mode 100644
index 1503f51f28..0000000000
--- a/entity/Person_entity/recordcontainers/db/filterextensions/salesprojectresponsible_filter/filterValuesProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("Sql_lib");
-
-var salesProjects = newSelect("SALESPROJECT.SALESPROJECTID, SALESPROJECT.PROJECTTITLE")
- .from("SALESPROJECT")
- .table();
-
-result.object(salesProjects);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index cb8830eabf..7cc6b6d6e3 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -890,6 +890,14 @@
<name>IgnoreOrderBy_param</name>
<expose v="true" />
</entityParameter>
+ <entityConsumer>
+ <name>Contacts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Contacts</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1145,15 +1153,15 @@
<filterExtensionSet>
<name>Member_filter</name>
<filterFieldsProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/member_filter/filterFieldsProcess.js</filterFieldsProcess>
- <filterValuesProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js</filterValuesProcess>
<filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/member_filter/filterConditionProcess.js</filterConditionProcess>
<filtertype>BASIC</filtertype>
</filterExtensionSet>
<filterExtension>
<name>Responsible_filter</name>
<title>Responsible</title>
- <contentType>BOOLEAN</contentType>
- <filterValuesProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/filterValuesProcess.js</filterValuesProcess>
+ <contentType>TEXT</contentType>
+ <useConsumer v="true" />
+ <consumer>Contacts</consumer>
<filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/filterConditionProcess.js</filterConditionProcess>
<filtertype>BASIC</filtertype>
</filterExtension>
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/member_filter/filterFieldsProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/member_filter/filterFieldsProcess.js
index f90041842e..232efd6c27 100644
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/member_filter/filterFieldsProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/member_filter/filterFieldsProcess.js
@@ -20,7 +20,8 @@ for (var i = 0; i < roles.length; i++)
title: translate.text("Role") + ": " + roles[i][1],
contentType: "TEXT",
hasDropDownValues: true,
- isGroupable: false
+ isGroupable: false,
+ consumer: "Contacts"
});
}
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js
deleted file mode 100644
index 4373a237de..0000000000
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.result");
-import("Contact_lib");
-import("Sql_lib");
-
-
-var values = newSelect(["CONTACT.CONTACTID", ContactUtils.getResolvingDisplaySubSql("CONTACT.CONTACTID", true, true)])
- .from(ContactUtils.getFullContactString())
- .where("CONTACT.PERSON_ID is not null")
- .table();
-
-result.object(values);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/filterConditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/filterConditionProcess.js
index 858d81adb1..475d1ca436 100644
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/filterConditionProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/filterConditionProcess.js
@@ -9,7 +9,8 @@ var responsibleSql = newSelect("OBJECTMEMBER.CONTACT_ID")
.from("OBJECTMEMBER")
.where("OBJECTMEMBER.OBJECT_TYPE", "Salesproject")
.and("OBJECTMEMBER.OBJECT_ROWID = SALESPROJECT.SALESPROJECTID")
- .and("OBJECTMEMBER.RESPONSIBLE", 1);
+ .and("OBJECTMEMBER.RESPONSIBLE", 1)
+ .andIfSet("OBJECTMEMBER.CONTACT_ID", rawValue);
var condType = SqlBuilder.EXISTS();
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/filterValuesProcess.js
deleted file mode 100644
index 4462144da5..0000000000
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/responsible_filter/filterValuesProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.translate");
-import("system.result");
-
-result.object([["true", translate.text("Yes")], ["false", translate.text("No")]]);
\ No newline at end of file
--
GitLab