Skip to content

[WOOMOB-1516] - Booking attendance status #14778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Oct 21, 2025
Merged

[WOOMOB-1516] - Booking attendance status #14778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ba1b320
Add booking.attendance_status to the data layer
AdamGrzybkowski Oct 16, 2025
0d66836
Show Booking attendance status in the UI
AdamGrzybkowski Oct 17, 2025
f8ad680
PUT request to update attendance status
AdamGrzybkowski Oct 17, 2025
ad610b5
Update BookingDetailsViewModel logic&state for attendance status update
AdamGrzybkowski Oct 17, 2025
ab3825f
Show Skeleton when updating attendance status
AdamGrzybkowski Oct 17, 2025
6e3d73c
Adjust BookingDetailsViewModelTest
AdamGrzybkowski Oct 17, 2025
890e50a
Fix modifiers in BookingAttendanceStatusTag
AdamGrzybkowski Oct 20, 2025
8b2f7dd
Remove unnecesary Companion name
AdamGrzybkowski Oct 20, 2025
ba2f3a6
Fix test
AdamGrzybkowski Oct 20, 2025
3216cca
Update AttendanceStatus and bookings fields without fetching an order
AdamGrzybkowski Oct 20, 2025
f69c029
Only update attendance status if a different one was selected
AdamGrzybkowski Oct 20, 2025
d4e83cc
Hide attendance status tag if Unknown
AdamGrzybkowski Oct 20, 2025
aac8045
Merge remote-tracking branch 'origin/trunk' into issue/WOOMOB-1516_at…
AdamGrzybkowski Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import com.woocommerce.android.ui.bookings.compose.BookingPaymentDetailsModel
import com.woocommerce.android.ui.bookings.compose.BookingStaffMemberStatus
import com.woocommerce.android.ui.bookings.compose.BookingStatus
import com.woocommerce.android.ui.bookings.compose.BookingSummaryModel
import com.woocommerce.android.ui.bookings.details.AttendanceUpdateStatus
import com.woocommerce.android.ui.bookings.details.CancelStatus
import com.woocommerce.android.ui.bookings.list.BookingListItem
import com.woocommerce.android.util.CurrencyFormatter
Expand Down Expand Up @@ -45,20 +46,21 @@ class BookingMapper @Inject constructor(
private val timeRangeFormatter: DateTimeFormatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
.withZone(ZoneOffset.UTC)

fun Booking.toBookingSummaryModel(): BookingSummaryModel {
fun Booking.toBookingSummaryModel(attendanceUpdateStatus: AttendanceUpdateStatus): BookingSummaryModel {
return BookingSummaryModel(
date = summaryDateFormatter.format(start),
name = order.productInfo?.name ?: "-",
customerName = order.customerInfo?.fullName(),
attendanceStatus = BookingAttendanceStatus.BOOKED,
status = status.toUiModel(order.status, order.paymentInfo?.paymentMethodId)
status = status.toUiModel(order.status, order.paymentInfo?.paymentMethodId),
attendanceStatus = attendanceStatus.toUiModel(),
attendanceUpdateStatus = attendanceUpdateStatus,
)
}

fun Booking.toListItem(): BookingListItem {
return BookingListItem(
id = id.value,
summary = toBookingSummaryModel()
summary = toBookingSummaryModel(AttendanceUpdateStatus.Idle)
)
}

Expand Down Expand Up @@ -125,6 +127,13 @@ class BookingMapper @Inject constructor(
}
}

private fun BookingEntity.AttendanceStatus.toUiModel(): BookingAttendanceStatus? = when (this) {
BookingEntity.AttendanceStatus.Booked -> BookingAttendanceStatus.Booked
BookingEntity.AttendanceStatus.CheckedIn -> BookingAttendanceStatus.CheckedIn
BookingEntity.AttendanceStatus.NoShow -> BookingAttendanceStatus.NoShow
Comment on lines +131 to +133
Copy link
Contributor Author

@AdamGrzybkowski AdamGrzybkowski Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you can see, there's no Cancelled here - not sure yet how we will determine such attendance status.

Copy link
Member

@hichamboushaba hichamboushaba Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to hide the AttendanceStatus when the booking is cancelled p1759237996387569/1759139627.152819-slack-C09224W4HAA

So it means there is no need for a Cancelled attendance status 🤔

Copy link
Member

@hichamboushaba hichamboushaba Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest moving this discussion to Slack to increase visibility and reach a final decision for both platforms.

is BookingEntity.AttendanceStatus.Unknown -> null
}

private fun BookingCustomerInfo.fullName(): String? {
return "${billingFirstName.orEmpty()} ${billingLastName.orEmpty()}".trim().ifEmpty { null }
}
Expand Down
16 changes: 16 additions & 0 deletions WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingsRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,22 @@ class BookingsRepository @Inject constructor(
}
}

suspend fun updateAttendanceStatus(
bookingId: Long,
attendanceStatus: BookingEntity.AttendanceStatus,
): Result<Unit> {
val result = bookingsStore.updateAttendanceStatus(
site = selectedSite.get(),
bookingId = bookingId,
attendanceStatus = attendanceStatus
)
return if (result.isError) {
Result.failure(WooException(result.error))
} else {
Result.success(Unit)
}
}

data class FetchResult(
val bookings: List<Booking>,
val hasMorePages: Boolean
Expand Down
84 changes: 67 additions & 17 deletions ...e/src/main/kotlin/com/woocommerce/android/ui/bookings/compose/BookingAttendanceSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,35 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.onSizeChanged
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import com.woocommerce.android.R
import com.woocommerce.android.ui.bookings.details.AttendanceUpdateStatus
import com.woocommerce.android.ui.compose.animations.SkeletonView
import com.woocommerce.android.ui.compose.preview.LightDarkThemePreviews
import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground

@Composable
fun BookingAttendanceSection(
status: BookingAttendanceStatus,
status: BookingAttendanceStatus?,
attendanceUpdateStatus: AttendanceUpdateStatus,
onClick: () -> Unit,
modifier: Modifier = Modifier,
) {
Expand All @@ -37,8 +48,11 @@ fun BookingAttendanceSection(
HorizontalDivider(thickness = 0.5.dp)
AttendanceRow(
label = R.string.booking_attendance_label_status,
attendanceUpdateStatus = attendanceUpdateStatus,
value = status.text(),
modifier = Modifier.clickable { onClick() }
modifier = Modifier.clickable {
if (attendanceUpdateStatus == AttendanceUpdateStatus.Idle) onClick()
}
)
HorizontalDivider(thickness = 0.5.dp)
}
Expand All @@ -54,9 +68,12 @@ fun BookingAttendanceSection(
@Composable
private fun AttendanceRow(
@StringRes label: Int,
attendanceUpdateStatus: AttendanceUpdateStatus,
value: String,
modifier: Modifier = Modifier,
) {
val density = LocalDensity.current
var skeletonSize by remember { mutableStateOf(DpSize.Zero) }
Column(modifier = modifier) {
Row(
verticalAlignment = Alignment.CenterVertically,
Expand All @@ -66,20 +83,39 @@ private fun AttendanceRow(
.padding(horizontal = 16.dp, vertical = 12.dp)
) {
BookingDetailsLabel(label)
Row(verticalAlignment = Alignment.CenterVertically) {
Text(
text = value,
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.onSurfaceVariant,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
Icon(
painter = painterResource(id = R.drawable.ic_arrow_right),
contentDescription = null,
tint = MaterialTheme.colorScheme.surfaceVariant,
modifier = Modifier.padding(start = 8.dp)
)
when (attendanceUpdateStatus) {
AttendanceUpdateStatus.InProgress -> {
SkeletonView(
modifier = Modifier
.size(skeletonSize)
)
}

AttendanceUpdateStatus.Idle -> {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.onSizeChanged {
with(density) {
skeletonSize = DpSize(it.width.toDp(), it.height.toDp())
}
}
) {
Text(
text = value,
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.onSurfaceVariant,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
Icon(
painter = painterResource(id = R.drawable.ic_arrow_right),
contentDescription = null,
tint = MaterialTheme.colorScheme.surfaceVariant,
modifier = Modifier.padding(start = 8.dp)
)
}
}
}
}
}
Expand All @@ -90,7 +126,21 @@ private fun AttendanceRow(
private fun BookingAttendanceSectionPreview() {
WooThemeWithBackground {
BookingAttendanceSection(
status = BookingAttendanceStatus.BOOKED,
status = BookingAttendanceStatus.Booked,
attendanceUpdateStatus = AttendanceUpdateStatus.Idle,
onClick = {},
modifier = Modifier.fillMaxWidth()
)
}
}

@LightDarkThemePreviews
@Composable
private fun BookingAttendanceSectionInProgressPreview() {
WooThemeWithBackground {
BookingAttendanceSection(
status = BookingAttendanceStatus.Booked,
attendanceUpdateStatus = AttendanceUpdateStatus.InProgress,
onClick = {},
modifier = Modifier.fillMaxWidth()
)
Expand Down
20 changes: 10 additions & 10 deletions .../kotlin/com/woocommerce/android/ui/bookings/compose/BookingAttendanceStatusBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ private fun BookingAttendanceStatusSelection(
modifier = Modifier.padding(bottom = 22.dp)
)
listOf(
BookingAttendanceStatus.BOOKED,
BookingAttendanceStatus.CHECKED_IN,
BookingAttendanceStatus.NO_SHOW,
BookingAttendanceStatus.Booked,
BookingAttendanceStatus.CheckedIn,
BookingAttendanceStatus.NoShow,
).forEachIndexed { index, status ->
AttendanceStatusRow(
status = status,
Expand Down Expand Up @@ -122,17 +122,17 @@ private fun AttendanceStatusRow(

@Composable
private fun BookingAttendanceStatus.description(): String = when (this) {
BookingAttendanceStatus.BOOKED -> R.string.booking_attendance_status_booked_desc
BookingAttendanceStatus.CHECKED_IN -> R.string.booking_attendance_status_checked_in_desc
BookingAttendanceStatus.NO_SHOW -> R.string.booking_attendance_status_no_show_desc
BookingAttendanceStatus.Booked -> R.string.booking_attendance_status_booked_desc
BookingAttendanceStatus.CheckedIn -> R.string.booking_attendance_status_checked_in_desc
BookingAttendanceStatus.NoShow -> R.string.booking_attendance_status_no_show_desc
else -> null
}?.let { stringResource(it) } ?: ""

private val BookingAttendanceStatus.iconRes: Int?
get() = when (this) {
BookingAttendanceStatus.BOOKED -> R.drawable.ic_attendance_booked
BookingAttendanceStatus.CHECKED_IN -> R.drawable.ic_attendance_checked_in
BookingAttendanceStatus.NO_SHOW -> R.drawable.ic_attendance_no_show
BookingAttendanceStatus.Booked -> R.drawable.ic_attendance_booked
BookingAttendanceStatus.CheckedIn -> R.drawable.ic_attendance_checked_in
BookingAttendanceStatus.NoShow -> R.drawable.ic_attendance_no_show
else -> null
}

Expand All @@ -151,7 +151,7 @@ private fun BookingAttendanceStatusBottomSheetPreview() {
private fun AttendanceStatusRowPreview() {
WooThemeWithBackground {
AttendanceStatusRow(
status = BookingAttendanceStatus.CHECKED_IN,
status = BookingAttendanceStatus.CheckedIn,
onClick = {}
)
}
Expand Down
Loading