admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FCLT#78249 Externe bezoekers (te bepalen adhv S(exchange_internal_email_regexp)) ook initieel importeren

Browse Source 
svn path=/Website/trunk/; revision=60583
This commit is contained in:
Koen Reefman
2023-06-01 08:53:39 +00:00
parent 9c6e2057cc
commit e8a3a203e0
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
UTILS/Exchange/exchange_graph.js
View File

@@ -207,7 +207,7 @@ function getReserveringByEvent(event, zaalemail)
+ " AND ro.res_ruimte_opstel_key = rr.res_ruimte_opstel_key"
+ " AND r.res_ruimte_key = ro.res_ruimte_key"
+ " AND r.res_ruimte_verwijder IS NULL"
+ " AND r.res_ruimte_extern_id = " + safe.quoted_sql(zaalemail);
+ " AND UPPER(r.res_ruimte_extern_id) = " + safe.quoted_sql_upper(zaalemail);
var eventoRs = Oracle.Execute(eventSql);
var result = [];
while (!eventoRs.eof) {
@@ -238,7 +238,7 @@ function getReserveringByEvent(event, zaalemail)
+ " AND rrr.res_rsv_ruimte_verwijder IS NULL"
+ " AND rr.res_ruimte_verwijder IS NULL"
+ " AND rrr.res_rsv_ruimte_externnr2 = '##PENDING##'"
+ " AND rr.res_ruimte_extern_id = " + safe.quoted_sql(zaalemail)
+ " AND UPPER(rr.res_ruimte_extern_id) = " + safe.quoted_sql_upper(zaalemail)
+ " AND rrr.res_rsv_ruimte_van = TO_TIMESTAMP (" + safe.quoted_sql(event.start.dateTime) + ", 'YYYY-MM-DD\"T\"HH24:MI:SS.FF7')"
+ " AND rrr.res_rsv_ruimte_tot = TO_TIMESTAMP (" + safe.quoted_sql(event.end.dateTime) + ", 'YYYY-MM-DD\"T\"HH24:MI:SS.FF7')"
+ " AND rrr.res_rsv_ruimte_externsyncdate > SYSDATE - (30 / 24 / 60)"; // Minder dan 30m geleden verstuurd
@@ -321,8 +321,9 @@ function makeCSV(data, zaalemail)
if (getMSGraphSyncLevel() & 4)
{ // Deze gaan vanzelf goed; de reservering blijft (dirty) staan in Facilitor en de ruimte declined het event in Exchange
// Wordt overigens bij de nachtelijk full sync alsnog verwijderd, dan had je het maar moeten rechtzetten
if (reserveringenFacilitor.length === 1 && reserveringenFacilitor[0].isDirty)
if (reserveringenFacilitor.length === 1 && reserveringenFacilitor[0].isDirty) {
continue;
}
}
// Op dit moment kan het nog steeds een "@removed" seriesMaster zijn, dan moeten we direct de hele serie deleten want we krijgen geen losse notificaties van de occurrences
@@ -444,21 +445,23 @@ function makeCSV(data, zaalemail)
{
var eventId = inArray(thisEvent.type, ["occurrence", "exception"]) ? thisEvent.seriesMasterId : thisEvent.id;
var occurrenceId = inArray(thisEvent.type, ["occurrence", "exception"]) ? thisEvent.id : "";
for (var attendee in thisEvent.attendees)
{
tds = [
thisEvent.subject,
_startDate.toISOString(),
_endDate.toISOString(),
thisEvent.organizer.emailAddress.address,
thisEvent.attendees[attendee].emailAddress.address,
thisEvent.attendees[attendee].emailAddress.name,
modifier,
eventId,
occurrenceId,
seqNbr
];
trs.push(tds.join(";"));
for (var attendee in thisEvent.attendees) {
if (thisEvent.attendees[attendee].emailAddress.address !== thisEvent.organizer.emailAddress.address && // Organisator hebben we al
thisEvent.attendees[attendee].emailAddress.address.toUpperCase() !== zaalemail.toUpperCase()) { // Ruimte idem
tds = [
thisEvent.subject,
_startDate.toISOString(),
_endDate.toISOString(),
thisEvent.organizer.emailAddress.address,
thisEvent.attendees[attendee].emailAddress.address,
thisEvent.attendees[attendee].emailAddress.name,
modifier,
eventId,
occurrenceId,
seqNbr
];
trs.push(tds.join(";"));
}
}
}
}