From f593306c504c796902d38dae46728e5ee9349ad0 Mon Sep 17 00:00:00 2001 From: androidlover5842 Date: Thu, 29 Jan 2026 20:14:14 +0530 Subject: [PATCH] improve checked in guest ui --- AGENTS.md | 5 ++++- .../data/api/model/BookingModels.kt | 3 +++ .../ui/roomstay/ActiveRoomStaysScreen.kt | 21 +++++++++++++++---- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index cd93be8..440e9d8 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -56,7 +56,10 @@ Optional query param: Behavior: - If status is omitted, returns all bookings for the property (newest first). -Response: List of BookingListItem with id, status, guestId, source, times, counts, expectedGuestCount, notes. +Response: List of BookingListItem with id, status, guestId, guestName, guestPhone, roomNumbers, source, times, counts, expectedGuestCount, notes. + +Notes: +- It returns active room stays (toAt = null) for each booking. --- diff --git a/app/src/main/java/com/android/trisolarispms/data/api/model/BookingModels.kt b/app/src/main/java/com/android/trisolarispms/data/api/model/BookingModels.kt index 47ee274..2a69730 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/model/BookingModels.kt +++ b/app/src/main/java/com/android/trisolarispms/data/api/model/BookingModels.kt @@ -37,6 +37,9 @@ data class BookingListItem( val id: String? = null, val status: String? = null, val guestId: String? = null, + val guestName: String? = null, + val guestPhone: String? = null, + val roomNumbers: List = emptyList(), val source: String? = null, val checkInAt: String? = null, val checkOutAt: String? = null, diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomstay/ActiveRoomStaysScreen.kt b/app/src/main/java/com/android/trisolarispms/ui/roomstay/ActiveRoomStaysScreen.kt index 8348ff1..9332abd 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomstay/ActiveRoomStaysScreen.kt +++ b/app/src/main/java/com/android/trisolarispms/ui/roomstay/ActiveRoomStaysScreen.kt @@ -174,10 +174,23 @@ private fun CheckedInBookingCard( ) ) { Column(modifier = Modifier.padding(12.dp)) { - Text( - text = booking.id?.take(8)?.let { "Booking #$it" } ?: "Booking", - style = MaterialTheme.typography.titleSmall - ) + val guestName = booking.guestName?.takeIf { it.isNotBlank() } + if (guestName == null) { + Text( + text = booking.id?.take(8)?.let { "Booking #$it" } ?: "Booking", + style = MaterialTheme.typography.titleSmall + ) + } + if (guestName != null) { + Text(text = guestName, style = MaterialTheme.typography.bodyMedium) + } + if (booking.roomNumbers.isNotEmpty()) { + Text( + text = booking.roomNumbers.joinToString(", "), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } val source = booking.source?.takeIf { it.isNotBlank() } if (source != null) { Text(text = source, style = MaterialTheme.typography.bodySmall)