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

Merge branch 'cm_dt_1077138_creating_appointment' into '2021.0.2'

Cm dt 1077138 creating appointment

See merge request xrm/basic!797
parents befebe60 121abf02
No related branches found
No related tags found
No related merge requests found
...@@ -18,12 +18,12 @@ var appointmentUids; ...@@ -18,12 +18,12 @@ var appointmentUids;
/** /**
* Will be used, if the user is operating the calendar. * Will be used, if the user is operating the calendar.
*/ */
if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param")) if(vars.get("$param.Entry_param"))
{ {
var entry = JSON.parse(vars.getString("$param.Entry_param")); var entry = JSON.parse(vars.getString("$param.Entry_param"));
var masterEntry = null; var masterEntry = null;
if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") { if (vars.get("$param.MasterEntry_param") != "") {
masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param")); masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param"));
} }
......
...@@ -1418,6 +1418,7 @@ ...@@ -1418,6 +1418,7 @@
<title>New appointment</title> <title>New appointment</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js</onActionProcess> <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CALENDAR</iconId> <iconId>VAADIN:CALENDAR</iconId>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/newappointment/stateProcess.js</stateProcess> <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/newappointment/stateProcess.js</stateProcess>
<tooltip>New Appointment</tooltip> <tooltip>New Appointment</tooltip>
</entityActionField> </entityActionField>
......
...@@ -1453,6 +1453,7 @@ ...@@ -1453,6 +1453,7 @@
<title>New appointment</title> <title>New appointment</title>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newappointment/onActionProcess.js</onActionProcess> <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newappointment/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CALENDAR</iconId> <iconId>VAADIN:CALENDAR</iconId>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/newappointment/stateProcess.js</stateProcess> <stateProcess>%aditoprj%/entity/Person_entity/entityfields/newappointment/stateProcess.js</stateProcess>
<tooltip>New Appointment</tooltip> <tooltip>New Appointment</tooltip>
</entityActionField> </entityActionField>
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<title>New Appointment</title> <title>New Appointment</title>
<onActionProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js</onActionProcess> <onActionProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CALENDAR</iconId> <iconId>VAADIN:CALENDAR</iconId>
<state>EDITABLE</state> <state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/stateProcess.js</stateProcess> <stateProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/stateProcess.js</stateProcess>
<tooltip>Create new Appointment</tooltip> <tooltip>Create new Appointment</tooltip>
<tooltipProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/tooltipProcess.js</tooltipProcess> <tooltipProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/tooltipProcess.js</tooltipProcess>
......
...@@ -26,11 +26,12 @@ if(savedData["STATUS_APPOINTMENT"] == "VISITSTATUSAPPOINTMENTCONFIRMED") ...@@ -26,11 +26,12 @@ if(savedData["STATUS_APPOINTMENT"] == "VISITSTATUSAPPOINTMENTCONFIRMED")
var description = savedData["CONTACT_ID.displayValue"]; var description = savedData["CONTACT_ID.displayValue"];
var standardMail = CommUtil.getStandardMail(savedData["CONTACT_ID"]); var standardMail = CommUtil.getStandardMail(savedData["CONTACT_ID"]);
var entryDate = datetime.toLocaleDate(savedData["ENTRYDATE"], "dd-MM-yyyy"); //1077138, 1074419 customized code to match, new CalendarUtil.createEntry()/newSilentEvent() and work without misbehaviour.
var startTime = entryDate + " " + datetime.toLocaleDate(savedData["BEGIN_TIME"], "HH:mm:ss.S"); var entryDateLocalTime = parseInt(datetime.toLong(datetime.toLocaleDate(parseInt(savedData["ENTRYDATE"]), "dd-MM-yyyy"), "dd-MM-yyyy",
startTime = datetime.toLong(startTime, "dd-MM-yyyy HH:mm:ss.S", "UTC"); // #1076044 set tz to prevent time gaps. vars.get("$sys.timezone")));
var endTime = savedData["END_TIME"];
var duration = eMath.subInt(endTime, startTime); var start = new Date(entryDateLocalTime+Number(savedData["BEGIN_TIME"]));
var end = new Date(entryDateLocalTime+Number(savedData["END_TIME"]));
var links = [ var links = [
{ {
...@@ -45,8 +46,7 @@ if(savedData["STATUS_APPOINTMENT"] == "VISITSTATUSAPPOINTMENTCONFIRMED") ...@@ -45,8 +46,7 @@ if(savedData["STATUS_APPOINTMENT"] == "VISITSTATUSAPPOINTMENTCONFIRMED")
var params = { var params = {
"Entry_param" : JSON.stringify(CalendarUtil.createEntry(summary, description, links, undefined, undefined, "Entry_param" : JSON.stringify(CalendarUtil.createEntry(summary, description, links, undefined, undefined,
Date(Date.toExponential(startTime)), Date(Date.toExponential(endTime)), start, end, undefined, undefined, undefined, [standardMail], undefined, undefined, undefined))
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);
......
...@@ -25,6 +25,7 @@ var summary = translate.text("Site visit") + " || " + fullName; ...@@ -25,6 +25,7 @@ var summary = translate.text("Site visit") + " || " + fullName;
var description = fullName; var description = fullName;
var standardMail = CommUtil.getStandardMail(selectionRowData[0].CONTACT_ID); var standardMail = CommUtil.getStandardMail(selectionRowData[0].CONTACT_ID);
//1077138, 1074419 customized code to match, new CalendarUtil.createEntry()/newSilentEvent() and work without misbehaviour.
var startTime = selectionRowData[0].BEGIN_TIME; var startTime = selectionRowData[0].BEGIN_TIME;
var endTime = selectionRowData[0].END_TIME; var endTime = selectionRowData[0].END_TIME;
var duration = eMath.subInt(endTime, startTime); var duration = eMath.subInt(endTime, startTime);
......
...@@ -391,7 +391,7 @@ CalendarUtil.createEntry = function(pSummary, pDescription, pLinks, pOwner, pAff ...@@ -391,7 +391,7 @@ CalendarUtil.createEntry = function(pSummary, pDescription, pLinks, pOwner, pAff
pStatus = calendars.STATUS_CONFIRMED; pStatus = calendars.STATUS_CONFIRMED;
} }
if(!pReminder) if(pReminder)
{ {
entry[calendars.HASREMINDER] = "true"; entry[calendars.HASREMINDER] = "true";
entry[calendars.REMINDER_DURATION] = pReminder.getTime().toString(); entry[calendars.REMINDER_DURATION] = pReminder.getTime().toString();
......
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