[napajanie modalov na BE]

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

@@ -71,9 +71,9 @@
 					</div>
 
 					<div class="event-footer d-flex">
-						<v-btn rounded class="event-footer-button me-2" :class="{'completed': event.completed}" @click.stop="clickCompleteTask(event)"><img :src="require('./_img/checkmark.svg')" alt=""></v-btn>
-						<v-btn rounded class="event-footer-button me-2" @click.stop="editTask(event.id, true)"><img :src="require('./_img/pencil.svg')" alt=""></v-btn>
-						<v-btn rounded class="event-footer-button me-2" @click.stop="showDeleteModal = {task: event}"><img :src="require('./_img/bin.svg')" alt=""></v-btn>
+						<v-btn rounded class="event-footer-button me-2" :class="{'completed': event.completed}" @click.stop="completeTask(event)"><img :src="require('./_img/checkmark.svg')" alt=""></v-btn>
+						<v-btn rounded class="event-footer-button me-2" @click.stop="editTask(event, true)"><img :src="require('./_img/pencil.svg')" alt=""></v-btn>
+						<v-btn rounded class="event-footer-button me-2" @click.stop="deleteTask(event)"><img :src="require('./_img/bin.svg')" alt=""></v-btn>
 					</div>
 				</div>
 
@@ -85,30 +85,11 @@
 				</div>
 			</template>
 		</Vue-cal>
-
-		<!-- Kravarik: Prerobit modaly na novy sposob -->
-		<Z-sub-task-modal ref="z-sub-task-modal" />
-		<Z-complete-task-modal v-if="showCompleteModal" :visible="showCompleteModal ? true : false" :task="showCompleteModal.task" @completeTask="completeTask" @close="showCompleteModal = null" />
-		<Z-delete-task-modal v-if="showDeleteModal" :visible="showDeleteModal ? true : false" :task="showDeleteModal.task" @deleteTask="deleteTask" @close="showDeleteModal = null" />
-		<Z-add-time-task-modal ref="z-add-time-task-modal" />
 	</div>
 </template>
 
 <script>
-import ZCompleteTaskModal 	from '@/plugins/tm@modal/task/z-complete-task-modal.vue'
-import ZDeleteTaskModal 	from '@/plugins/tm@modal/task/z-delete-task-modal.vue'
-import ZAddTimeTaskModal 	from '@/plugins/tm@modal/sub-task/z-add-time-task-modal.vue'
-import ZSubTaskModal 		from '@/plugins/tm@modal/sub-task/z-sub-task-modal.vue'
-
-
 export default {
-	components: {
-		ZCompleteTaskModal,
-		ZDeleteTaskModal,
-		ZAddTimeTaskModal,
-		ZSubTaskModal
-	},
-
 	props: {
 		calData: {
 			type: Object,
@@ -145,8 +126,6 @@ export default {
 				}
 			},
 			focusedEventId: null,
-			showCompleteModal: null,
-			showDeleteModal: null,
 			timeCellHeight: 100,
 		}
 	},
@@ -212,37 +191,24 @@ export default {
 		},
 
 		clickCompleteTask(event) {
-			if (event.completed) this.completeTask(event.id)
-			else this.showCompleteModal = {task: event}
+			if (event.completed) this.completeTask(event)
 		},
 
-		completeTask(id) {
-			this.$emit('completeTask', id)
+		completeTask(task) {
+			this.$events.emit('show-complete-task-modal', {task})
 		},
 
-		editTask(subTask, editMode) {
-			this.$refs['z-sub-task-modal'].create(subTask, editMode)
+		editTask(task, editMode) {
+			this.$events.emit('show-task-modal', {task, editMode})
 		},
 
-		addTimeModal() {
-			this.$refs['z-add-time-task-modal'].showModal()
+		addTimeModal(task) {
+			this.$events.emit('show-task-add-time-modal', {task})
 		},
 
-		deleteTask(id) {
-			this.$emit('deleteTask', id)
-		},
-
-		// completeTask(id) {
-		// 	this.$emit('completeTask', id)
-		// },
-
-		// editTask(id) {
-		// 	this.$emit('edit-task', id)
-		// },
-
-		// deleteTask(id) {
-		// 	this.$emit('deleteTask', id)
-		// },
+		deleteTask(task) {
+			this.$events.emit('show-delete-task-modal', {task})
+		}
 	}
 }
 </script>

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

@@ -1,18 +1,18 @@
 <template>
 	<div id="calendar" class="mb-12">
 		<V-full-calendar ref="fullCalendar" :options="calendarOptions" />
-		<Z-master-task-modal ref="z-master-task-modal" />
+		<!-- <Z-master-task-modal ref="z-master-task-modal" /> -->
 	</div>
 </template>
 <script>
 import VFullCalendar 	from '@fullcalendar/vue3'
 import dayGridPlugin 	from '@fullcalendar/daygrid'
-import ZMasterTaskModal from '@/plugins/tm@modal/master-task/z-master-task-modal.vue'
+// import ZMasterTaskModal from '@/plugins/tm@modal/master-task/z-master-task-modal.vue'
 
 export default {
 	components: {
 		VFullCalendar,
-		ZMasterTaskModal
+		// ZMasterTaskModal
 	},
 
 	props: {
@@ -54,8 +54,8 @@ export default {
 
 	methods: {
 		editTask(masterTask, editMode) {
-			this.$refs['z-master-task-modal'].create(masterTask, editMode)
-		}
+			this.$events.emit('show-master-task-modal', {masterTask, editMode})
+		},
 	},
 
 	watch: {

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

@@ -3,12 +3,7 @@
 		<A-task-filter :unscheduledTime="unscheduledTime" @dataChanged="getTimelineData" />
 
 		<W-loadable :content="timelineData" class="w-loadable" empty-message="Nepodarilo sa nacitat data!">
-			<Z-timeline :calData="timelineData" :calConfig="config" :splits="splitDays" 
-				@eventMoved="onEventMoved" @completeTask="completeTask" @deleteTask="deleteTask" />
-
-				<!-- <Z-complete-task-modal 	ref="z-complete-task-modal" />
-				<Z-delete-task-modal 	ref="z-delete-task-modal" />
-				<Z-sub-task-modal 		ref="z-sub-task-modal" /> -->
+			<Z-timeline :calData="timelineData" :calConfig="config" :splits="splitDays" />
 		</W-loadable>
 	</div>
 </template>
@@ -16,19 +11,12 @@
 <script>
 import ATaskFilter 			from './_components/a-tasks-filter.vue'
 import ZTimeline 			from '@/plugins/tm@dashboard/_components/z-timeline.vue'
-// import ZCompleteTaskModal 	from '@/plugins/tm@modal/task/z-complete-task-modal.vue'
-// import ZDeleteTaskModal 	from '@/plugins/tm@modal/task/z-delete-task-modal.vue'
-// import ZSubTaskModal 		from '@/plugins/tm@modal/sub-task/z-sub-task-modal.vue'
-
 import { addDays, setHours, setMinutes, setSeconds, differenceInCalendarDays } from 'date-fns'
 
 export default {
 	components: {
 		ATaskFilter,
-		ZTimeline,
-		// ZDeleteTaskModal,
-		// ZCompleteTaskModal,
-		// ZSubTaskModal
+		ZTimeline
 	},
 
 	data() {
@@ -157,19 +145,6 @@ export default {
 			}
 		},
 
-		completeTask(id) {
-			const task = this.timelineData.tasks.find(task => task.id == id)
-			task.completed = !task.completed
-		},
-
-		deleteTask(id) {
-			this.timelineData.tasks.splice(this.timelineData.tasks.findIndex(item => item.id === id), 1)
-		}
-
-		// editTask(subTask, editMode) {
-		// 	this.$refs['z-sub-task-modal'].create(subTask, editMode)
-		// },
-
 		// deleteTask(id) {
 		// 	const task = this.timelineData.find(task => task.id == id)
 		// 	this.$refs['z-delete-task-modal'].delete(task)

app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue

@@ -74,7 +74,7 @@ export default {
 		},
 
 		async _getTeams() {
-			this.teams =  await this.$axios.get_auth_data('v1/teamsx')
+			this.teams =  await this.$axios.get_auth_data('v1/teams')
 			this.selectedTeam = this.teams[0]
 		},