aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-02-23 21:50:45 -0600
committerIván Ávalos <avalos@disroot.org>2022-02-23 21:50:45 -0600
commitd5c8fd0cfa50a9407be936eacaf932cb74f9b6b1 (patch)
tree568451532eee3b34415005d5f59206bfe40b4fb7
parent13427fcf3975e55bea6ce089e741d401daed4ea4 (diff)
parent70141fe10227ef4eca2ef7ae4b2b9d7c8fac5675 (diff)
downloadetbsa-trackermap-mobile-d5c8fd0cfa50a9407be936eacaf932cb74f9b6b1.tar.gz
etbsa-trackermap-mobile-d5c8fd0cfa50a9407be936eacaf932cb74f9b6b1.tar.bz2
etbsa-trackermap-mobile-d5c8fd0cfa50a9407be936eacaf932cb74f9b6b1.zip
Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile
-rw-r--r--iosApp/iosApp/Details/Commands/UnitCommandsViewModel.swift12
1 files changed, 11 insertions, 1 deletions
diff --git a/iosApp/iosApp/Details/Commands/UnitCommandsViewModel.swift b/iosApp/iosApp/Details/Commands/UnitCommandsViewModel.swift
index d7298c4..8e1da00 100644
--- a/iosApp/iosApp/Details/Commands/UnitCommandsViewModel.swift
+++ b/iosApp/iosApp/Details/Commands/UnitCommandsViewModel.swift
@@ -21,6 +21,7 @@ import shared
class UnitCommandsViewModel: ObservableObject {
@Inject var commandsController: CommandsController
+ var deviceId: Int32? = nil
@Published var commands = [Command]()
@Published var selected: Command?
@Published var selectedId: Int = 0 {
@@ -29,6 +30,9 @@ class UnitCommandsViewModel: ObservableObject {
Int(truncating: $0.id!) == selectedId
}) {
self.selected = selected
+ if let id = deviceId {
+ self.selected?.deviceId = KotlinInt(int: id)
+ }
notSelected = false
} else {
self.selected = nil
@@ -40,6 +44,7 @@ class UnitCommandsViewModel: ObservableObject {
@Published var showConfirmation: Bool = false
func fetchCommands(id: Int32) {
+ deviceId = id
commandsController.fetchCommands(deviceId: id) { commands, error in
print("We've got the commands! \(commands ?? [])")
self.commands = commands ?? []
@@ -48,7 +53,12 @@ class UnitCommandsViewModel: ObservableObject {
func sendCommand() {
if let command = selected {
- commandsController.sendCommand(command: command) { _, error in }
+ commandsController.sendCommand(command: command) { _, error in
+ if let error = error {
+ print("There is a fucking error")
+ print(error.localizedDescription)
+ }
+ }
}
}
}