From 3cdfc988b4de612f0da54a4d9450c7c5822f54b5 Mon Sep 17 00:00:00 2001
From: Frederick Yin <fkfd@fkfd.me>
Date: Sat, 9 Apr 2022 14:56:05 +0800
Subject: Show "Submitted" instead of due date when applicable

---
 contents/ui/ActivityView.qml | 13 +++++++------
 contents/ui/main.qml         |  2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'contents')

diff --git a/contents/ui/ActivityView.qml b/contents/ui/ActivityView.qml
index b3ba66c..7bc66ed 100644
--- a/contents/ui/ActivityView.qml
+++ b/contents/ui/ActivityView.qml
@@ -77,16 +77,18 @@ RowLayout {
             }
 
             humanDueString += " " + Qt.formatTime(due)
-
-            if (pastDue) {
-                humanDueString += " " + i18n("(missed)")
-            }
             return humanDueString
         } catch (e) {
             return isoDue // screw it
         }
     }
 
+    function dueLabelText() {
+        if (type != "assignment") { return "" }
+        if (submitted) { return i18n("Submitted") }
+        return i18n("Due: ") + humanDue(dueAt)
+    }
+
     RowLayout {
         Layout.fillWidth: true
         PlasmaComponents3.CheckBox {
@@ -104,13 +106,12 @@ RowLayout {
                 color: important ? PlasmaCore.Theme.negativeTextColor : PlasmaCore.Theme.textColor
                 elide: Text.ElideRight
                 Layout.fillWidth: true
-
             }
 
             PlasmaComponents3.Label {
                 id: dueLabel
                 visible: type == "assignment"
-                text: dueAt ? ("Due: " + humanDue(dueAt)) : ""
+                text: dueLabelText()
                 color: activityLabel.color
                 Layout.fillWidth: true
             }
diff --git a/contents/ui/main.qml b/contents/ui/main.qml
index 5b3ebb5..5593b8c 100644
--- a/contents/ui/main.qml
+++ b/contents/ui/main.qml
@@ -79,6 +79,7 @@ Item {
                         course: course[1],
                         title: assignment.name,
                         dueAt: assignment.due_at,
+                        submitted: assignment.has_submitted_submissions,
                         url: assignment.html_url,
                         important: plasmoid.configuration.importantAssignments.includes(assignment.id.toString()),
                     }
@@ -154,6 +155,7 @@ Item {
                 course: "EE210"
                 title: "Title"
                 dueAt: "2022-04-10T15:59:59Z"
+                submitted: true
                 url: "https://xkcd.com"
                 important: true
                 activityId: 1
-- 
cgit v1.2.3