Skip to content
Snippets Groups Projects
Commit 35ad205d authored by Andreas Schindlbeck's avatar Andreas Schindlbeck
Browse files

#1032168 AllDay-Field an diversen Stellen hinzugefügt

parent b39a2669
No related branches found
No related tags found
No related merge requests found
This diff is collapsed.
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
......@@ -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,
......
......@@ -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");
......
......@@ -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") ||
......
<?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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment