Skip to content
Snippets Groups Projects
Commit e678a9fa authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong:
Browse files

Merge branch 'cm_dt_1074419_newSilentEvent' into '2021.0'

Cm dt 1074419 new silent event

See merge request xrm/basic!725
parents 228fb9a1 5d40b400
No related branches found
No related tags found
No related merge requests found
...@@ -6,23 +6,14 @@ if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param")) ...@@ -6,23 +6,14 @@ if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
{ {
var entry = JSON.parse(vars.getString("$param.Entry_param")); var entry = JSON.parse(vars.getString("$param.Entry_param"));
if(entry["AppLinkContext"] && entry["AppLinkId"]) if(entry["LINKS"])
{ {
neon.addRecord("AppointmentLinks", entry["LINKS"].forEach(function(pLink){
{ neon.addRecord("AppointmentLinks",
"OBJECTID" : entry["AppLinkId"], {
"OBJECTTYPE" : entry["AppLinkContext"] "OBJECTID" : pLink["OBJECT_ID"],
}); "OBJECTTYPE" : pLink["OBJECT_TYPE"]
});
})
} }
}
if(vars.exists("$param.PresetLinks_param") && vars.get("$param.PresetLinks_param"))
{
var presetLink = JSON.parse(vars.get("$param.PresetLinks_param"));
presetLink.forEach(function(link) {
neon.addRecord("AppointmentLinks", {
"OBJECTTYPE" : link[0],
"OBJECTID" : link[1]
});
});
} }
\ No newline at end of file
import("system.logging"); import("system.logging");
import("Sql_lib");
import("system.neon"); import("system.neon");
import("system.calendars"); import("system.calendars");
import("system.vars"); import("system.vars");
import("Sql_lib");
var uid; var uid;
...@@ -23,8 +23,9 @@ else if(vars.get("$field.OWNER")) ...@@ -23,8 +23,9 @@ else if(vars.get("$field.OWNER"))
calendars.removeEntryByUID(calendars.VEVENT, JSON.parse(vars.get("$field.OWNER"))["cn"], uid, vars.get("$field.RECURRENCEID")); calendars.removeEntryByUID(calendars.VEVENT, JSON.parse(vars.get("$field.OWNER"))["cn"], uid, vars.get("$field.RECURRENCEID"));
} }
/** /**
* Deletes ApointmentLinks referring to the deleted Appointment. * Deletes ApointmentLinks referring to the deleted Appointment.
*/ */
newWhereIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", uid) newWhereIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", uid)
.deleteData(); .deleteData();
\ No newline at end of file
\ No newline at end of file
import("system.neon");
import("system.calendars"); import("system.calendars");
import("system.vars");
import("system.question"); import("system.question");
import("system.translate"); import("system.translate");
import("system.text");
import("system.datetime"); import("system.datetime");
import("system.db");
import("system.result"); import("system.result");
import("system.tools"); import("system.tools");
import("system.neon");
import("system.vars");
import("system.text");
import("system.db");
var event = JSON.parse(vars.getString("$param.Entry_param")); var event = JSON.parse(vars.getString("$param.Entry_param"));
...@@ -38,6 +38,19 @@ if (fields["REMINDER.value"]) ...@@ -38,6 +38,19 @@ if (fields["REMINDER.value"])
var idstringarray = calendars.insert([event]); var idstringarray = calendars.insert([event]);
if(event["LINKS"])
{
event["LINKS"].forEach(function(pLink){
neon.addRecord("AppointmentLinks",
{
"OBJECTID" : pLink["OBJECT_ID"],
"OBJECTTYPE" : pLink["OBJECT_TYPE"],
"APPOINTMENT_ID" : idstringarray[0]
});
})
}
event[calendars.ID] = idstringarray[0]; event[calendars.ID] = idstringarray[0];
neon.setFieldValue("$field.UID", event[calendars.ID]); neon.setFieldValue("$field.UID", event[calendars.ID]);
......
import("system.calendars");
import("system.vars"); import("system.vars");
import("system.neon"); import("system.neon");
import("system.calendars");
import("Calendar_lib");
import("system.date"); import("system.date");
import("Context_lib");
import("system.util"); import("system.util");
import("Context_lib");
import("Calendar_lib");
var links = [
{
"OBJECT_ID":vars.get("$field.CONTACTID"),
"OBJECT_TYPE":ContextUtils.getCurrentContextId()
}
];
var params = {}; var params = {
params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(util.getNewUUID(), calendars.VEVENT, "", "", false, ContextUtils.getCurrentContextId(), vars.get("$field.CONTACTID"))); "Entry_param":JSON.stringify(CalendarUtil.createEntry("", "", links, undefined, undefined, undefined, undefined, undefined, undefined, undefined,
undefined, undefined, undefined, undefined))
};
neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params); neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params);
import("system.calendars");
import("system.vars"); import("system.vars");
import("system.neon"); import("system.neon");
import("system.calendars");
import("Calendar_lib");
import("system.date"); import("system.date");
import("Context_lib");
import("system.util"); import("system.util");
import("Calendar_lib");
import("Context_lib");
var links = [
{
"OBJECT_ID":vars.get("$field.CONTACTID"),
"OBJECT_TYPE":ContextUtils.getCurrentContextId()
}
];
var params = {}; var params = {
params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(util.getNewUUID(), calendars.VEVENT, "", "", false, ContextUtils.getCurrentContextId(), vars.get("$field.CONTACTID"))); "Entry_param":JSON.stringify(CalendarUtil.createEntry("", "", links, undefined, undefined, undefined, undefined, undefined, undefined, undefined,
undefined, undefined, undefined, undefined))
};
neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params); neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
import("Sql_lib");
import("system.translate"); import("system.translate");
import("system.eMath"); import("system.eMath");
import("system.datetime"); import("system.datetime");
import("Date_lib");
import("system.logging"); import("system.logging");
import("system.result"); import("system.result");
import("system.neon"); import("system.neon");
...@@ -10,8 +8,10 @@ import("system.calendars"); ...@@ -10,8 +8,10 @@ import("system.calendars");
import("system.util"); import("system.util");
import("system.vars"); import("system.vars");
import("system.db"); import("system.db");
import("Calendar_lib");
import("Communication_lib"); import("Communication_lib");
import("Calendar_lib");
import("Sql_lib");
import("Date_lib");
var savedData = vars.get("$local.entitydata"); var savedData = vars.get("$local.entitydata");
...@@ -32,14 +32,22 @@ if(savedData["STATUS_APPOINTMENT"] == "VISITSTATUSAPPOINTMENTCONFIRMED") ...@@ -32,14 +32,22 @@ if(savedData["STATUS_APPOINTMENT"] == "VISITSTATUSAPPOINTMENTCONFIRMED")
var endTime = savedData["END_TIME"]; var endTime = savedData["END_TIME"];
var duration = eMath.subInt(endTime, startTime); var duration = eMath.subInt(endTime, startTime);
var params = {}; var links = [
params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(util.getNewUUID(), calendars.VEVENT, summary, description, false, null, null {
, null, null, startTime, duration, null, null, null, null, [standardMail])); "OBJECT_ID":savedData["ORGANISATION_CONTACT_ID"],
"OBJECT_TYPE":"Organisation"
params["PresetLinks_param"] = JSON.stringify([ },
["Organisation", savedData["ORGANISATION_CONTACT_ID"]], {
["Person", savedData["CONTACT_ID"]] "OBJECT_ID":savedData["CONTACT_ID"],
]); "OBJECT_TYPE":"Person"
}
]
var params = {
"Entry_param" : JSON.stringify(CalendarUtil.createEntry(summary, description, links, undefined, undefined,
Date(Date.toExponential(startTime)), Date(Date.toExponential(endTime)),
undefined, undefined, undefined, [standardMail], undefined, undefined, undefined))
};
neon.openContext("Appointment", "AppointmentEdit_view", [vars.get("$field.UID")], neon.OPERATINGSTATE_NEW, params, null); neon.openContext("Appointment", "AppointmentEdit_view", [vars.get("$field.UID")], neon.OPERATINGSTATE_NEW, params, null);
result.string(true); result.string(true);
......
import("Sql_lib");
import("system.translate"); import("system.translate");
import("system.db");
import("Communication_lib");
import("system.datetime"); import("system.datetime");
import("system.eMath");
import("system.calendars"); import("system.calendars");
import("system.eMath");
import("system.util"); import("system.util");
import("Calendar_lib"); import("system.db");
import("system.vars"); import("system.vars");
import("system.neon"); import("system.neon");
import("system.result"); import("system.result");
import("Communication_lib");
import("Calendar_lib");
import("Contact_lib") import("Contact_lib")
import("Sql_lib");
var selectionRowData = vars.get("$sys.selectionRows"); var selectionRowData = vars.get("$sys.selectionRows");
...@@ -32,14 +32,22 @@ var entryDate = datetime.toDate(selectionRowData[0].ENTRYDATE, "dd-MM-yyyy"); ...@@ -32,14 +32,22 @@ var entryDate = datetime.toDate(selectionRowData[0].ENTRYDATE, "dd-MM-yyyy");
startTime = entryDate + " " + datetime.toDate(selectionRowData[0].BEGIN_TIME, "HH:mm:ss.S"); startTime = entryDate + " " + datetime.toDate(selectionRowData[0].BEGIN_TIME, "HH:mm:ss.S");
startTime = datetime.toLong(startTime, "dd-MM-yyyy HH:mm:ss.S"); startTime = datetime.toLong(startTime, "dd-MM-yyyy HH:mm:ss.S");
var params = {}; var links = [
params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(util.getNewUUID(), calendars.VEVENT, summary, description, false, null, null {
, null, null, startTime, duration, null, null, null, null, [standardMail])); "OBJECT_ID" : selectionRowData[0]["ORGANISATION_CONTACT_ID"],
"OBJECT_TYPE" : "Organisation"
params["PresetLinks_param"] = JSON.stringify([ },
["Organisation", selectionRowData[0].ORGANISATION_CONTACT_ID], {
["Person", selectionRowData[0].CONTACT_ID] "OBJECT_ID" : selectionRowData[0]["CONTACT_ID"],
]); "OBJECT_TYPE" : "Person"
}
];
var params = {
"Entry_param": JSON.stringify(CalendarUtil.createEntry(summary, description, links, undefined, undefined, Date(Date.toExponential(startTime)),
Date(Date.toExponential(endTime)), undefined, undefined, undefined, [standardMail],
undefined, undefined, undefined))
};
neon.openContext("Appointment", "AppointmentEdit_view", [vars.get("$field.UID")], neon.OPERATINGSTATE_NEW, params, null); neon.openContext("Appointment", "AppointmentEdit_view", [vars.get("$field.UID")], neon.OPERATINGSTATE_NEW, params, null);
result.string(true); result.string(true);
......
...@@ -10708,6 +10708,13 @@ Bitte Datumseingabe prüfen</value> ...@@ -10708,6 +10708,13 @@ Bitte Datumseingabe prüfen</value>
<key>Automatically</key> <key>Automatically</key>
<value>Automatisch</value> <value>Automatisch</value>
</entry> </entry>
<entry>
<key>On site</key>
</entry>
<entry>
<key>Vacation</key>
<value>Urlaub</value>
</entry>
</keyValueMap> </keyValueMap>
<font name="Dialog" style="0" size="11" /> <font name="Dialog" style="0" size="11" />
</language> </language>
This diff is collapsed.
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