From 7e1a7f3f19f91f5c41f7c3be8c834417ca55ef60 Mon Sep 17 00:00:00 2001
From: konrad <k@knt.li>
Date: Tue, 5 Oct 2021 05:43:10 +0000
Subject: [PATCH] feat: hide priority label for done tasks (#825)

Co-authored-by: kolaente <k@knt.li>
Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/825
Co-authored-by: konrad <k@knt.li>
Co-committed-by: konrad <k@knt.li>
---
 src/components/tasks/gantt-component.vue           | 2 +-
 src/components/tasks/partials/kanban-card.vue      | 2 +-
 src/components/tasks/partials/priorityLabel.vue    | 6 +++++-
 src/components/tasks/partials/singleTaskInList.vue | 2 +-
 src/views/list/views/Table.vue                     | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/tasks/gantt-component.vue b/src/components/tasks/gantt-component.vue
index 106f3be17..7ef86a01f 100644
--- a/src/components/tasks/gantt-component.vue
+++ b/src/components/tasks/gantt-component.vue
@@ -103,7 +103,7 @@
 					>
 						{{ t.title }}
 					</span>
-					<priority-label :priority="t.priority"/>
+					<priority-label :priority="t.priority" :done="t.done"/>
 					<!-- using the key here forces vue to use the updated version model and not the response returned by the api -->
 					<a @click="editTask(theTasks[k])" class="edit-toggle">
 						<icon icon="pen"/>
diff --git a/src/components/tasks/partials/kanban-card.vue b/src/components/tasks/partials/kanban-card.vue
index d21e571e7..e7e306949 100644
--- a/src/components/tasks/partials/kanban-card.vue
+++ b/src/components/tasks/partials/kanban-card.vue
@@ -41,7 +41,7 @@
 		</progress>
 		<div class="footer">
 			<labels :labels="task.labels"/>
-			<priority-label :priority="task.priority"/>
+			<priority-label :priority="task.priority" :done="task.done"/>
 			<div class="assignees" v-if="task.assignees.length > 0">
 				<user
 					:avatar-size="24"
diff --git a/src/components/tasks/partials/priorityLabel.vue b/src/components/tasks/partials/priorityLabel.vue
index 71c29a049..11e4d0175 100644
--- a/src/components/tasks/partials/priorityLabel.vue
+++ b/src/components/tasks/partials/priorityLabel.vue
@@ -2,7 +2,7 @@
 	<span
 		:class="{'not-so-high': priority === priorities.HIGH, 'high-priority': priority >= priorities.HIGH}"
 		class="priority-label"
-		v-if="showAll || priority >= priorities.HIGH">
+		v-if="!done && (showAll || priority >= priorities.HIGH)">
 		<span class="icon" v-if="priority >= priorities.HIGH">
 			<icon icon="exclamation"/>
 		</span>
@@ -39,6 +39,10 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		done: {
+			type: Boolean,
+			default: false,
+		},
 	},
 }
 </script>
diff --git a/src/components/tasks/partials/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue
index 40ac483ab..acc22a802 100644
--- a/src/components/tasks/partials/singleTaskInList.vue
+++ b/src/components/tasks/partials/singleTaskInList.vue
@@ -50,7 +50,7 @@
 			<transition name="fade">
 				<defer-task v-if="+new Date(task.dueDate) > 0 && showDefer" v-model="task" ref="deferDueDate"/>
 			</transition>
-			<priority-label :priority="task.priority"/>
+			<priority-label :priority="task.priority" :done="task.done"/>
 			<span>
 				<span class="list-task-icon" v-if="task.attachments.length > 0">
 					<icon icon="paperclip"/>
diff --git a/src/views/list/views/Table.vue b/src/views/list/views/Table.vue
index 181494168..04b407d8b 100644
--- a/src/views/list/views/Table.vue
+++ b/src/views/list/views/Table.vue
@@ -140,7 +140,7 @@
 							<router-link :to="{name: 'task.detail', params: { id: t.id }}">{{ t.title }}</router-link>
 						</td>
 						<td v-if="activeColumns.priority">
-							<priority-label :priority="t.priority" :show-all="true"/>
+							<priority-label :priority="t.priority" :done="t.done" :show-all="true"/>
 						</td>
 						<td v-if="activeColumns.labels">
 							<labels :labels="t.labels"/>