Skip to content
Snippets Groups Projects
Commit a6fcaeaf authored by Maximilian Schröger's avatar Maximilian Schröger
Browse files

Merge branch 'master' of gitlab.adito.de:xrm/basic

parents 062efa21 f66e1612
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 51 additions and 18 deletions
entity/Appointment_entity/Appointment_entity.aod
+ 7
− 0
View file @ a6fcaeaf
......@@ -21,6 +21,7 @@
<element>LOCATION</element>
<element>ICON</element>
<element>CLASSIFICATION</element>
<element>ALLDAY</element>
</fields>
<contentProcess>%aditoprj%/entity/Appointment_entity/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/Appointment_entity/onInsert.js</onInsert>
......@@ -96,5 +97,11 @@
<fieldName>ATTENDEES</fieldName>
<possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>ALLDAY</name>
<fieldName>ALLDAY</fieldName>
<contentType>BOOLEAN</contentType>
<selectionMode>NONE</selectionMode>
</entityField>
</entityFields>
</entity>
entity/Appointment_entity/contentProcess.js
+ 7
− 8
View file @ a6fcaeaf
......@@ -4,6 +4,7 @@ import("system.vars");
import("system.calendars");
import("system.datetime");
import("system.eMath");
import("system.util");
if(vars.exists("$image.entry"))
{
......@@ -11,8 +12,7 @@ if(vars.exists("$image.entry"))
var uid = entry[calendars.ID];
var summary = entry[calendars.SUMMARY];
var affectedusers = entry[calendars.AFFECTEDUSERS];
var attendees = entry[calendars.ATTENDEES];
var attendees = entry[calendars.AFFECTEDUSERS];
var startdate = entry[calendars.DTSTART];
var enddate = entry[calendars.DTEND];
var links = entry[calendars.LINKS];
......@@ -23,17 +23,16 @@ if(vars.exists("$image.entry"))
var reminder = entry[calendars.REMINDER];
var remindercheck = entry[calendars.HASREMINDER]
var classification = entry[calendars.CLASSIFICATION];
var allday = entry[calendars];
//@TODO Icon
result.object([
[uid, '', '', attendees.length, startdate, enddate, summary, organizer, attendees, status, links, description, location, '', classification] //, location, reminder, remindercheck
[uid, '', '', attendees.length, startdate, enddate, summary, organizer, attendees, status, links, description, location, '', classification, allday] //, location, reminder, remindercheck
]);
}
else
{
logging.log("contentproc: empty");
var filter = ( vars.exists("$param.p_filter")
&& vars.get("$param.p_filter") != null
&& vars.get("$param.p_filter") != undefined) ? vars.get("$param.p_filter") : "";
......@@ -55,5 +54,5 @@ else
// var icon = (getIcon("termine_aufgaben", iconInfo));
// events[i] = events[i].concat(icon);
//}
//result.object(events);
}
\ No newline at end of file
//result.object(events);
}
entity/Appointment_entity/onUpdate.js
+ 6
− 5
View file @ a6fcaeaf
......@@ -27,7 +27,8 @@ if(vars.exists("$image.entry"))
ok = true;
}
else
{
{
event[calendars.TYPE] = calendars.VEVENT;
event[calendars.STATUS] = vars.getString("$field.STATUS");
event[calendars.SUMMARY] = vars.getString("$field.SUMMARY");
......@@ -36,6 +37,10 @@ if(vars.exists("$image.entry"))
event[calendars.DTSTART] = vars.get("$field.BEGIN");
event[calendars.DTEND] = vars.get("$field.END");
event[calendars.HASREMINDER] = "false";
event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
var att = vars.get("$field.ATTENDEES");
event[calendars.AFFECTEDUSERS] = att;
var hasReminder = vars.get("$field.REMINDER_CHECK");
if (hasReminder == "true")
{
......@@ -59,12 +64,8 @@ if(vars.exists("$image.entry"))
// }
// }
}
event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
// event[calendars.TRANSPARENCY] = vars.get("$comp.transparency");
//event[calendars.AFFECTEDUSERS] = getAffectedUsers( event );
var categs = vars.get("$field.CATEGORIES");
logging.log(categs);
event[calendars.CATEGORIES] = categs;
// calcrecurrence(event);
// if (event[calendars.RRULE] != undefined) recurrencend(event);
// Links updaten
......
neonContext/Default_context/Default_context.aod 0 → 100644
+ 11
− 0
View file @ a6fcaeaf
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
<name>Default_context</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<references>
<neonViewReference>
<name>9fab8655-e49d-4108-a64f-a371c3d9c80b</name>
<view>DefaultLookup_view</view>
</neonViewReference>
</references>
</neonContext>
neonContext/Org_context/Org_context.aod
+ 0
− 1
View file @ a6fcaeaf
......@@ -9,7 +9,6 @@
<filterview>OrgFilter_view</filterview>
<editview>OrgEdit_view</editview>
<preview>OrgPreview_view</preview>
<lookupview>OrgFilter_view</lookupview>
<entity>Org_entity</entity>
<references>
<neonViewReference>
......
neonView/AppointmentEdit_view/AppointmentEdit_view.aod
+ 2
− 1
View file @ a6fcaeaf
......@@ -14,12 +14,13 @@
<descriptionField>DESCRIPTION</descriptionField>
<beginField>BEGIN</beginField>
<endField>END</endField>
<affectedUsersField>SUMMARY</affectedUsersField>
<affectedUsersField>ATTENDEES</affectedUsersField>
<attendeesField>ATTENDEES</attendeesField>
<privateField>CLASSIFICATION</privateField>
<statusField>STATUS</statusField>
<locationField>LOCATION</locationField>
<categoriesField>CATEGORIES</categoriesField>
<alldayField>ALLDAY</alldayField>
<entityField>#ENTITY</entityField>
</appointmentEditViewTemplate>
</children>
......
neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+ 1
− 2
View file @ a6fcaeaf
......@@ -13,8 +13,7 @@
<summaryField>SUMMARY</summaryField>
<descriptionField>DESCRIPTION</descriptionField>
<periodField>STARTEND</periodField>
<affectedUsersField>SUMMARY</affectedUsersField>
<attendeesField>SUMMARY</attendeesField>
<attendeesField>ATTENDEES</attendeesField>
<privateField>CLASSIFICATION</privateField>
<statusField>STATUS</statusField>
<locationField>LOCATION</locationField>
......
neonView/DefaultLookup_view/DefaultLookup_view.aod 0 → 100644
+ 16
− 0
View file @ a6fcaeaf
<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>DefaultLookup_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<noneLayout>
<name>layout</name>
</noneLayout>
</layout>
<children>
<listTemplate>
<name>ListTemplate</name>
<entityField>#ENTITY</entityField>
</listTemplate>
</children>
</neonView>
preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+ 1
− 1
View file @ a6fcaeaf
......@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.1">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<projectName>xRM-Basic</projectName>
<projectName>xRM-Basic-5</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment