From bd56654dad9736371833597cf6620c1c218a78df Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 26 Jun 2019 10:51:44 +0200
Subject: [PATCH] =?UTF-8?q?#1039171=20Verkn=C3=BCpfte=20Termine=20in=20Mod?=
=?UTF-8?q?ulen=20anzeigen:=20Fixes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
entity/Appointment_entity/Appointment_entity.aod | 3 +++
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 3 +++
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++++
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 +++
neonView/AppointmentFilter_view/AppointmentFilter_view.aod | 2 +-
.../AppointmentLinkFilter_view.aod | 5 +++--
6 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index ac66605041..eb93da759d 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -29,6 +29,7 @@
</entityField>
<entityField>
<name>BEGIN</name>
+ <title>Begin</title>
<contentType>DATE</contentType>
<outputFormat>dd.MM.yyyy HH:mm</outputFormat>
<selectionMode>SINGLE</selectionMode>
@@ -36,6 +37,7 @@
</entityField>
<entityField>
<name>END</name>
+ <title>End</title>
<contentType>DATE</contentType>
<outputFormat>dd.MM.yyyy HH:mm</outputFormat>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
@@ -55,6 +57,7 @@
</entityField>
<entityField>
<name>LOCATION</name>
+ <title>Location</title>
</entityField>
<entityField>
<name>REMINDER_CHECK</name>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index ce3e097e8c..a8c3c421bd 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -4431,6 +4431,9 @@
<entry>
<key>USER_NEW_CONTACT</key>
</entry>
+ <entry>
+ <key>Linked Appointments</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 3ebd381347..2b0b8d4c42 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1005,6 +1005,10 @@
<entry>
<key>0 %</key>
</entry>
+ <entry>
+ <key>Location</key>
+ <value>Ort</value>
+ </entry>
<entry>
<key>75 %</key>
<value></value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 92b81f8009..fe2f84a688 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -4480,6 +4480,9 @@
<entry>
<key>USER_NEW_CONTACT</key>
</entry>
+ <entry>
+ <key>Linked Appointments</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/AppointmentFilter_view/AppointmentFilter_view.aod b/neonView/AppointmentFilter_view/AppointmentFilter_view.aod
index f915869f30..f47a495b14 100644
--- a/neonView/AppointmentFilter_view/AppointmentFilter_view.aod
+++ b/neonView/AppointmentFilter_view/AppointmentFilter_view.aod
@@ -3,7 +3,7 @@
<name>AppointmentFilter_view</name>
<title>Linked Appointments</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
+ <filterable v="false" />
<layout>
<drawerLayout>
<name>layout</name>
diff --git a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
index 4951de3ef2..a4f171e1b1 100644
--- a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
+++ b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
@@ -4,9 +4,10 @@
<title>relations</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <noneLayout>
+ <drawerLayout>
<name>layout</name>
- </noneLayout>
+ <layoutCaption>Connections</layoutCaption>
+ </drawerLayout>
</layout>
<children>
<tableViewTemplate>
--
GitLab