androidlover5842/TrisolarisPMS
1
0
Fork 0
Code Issues 22 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Update amenities API and category suggestions

Browse Source
This commit is contained in:
androidlover5842
2026-01-27 04:55:28 +05:30
parent 94eb4f9be4
commit 4642102ff5
13 changed files with 177 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/com/android/trisolarispms/MainActivity.kt
View File

@@ -65,10 +65,8 @@ class MainActivity : ComponentActivity() {
isSuperAdmin = state.isSuperAdmin,
onAddProperty = { route.value = AppRoute.AddProperty },
onAmenities = {
selectedPropertyId.value?.let { propertyId ->
amenitiesReturnRoute.value = AppRoute.Home
route.value = AppRoute.Amenities(propertyId)
}
amenitiesReturnRoute.value = AppRoute.Home
route.value = AppRoute.Amenities
},
refreshKey = refreshKey.value,
selectedPropertyId = selectedPropertyId.value,
@@ -134,27 +132,24 @@ class MainActivity : ComponentActivity() {
onBack = { route.value = AppRoute.RoomTypes(currentRoute.propertyId) },
onSave = { route.value = AppRoute.RoomTypes(currentRoute.propertyId) }
)
is AppRoute.Amenities -> AmenitiesScreen(
propertyId = currentRoute.propertyId,
AppRoute.Amenities -> AmenitiesScreen(
onBack = { route.value = amenitiesReturnRoute.value },
onAdd = { route.value = AppRoute.AddAmenity(currentRoute.propertyId) },
onAdd = { route.value = AppRoute.AddAmenity },
canManageAmenities = state.isSuperAdmin,
onEdit = {
selectedAmenity.value = it
route.value = AppRoute.EditAmenity(currentRoute.propertyId, it.id ?: "")
route.value = AppRoute.EditAmenity(it.id ?: "")
}
)
is AppRoute.AddAmenity -> AddAmenityScreen(
propertyId = currentRoute.propertyId,
onBack = { route.value = AppRoute.Amenities(currentRoute.propertyId) },
onSave = { route.value = AppRoute.Amenities(currentRoute.propertyId) }
AppRoute.AddAmenity -> AddAmenityScreen(
onBack = { route.value = AppRoute.Amenities },
onSave = { route.value = AppRoute.Amenities }
)
is AppRoute.EditAmenity -> EditAmenityScreen(
propertyId = currentRoute.propertyId,
amenity = selectedAmenity.value
?: com.android.trisolarispms.data.api.model.AmenityDto(id = currentRoute.amenityId, name = ""),
onBack = { route.value = AppRoute.Amenities(currentRoute.propertyId) },
onSave = { route.value = AppRoute.Amenities(currentRoute.propertyId) }
onBack = { route.value = AppRoute.Amenities },
onSave = { route.value = AppRoute.Amenities }
)
is AppRoute.AddRoom -> RoomFormScreen(
title = "Add Room",