diff --git a/src/components/lists/ShowList.vue b/src/components/lists/ShowList.vue index d34a7245..14968a35 100644 --- a/src/components/lists/ShowList.vue +++ b/src/components/lists/ShowList.vue @@ -41,7 +41,18 @@ {{l.text}} - - Due on {{new Date(l.dueDate).toLocaleString()}} + - Due on {{new Date(l.dueDate).toLocaleString()}} + + + + + + + + + + +
@@ -156,6 +167,22 @@
+
+ +
+
+ +
+
+
+
@@ -210,6 +237,7 @@ import TaskService from '../../services/task' import TaskModel from '../../models/task' import ListModel from '../../models/list' + import priorities from '../../models/priorities' export default { data() { @@ -218,6 +246,7 @@ listService: ListService, taskService: TaskService, + priorities: priorities, list: {}, newTask: TaskModel, isTaskEdit: false, diff --git a/src/components/lists/ShowTasks.vue b/src/components/lists/ShowTasks.vue index 6463e6d6..ea247a19 100644 --- a/src/components/lists/ShowTasks.vue +++ b/src/components/lists/ShowTasks.vue @@ -20,9 +20,20 @@
- {{l.text}} - - Due on {{formatUnixDate(l.dueDate)}} + {{l.text}} + - Due on {{formatUnixDate(l.dueDate)}} + + + + + + + + + + +
@@ -33,6 +44,7 @@ import {HTTP} from '../../http-common' import message from '../../message' import TaskService from '../../services/task' + import priorities from '../../models/priorities' export default { name: "ShowTasks", @@ -42,6 +54,7 @@ tasks: [], hasUndoneTasks: false, taskService: TaskService, + priorities: priorities, } }, props: { diff --git a/src/main.js b/src/main.js index dc0c5d1c..9067f11b 100644 --- a/src/main.js +++ b/src/main.js @@ -40,6 +40,7 @@ import { faCalendar } from '@fortawesome/free-solid-svg-icons' import { faBars } from '@fortawesome/free-solid-svg-icons' import { faPowerOff } from '@fortawesome/free-solid-svg-icons' import { faCalendarWeek } from '@fortawesome/free-solid-svg-icons' +import { faExclamation } from '@fortawesome/free-solid-svg-icons' import { faTimesCircle } from '@fortawesome/free-regular-svg-icons' import { faCalendarAlt } from '@fortawesome/free-regular-svg-icons' import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome' @@ -64,6 +65,7 @@ library.add(faBars) library.add(faPowerOff) library.add(faCalendarWeek) library.add(faCalendarAlt) +library.add(faExclamation) Vue.component('icon', FontAwesomeIcon) diff --git a/src/models/priorities.json b/src/models/priorities.json new file mode 100644 index 00000000..8a781e2e --- /dev/null +++ b/src/models/priorities.json @@ -0,0 +1,8 @@ +{ + "UNSET": 0, + "LOW": 1, + "MEDIUM": 2, + "HIGH": 3, + "URGENT": 4, + "DO_NOW": 5 +} \ No newline at end of file diff --git a/src/styles/tasks.scss b/src/styles/tasks.scss index 077f44da..09e5e521 100644 --- a/src/styles/tasks.scss +++ b/src/styles/tasks.scss @@ -54,6 +54,18 @@ color: $red; } } + + .high-priority{ + color: $red; + + .icon { + vertical-align: middle; + } + + &.not-so-high { + color: $orange; + } + } } input[type="checkbox"] { @@ -102,4 +114,10 @@ } } } + + .priority-select{ + .select, select{ + width: 100%; + } + } } \ No newline at end of file diff --git a/todo.md b/todo.md index 4be6ca71..04caaac8 100644 --- a/todo.md +++ b/todo.md @@ -89,8 +89,8 @@ * [ ] Users with access to a namespace * [ ] Teams with access to a list * [ ] Teams with access to a namespace -* [ ] Priorities - * [ ] Sachen mit hoher Prio irgendwie hervorheben (rotes Dreieck zb) +* [x] Priorities + * [x] Highlight tasks with high priority * [ ] Assignees * [ ] Labels * [ ] Timeline/Calendar view -> Dazu tasks die in einem Bestimmten Bereich due sind, macht dann das Frontend