Skip to content

Commit d4e83cc

Browse files
Hide attendance status tag if Unknown
1 parent f69c029 commit d4e83cc

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingMapper.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ class BookingMapper @Inject constructor(
121121
}
122122
}
123123

124-
private fun BookingEntity.AttendanceStatus.toUiModel(): BookingAttendanceStatus = when (this) {
124+
private fun BookingEntity.AttendanceStatus.toUiModel(): BookingAttendanceStatus? = when (this) {
125125
BookingEntity.AttendanceStatus.Booked -> BookingAttendanceStatus.Booked
126126
BookingEntity.AttendanceStatus.CheckedIn -> BookingAttendanceStatus.CheckedIn
127127
BookingEntity.AttendanceStatus.NoShow -> BookingAttendanceStatus.NoShow
128-
is BookingEntity.AttendanceStatus.Unknown -> BookingAttendanceStatus.Unknown(this.key)
128+
is BookingEntity.AttendanceStatus.Unknown -> null
129129
}
130130

131131
private fun BookingCustomerInfo.fullName(): String? {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/compose/BookingAttendanceSection.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
3535

3636
@Composable
3737
fun BookingAttendanceSection(
38-
status: BookingAttendanceStatus,
38+
status: BookingAttendanceStatus?,
3939
attendanceUpdateStatus: AttendanceUpdateStatus,
4040
onClick: () -> Unit,
4141
modifier: Modifier = Modifier,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/compose/BookingAttendanceStatusTag.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,16 @@ sealed interface BookingAttendanceStatus {
7373
data object CheckedIn : BookingAttendanceStatus
7474
data object NoShow : BookingAttendanceStatus
7575
data object Cancelled : BookingAttendanceStatus
76-
data class Unknown(val key: String) : BookingAttendanceStatus
7776
}
7877

7978
@Composable
80-
fun BookingAttendanceStatus.text(): String {
79+
fun BookingAttendanceStatus?.text(): String {
8180
return when (this) {
8281
BookingAttendanceStatus.Booked -> stringResource(R.string.booking_attendance_status_booked)
8382
BookingAttendanceStatus.CheckedIn -> stringResource(R.string.booking_attendance_status_checked_in)
8483
BookingAttendanceStatus.Cancelled -> stringResource(R.string.booking_attendance_status_cancelled)
8584
BookingAttendanceStatus.NoShow -> stringResource(R.string.booking_attendance_status_no_show)
86-
is BookingAttendanceStatus.Unknown -> key
85+
else -> ""
8786
}
8887
}
8988

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/compose/BookingSummary.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,12 @@ fun BookingSummary(
5757
modifier = Modifier
5858
.padding(top = 8.dp)
5959
) {
60-
BookingAttendanceStatusTag(
61-
state = model.attendanceStatus,
62-
attendanceUpdateStatus = model.attendanceUpdateStatus,
63-
)
60+
model.attendanceStatus?.let {
61+
BookingAttendanceStatusTag(
62+
state = it,
63+
attendanceUpdateStatus = model.attendanceUpdateStatus,
64+
)
65+
}
6466
BookingStatusTag(
6567
state = model.status
6668
)
@@ -72,7 +74,7 @@ data class BookingSummaryModel(
7274
val date: String,
7375
val name: String,
7476
val customerName: String?,
75-
val attendanceStatus: BookingAttendanceStatus,
77+
val attendanceStatus: BookingAttendanceStatus?,
7678
val status: BookingStatus,
7779
val attendanceUpdateStatus: AttendanceUpdateStatus,
7880
)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/details/BookingDetailsViewModel.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ class BookingDetailsViewModel @Inject constructor(
177177
BookingAttendanceStatus.Booked -> BookingEntity.AttendanceStatus.Booked
178178
BookingAttendanceStatus.CheckedIn -> BookingEntity.AttendanceStatus.CheckedIn
179179
BookingAttendanceStatus.NoShow -> BookingEntity.AttendanceStatus.NoShow
180-
is BookingAttendanceStatus.Unknown,
181180
BookingAttendanceStatus.Cancelled -> null
182181
}
183182

0 commit comments

Comments
 (0)