This commit is contained in:
Trey t
2025-11-07 14:53:14 -06:00
parent 4e14352cd1
commit b922c4fb88
20 changed files with 1366 additions and 649 deletions

View File

@@ -5,7 +5,7 @@ struct ResidenceDetailView: View {
let residenceId: Int32
@StateObject private var viewModel = ResidenceViewModel()
@StateObject private var taskViewModel = TaskViewModel()
@State private var tasksResponse: TasksByResidenceResponse?
@State private var tasksResponse: TaskColumnsResponse?
@State private var isLoadingTasks = false
@State private var tasksError: String?
@State private var showAddTask = false
@@ -41,18 +41,18 @@ struct ResidenceDetailView: View {
selectedTaskForEdit = task
showEditTask = true
},
onCancelTask: { task in
taskViewModel.cancelTask(id: task.id) { _ in
onCancelTask: { taskId in
taskViewModel.cancelTask(id: taskId) { _ in
loadResidenceTasks()
}
},
onUncancelTask: { task in
taskViewModel.uncancelTask(id: task.id) { _ in
onUncancelTask: { taskId in
taskViewModel.uncancelTask(id: taskId) { _ in
loadResidenceTasks()
}
},
onMarkInProgress: { task in
taskViewModel.markInProgress(id: task.id) { success in
onMarkInProgress: { taskId in
taskViewModel.markInProgress(id: taskId) { success in
if success {
loadResidenceTasks()
}
@@ -61,13 +61,13 @@ struct ResidenceDetailView: View {
onCompleteTask: { task in
selectedTaskForComplete = task
},
onArchiveTask: { task in
taskViewModel.archiveTask(id: task.id) { _ in
onArchiveTask: { taskId in
taskViewModel.archiveTask(id: taskId) { _ in
loadResidenceTasks()
}
},
onUnarchiveTask: { task in
taskViewModel.unarchiveTask(id: task.id) { _ in
onUnarchiveTask: { taskId in
taskViewModel.unarchiveTask(id: taskId) { _ in
loadResidenceTasks()
}
}
@@ -158,7 +158,7 @@ struct ResidenceDetailView: View {
let taskApi = TaskApi(client: ApiClient_iosKt.createHttpClient())
taskApi.getTasksByResidence(token: token, residenceId: residenceId, days: 30) { result, error in
if let successResult = result as? ApiResultSuccess<TasksByResidenceResponse> {
if let successResult = result as? ApiResultSuccess<TaskColumnsResponse> {
self.tasksResponse = successResult.data
self.isLoadingTasks = false
} else if let errorResult = result as? ApiResultError {