From 6f3e2c64a10e7d3c4e7c37168f9cfe6e6ad59e56 Mon Sep 17 00:00:00 2001 From: Tiago Ferreira Date: Thu, 1 Mar 2018 22:38:16 +0000 Subject: [PATCH] Classification patch --- Cartfile.resolved | 2 +- UCLKit/RoomBookings.swift | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index a05643a..27bd2cd 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "nerdishbynature/RequestKit" "1e587aa550de5d3903e7ef6e9364f9f8f797a150" +github "nerdishbynature/RequestKit" "3f1fc824325bf974976bcb4bea2ddaf7bd94d7b6" diff --git a/UCLKit/RoomBookings.swift b/UCLKit/RoomBookings.swift index 3dfcdd9..a5eb619 100644 --- a/UCLKit/RoomBookings.swift +++ b/UCLKit/RoomBookings.swift @@ -136,6 +136,11 @@ public enum Classification: String, Codable { case Classroom = "CR" case PublicCluster = "PC1" case SocialSpace = "SS" + case TheatreHall = "TH" + case UndocumentedCFE = "CFE" // FIXME: Undocumented option CFE (UCLAPI #326) + case UndocumentedMR = "MR" // FIXME: Undocumented option MR (UCLAPI #326) + case UndocumentedER = "ER" // FIXME: Undocumented option ER (UCLAPI #326) + case UndocumentedCF = "CF" // FIXME: Undocumented option CF (UCLAPI #326) case Unknown = "" } @@ -259,7 +264,7 @@ enum RoomBookingsRouter: Router { var params: [String: Any] { switch self { case .readRooms(_, let roomID, let roomName, let siteID, let siteName, let classification, let capacity): - return ["roomid": roomID, "roomname": roomName, "siteid": siteID, "sitename": siteName, "classification": classification, "capacity": capacity] + return ["roomid": roomID, "roomname": roomName, "siteid": siteID, "sitename": siteName, "classification": classification.rawValue, "capacity": capacity] case .readBookings(_, let pageToken, let roomName, let roomID, let startDateTime, let endDateTime, let date, let siteID, let description, let contact, let resultsPerPage): return ["page_token": pageToken, "roomname": roomName, "roomid": roomID, "start_datetime": startDateTime, "end_datetime": endDateTime, "date": date, "siteid": siteID, "description": description, "contact": contact, "results_per_page": resultsPerPage] case .readEquipment(_, let roomID, let siteID):