diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod index e00455cf9791d2ca1d5de84132d4408b32273aa9..afa818a7903f7f3be94f33b51d73894adebcf479 100644 --- a/entity/Appointment_entity/Appointment_entity.aod +++ b/entity/Appointment_entity/Appointment_entity.aod @@ -4,7 +4,7 @@ <title>Termin</title> <majorModelMode>DISTRIBUTED</majorModelMode> <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation> - <recordContainer>jDitoRC</recordContainer> + <recordContainer>jdito</recordContainer> <entityFields> <entityField> <name>SUMMARY</name> @@ -90,7 +90,7 @@ <name>#PROVIDER</name> </entityProvider> <entityParameter> - <name>masterEntry</name> + <name>MasterEntry_param</name> <expose v="true" /> <description>PARAMETER</description> </entityParameter> @@ -125,21 +125,21 @@ <name>ICON</name> </entityField> <entityParameter> - <name>entry</name> + <name>Entry_param</name> <expose v="true" /> <description>PARAMETER</description> </entityParameter> </entityFields> <recordContainers> <jDitoRecordContainer> - <name>jDitoRC</name> - <title>jDitoRC</title> + <name>jdito</name> + <title>jdito</title> <description></description> <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias> - <contentProcess>%aditoprj%/entity/Appointment_entity/recordcontainers/jditorc/contentProcess.js</contentProcess> - <onInsert>%aditoprj%/entity/Appointment_entity/recordcontainers/jditorc/onInsert.js</onInsert> - <onUpdate>%aditoprj%/entity/Appointment_entity/recordcontainers/jditorc/onUpdate.js</onUpdate> - <onDelete>%aditoprj%/entity/Appointment_entity/recordcontainers/jditorc/onDelete.js</onDelete> + <contentProcess>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js</contentProcess> + <onInsert>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onInsert.js</onInsert> + <onUpdate>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js</onUpdate> + <onDelete>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onDelete.js</onDelete> <recordFields> <element>UID.value</element> <element>ATTENDEESLENGTH.value</element> @@ -167,4 +167,3 @@ </jDitoRecordContainer> </recordContainers> </entity> - diff --git a/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js b/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js index 36c1c54189395ff6c68110ba5423b82fe92f864f..a7d9ac4148682f46d89d239edc350e8651cb799f 100644 --- a/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js +++ b/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js @@ -3,7 +3,7 @@ import("system.logging"); import("system.result"); import("system.calendars"); -var entry = JSON.parse(vars.getString("param.entry")); +var entry = JSON.parse(vars.getString("$param.Entry_param")); var allUsers = calendars.getFullCalendarUsers(calendars.RIGHT_WRITE); var results = []; diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js index 206bf84110273b73465d1ff9b7f5e806ce8168cd..e6467cae5b4cb5d9a2940ba2d61f710b640159a5 100644 --- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js +++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js @@ -42,8 +42,7 @@ if(vars.exists("$param.Entry_param")) } else { rrule = entry[calendars.RRULE] != null ? entry[calendars.RRULE][0] : null; } - -// logging.log("contentProcess summary: " + summary); + //@TODO Icon result.object([ diff --git a/entity/Appointment_entity/recordcontainers/jdito/onDelete.js b/entity/Appointment_entity/recordcontainers/jdito/onDelete.js index fef9fc36c9b7757d15afa8c0ead5f1e0a3a4c834..6568eb214c0bcd223a436f27bd71b30bf71fd0f3 100644 --- a/entity/Appointment_entity/recordcontainers/jdito/onDelete.js +++ b/entity/Appointment_entity/recordcontainers/jdito/onDelete.js @@ -3,7 +3,7 @@ import("system.neon"); import("system.calendars"); import("system.vars"); -//logging.log("onDelete has var: " + vars.exists("$param.Entry_param")) + if (vars.exists("$param.Entry_param")) { var entry = JSON.parse(vars.getString("$param.Entry_param")); diff --git a/entity/Appointment_entity/recordcontainers/jdito/onInsert.js b/entity/Appointment_entity/recordcontainers/jdito/onInsert.js index a820ad8e64ff5628882bc00864db0d9848519f33..be015fb85ed91bf655140b037d3221d3e9490242 100644 --- a/entity/Appointment_entity/recordcontainers/jdito/onInsert.js +++ b/entity/Appointment_entity/recordcontainers/jdito/onInsert.js @@ -10,10 +10,7 @@ import("system.db"); import("system.result"); import("system.tools"); -//logging.log("on Insert has var: " + vars.exists("$param.Entry_param")); - var event = JSON.parse(vars.getString("$param.Entry_param")); -var ok = false; event[calendars.TYPE] = calendars.VEVENT; event[calendars.ID] = ""; //wenn hier neue id erstellt und mitgegeben wird, wird versucht einen termin mit dieser id zu finden, den es nicht gibt. also leer. diff --git a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js index 267c730dc755d04b26ef17f87ef47374d4c44017..b0b135b62a2d1e77cf852189ab621ea76037dc98 100644 --- a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js +++ b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js @@ -14,7 +14,7 @@ import("system.tools"); // Dieser Prozess speichert die im Frame angezeigten Daten // Je nach Modus (INSERT, EDIT) wird ein neuer Datensatz angelegt oder der alte editiert -//logging.log("onUpdate has var: "+ vars.exists("$param.Entry_param")); + if(vars.exists("$param.Entry_param") && vars.getString("$param.Entry_param") != "") { var event = JSON.parse(vars.getString("$param.Entry_param"));