diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 17f38943a256a81d5be4fa0124141374f668d48f..35edda7bfd216c957ffe2922516dbe362e6f6bd5 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -22,6 +22,7 @@
<element>ICON</element>
<element>CLASSIFICATION</element>
<element>TRANSPARENCY</element>
+ <element>CATEGORIES</element>
</fields>
<contentProcess>%aditoprj%/entity/Appointment_entity/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/Appointment_entity/onInsert.js</onInsert>
@@ -88,6 +89,7 @@
</entityField>
<entityField>
<name>CATEGORIES</name>
+ <fieldName>CATEGORIES</fieldName>
<possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/possibleItemsProcess.js</possibleItemsProcess>
<newItemsAllowed v="true" />
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/valueProcess.js</valueProcess>
@@ -101,9 +103,5 @@
<name>TRANSPARENCY</name>
<fieldName>TRANSPARENCY</fieldName>
</entityField>
- <entityField>
- <name>ALLDAY</name>
- <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/allday/valueProcess.js</valueProcess>
- </entityField>
</entityFields>
</entity>
diff --git a/entity/Appointment_entity/contentProcess.js b/entity/Appointment_entity/contentProcess.js
index f4b3c55983448f2e56d979fe05d824f379d913cf..927ff03b31f8e3c4ae557c6c99f25a076cbca914 100644
--- a/entity/Appointment_entity/contentProcess.js
+++ b/entity/Appointment_entity/contentProcess.js
@@ -24,11 +24,12 @@ if(vars.exists("$param.entry"))
var remindercheck = entry[calendars.HASREMINDER]
var classification = entry[calendars.CLASSIFICATION];
var transparency = entry[calendars.TRANSPARENCY];
+ var categories = entry[calendars.CATEGORIES];
//@TODO Icon
result.object([
- [uid, '', '', attendees.length, startdate, enddate, summary, organizer, attendees, status, links, description, location, '', classification, transparency] //reminder, remindercheck
+ [uid, '', '', attendees.length, startdate, enddate, summary, organizer, attendees, status, links, description, location, '', classification, transparency, categories] //reminder, remindercheck
]);
}
else
diff --git a/entity/Appointment_entity/entityfields/allday/valueProcess.js b/entity/Appointment_entity/entityfields/allday/valueProcess.js
deleted file mode 100644
index aab21974bdd8dfea53bfa129fe5640be38e324fe..0000000000000000000000000000000000000000
--- a/entity/Appointment_entity/entityfields/allday/valueProcess.js
+++ /dev/null
@@ -1,17 +0,0 @@
-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
diff --git a/entity/Appointment_entity/onInsert.js b/entity/Appointment_entity/onInsert.js
index 9eac4094d6b455abb0e28fcc81674849cf327956..ba6725551cea3e4f3f4d09416d13695cdc7f9f5c 100644
--- a/entity/Appointment_entity/onInsert.js
+++ b/entity/Appointment_entity/onInsert.js
@@ -10,12 +10,8 @@ import("system.db");
import("system.result");
import("system.tools");
-logging.log("on insert");
-// Dieser Prozess speichert die im Frame angezeigten Daten
-// Je nach Modus (INSERT, EDIT) wird ein neuer Datensatz angelegt oder der alte editiert
var event = JSON.parse(vars.getString("param.entry"));
-
var ok = false;
event[calendars.TYPE] = calendars.VEVENT;
@@ -51,9 +47,9 @@ if (hasReminder == "true")
// }
}
event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
-// event[calendars.TRANSPARENCY] = vars.get("$field.transparency");
+event[calendars.TRANSPARENCY] = vars.get("$field.TRANSPARENCY");
//event[calendars.AFFECTEDUSERS] = getAffectedUsers( event );
-// event[calendars.CATEGORIES] = vars.get("$field.categories");
+event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
//calcrecurrence(event);
//if (event[calendars.RRULE] != undefined) recurrencend(event);
// Links updaten
@@ -63,15 +59,6 @@ event[calendars.ID] = calendars.insert([event])[0];
vars.set("$image.editmode", calendars.MODE_UPDATE);
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
diff --git a/entity/Appointment_entity/onUpdate.js b/entity/Appointment_entity/onUpdate.js
index c57e7291d14c1cc45ad19d63e70c6fb8d518d905..3c635c2eb5eaa2d64d149ebeab676f44f2faefc2 100644
--- a/entity/Appointment_entity/onUpdate.js
+++ b/entity/Appointment_entity/onUpdate.js
@@ -27,7 +27,7 @@ if(vars.exists("param.entry"))
ok = true;
}
else
- {
+ {
event[calendars.TYPE] = calendars.VEVENT;
event[calendars.STATUS] = vars.getString("$field.STATUS");
diff --git a/entity/Comm_entity/Comm_entity.aod b/entity/Comm_entity/Comm_entity.aod
index 3841980aa55fea829857d7bbb6f38a46cc2d229b..c8e8ab8a1280bd4d3acf578d04f850279cff51b7 100644
--- a/entity/Comm_entity/Comm_entity.aod
+++ b/entity/Comm_entity/Comm_entity.aod
@@ -41,7 +41,6 @@
<columnName>MEDIUM_ID</columnName>
<caption>Medium</caption>
<possibleItemsProcess>%aditoprj%/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js</possibleItemsProcess>
- <valueMappingProcess>%aditoprj%/entity/Comm_entity/entityfields/medium_id/valueMappingProcess.js</valueMappingProcess>
</entityField>
<entityField>
<name>RELATION_ID</name>
@@ -72,48 +71,6 @@
<description>This parameter is used for specifing a related &quot;RELATIONID&quot; to a COMM-entry.
Usually this is used for filtering COMM-entires by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
- <entityIncomingField>
- <name>PersComm_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>b509cb67-6306-4f74-8ce8-0385052a9611</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersComm_dfo</fieldName>
- <isOutgoing v="false" />
- </entityDependency>
- <entityDependency>
- <name>6bee4be4-34bd-47fc-a909-8e8bbf2f45f2</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersCommPhone_dfo</fieldName>
- <isOutgoing v="false" />
- </entityDependency>
- <entityDependency>
- <name>89ff88fa-029f-4b0d-a358-b7b310a6e72c</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersCommOthers_dfo</fieldName>
- <isOutgoing v="false" />
- </entityDependency>
- <entityDependency>
- <name>90c0436e-3a46-40ec-ae73-b4aaded95bbc</name>
- <entityName>Pers_entity</entityName>
- <fieldName>PersCommEmail_dfo</fieldName>
- <isOutgoing v="false" />
- </entityDependency>
- </dependencies>
- </entityIncomingField>
- <entityIncomingField>
- <name>OrgComm_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>09723d40-72bc-4fcd-8283-fe085de73330</name>
- <entityName>Org_entity</entityName>
- <fieldName>OrgComm_dfo</fieldName>
- <isOutgoing v="false" />
- </entityDependency>
- </dependencies>
- </entityIncomingField>
<entityField>
<name>IS_STANDARD</name>
<contentType>BOOLEAN</contentType>
@@ -127,6 +84,9 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
So, for only showing telephone-types you&apos;ve to specify this parameter with it&apos;s phone-number-category.
</description>
</entityParameter>
+ <entityIncomingField>
+ <name>#INCOMING</name>
+ </entityIncomingField>
</entityFields>
<linkInformation>
<linkInformation>
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index 9a4e1e43cf7501a1cb2a8b7baa243b29c30d57b7..f71fe8af6f4e2667995cacc3168036197f79bd96 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -246,7 +246,7 @@
<dependency>
<name>dependency</name>
<entityName>Comm_entity</entityName>
- <fieldName>OrgComm_dfi</fieldName>
+ <fieldName>#INCOMING</fieldName>
</dependency>
<children>
<entityParameter>
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index 3bde50426e7df363af3df0c628a7579347165569..e9215647ece9b25a589bfab2f4a27722c134189d 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -225,7 +225,7 @@
<dependency>
<name>dependency</name>
<entityName>Comm_entity</entityName>
- <fieldName>PersComm_dfi</fieldName>
+ <fieldName>#INCOMING</fieldName>
</dependency>
<children>
<entityParameter>
@@ -290,7 +290,7 @@
<dependency>
<name>dependency</name>
<entityName>Comm_entity</entityName>
- <fieldName>PersComm_dfi</fieldName>
+ <fieldName>#INCOMING</fieldName>
</dependency>
<children>
<entityParameter>
@@ -310,7 +310,7 @@
<dependency>
<name>dependency</name>
<entityName>Comm_entity</entityName>
- <fieldName>PersComm_dfi</fieldName>
+ <fieldName>#INCOMING</fieldName>
</dependency>
<children>
<entityParameter>
@@ -330,7 +330,7 @@
<dependency>
<name>dependency</name>
<entityName>Comm_entity</entityName>
- <fieldName>PersComm_dfi</fieldName>
+ <fieldName>#INCOMING</fieldName>
</dependency>
<children>
<entityParameter>