From 914d1e3036ded17219b72eb081fbba9a8d829182 Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Fri, 7 Aug 2020 13:15:08 +0000
Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?=
=?UTF-8?q?=201061658][Besuchsvorschlag=20-=20neuer=20Wochenplaneintrag:?=
=?UTF-8?q?=20Kontakt=20nicht=20ausw=C3=A4hlbar=20obwohl=20vorhanden]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../rename_VisitPlanEntry_ORGANISATION_ID.xml | 4 ++--
.liquibase/Data_alias/basic/2020.1.3/changelog.xml | 3 +--
.../recordcontainers/jdito/contentProcess.js | 8 ++++----
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml b/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
index 0603638910..17f5ed88b3 100644
--- a/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
+++ b/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
@@ -3,9 +3,9 @@
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 id="3d7f038c-04f1-45a2-9a1c-73c1a8666fea" author="b.ulrich" >
<renameColumn
- columnDataType="CHAR(36)"
- newColumnName="ORGANISATION_CONTACT_ID"
+ columnDataType="CHAR"
oldColumnName="ORGANISATION_ID"
+ newColumnName="ORGANISATION_CONTACT_ID"
tableName="VISITPLANENTRY"/>
</changeSet>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
index bd8e2232fe..dd3d04e98c 100644
--- a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
@@ -3,6 +3,5 @@
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">
<include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
<include file="add_Address_LatLon.xml" relativeToChangelogFile="true"/>
- <!-- disabled the following script since it is WIP-->
- <!--<include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />-->
+ <include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />
</databaseChangeLog>
diff --git a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
index 4ec4a7d08e..341015c21e 100644
--- a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
@@ -62,7 +62,7 @@ if(idValues == false)
.from("CONTACT")
.join("ORGANISATION", "CONTACT.ORGANISATION_ID = org.ORGANISATIONID", "org")
.leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
- .join("ADDRESS", "ADDRESS_ID = ADDRESSID")
+ .leftJoin("ADDRESS", "ADDRESS_ID = ADDRESSID")
.join("AB_ATTRIBUTERELATION", "visitPlanFrequency.OBJECT_ROWID = CONTACT.CONTACTID", "visitPlanFrequency")
.where(["AB_ATTRIBUTERELATION", "AB_ATTRIBUTE_ID", "visitPlanFrequency"], $AttributeRegistry.visitPlanFrequency())
.table();
@@ -80,7 +80,7 @@ var recommendationSQLData = newSelect(["VISITRECOMMENDATIONID", "VISITRECOMMENDA
newSelect("min(ENTRYDATE)")
.from("VISITPLANENTRY")
- .where("VISITPLANENTRY.ORGANISATION_CONTACT_ID = VISITRECOMMENDATION.CONTACT_ID")
+ .where("VISITPLANENTRY.ORGANISATION_CONTACT_ID", "VISITRECOMMENDATION.CONTACT_ID")
.and("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
.or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged())
.and("VISITPLANENTRY.entrydate", datetime.today(), SqlBuilder.GREATER())
@@ -88,8 +88,8 @@ var recommendationSQLData = newSelect(["VISITRECOMMENDATIONID", "VISITRECOMMENDA
newSelect("VISITRECOMMENDATION.CONTACT_ID")
.from("VISITPLANEMPLOYEEWEEK, VISITPLANENTRY")
- .where("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", "VISITPLANEMPLOYEEWEEKID")
- .and("VISITRECOMMENDATION.CONTACT_ID = VISITPLANENTRY.ORGANISATION_CONTACT_ID")
+ .where("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", "VISITPLANEMPLOYEEWEEK.VISITPLANEMPLOYEEWEEKID")
+ .and("VISITRECOMMENDATION.CONTACT_ID", "VISITPLANENTRY.ORGANISATION_CONTACT_ID")
.and(newWhere("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
.or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged()))
.and("VISITPLANENTRY.entrydate", newSelect("min(vp.entrydate)")
--
GitLab