local-it/vikunja-frontend
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

feat: hide priority label for done tasks (#825)

Browse source 
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>
This commit is contained in:
konrad 2021-10-05 05:43:10 +00:00
parent 49fcce043d
commit 7e1a7f3f19
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/tasks/gantt-component.vue
View file

@ -103,7 +103,7 @@
> >
{{ t.title }} {{ t.title }}
</span> </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 --> <!-- 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"> <a @click="editTask(theTasks[k])" class="edit-toggle">
<icon icon="pen"/> <icon icon="pen"/>

2
src/components/tasks/partials/kanban-card.vue
View file

@ -41,7 +41,7 @@
</progress> </progress>
<div class="footer"> <div class="footer">
<labels :labels="task.labels"/> <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"> <div class="assignees" v-if="task.assignees.length > 0">
<user <user
:avatar-size="24" :avatar-size="24"

6
src/components/tasks/partials/priorityLabel.vue
View file

@ -2,7 +2,7 @@
<span <span
:class="{'not-so-high': priority === priorities.HIGH, 'high-priority': priority >= priorities.HIGH}" :class="{'not-so-high': priority === priorities.HIGH, 'high-priority': priority >= priorities.HIGH}"
class="priority-label" class="priority-label"
v-if="showAll || priority >= priorities.HIGH"> v-if="!done && (showAll || priority >= priorities.HIGH)">
<span class="icon" v-if="priority >= priorities.HIGH"> <span class="icon" v-if="priority >= priorities.HIGH">
<icon icon="exclamation"/> <icon icon="exclamation"/>
</span> </span>
@ -39,6 +39,10 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
done: {
type: Boolean,
default: false,
},
}, },
} }
</script> </script>

2
src/components/tasks/partials/singleTaskInList.vue
View file

@ -50,7 +50,7 @@
<transition name="fade"> <transition name="fade">
<defer-task v-if="+new Date(task.dueDate) > 0 && showDefer" v-model="task" ref="deferDueDate"/> <defer-task v-if="+new Date(task.dueDate) > 0 && showDefer" v-model="task" ref="deferDueDate"/>
</transition> </transition>
<priority-label :priority="task.priority"/> <priority-label :priority="task.priority" :done="task.done"/>
<span> <span>
<span class="list-task-icon" v-if="task.attachments.length > 0"> <span class="list-task-icon" v-if="task.attachments.length > 0">
<icon icon="paperclip"/> <icon icon="paperclip"/>

2
src/views/list/views/Table.vue
View file

@ -140,7 +140,7 @@
<router-link :to="{name: 'task.detail', params: { id: t.id }}">{{ t.title }}</router-link> <router-link :to="{name: 'task.detail', params: { id: t.id }}">{{ t.title }}</router-link>
</td> </td>
<td v-if="activeColumns.priority"> <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>
<td v-if="activeColumns.labels"> <td v-if="activeColumns.labels">
<labels :labels="t.labels"/> <labels :labels="t.labels"/>