Add client-side summary calculation and lookup resolution from cache
- Add calculateSummaryFromKanban() to compute summary stats from cached kanban data - Add refreshSummaryFromKanban() called after task CRUD operations - Fix column name matching to use API format (e.g., "overdue_tasks" not "overdue") - Fix tasksDueNextMonth to only include due_soon tasks (not upcoming) - Update TaskResponse computed properties to resolve from DataManager cache - Update iOS task cards to use computed properties for priority/frequency/category - This enables API to skip preloading lookups for better performance 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -303,6 +303,65 @@ object DataManager {
|
|||||||
persistToDisk()
|
persistToDisk()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculate TotalSummary from cached kanban data.
|
||||||
|
* This allows the client to compute summary stats without waiting for API responses
|
||||||
|
* after CRUD operations (API now returns empty summaries for performance).
|
||||||
|
*
|
||||||
|
* Columns from API: overdue_tasks, in_progress_tasks, due_soon_tasks, upcoming_tasks, completed_tasks, cancelled_tasks
|
||||||
|
*/
|
||||||
|
fun calculateSummaryFromKanban(): TotalSummary {
|
||||||
|
val kanban = _allTasks.value ?: return _totalSummary.value ?: TotalSummary()
|
||||||
|
val residenceCount = _myResidences.value?.residences?.size ?: _residences.value.size
|
||||||
|
|
||||||
|
var overdueCount = 0
|
||||||
|
var inProgressCount = 0
|
||||||
|
var dueSoonCount = 0
|
||||||
|
var upcomingCount = 0
|
||||||
|
var completedCount = 0
|
||||||
|
|
||||||
|
for (column in kanban.columns) {
|
||||||
|
when (column.name) {
|
||||||
|
"overdue_tasks" -> overdueCount = column.count
|
||||||
|
"in_progress_tasks" -> inProgressCount = column.count
|
||||||
|
"due_soon_tasks" -> dueSoonCount = column.count
|
||||||
|
"upcoming_tasks" -> upcomingCount = column.count
|
||||||
|
"completed_tasks" -> completedCount = column.count
|
||||||
|
// cancelled_tasks is not counted in totals
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// totalTasks = all non-cancelled tasks
|
||||||
|
val totalTasks = overdueCount + inProgressCount + dueSoonCount + upcomingCount + completedCount
|
||||||
|
// totalPending = not completed (i.e., still needs attention)
|
||||||
|
val totalPending = overdueCount + inProgressCount + dueSoonCount + upcomingCount
|
||||||
|
|
||||||
|
return TotalSummary(
|
||||||
|
totalResidences = residenceCount,
|
||||||
|
totalTasks = totalTasks,
|
||||||
|
totalPending = totalPending,
|
||||||
|
totalOverdue = overdueCount,
|
||||||
|
// due_soon_tasks column = tasks due within threshold (default 30 days)
|
||||||
|
// upcoming_tasks column = tasks with dates beyond threshold OR no due date
|
||||||
|
// Both "Due This Week" and "Next 30 Days" use due_soon since it represents the 30-day window
|
||||||
|
tasksDueNextWeek = dueSoonCount,
|
||||||
|
tasksDueNextMonth = dueSoonCount
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update totalSummary from cached kanban data.
|
||||||
|
* Call this after task CRUD operations to keep summary in sync without API call.
|
||||||
|
*/
|
||||||
|
fun refreshSummaryFromKanban() {
|
||||||
|
val calculatedSummary = calculateSummaryFromKanban()
|
||||||
|
_totalSummary.value = calculatedSummary
|
||||||
|
// Also update myResidences summary if present
|
||||||
|
_myResidences.value?.let { current ->
|
||||||
|
_myResidences.value = current.copy(summary = calculatedSummary)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun setResidenceSummary(residenceId: Int, summary: ResidenceSummaryResponse) {
|
fun setResidenceSummary(residenceId: Int, summary: ResidenceSummaryResponse) {
|
||||||
_residenceSummaries.value = _residenceSummaries.value + (residenceId to summary)
|
_residenceSummaries.value = _residenceSummaries.value + (residenceId to summary)
|
||||||
persistToDisk()
|
persistToDisk()
|
||||||
@@ -378,6 +437,7 @@ object DataManager {
|
|||||||
/**
|
/**
|
||||||
* Update a single task - moves it to the correct kanban column based on kanban_column field.
|
* Update a single task - moves it to the correct kanban column based on kanban_column field.
|
||||||
* This is called after task completion, status change, etc.
|
* This is called after task completion, status change, etc.
|
||||||
|
* Also refreshes the summary from the updated kanban data.
|
||||||
*/
|
*/
|
||||||
fun updateTask(task: TaskResponse) {
|
fun updateTask(task: TaskResponse) {
|
||||||
// Update in allTasks
|
// Update in allTasks
|
||||||
@@ -414,6 +474,8 @@ object DataManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Refresh summary from updated kanban data (API no longer returns summaries for CRUD)
|
||||||
|
refreshSummaryFromKanban()
|
||||||
persistToDisk()
|
persistToDisk()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -436,6 +498,8 @@ object DataManager {
|
|||||||
tasks.copy(columns = newColumns)
|
tasks.copy(columns = newColumns)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Refresh summary from updated kanban data (API no longer returns summaries for CRUD)
|
||||||
|
refreshSummaryFromKanban()
|
||||||
persistToDisk()
|
persistToDisk()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.example.casera.models
|
package com.example.casera.models
|
||||||
|
|
||||||
|
import com.example.casera.data.DataManager
|
||||||
import kotlinx.serialization.SerialName
|
import kotlinx.serialization.SerialName
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
|
|
||||||
@@ -67,14 +68,15 @@ data class TaskResponse(
|
|||||||
// Helper to get created by username
|
// Helper to get created by username
|
||||||
val createdByUsername: String get() = createdBy?.displayName ?: ""
|
val createdByUsername: String get() = createdBy?.displayName ?: ""
|
||||||
|
|
||||||
// Computed properties for UI compatibility (these were in Django API but not Go API)
|
// Computed properties for UI compatibility - resolves from cache if not embedded in response
|
||||||
val categoryName: String? get() = category?.name
|
// This allows the API to skip Preloading these lookups for performance
|
||||||
val categoryDescription: String? get() = category?.description
|
val categoryName: String? get() = category?.name ?: DataManager.getTaskCategory(categoryId)?.name
|
||||||
val frequencyName: String? get() = frequency?.name
|
val categoryDescription: String? get() = category?.description ?: DataManager.getTaskCategory(categoryId)?.description
|
||||||
val frequencyDisplayName: String? get() = frequency?.displayName
|
val frequencyName: String? get() = frequency?.name ?: DataManager.getTaskFrequency(frequencyId)?.name
|
||||||
val frequencyDaySpan: Int? get() = frequency?.days
|
val frequencyDisplayName: String? get() = frequency?.displayName ?: DataManager.getTaskFrequency(frequencyId)?.displayName
|
||||||
val priorityName: String? get() = priority?.name
|
val frequencyDaySpan: Int? get() = frequency?.days ?: DataManager.getTaskFrequency(frequencyId)?.days
|
||||||
val priorityDisplayName: String? get() = priority?.displayName
|
val priorityName: String? get() = priority?.name ?: DataManager.getTaskPriority(priorityId)?.name
|
||||||
|
val priorityDisplayName: String? get() = priority?.displayName ?: DataManager.getTaskPriority(priorityId)?.displayName
|
||||||
|
|
||||||
// Effective due date: use nextDueDate if set (for recurring tasks), otherwise use dueDate
|
// Effective due date: use nextDueDate if set (for recurring tasks), otherwise use dueDate
|
||||||
val effectiveDueDate: String? get() = nextDueDate ?: dueDate
|
val effectiveDueDate: String? get() = nextDueDate ?: dueDate
|
||||||
@@ -82,7 +84,7 @@ data class TaskResponse(
|
|||||||
// Fields that don't exist in Go API - return null/default
|
// Fields that don't exist in Go API - return null/default
|
||||||
val nextScheduledDate: String? get() = nextDueDate // Now we have this from the API
|
val nextScheduledDate: String? get() = nextDueDate // Now we have this from the API
|
||||||
val showCompletedButton: Boolean get() = true // Always show complete button since status is now just in_progress boolean
|
val showCompletedButton: Boolean get() = true // Always show complete button since status is now just in_progress boolean
|
||||||
val daySpan: Int? get() = frequency?.days
|
val daySpan: Int? get() = frequency?.days ?: DataManager.getTaskFrequency(frequencyId)?.days
|
||||||
val notifyDays: Int? get() = null // Not in Go API
|
val notifyDays: Int? get() = null // Not in Go API
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -273,10 +273,10 @@ final class WidgetDataManager {
|
|||||||
id: Int(task.id),
|
id: Int(task.id),
|
||||||
title: task.title,
|
title: task.title,
|
||||||
description: task.description_,
|
description: task.description_,
|
||||||
priority: task.priority?.name ?? "",
|
priority: task.priorityName ?? "",
|
||||||
inProgress: task.inProgress,
|
inProgress: task.inProgress,
|
||||||
dueDate: task.effectiveDueDate, // Use effective date (nextDueDate if set, otherwise dueDate)
|
dueDate: task.effectiveDueDate, // Use effective date (nextDueDate if set, otherwise dueDate)
|
||||||
category: task.category?.name ?? "",
|
category: task.categoryName ?? "",
|
||||||
residenceName: "", // No longer available in API, residence lookup needed
|
residenceName: "", // No longer available in API, residence lookup needed
|
||||||
isOverdue: column.name == "overdue_tasks"
|
isOverdue: column.name == "overdue_tasks"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -483,7 +483,8 @@ private extension ResidenceDetailView {
|
|||||||
Task {
|
Task {
|
||||||
do {
|
do {
|
||||||
let result = try await APILayer.shared.getContractorsByResidence(
|
let result = try await APILayer.shared.getContractorsByResidence(
|
||||||
residenceId: Int32(Int(residenceId))
|
residenceId: Int32(Int(residenceId)),
|
||||||
|
forceRefresh: false
|
||||||
)
|
)
|
||||||
|
|
||||||
await MainActor.run {
|
await MainActor.run {
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ struct DynamicTaskCard: View {
|
|||||||
@State private var showCompletionHistory = false
|
@State private var showCompletionHistory = false
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
let _ = print("📋 DynamicTaskCard - Task: \(task.title), ButtonTypes: \(buttonTypes)")
|
// let _ = print("📋 DynamicTaskCard - Task: \(task.title), ButtonTypes: \(buttonTypes)")
|
||||||
|
|
||||||
VStack(alignment: .leading, spacing: 12) {
|
VStack(alignment: .leading, spacing: 12) {
|
||||||
HStack {
|
HStack {
|
||||||
@@ -32,7 +32,7 @@ struct DynamicTaskCard: View {
|
|||||||
|
|
||||||
Spacer()
|
Spacer()
|
||||||
|
|
||||||
PriorityBadge(priority: task.priority?.name ?? "")
|
PriorityBadge(priority: task.priorityName ?? "")
|
||||||
}
|
}
|
||||||
|
|
||||||
if !task.description_.isEmpty {
|
if !task.description_.isEmpty {
|
||||||
@@ -43,7 +43,7 @@ struct DynamicTaskCard: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
HStack {
|
HStack {
|
||||||
Label(task.frequency?.displayName ?? "", systemImage: "repeat")
|
Label(task.frequencyDisplayName ?? "", systemImage: "repeat")
|
||||||
.font(.caption)
|
.font(.caption)
|
||||||
.foregroundColor(Color.appTextSecondary)
|
.foregroundColor(Color.appTextSecondary)
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ struct TaskCard: View {
|
|||||||
|
|
||||||
Spacer()
|
Spacer()
|
||||||
|
|
||||||
PriorityBadge(priority: task.priority?.name ?? "")
|
PriorityBadge(priority: task.priorityName ?? "")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Description
|
// Description
|
||||||
@@ -47,7 +47,7 @@ struct TaskCard: View {
|
|||||||
Image(systemName: "repeat")
|
Image(systemName: "repeat")
|
||||||
.font(.system(size: 12, weight: .medium))
|
.font(.system(size: 12, weight: .medium))
|
||||||
.foregroundColor(Color.appTextSecondary.opacity(0.7))
|
.foregroundColor(Color.appTextSecondary.opacity(0.7))
|
||||||
Text(task.frequency?.displayName ?? "")
|
Text(task.frequencyDisplayName ?? "")
|
||||||
.font(.caption.weight(.medium))
|
.font(.caption.weight(.medium))
|
||||||
.foregroundColor(Color.appTextSecondary)
|
.foregroundColor(Color.appTextSecondary)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ struct CompleteTaskView: View {
|
|||||||
.font(.headline)
|
.font(.headline)
|
||||||
|
|
||||||
HStack {
|
HStack {
|
||||||
Label((task.category?.name ?? "").capitalized, systemImage: "folder")
|
Label((task.categoryName ?? "").capitalized, systemImage: "folder")
|
||||||
.font(.subheadline)
|
.font(.subheadline)
|
||||||
.foregroundStyle(.secondary)
|
.foregroundStyle(.secondary)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user