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

Calendar Category Integration

parent 0aa9cad4
No related branches found
No related tags found
No related merge requests found
......@@ -54,6 +54,7 @@
<columnName>COUNTRY</columnName>
<caption>Country</caption>
<possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/country/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/country/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
......
......@@ -85,5 +85,11 @@
<entityField>
<name>REMINDER</name>
</entityField>
<entityField>
<name>CATEGORIES</name>
<possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/possibleItemsProcess.js</possibleItemsProcess>
<newItemsAllowed v="true" />
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/valueProcess.js</valueProcess>
</entityField>
</entityFields>
</entity>
......@@ -23,8 +23,6 @@ if(vars.exists("$image.entry"))
var reminder = entry[calendars.REMINDER];
var remindercheck = entry[calendars.HASREMINDER]
var classification = entry[calendars.CLASSIFICATION];
logging.log("contentproc: entry location:" + location + " desc: " + description + " summary: " + summary);
//@TODO Icon
......
import("system.result");
import("system.translate");
import("system.calendars");
var rawElements = calendars.getElementPrefs()[calendars.ELEM_CATEGORIES_EVENT];
var resultName = [[]];
for (var i = 0; i < rawElements.length; i++)
{
resultName[i] = [translate.text(rawElements[i]), translate.text(rawElements[i])];
}
result.object(resultName);
\ No newline at end of file
import("system.result");
import("system.vars");
import("system.calendars");
var categs = vars.get("$image.entry")[calendars.CATEGORIES];
result.string(categs);
\ No newline at end of file
......@@ -62,7 +62,9 @@ if(vars.exists("$image.entry"))
event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
// event[calendars.TRANSPARENCY] = vars.get("$comp.transparency");
//event[calendars.AFFECTEDUSERS] = getAffectedUsers( event );
// event[calendars.CATEGORIES] = vars.get("$comp.categories");
var categs = vars.get("$field.CATEGORIES");
logging.log(categs);
event[calendars.CATEGORIES] = categs;
// calcrecurrence(event);
// if (event[calendars.RRULE] != undefined) recurrencend(event);
// Links updaten
......
......@@ -240,6 +240,13 @@
</entityParameter>
</children>
</entityOutgoingField>
<entityOutgoingField>
<name>PersAppointment_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
</dependency>
</entityOutgoingField>
</entityFields>
<linkInformation>
<linkInformation>
......
......@@ -19,6 +19,7 @@
<privateField>CLASSIFICATION</privateField>
<statusField>STATUS</statusField>
<locationField>LOCATION</locationField>
<categoriesField>CATEGORIES</categoriesField>
<entityField>#ENTITY</entityField>
</appointmentEditViewTemplate>
</children>
......
......@@ -4,6 +4,34 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<projectName>xRM-Basic 5</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategories>
<entry>
<key>Meeting</key>
<value></value>
</entry>
<entry>
<key>Privat</key>
<value></value>
</entry>
<entry>
<key>Organisatorisch</key>
<value></value>
</entry>
</calendarCategories>
<calendarCategoriesEvent>
<entry>
<key>MeetingEvent</key>
<value></value>
</entry>
<entry>
<key>PrivatEvent</key>
<value></value>
</entry>
<entry>
<key>OrganisatorischEvent</key>
<value></value>
</entry>
</calendarCategoriesEvent>
<clientSearchOptimizedForSpeed v="true" />
<clientSearchExcludeForIgnorecase v="true" />
<blobHandlingMethod>DATABASE</blobHandlingMethod>
......
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