Skip to content

Commit cf200f4

Browse files
committed
GitHub:11728 (handle .startDateTime and .endDateTime attributes)
1 parent ac33e5d commit cf200f4

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

Project/Sources/Classes/Office365Calendar.4dm

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,23 @@ Class constructor($inProvider : cs.OAuth2Provider; $inParameters : Object)
1212
// ----------------------------------------------------
1313

1414

15+
Function _getURLParamsFromObject($inParameters : Object; $inCount : Boolean) : Text
16+
17+
var $URL : Text:=Super._getURLParamsFromObject($inParameters; $inCount)
18+
var $delimiter : Text:=(Position("&";$URL)>0) ? "&" : "?"
19+
20+
If (Length(String($inParameters.startDateTime))>0)
21+
$URL+=$delimiter+"startDateTime="+cs.Tools.me.urlEncode(inParameters.startDateTime)
22+
$delimiter:="&"
23+
End if
24+
If (Length(String($inParameters.endDateTime))>0)
25+
$URL+=$delimiter+"endDateTime="+cs.Tools.me.urlEncode(inParameters.endDateTime)
26+
$delimiter:="&"
27+
End if
28+
29+
return $result
30+
31+
1532
// Mark: - [Public]
1633
// Mark: - Calendars
1734
// ----------------------------------------------------
@@ -57,7 +74,6 @@ Function getCalendars($inParameters : Object) : Object
5774

5875
var $headers : Object:={}
5976
var $urlParams : Text:=""
60-
var $delimiter : Text:="?"
6177

6278
If (Length(String(This.userId))>0)
6379
$urlParams:="users/"+This.userId
@@ -120,7 +136,7 @@ Function getEvent($inParameters : Object) : Object
120136
End if
121137
$urlParams+="/events/"+cs.Tools.me.urlEncode($inParameters.eventId)
122138

123-
$urlParams+=Super._getURLParamsFromObject($inParameters)
139+
$urlParams+=This._getURLParamsFromObject($inParameters)
124140

125141
var $prefer : Text:=""
126142
If (Length(String($inParameters.timeZone))>0)
@@ -160,7 +176,7 @@ Function getEvents($inParameters : Object) : Object
160176
GET /me/calendars/{id}/events
161177
GET /users/{id | userPrincipalName}/calendars/{id}/events
162178
*/
163-
var $urlParams : Text:=""
179+
var $urlParams : Text:=""
164180
If (Length(String(This.userId))>0)
165181
$urlParams+="users/"+This.userId
166182
Else
@@ -171,7 +187,7 @@ var $urlParams : Text:=""
171187
Else
172188
$urlParams+="/calendar"
173189
End if
174-
$urlParams+="/events"+Super._getURLParamsFromObject($inParameters)
190+
$urlParams+="/events"+This._getURLParamsFromObject($inParameters)
175191

176192
var $prefer : Text:=""
177193
If (Length(String($inParameters.timeZone))>0)

0 commit comments

Comments
 (0)