[subTask] v-select employee, [refactor], [masterTaskDetail] formattedDates

app/src/plugins/tm@overview/_components/z-tasks-search.vue

@@ -4,8 +4,10 @@
 			v-model="selectedEmployee"
 			class="subheader-input"
 			variant="outlined"
-			:items="allEmployees"
 			label="Zamestanec"
+			:items="allEmployees"
+			item-title="fullName"
+			item-value="id"
 		></v-select>
 		<v-text-field
 			v-model="searchQuery"
@@ -23,7 +25,7 @@
 export default {
 	data() {
 		return {
-			selectedEmployee: '',
+			selectedEmployee: null,
 			employees: [],
 			searchQuery: ''
 		}
@@ -42,6 +44,9 @@ export default {
 	async created() {
 		try {
 			this.employees 	= await this.$axios.get_auth_data('v1/employees')
+			this.employees.filter((employee) => {
+				employee.fullName = `${employee.name} ${employee.surname}`
+			})
 		} catch (error) {
 			this.$toast.error(error)
 		}
@@ -51,7 +56,13 @@ export default {
 		onInput() {
 			this.$emit('queryChange', this.searchQuery)
 		}
-	}
+	},
+
+	// watch: {
+	// 	selectedEmployee() {
+	// 		this.search()
+	// 	}
+	// }
 }
 </script>
 

app/src/plugins/tm@overview/teams/_components/a-teams-table.vue

@@ -14,7 +14,7 @@
 					<td class="task-action">
 						<div class="d-flex justify-start">
 							<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" @click.stop="editTeam(team)" />
-							<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="deleteModal = { team }" />
+							<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="deleteTeam(team)" />
 						</div>
 					</td>
 				</tr>
@@ -22,8 +22,7 @@
 		</v-table>
 
 		<Z-team-modal ref="z-team-modal" />
-		<!-- Kravarik: Aj tento modal prerob novym sposobom -->
-		<Z-delete-team-modal 	v-if="deleteModal" 	:visible="deleteModal ? true : false" 	:team="deleteModal.team" 	@close="(deleteModal = null)" />
+		<Z-delete-team-modal ref="z-delete-team-modal" @deleted="onTeamDeleted"  />
 	</div>
 </template>
 
@@ -32,6 +31,8 @@ import ZDeleteTeamModal from '@/plugins/tm@modal/team/z-delete-team-modal.vue'
 import ZTeamModal		from '@/plugins/tm@modal/team/z-team-modal.vue'
 
 export default {
+	emits: ['refresh'],
+
 	components: {
 		ZDeleteTeamModal,
 		ZTeamModal
@@ -52,7 +53,15 @@ export default {
 
 	methods: {
 		editTeam(team) {
-			this.$refs['z-team-modal'].create(team)
+			this.$refs['z-team-modal'].create(team.id)
+		},
+
+		deleteTeam(team) {
+			this.$refs['z-delete-team-modal'].delete(team)
+		},
+
+		onTeamDeleted() {
+			this.$emit('refresh')
 		}
 	}
 }

app/src/plugins/tm@overview/teams/teams.vue

@@ -1,6 +1,6 @@
 <template>
 	<W-loadable :content="teams">
-		<A-teams-table :teams="teams" />
+		<A-teams-table :teams="teams" @refresh="loadData" />
 	</W-loadable>
 </template>
 
@@ -19,10 +19,18 @@ export default {
 	},
 
 	async created() {
-		try {
-			this.teams = await this.$axios.get_auth_data('v1/teams')
-		} catch (error) {
-			this.teams = {error}
+		await this.loadData()
+	},
+
+	methods: {
+		async loadData() {
+			this.teams = null
+			
+			try {
+				this.teams = await this.$axios.get_auth_data('v1/teamsx')
+			} catch (error) {
+				this.teams = {error}
+			}
 		}
 	}
 }