From f6c80b691c51778360e9199a745107ec939a17f7 Mon Sep 17 00:00:00 2001 From: "a.schindlbeck" <a.schindlbeck@adito.de> Date: Fri, 8 Mar 2019 13:23:48 +0100 Subject: [PATCH] =?UTF-8?q?#1035776=20Einstellungen=20von=20"Neuer=20Termi?= =?UTF-8?q?n"-Dialog=20gehen=20=C3=BCber=20auf=20EditView=20wenn=20Klick?= =?UTF-8?q?=20auf=20"erweiterte=20Ansicht"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entity/Appointment_entity/Appointment_entity.aod | 8 ++++++++ .../entityfields/begin/valueProcess.js | 15 +++++++++++++++ .../entityfields/classification/valueProcess.js | 15 +++++++++++++++ .../entityfields/end/valueProcess.js | 15 +++++++++++++++ .../entityfields/recurrenceid/valueProcess.js | 12 ++++++++++++ .../entityfields/reminder/valueProcess.js | 15 +++++++++++++++ .../entityfields/reminder_check/valueProcess.js | 15 +++++++++++++++ .../entityfields/rrule/valueProcess.js | 12 ++++++++++++ .../entityfields/summary/valueProcess.js | 16 +++++++++++++++- .../entityfields/transparency/valueProcess.js | 15 +++++++++++++++ 10 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 entity/Appointment_entity/entityfields/begin/valueProcess.js create mode 100644 entity/Appointment_entity/entityfields/classification/valueProcess.js create mode 100644 entity/Appointment_entity/entityfields/end/valueProcess.js create mode 100644 entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js create mode 100644 entity/Appointment_entity/entityfields/reminder/valueProcess.js create mode 100644 entity/Appointment_entity/entityfields/reminder_check/valueProcess.js create mode 100644 entity/Appointment_entity/entityfields/rrule/valueProcess.js create mode 100644 entity/Appointment_entity/entityfields/transparency/valueProcess.js diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod index 4041936686..632ee34458 100644 --- a/entity/Appointment_entity/Appointment_entity.aod +++ b/entity/Appointment_entity/Appointment_entity.aod @@ -17,13 +17,16 @@ <entityField> <name>CLASSIFICATION</name> <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/possibleItemsProcess.js</possibleItemsProcess> + <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/valueProcess.js</valueProcess> </entityField> <entityField> <name>BEGIN</name> <selectionMode>SINGLE</selectionMode> + <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess> </entityField> <entityField> <name>END</name> + <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess> </entityField> <entityFieldGroup> <name>STARTEND</name> @@ -43,9 +46,11 @@ </entityField> <entityField> <name>REMINDER_CHECK</name> + <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js</valueProcess> </entityField> <entityField> <name>REMINDER</name> + <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder/valueProcess.js</valueProcess> </entityField> <entityField> <name>CATEGORIES</name> @@ -57,6 +62,7 @@ </entityField> <entityField> <name>TRANSPARENCY</name> + <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/transparency/valueProcess.js</valueProcess> </entityField> <entityActionGroup> <name>PartStatActionGroup</name> @@ -100,9 +106,11 @@ </entityField> <entityField> <name>RRULE</name> + <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/rrule/valueProcess.js</valueProcess> </entityField> <entityField> <name>RECURRENCEID</name> + <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js</valueProcess> </entityField> <entityField> <name>SAFESCOPEFIELD</name> diff --git a/entity/Appointment_entity/entityfields/begin/valueProcess.js b/entity/Appointment_entity/entityfields/begin/valueProcess.js new file mode 100644 index 0000000000..0ec0da52b2 --- /dev/null +++ b/entity/Appointment_entity/entityfields/begin/valueProcess.js @@ -0,0 +1,15 @@ +import("system.neon"); +import("system.vars"); +import("system.calendars"); +import("system.result"); + +/** + * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate + */ +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param")) +{ + var event = JSON.parse(vars.getString("$param.Entry_param")); + + if(event[calendars.DTSTART]) + result.string(event[calendars.DTSTART]); +} \ No newline at end of file diff --git a/entity/Appointment_entity/entityfields/classification/valueProcess.js b/entity/Appointment_entity/entityfields/classification/valueProcess.js new file mode 100644 index 0000000000..a4056b8834 --- /dev/null +++ b/entity/Appointment_entity/entityfields/classification/valueProcess.js @@ -0,0 +1,15 @@ +import("system.neon"); +import("system.vars"); +import("system.calendars"); +import("system.result"); + +/** + * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate + */ +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param")) +{ + var event = JSON.parse(vars.getString("$param.Entry_param")); + + if(event[calendars.CLASSIFICATION]) + result.string(event[calendars.CLASSIFICATION]); +} \ No newline at end of file diff --git a/entity/Appointment_entity/entityfields/end/valueProcess.js b/entity/Appointment_entity/entityfields/end/valueProcess.js new file mode 100644 index 0000000000..3ed796fe83 --- /dev/null +++ b/entity/Appointment_entity/entityfields/end/valueProcess.js @@ -0,0 +1,15 @@ +import("system.neon"); +import("system.vars"); +import("system.calendars"); +import("system.result"); + +/** + * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate + */ +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param")) +{ + var event = JSON.parse(vars.getString("$param.Entry_param")); + + if(event[calendars.DTEND]) + result.string(event[calendars.DTEND]); +} \ No newline at end of file diff --git a/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js b/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js new file mode 100644 index 0000000000..4a9bbcc8f2 --- /dev/null +++ b/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js @@ -0,0 +1,12 @@ +import("system.neon"); +import("system.vars"); +import("system.calendars"); +import("system.result"); + +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param")) +{ + var event = JSON.parse(vars.getString("$param.Entry_param")); + + if(event[calendars.RECURRENCEID]) + result.string(event[calendars.RECURRENCEID]); +} \ No newline at end of file diff --git a/entity/Appointment_entity/entityfields/reminder/valueProcess.js b/entity/Appointment_entity/entityfields/reminder/valueProcess.js new file mode 100644 index 0000000000..b2b5966bb1 --- /dev/null +++ b/entity/Appointment_entity/entityfields/reminder/valueProcess.js @@ -0,0 +1,15 @@ +import("system.neon"); +import("system.vars"); +import("system.calendars"); +import("system.result"); + +/** + * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate + */ +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param")) +{ + var event = JSON.parse(vars.getString("$param.Entry_param")); + + if(event[calendars.REMINDER_DURATION]) + result.string(event[calendars.REMINDER_DURATION]); +} \ No newline at end of file diff --git a/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js b/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js new file mode 100644 index 0000000000..0929f447e7 --- /dev/null +++ b/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js @@ -0,0 +1,15 @@ +import("system.neon"); +import("system.vars"); +import("system.calendars"); +import("system.result"); + +/** + * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate + */ +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param")) +{ + var event = JSON.parse(vars.getString("$param.Entry_param")); + + if(event[calendars.HASREMINDER]) + result.string(event[calendars.HASREMINDER]); +} \ No newline at end of file diff --git a/entity/Appointment_entity/entityfields/rrule/valueProcess.js b/entity/Appointment_entity/entityfields/rrule/valueProcess.js new file mode 100644 index 0000000000..560cffd4c2 --- /dev/null +++ b/entity/Appointment_entity/entityfields/rrule/valueProcess.js @@ -0,0 +1,12 @@ +import("system.neon"); +import("system.vars"); +import("system.calendars"); +import("system.result"); + +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param")) +{ + var event = JSON.parse(vars.getString("$param.Entry_param")); + + if(event[calendars.RRULE]) + result.string(event[calendars.RRULE]); +} \ No newline at end of file diff --git a/entity/Appointment_entity/entityfields/summary/valueProcess.js b/entity/Appointment_entity/entityfields/summary/valueProcess.js index d3f5a12faa..432475ace3 100644 --- a/entity/Appointment_entity/entityfields/summary/valueProcess.js +++ b/entity/Appointment_entity/entityfields/summary/valueProcess.js @@ -1 +1,15 @@ - +import("system.neon"); +import("system.vars"); +import("system.calendars"); +import("system.result"); + +/** + * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate + */ +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param")) +{ + var event = JSON.parse(vars.getString("$param.Entry_param")); + + if(event[calendars.SUMMARY]) + result.string(event[calendars.SUMMARY]); +} \ No newline at end of file diff --git a/entity/Appointment_entity/entityfields/transparency/valueProcess.js b/entity/Appointment_entity/entityfields/transparency/valueProcess.js new file mode 100644 index 0000000000..774f704312 --- /dev/null +++ b/entity/Appointment_entity/entityfields/transparency/valueProcess.js @@ -0,0 +1,15 @@ +import("system.neon"); +import("system.vars"); +import("system.calendars"); +import("system.result"); + +/** + * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate + */ +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param")) +{ + var event = JSON.parse(vars.getString("$param.Entry_param")); + + if(event[calendars.TRANSPARENCY]) + result.string(event[calendars.TRANSPARENCY]); +} \ No newline at end of file -- GitLab