diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/App.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/App.kt index 95ed65e..01bd58c 100644 --- a/composeApp/src/commonMain/kotlin/com/example/mycrib/App.kt +++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/App.kt @@ -323,7 +323,7 @@ fun App( statusId = task.status?.id, statusName = task.status?.name, dueDate = task.dueDate, - estimatedCost = task.estimatedCost, + estimatedCost = task.estimatedCost?.toString(), createdAt = task.createdAt, updatedAt = task.updatedAt ) @@ -481,7 +481,7 @@ fun App( statusId = task.status?.id, statusName = task.status?.name, dueDate = task.dueDate, - estimatedCost = task.estimatedCost, + estimatedCost = task.estimatedCost?.toString(), createdAt = task.createdAt, updatedAt = task.updatedAt ) @@ -509,9 +509,7 @@ fun App( TaskStatus(it, route.statusName ?: "", displayName = route.statusName ?: "") }, dueDate = route.dueDate, - estimatedCost = route.estimatedCost, - actualCost = null, - notes = null, + estimatedCost = route.estimatedCost?.toDoubleOrNull(), createdAt = route.createdAt, updatedAt = route.updatedAt, nextScheduledDate = null, diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/models/CustomTask.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/models/CustomTask.kt index 6a51ae6..6dc9a3d 100644 --- a/composeApp/src/commonMain/kotlin/com/example/mycrib/models/CustomTask.kt +++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/models/CustomTask.kt @@ -17,8 +17,8 @@ data class CustomTask ( val status: TaskStatus? = null, @SerialName("due_date") val dueDate: String?, @SerialName("next_scheduled_date") val nextScheduledDate: String? = null, - @SerialName("estimated_cost") val estimatedCost: String? = null, - @SerialName("actual_cost") val actualCost: String? = null, + @SerialName("estimated_cost") val estimatedCost: Double? = null, + @SerialName("actual_cost") val actualCost: Double? = null, @SerialName("completion_count") val completionCount: Int? = null, val notes: String? = null, val archived: Boolean = false, @@ -34,7 +34,7 @@ data class CustomTask ( data class LastCompletion( @SerialName("completion_date") val completionDate: String, @SerialName("completed_by") val completedBy: String?, - @SerialName("actual_cost") val actualCost: String?, + @SerialName("actual_cost") val actualCost: Double?, val rating: Int? ) @@ -49,7 +49,7 @@ data class TaskCreateRequest( val priority: Int, val status: Int? = null, @SerialName("due_date") val dueDate: String, - @SerialName("estimated_cost") val estimatedCost: String? = null, + @SerialName("estimated_cost") val estimatedCost: Double? = null, val archived: Boolean = false ) @@ -57,8 +57,9 @@ data class TaskCreateRequest( data class TaskDetail( val id: Int, val residence: Int, - //@SerialName("created_by") val createdBy: Int, - //@SerialName("created_by_username") val createdByUsername: String, + @SerialName("residence_name") val residenceName: String? = null, + @SerialName("created_by") val createdBy: Int? = null, + @SerialName("created_by_username") val createdByUsername: String? = null, val title: String, val description: String?, val category: TaskCategory, @@ -66,9 +67,8 @@ data class TaskDetail( val frequency: TaskFrequency, val status: TaskStatus?, @SerialName("due_date") val dueDate: String?, - @SerialName("estimated_cost") val estimatedCost: String? = null, - @SerialName("actual_cost") val actualCost: String? = null, - val notes: String? = null, + @SerialName("interval_days") val intervalDays: Int? = null, + @SerialName("estimated_cost") val estimatedCost: Double? = null, val archived: Boolean = false, @SerialName("created_at") val createdAt: String, @SerialName("updated_at") val updatedAt: String, diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Residence.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Residence.kt index 79f9966..6f147b1 100644 --- a/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Residence.kt +++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Residence.kt @@ -25,7 +25,7 @@ data class Residence( @SerialName("year_built") val yearBuilt: Int?, val description: String?, @SerialName("purchase_date") val purchaseDate: String?, - @SerialName("purchase_price") val purchasePrice: String?, + @SerialName("purchase_price") val purchasePrice: Double?, @SerialName("is_primary") val isPrimary: Boolean = false, @SerialName("created_at") val createdAt: String, @SerialName("updated_at") val updatedAt: String @@ -133,7 +133,7 @@ data class ResidenceWithTasks( @SerialName("year_built") val yearBuilt: Int?, val description: String?, @SerialName("purchase_date") val purchaseDate: String?, - @SerialName("purchase_price") val purchasePrice: String?, + @SerialName("purchase_price") val purchasePrice: Double?, @SerialName("is_primary") val isPrimary: Boolean, @SerialName("task_summary") val taskSummary: TaskSummary, val tasks: List, diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/models/TaskCompletion.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/models/TaskCompletion.kt index fd79829..4f64d31 100644 --- a/composeApp/src/commonMain/kotlin/com/example/mycrib/models/TaskCompletion.kt +++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/models/TaskCompletion.kt @@ -15,7 +15,7 @@ data class TaskCompletion( @SerialName("completed_by_email") val completedByEmail: String?, @SerialName("company_name") val companyName: String?, @SerialName("completion_date") val completionDate: String, - @SerialName("actual_cost") val actualCost: String?, + @SerialName("actual_cost") val actualCost: Double?, val notes: String?, val rating: Int?, @SerialName("completed_by_display") val completedByDisplay: String?, @@ -43,7 +43,7 @@ data class TaskCompletionCreateRequest( @SerialName("completed_by_email") val completedByEmail: String? = null, @SerialName("company_name") val companyName: String? = null, @SerialName("completion_date") val completionDate: String, - @SerialName("actual_cost") val actualCost: String? = null, + @SerialName("actual_cost") val actualCost: Double? = null, val notes: String? = null, val rating: Int? = null ) diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/AddTaskDialog.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/AddTaskDialog.kt index 27a4d09..53f7d22 100644 --- a/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/AddTaskDialog.kt +++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/AddTaskDialog.kt @@ -342,7 +342,7 @@ fun AddTaskDialog( priority = priority.id, status = null, dueDate = dueDate, - estimatedCost = estimatedCost.ifBlank { null } + estimatedCost = estimatedCost.ifBlank { null }?.toDoubleOrNull() ) ) } diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/CompleteTaskDialog.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/CompleteTaskDialog.kt index 812a5fc..6fb3ee3 100644 --- a/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/CompleteTaskDialog.kt +++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/CompleteTaskDialog.kt @@ -261,7 +261,7 @@ fun CompleteTaskDialog( contractor = selectedContractorId, completedByName = completedByName.ifBlank { null }, completionDate = currentDate, - actualCost = actualCost.ifBlank { null }, + actualCost = actualCost.ifBlank { null }?.toDoubleOrNull(), notes = notes.ifBlank { null }, rating = rating ), diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/task/TaskCard.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/task/TaskCard.kt index bc46f63..95ce3b9 100644 --- a/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/task/TaskCard.kt +++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/task/TaskCard.kt @@ -601,9 +601,7 @@ fun TaskCardPreview() { ), status = TaskStatus(id = 1, name = "pending", displayName = "Pending", description = ""), dueDate = "2024-12-15", - estimatedCost = "150.00", - actualCost = null, - notes = null, + estimatedCost = 150.00, createdAt = "2024-01-01T00:00:00Z", updatedAt = "2024-01-01T00:00:00Z", nextScheduledDate = "2024-12-15", diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/screens/EditTaskScreen.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/screens/EditTaskScreen.kt index 0746b7b..c2908a0 100644 --- a/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/screens/EditTaskScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/screens/EditTaskScreen.kt @@ -33,7 +33,7 @@ fun EditTaskScreen( var selectedPriority by remember { mutableStateOf(task.priority) } var selectedStatus by remember { mutableStateOf(task.status) } var dueDate by remember { mutableStateOf(task.dueDate ?: "") } - var estimatedCost by remember { mutableStateOf(task.estimatedCost ?: "") } + var estimatedCost by remember { mutableStateOf(task.estimatedCost?.toString() ?: "") } var categoryExpanded by remember { mutableStateOf(false) } var frequencyExpanded by remember { mutableStateOf(false) } @@ -309,7 +309,7 @@ fun EditTaskScreen( priority = selectedPriority!!.id, status = selectedStatus!!.id, dueDate = dueDate, - estimatedCost = estimatedCost.ifBlank { null }, + estimatedCost = estimatedCost.ifBlank { null }?.toDoubleOrNull(), archived = task.archived ) )