|
@@ -91,8 +91,14 @@ extension NightscoutAPI {
|
|
|
components.path = Config.treatmentsPath
|
|
components.path = Config.treatmentsPath
|
|
|
components.queryItems = [
|
|
components.queryItems = [
|
|
|
URLQueryItem(name: "find[carbs][$exists]", value: "true"),
|
|
URLQueryItem(name: "find[carbs][$exists]", value: "true"),
|
|
|
- URLQueryItem(name: "find[enteredBy][$ne]", value: CarbsEntry.manual),
|
|
|
|
|
- URLQueryItem(name: "find[enteredBy][$ne]", value: NigtscoutTreatment.local)
|
|
|
|
|
|
|
+ URLQueryItem(
|
|
|
|
|
+ name: "find[enteredBy][$ne]",
|
|
|
|
|
+ value: CarbsEntry.manual.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
|
|
|
|
|
+ ),
|
|
|
|
|
+ URLQueryItem(
|
|
|
|
|
+ name: "find[enteredBy][$ne]",
|
|
|
|
|
+ value: NigtscoutTreatment.local.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
|
|
|
|
|
+ )
|
|
|
]
|
|
]
|
|
|
if let date = sinceDate {
|
|
if let date = sinceDate {
|
|
|
let dateItem = URLQueryItem(
|
|
let dateItem = URLQueryItem(
|
|
@@ -124,8 +130,14 @@ extension NightscoutAPI {
|
|
|
components.path = Config.treatmentsPath
|
|
components.path = Config.treatmentsPath
|
|
|
components.queryItems = [
|
|
components.queryItems = [
|
|
|
URLQueryItem(name: "find[eventType]", value: "Temporary+Target"),
|
|
URLQueryItem(name: "find[eventType]", value: "Temporary+Target"),
|
|
|
- URLQueryItem(name: "find[enteredBy][$ne]", value: TempTarget.manual),
|
|
|
|
|
- URLQueryItem(name: "find[enteredBy][$ne]", value: NigtscoutTreatment.local)
|
|
|
|
|
|
|
+ URLQueryItem(
|
|
|
|
|
+ name: "find[enteredBy][$ne]",
|
|
|
|
|
+ value: TempTarget.manual.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
|
|
|
|
|
+ ),
|
|
|
|
|
+ URLQueryItem(
|
|
|
|
|
+ name: "find[enteredBy][$ne]",
|
|
|
|
|
+ value: NigtscoutTreatment.local.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
|
|
|
|
|
+ )
|
|
|
]
|
|
]
|
|
|
if let date = sinceDate {
|
|
if let date = sinceDate {
|
|
|
let dateItem = URLQueryItem(
|
|
let dateItem = URLQueryItem(
|
|
@@ -157,7 +169,10 @@ extension NightscoutAPI {
|
|
|
components.path = Config.treatmentsPath
|
|
components.path = Config.treatmentsPath
|
|
|
components.queryItems = [
|
|
components.queryItems = [
|
|
|
URLQueryItem(name: "find[eventType]", value: "Announcement"),
|
|
URLQueryItem(name: "find[eventType]", value: "Announcement"),
|
|
|
- URLQueryItem(name: "find[enteredBy]", value: Announcement.remote)
|
|
|
|
|
|
|
+ URLQueryItem(
|
|
|
|
|
+ name: "find[enteredBy]",
|
|
|
|
|
+ value: Announcement.remote.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
|
|
|
|
|
+ )
|
|
|
]
|
|
]
|
|
|
if let date = sinceDate {
|
|
if let date = sinceDate {
|
|
|
let dateItem = URLQueryItem(
|
|
let dateItem = URLQueryItem(
|