Merge branch 'task001/add-labels' of bitbucket.org:studiotem/jandl-taskmanager-app

app/src/plugins/tm@dashboard/_components/a-timeline-event.vue

@@ -86,11 +86,11 @@
           deadline
         }}</small>
         <v-tooltip v-else text="Deadline z Mastertasku" location="bottom">
-          <template #activator="{ props }">
+          <template #activator="{ props: activatorProps }">
             <small
               v-if="!props.event?.subtask?.deadline"
               class="cursor-pointer ml-1"
-              v-bind="props"
+              v-bind="activatorProps"
               >{{ deadline }}*</small
             >
           </template>

app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue

@@ -58,16 +58,7 @@ export default {
 		}
 	},
 
-	mounted() {
-		const monthIndex = new Date().getMonth()
-		this.filter.month = monthIndex < 9 ? `0${monthIndex + 1}` : `${monthIndex + 1}`
-		const savedTeamMT = localStorage.getItem('savedTeamMT')
-		const savedCreatedBy = localStorage.getItem('savedCreatedBy')
-		const savedEmployee = localStorage.getItem('savedEmployee')
-		if(savedTeamMT) this.filter.teamId = JSON.parse(savedTeamMT)
-		if(savedCreatedBy) this.filter.createdById = JSON.parse(savedCreatedBy)
-		if(savedEmployee) this.filter.employeeId = JSON.parse(savedEmployee)
-	},
+	
 
 	computed: {
 		...mapGetters('tm', [
@@ -113,7 +104,18 @@ export default {
 			},
 			deep: true
 		}
-	}
+	},
+
+	mounted() {
+		const monthIndex = new Date().getMonth()
+		this.filter.month = monthIndex < 9 ? `0${monthIndex + 1}` : `${monthIndex + 1}`
+		const savedTeamMT = localStorage.getItem('savedTeamMT')
+		const savedCreatedBy = localStorage.getItem('savedCreatedBy')
+		const savedEmployee = localStorage.getItem('savedEmployee')
+		if(savedTeamMT) this.filter.teamId = JSON.parse(savedTeamMT)
+		if(savedCreatedBy) this.filter.createdById = JSON.parse(savedCreatedBy)
+		if(savedEmployee) this.filter.employeeId = JSON.parse(savedEmployee)
+	},
 }
 </script>
 

app/src/plugins/tm@dashboard/projects/projects.vue

@@ -2,7 +2,7 @@
   <div ref="page">
     <A-project-filter
       v-if="$store.getters['tm/isInitialized']"
-      @filterChanged="onFilterChanged"
+      @filter-changed="onFilterChanged"
     />
 
     <W-loadable

app/src/plugins/tm@dashboard/tasks-concepts/tasks-concepts.vue

@@ -38,26 +38,9 @@ export default {
     };
   },
 
-  async ionViewWillEnter() {
-    await this.loadConceptTasks();
-  },
+  
 
-  async mounted() {
-    await this.loadConceptTasks();
-
-    this.$events.on('on-subtask-edited', async () => {
-      await this.loadConceptTasks();
-    });
-
-    this.$events.on('on-subtask-deleted', async () => {
-      await this.loadConceptTasks();
-    });
-  },
-
-  unmounted() {
-    this.$events.off('on-subtask-edited');
-    this.$events.off('on-subtask-deleted');
-  },
+ 
 
   computed: {
     ...mapGetters('tm', ['mastertasks']),
@@ -116,6 +99,27 @@ export default {
     },
   },
 
+  async ionViewWillEnter() {
+    await this.loadConceptTasks();
+  },
+
+  async mounted() {
+    await this.loadConceptTasks();
+
+    this.$events.on('on-subtask-edited', async () => {
+      await this.loadConceptTasks();
+    });
+
+    this.$events.on('on-subtask-deleted', async () => {
+      await this.loadConceptTasks();
+    });
+  },
+
+   unmounted() {
+    this.$events.off('on-subtask-edited');
+    this.$events.off('on-subtask-deleted');
+  },
+
   methods: {
     async loadConceptTasks(employeeId = null) {
       try {

app/src/plugins/tm@dashboard/tasks/_utils/timeline.utils.ts

@@ -1,4 +1,4 @@
-import { setHours, setMinutes, addDays, differenceInCalendarDays } from 'date-fns'
+import { addDays, differenceInCalendarDays } from 'date-fns'
 import moment from 'moment'
 
 export default {