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

Termin: privat, ganztägig, transparent

parent 93c1e256
No related branches found
No related tags found
No related merge requests found
......@@ -21,7 +21,7 @@
<element>LOCATION</element>
<element>ICON</element>
<element>CLASSIFICATION</element>
<element>ALLDAY</element>
<element>TRANSPARENCY</element>
</fields>
<contentProcess>%aditoprj%/entity/Appointment_entity/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/Appointment_entity/onInsert.js</onInsert>
......@@ -97,11 +97,13 @@
<fieldName>ATTENDEES</fieldName>
<possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>TRANSPARENCY</name>
<fieldName>TRANSPARENCY</fieldName>
</entityField>
<entityField>
<name>ALLDAY</name>
<fieldName>ALLDAY</fieldName>
<contentType>BOOLEAN</contentType>
<selectionMode>NONE</selectionMode>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/allday/valueProcess.js</valueProcess>
</entityField>
</entityFields>
</entity>
......@@ -23,12 +23,12 @@ if(vars.exists("$param.entry"))
var reminder = entry[calendars.REMINDER];
var remindercheck = entry[calendars.HASREMINDER]
var classification = entry[calendars.CLASSIFICATION];
var allday = entry[calendars];
var transparency = entry[calendars.TRANSPARENCY];
//@TODO Icon
result.object([
[uid, '', '', attendees.length, startdate, enddate, summary, organizer, attendees, status, links, description, location, '', classification, allday] //, location, reminder, remindercheck
[uid, '', '', attendees.length, startdate, enddate, summary, organizer, attendees, status, links, description, location, '', classification, transparency] //reminder, remindercheck
]);
}
else
......
import("system.vars");
import("system.datetime");
import("system.result");
var start = vars.get("$field.BEGIN");
var end = vars.get("$fild.END")
var startNumber = number(start);
var endNumber = number(end);
// überprüft ob beide uhrzeiten start und end auf 0 Uhr stehen und
// ob es 0 Uhr des selben tages ist
var isAllday = datetime.toDate(start, "HH:mm") == "00:00" &&
datetime.toDate(end, "HH:mm") == "23:59" &&
startNumber < endNumber;
result.string(allday);
\ No newline at end of file
......@@ -64,7 +64,7 @@ if(vars.exists("param.entry"))
// }
// }
}
// event[calendars.TRANSPARENCY] = vars.get("$comp.transparency");
event[calendars.TRANSPARENCY] = vars.get("$field.TRANSPARENCY");
//event[calendars.AFFECTEDUSERS] = getAffectedUsers( event );
// calcrecurrence(event);
// if (event[calendars.RRULE] != undefined) recurrencend(event);
......@@ -76,16 +76,6 @@ if(vars.exists("param.entry"))
ok = true;
}
// //Zwischenspeichern
// if(vars.exists("$image.dontClose") && vars.get("$image.dontClose") ) ok = false; //Maske offen lassen
// vars.set("$image.dontClose", false); // zurücksetzen, damit Klick auf Speichern noch funktioniert
if(vars.exists("$sys.ancestorimageuid") && vars.get("$sys.ancestorimageuid") != null)
{
neon.closeImage(vars.getString("$sys.currentimage"), true);
neon.refresh(vars.get("$sys.ancestorimageuid"));
}
}
// Liefert die AffectedUsers
function getAffectedUsers( pEvent )
......
......@@ -14,13 +14,13 @@
<descriptionField>DESCRIPTION</descriptionField>
<beginField>BEGIN</beginField>
<endField>END</endField>
<affectedUsersField>ATTENDEES</affectedUsersField>
<attendeesField>ATTENDEES</attendeesField>
<privateField>CLASSIFICATION</privateField>
<statusField>STATUS</statusField>
<locationField>LOCATION</locationField>
<categoriesField>CATEGORIES</categoriesField>
<alldayField>ALLDAY</alldayField>
<transparencyField>TRANSPARENCY</transparencyField>
<entityField>#ENTITY</entityField>
</appointmentEditViewTemplate>
</children>
......
......@@ -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-5</projectName>
<projectName>xRM-Basic 5</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
......
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