From 1d910f8d661ba218ab674447528d764071fa7ae1 Mon Sep 17 00:00:00 2001
From: Michael <5672750+mibac138@users.noreply.github.com>
Date: Wed, 27 Oct 2021 10:07:04 +0200
Subject: [PATCH] Fix excuse button showing up despite no lessons available to
 excuse (#1607)

This was happening when there was an unexcused lesson that you excused until the teacher sent a response (accepted or denied it)
---
 .../wulkanowy/ui/modules/attendance/AttendanceAdapter.kt     | 2 +-
 .../wulkanowy/ui/modules/attendance/AttendancePresenter.kt   | 5 ++---
 .../java/io/github/wulkanowy/utils/AttendanceExtension.kt    | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
index 6cee23963..bb4f70224 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
@@ -46,7 +46,7 @@ class AttendanceAdapter @Inject constructor() :
                 onExcuseCheckboxSelect(item, checked)
             }
 
-            when (if (item.excuseStatus != null) SentExcuseStatus.valueOf(item.excuseStatus) else null) {
+            when (item.excuseStatus?.let { SentExcuseStatus.valueOf(it)}) {
                 SentExcuseStatus.WAITING -> {
                     attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_waiting)
                     attendanceItemExcuseInfo.visibility = View.VISIBLE
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index 03545b25b..5ed14f67e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@@ -259,9 +259,8 @@ class AttendancePresenter @Inject constructor(
                         showEmpty(filteredAttendance.isEmpty())
                         showErrorView(false)
                         showContent(filteredAttendance.isNotEmpty())
-                        showExcuseButton(filteredAttendance.any { item ->
-                            (!isParent && isVulcanExcusedFunctionEnabled) || (isParent && item.isExcusableOrNotExcused)
-                        })
+                        val anyExcusables = filteredAttendance.any { it.isExcusableOrNotExcused }
+                        showExcuseButton(anyExcusables && (isParent || isVulcanExcusedFunctionEnabled))
                     }
                     analytics.logEvent(
                         "load_data",
diff --git a/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
index 479cc5188..b89ad57d3 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
@@ -17,7 +17,7 @@ private inline val AttendanceSummary.allAbsences: Double
     get() = absence.toDouble() + absenceExcused
 
 inline val Attendance.isExcusableOrNotExcused: Boolean
-    get() = excusable || ((absence || lateness) && !excused)
+    get() = (excusable || ((absence || lateness) && !excused)) && excuseStatus == null
 
 fun AttendanceSummary.calculatePercentage() = calculatePercentage(allPresences, allAbsences)