fixes for updateEvents and updateCalendar

hpi-swa-teaching · Jul 26, 2019 · 65743e9 · 65743e9
1 parent 15c06e5
commit 65743e9
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/repository/DAV.package/CalDavCalendar.class/instance/addEvent..st b/repository/DAV.package/CalDavCalendar.class/instance/addEvent..st
@@ -1,4 +1,7 @@
 events handling
 addEvent: anEvent
 
-	self eventsDictionary at: anEvent url schemeSpecificPart asSymbol put: anEvent.
+	self eventsDictionary at: anEvent url schemeSpecificPart asSymbol put: anEvent.
+	anEvent
+		setClean;
+		calendar: self.
diff --git a/repository/DAV.package/CalDavCalendar.class/instance/updateCalendar.st b/repository/DAV.package/CalDavCalendar.class/instance/updateCalendar.st
@@ -5,10 +5,10 @@ updateCalendar
 
 	updateInformation := self client fetchCalendarDataFrom: self url.
 	self
-		calendarName: (updateInformation at: #'d:displayname');
-		ctag: (updateInformation at: #'cs:getctag');
-		syncToken: (updateInformation at: #'d:sync-token');
-		contentType: (updateInformation at: #'d:getcontenttype');
+		calendarName: (updateInformation at: #'displayname');
+		ctag: (updateInformation at: #'getctag');
+		syncToken: (updateInformation at: #'sync-token');
+		contentType: (updateInformation at: #'getcontenttype');
 		calendarColor:
-			(Color fromString: (updateInformation at: #'ical:calendar-color'
-				ifAbsent: [self defaultColor]))
+			(Color fromString: (updateInformation at: #'icalendar-color'
+				ifAbsent: [self defaultColor asString]))
diff --git a/repository/DAV.package/CalDavCalendar.class/instance/updateEvents.st b/repository/DAV.package/CalDavCalendar.class/instance/updateEvents.st
@@ -6,7 +6,7 @@ updateEvents
 	etagsOfEvents := self client fetchEtagsOfEventsFrom: self url.
 
 	etagsOfEvents do: [:rawEventData | 
-		rawEventData at: #url put:	(self buildUrlFrom: rawEventData url)].
+		rawEventData at: #url put:	(self buildUrlFrom: (rawEventData at: #urlLocalPart))].
 
 	self 
 		removeDeletedEvents: etagsOfEvents;

diff --git a/repository/DAV.package/CalDavCalendar.class/methodProperties.json b/repository/DAV.package/CalDavCalendar.class/methodProperties.json
@@ -11,7 +11,7 @@
 		"example05CreateAndPushEvent" : "ph 7/25/2019 17:02",
 		"example05CreateAndPushEvent:" : "ph 7/25/2019 17:02" },
 	"instance" : {
-		"addEvent:" : "ph 7/25/2019 16:53",
+		"addEvent:" : "c a 7/26/2019 11:24",
 		"buildUrlFrom:" : "ph 7/25/2019 17:04",
 		"calendarColor" : "ph 7/25/2019 16:46",
 		"calendarColor:" : "TSP 7/2/2019 13:07",
@@ -45,9 +45,9 @@
 		"syncToken" : "ph 7/25/2019 16:48",
 		"syncToken:" : "ph 7/25/2019 16:48",
 		"update" : "TSP 7/25/2019 16:00",
-		"updateCalendar" : "ph 7/25/2019 17:33",
+		"updateCalendar" : "c a 7/26/2019 11:07",
 		"updateCalendarWithData:" : "TSP 7/25/2019 16:02",
-		"updateEvents" : "ph 7/25/2019 17:38",
+		"updateEvents" : "c a 7/26/2019 10:57",
 		"updateOrAddEvents:" : "ph 7/25/2019 17:38",
 		"updateOrCreateEventsFrom:" : "ph 7/25/2019 17:40",
 		"url" : "pre 1/20/2017 10:43",

diff --git a/repository/DAV.package/CalDavEvent.class/instance/doesNotUnderstand..st b/repository/DAV.package/CalDavEvent.class/instance/doesNotUnderstand..st
@@ -7,6 +7,4 @@ doesNotUnderstand: aMessage
 			[self serverData ifNil: [^ 'uninitialized event'].
 			 super doesNotUnderstand: aMessage].
 
-	aMessage selector numArgs = 1 ifTrue: ["We assume this is a setter and " self setDirty].
-
 	^ aMessage sendTo: self serverData 
diff --git a/repository/DAV.package/CalDavEvent.class/methodProperties.json b/repository/DAV.package/CalDavEvent.class/methodProperties.json
@@ -11,7 +11,7 @@
 		"calendar:" : "ph 7/25/2019 17:52",
 		"client" : "pre 4/11/2017 11:52",
 		"delete" : "TSP 6/29/2019 11:50",
-		"doesNotUnderstand:" : "ph 7/25/2019 19:15",
+		"doesNotUnderstand:" : "c a 7/26/2019 11:30",
 		"end" : "TSP 6/29/2019 12:13",
 		"end:" : "ph 7/25/2019 17:52",
 		"etag" : "pre 3/15/2017 14:19",