From 22cc5f13a66d4ec32cba6fa8e630ce7d4e92b54c Mon Sep 17 00:00:00 2001 From: Wolfgang Witt Date: Fri, 19 Mar 2021 17:23:36 +0100 Subject: [PATCH] chore: use css for strikethrough decoration --- frontend/src/app.sass | 2 +- .../widgets/exam-occurrence-mapping.hamlet | 62 +++++-------------- 2 files changed, 18 insertions(+), 46 deletions(-) diff --git a/frontend/src/app.sass b/frontend/src/app.sass index 3da114507..2de117489 100644 --- a/frontend/src/app.sass +++ b/frontend/src/app.sass @@ -971,7 +971,7 @@ th, td right: 5px top: 5px -.occurrence--not-registered, .no-bonus, .allocation-course--excluded, .allocation-course--inactive +.occurrence--not-registered, .no-bonus, .allocation-course--excluded, .allocation-course--inactive, .occurrence--ignored text-decoration: line-through .result diff --git a/templates/widgets/exam-occurrence-mapping.hamlet b/templates/widgets/exam-occurrence-mapping.hamlet index f99698873..813147807 100644 --- a/templates/widgets/exam-occurrence-mapping.hamlet +++ b/templates/widgets/exam-occurrence-mapping.hamlet @@ -27,53 +27,25 @@ $newline never $forall Entity occId ExamOccurrence{ examOccurrenceName, examOccurrenceRoom, examOccurrenceStart, examOccurrenceEnd, examOccurrenceDescription, examOccurrenceCapacity } <- occurrences - - $if isIgnored occId - - _{examOccurrenceName} - $else - _{examOccurrenceName} - - $if isIgnored occId - - _{loadProp (occLoad occId) examOccurrenceCapacity} - $else - _{loadProp (occLoad occId) examOccurrenceCapacity} - + + _{examOccurrenceName} + + _{loadProp (occLoad occId) examOccurrenceCapacity} + $maybe nudgeWgt' <- Map.lookup occId nudgeWgt ^{nudgeWgt'} $maybe ignoreRoomWgt' <- Map.lookup occId ignoreRoomWgt ^{ignoreRoomWgt'} - - $if isIgnored occId - - $maybe mappingWgt <- occMapping occId - ^{mappingWgt} - $else - $maybe mappingWgt <- occMapping occId - ^{mappingWgt} - - $if isIgnored occId - - $maybe room <- examOccurrenceRoom - ^{roomReferenceWidget room} - $nothing - _{MsgExamOccurrenceRoomIsUnset} - $else - $maybe room <- examOccurrenceRoom - ^{roomReferenceWidget room} - $nothing - _{MsgExamOccurrenceRoomIsUnset} - - $if isIgnored occId - - ^{formatTimeRangeW SelFormatDateTime examOccurrenceStart examOccurrenceEnd} - $else - ^{formatTimeRangeW SelFormatDateTime examOccurrenceStart examOccurrenceEnd} - + + $maybe mappingWgt <- occMapping occId + ^{mappingWgt} + + $maybe room <- examOccurrenceRoom + ^{roomReferenceWidget room} + $nothing + _{MsgExamOccurrenceRoomIsUnset} + + ^{formatTimeRangeW SelFormatDateTime examOccurrenceStart examOccurrenceEnd} + $maybe desc <- examOccurrenceDescription - $if isIgnored occId - - #{desc} - $else - #{desc} + #{desc}