From 35ad205dc41f3fd9481a7a011197e812c839f389 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Fri, 5 Jul 2019 14:54:37 +0200
Subject: [PATCH] =?UTF-8?q?#1032168=20AllDay-Field=20an=20diversen=20Stell?=
=?UTF-8?q?en=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Appointment_entity/Appointment_entity.aod | 609 +++++++++---------
.../entityfields/allday/valueProcess.js | 15 +
.../recordcontainers/jdito/contentProcess.js | 2 +
.../recordcontainers/jdito/onInsert.js | 1 +
.../recordcontainers/jdito/onUpdate.js | 2 +
.../AppointmentPreview_view.aod | 75 +--
6 files changed, 366 insertions(+), 338 deletions(-)
create mode 100644 entity/Appointment_entity/entityfields/allday/valueProcess.js
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 02dc58c423..88d51bef0b 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -1,301 +1,308 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
- <name>Appointment_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
- <title>Termin</title>
- <siblings />
- <afterUiInit>%aditoprj%/entity/Appointment_entity/afterUiInit.js</afterUiInit>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityField>
- <name>SUMMARY</name>
- <title>Betreff</title>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/summary/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Appointment_entity/entityfields/summary/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>DESCRIPTION</name>
- </entityField>
- <entityField>
- <name>CLASSIFICATION</name>
- <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/dropDownProcess.js</dropDownProcess>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>BEGIN</name>
- <title>Begin</title>
- <contentType>DATE</contentType>
- <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
- <selectionMode>SINGLE</selectionMode>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
- </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>
- </entityField>
- <entityFieldGroup>
- <name>STARTEND</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/startend/valueProcess.js</valueProcess>
- <description>FIELDGROUP</description>
- <fields>
- <element>BEGIN</element>
- <element>END</element>
- </fields>
- </entityFieldGroup>
- <entityField>
- <name>STATUS</name>
- <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/status/dropDownProcess.js</dropDownProcess>
- </entityField>
- <entityField>
- <name>LOCATION</name>
- <title>Location</title>
- </entityField>
- <entityField>
- <name>REMINDER_CHECK</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>REMINDER</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>CATEGORIES</name>
- <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/dropDownProcess.js</dropDownProcess>
- </entityField>
- <entityField>
- <name>ATTENDEES</name>
- <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/dropDownProcess.js</dropDownProcess>
- </entityField>
- <entityField>
- <name>TRANSPARENCY</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/transparency/valueProcess.js</valueProcess>
- </entityField>
- <entityActionGroup>
- <name>PartStatActionGroup</name>
- <children>
- <entityActionField>
- <name>accept</name>
- <title>accept</title>
- <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js</onActionProcess>
- <actionOrder v="0" />
- <isMenuAction v="true" />
- <iconId>VAADIN:CHECK</iconId>
- <stateProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/stateProcess.js</stateProcess>
- </entityActionField>
- <entityActionField>
- <name>decline</name>
- <title>decline</title>
- <description></description>
- <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <iconId>VAADIN:CLOSE</iconId>
- <stateProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/stateProcess.js</stateProcess>
- </entityActionField>
- <entityActionField>
- <name>tentative</name>
- <title>tentative</title>
- <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <iconId>VAADIN:QUESTION</iconId>
- <stateProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/stateProcess.js</stateProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>jdito</recordContainer>
- </entityProvider>
- <entityParameter>
- <name>MasterEntry_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>ORGANIZER</name>
- </entityField>
- <entityField>
- <name>RRULE</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/rrule/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>RECURRENCEID</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>SAFESCOPEFIELD</name>
- </entityField>
- <entityField>
- <name>MASTERBEGIN</name>
- </entityField>
- <entityField>
- <name>MASTEREND</name>
- </entityField>
- <entityField>
- <name>UID</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/uid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ATTENDEESLENGTH</name>
- </entityField>
- <entityField>
- <name>ICON</name>
- </entityField>
- <entityParameter>
- <name>Entry_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>AnyObjectRowid_param</name>
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>AnyObjectType_param</name>
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>AppointmentLinks</name>
- <dependency>
- <name>dependency</name>
- <entityName>AppointmentLink_entity</entityName>
- <fieldName>Links</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AppointmentId_param</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityActionField>
- <name>deleteSeries</name>
- <title>Delete recurring appointment</title>
- <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/deleteseries/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:TRASH</iconId>
- <stateProcess>%aditoprj%/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js</stateProcess>
- <tooltip>series delete action</tooltip>
- </entityActionField>
- <entityParameter>
- <name>LinkedObjectId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>LinkedAppointments</name>
- <recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>74dea3cd-a528-4616-b468-cd27f3f1a795</name>
- <entityName>Activity_entity</entityName>
- <fieldName>Appointments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>12b2a8cd-1b66-4123-b0a6-f1ca164bdfec</name>
- <entityName>Person_entity</entityName>
- <fieldName>Appointments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>17129bd7-1b1b-4090-9185-d6b3b83ffb40</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>LinkedAppointments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityParameter>
- <name>LinkedAppointmentsFromDashlet_param</name>
- <expose v="true" />
- </entityParameter>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <title>jdito</title>
- <description></description>
- <recordFieldMappings>
- <jDitoRecordFieldMapping>
- <name>UID.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>ATTENDEESLENGTH.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>BEGIN.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>END.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>SUMMARY.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>ORGANIZER.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>ATTENDEES.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>STATUS.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>LINKS.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>DESCRIPTION.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>LOCATION.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>ICON.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>CLASSIFICATION.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>TRANSPARENCY.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>CATEGORIES.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>REMINDER.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>REMINDER_CHECK.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>RRULE.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>RECURRENCEID.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>SAFESCOPEFIELD.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>MASTERBEGIN.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>MASTEREND.value</name>
- </jDitoRecordFieldMapping>
- </recordFieldMappings>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Appointment_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
+ <title>Termin</title>
+ <siblings />
+ <afterUiInit>%aditoprj%/entity/Appointment_entity/afterUiInit.js</afterUiInit>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityField>
+ <name>SUMMARY</name>
+ <title>Betreff</title>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/summary/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Appointment_entity/entityfields/summary/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATION</name>
+ <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/dropDownProcess.js</dropDownProcess>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>BEGIN</name>
+ <title>Begin</title>
+ <contentType>DATE</contentType>
+ <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
+ <selectionMode>SINGLE</selectionMode>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
+ </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>
+ </entityField>
+ <entityFieldGroup>
+ <name>STARTEND</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/startend/valueProcess.js</valueProcess>
+ <description>FIELDGROUP</description>
+ <fields>
+ <element>BEGIN</element>
+ <element>END</element>
+ </fields>
+ </entityFieldGroup>
+ <entityField>
+ <name>STATUS</name>
+ <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/status/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityField>
+ <name>LOCATION</name>
+ <title>Location</title>
+ </entityField>
+ <entityField>
+ <name>REMINDER_CHECK</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>REMINDER</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>CATEGORIES</name>
+ <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityField>
+ <name>ATTENDEES</name>
+ <dropDownProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityField>
+ <name>TRANSPARENCY</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/transparency/valueProcess.js</valueProcess>
+ </entityField>
+ <entityActionGroup>
+ <name>PartStatActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>accept</name>
+ <title>accept</title>
+ <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/onActionProcess.js</onActionProcess>
+ <actionOrder v="0" />
+ <isMenuAction v="true" />
+ <iconId>VAADIN:CHECK</iconId>
+ <stateProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/accept/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>decline</name>
+ <title>decline</title>
+ <description></description>
+ <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <iconId>VAADIN:CLOSE</iconId>
+ <stateProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/decline/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>tentative</name>
+ <title>tentative</title>
+ <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <iconId>VAADIN:QUESTION</iconId>
+ <stateProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/children/tentative/stateProcess.js</stateProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>jdito</recordContainer>
+ </entityProvider>
+ <entityParameter>
+ <name>MasterEntry_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>ORGANIZER</name>
+ </entityField>
+ <entityField>
+ <name>RRULE</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/rrule/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>RECURRENCEID</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SAFESCOPEFIELD</name>
+ </entityField>
+ <entityField>
+ <name>MASTERBEGIN</name>
+ </entityField>
+ <entityField>
+ <name>MASTEREND</name>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/uid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ATTENDEESLENGTH</name>
+ </entityField>
+ <entityField>
+ <name>ICON</name>
+ </entityField>
+ <entityParameter>
+ <name>Entry_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>AnyObjectRowid_param</name>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>AnyObjectType_param</name>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>AppointmentLinks</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AppointmentLink_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AppointmentId_param</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>deleteSeries</name>
+ <title>Delete recurring appointment</title>
+ <onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/deleteseries/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TRASH</iconId>
+ <stateProcess>%aditoprj%/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js</stateProcess>
+ <tooltip>series delete action</tooltip>
+ </entityActionField>
+ <entityParameter>
+ <name>LinkedObjectId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>LinkedAppointments</name>
+ <recordContainer>jdito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>74dea3cd-a528-4616-b468-cd27f3f1a795</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>Appointments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>12b2a8cd-1b66-4123-b0a6-f1ca164bdfec</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Appointments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>17129bd7-1b1b-4090-9185-d6b3b83ffb40</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>LinkedAppointments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>LinkedAppointmentsFromDashlet_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityField>
+ <name>ALLDAY</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/allday/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <title>jdito</title>
+ <description></description>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ATTENDEESLENGTH.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>BEGIN.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>END.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SUMMARY.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ORGANIZER.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ATTENDEES.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>STATUS.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>LINKS.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DESCRIPTION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>LOCATION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ICON.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ALLDAY.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TRANSPARENCY.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CATEGORIES.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>REMINDER.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>REMINDER_CHECK.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>RRULE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>RECURRENCEID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SAFESCOPEFIELD.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>MASTERBEGIN.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>MASTEREND.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Appointment_entity/entityfields/allday/valueProcess.js b/entity/Appointment_entity/entityfields/allday/valueProcess.js
new file mode 100644
index 0000000000..955e531fbe
--- /dev/null
+++ b/entity/Appointment_entity/entityfields/allday/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(event["X-ADITO-ISALLDAYEVENT"])
+ result.string(event["X-ADITO-ISALLDAYEVENT"]);
+}
\ No newline at end of file
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index 23649935d1..240de2d443 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -89,6 +89,7 @@ function buildEntry(pEntry, pMasterentry)
var classification = pEntry[calendars.CLASSIFICATION];
var transparency = pEntry[calendars.TRANSPARENCY];
var categories = pEntry[calendars.CATEGORIES];
+ var isAllDay = pEntry["X-ADITO-ISALLDAYEVENT"] != null ? pEntry["X-ADITO-ISALLDAYEVENT"] : "FALSE";
var masterBegin = pMasterentry != null ? pMasterentry[calendars.DTSTART] : null
var masterEnd = pMasterentry != null ? pMasterentry[calendars.DTEND] : null
@@ -115,6 +116,7 @@ function buildEntry(pEntry, pMasterentry)
description,
location,
'',
+ isAllDay,
classification,
transparency,
categories,
diff --git a/entity/Appointment_entity/recordcontainers/jdito/onInsert.js b/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
index bf585bd47b..ffb995d303 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
@@ -20,6 +20,7 @@ event[calendars.LOCATION] = vars.get("$field.LOCATION");
event[calendars.DESCRIPTION] = vars.get("$field.DESCRIPTION");
event[calendars.DTSTART] = vars.get("$field.BEGIN");
event[calendars.DTEND] = vars.get("$field.END");
+event["X-ADITO-ISALLDAYEVENT"] = vars.get("$field.ALLDAY");
event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
event[calendars.TRANSPARENCY] = vars.get("$field.TRANSPARENCY");
event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
diff --git a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
index 473831ca07..aa75959659 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
@@ -42,6 +42,7 @@ if(event)
event[calendars.DTSTART] = vars.get("$field.BEGIN");
event[calendars.DTEND] = vars.get("$field.END");
event[calendars.HASREMINDER] = "false";
+ event["X-ADITO-ISALLDAYEVENT"] = vars.get("$field.ALLDAY");
event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
event[calendars.AFFECTEDUSERS] = vars.get("$field.ATTENDEES");
@@ -76,6 +77,7 @@ function areEventAndFieldsDifferent(event){
event[calendars.DTSTART] != vars.get("$field.BEGIN") ||
event[calendars.DTEND] != vars.get("$field.END") ||
event[calendars.HASREMINDER] != "false" ||
+ event["X-ADITO-ISALLDAYEVENT"] == vars.get("$field.ALLDAY") ||
event[calendars.CLASSIFICATION] != vars.get("$field.CLASSIFICATION") ||
event[calendars.CATEGORIES] != vars.get("$field.CATEGORIES") ||
event[calendars.AFFECTEDUSERS] != vars.get("$field.ATTENDEES") ||
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index c915ea5d41..be2c5d3410 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -1,37 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>AppointmentPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/neonView/AppointmentPreview_view/documentation.adoc</documentation>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- </headerFooterLayout>
- </layout>
- <children>
- <appointmentPreviewViewTemplate>
- <name>Appointments</name>
- <summaryField>SUMMARY</summaryField>
- <descriptionField>DESCRIPTION</descriptionField>
- <beginField>BEGIN</beginField>
- <endField>END</endField>
- <periodField>STARTEND</periodField>
- <attendeesField>ATTENDEES</attendeesField>
- <privateField>CLASSIFICATION</privateField>
- <transparencyField>TRANSPARENCY</transparencyField>
- <statusField>STATUS</statusField>
- <locationField>LOCATION</locationField>
- <linkField>LINKS</linkField>
- <organizerField>ORGANIZER</organizerField>
- <categoriesField>CATEGORIES</categoriesField>
- <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
- <favoriteActionGroup2>seriesActionGroup</favoriteActionGroup2>
- <entityField>#ENTITY</entityField>
- </appointmentPreviewViewTemplate>
- <neonViewReference>
- <name>7937d700-ecaf-488e-a2a5-79e4310b88b5</name>
- <entityField>AppointmentLinks</entityField>
- <view>AppointmentLinkFilter_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>AppointmentPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/neonView/AppointmentPreview_view/documentation.adoc</documentation>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <appointmentPreviewViewTemplate>
+ <name>Appointments</name>
+ <summaryField>SUMMARY</summaryField>
+ <descriptionField>DESCRIPTION</descriptionField>
+ <beginField>BEGIN</beginField>
+ <endField>END</endField>
+ <periodField>STARTEND</periodField>
+ <attendeesField>ATTENDEES</attendeesField>
+ <privateField>CLASSIFICATION</privateField>
+ <alldayField>ALLDAY</alldayField>
+ <transparencyField>TRANSPARENCY</transparencyField>
+ <statusField>STATUS</statusField>
+ <locationField>LOCATION</locationField>
+ <linkField>LINKS</linkField>
+ <organizerField>ORGANIZER</organizerField>
+ <categoriesField>CATEGORIES</categoriesField>
+ <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
+ <favoriteActionGroup2>seriesActionGroup</favoriteActionGroup2>
+ <entityField>#ENTITY</entityField>
+ </appointmentPreviewViewTemplate>
+ <neonViewReference>
+ <name>7937d700-ecaf-488e-a2a5-79e4310b88b5</name>
+ <entityField>AppointmentLinks</entityField>
+ <view>AppointmentLinkFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
--
GitLab