[quill editor, detail modals, ongoing & unscheduled modals, review, download files]

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="clickCompleteTask(event)"><img :src="require('./_img/checkmark.svg')" alt=""></v-btn>
+						<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="this.showDeleteModal = {task: event}"><img :src="require('./_img/bin.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>
 					</div>
 				</div>
 
@@ -86,9 +86,8 @@
 			</template>
 		</Vue-cal>
 
-		<Z-sub-task-modal ref="z-sub-task-modal" />
-
 		<!-- 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" />
@@ -98,16 +97,16 @@
 <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'
-import ZAddTimeTaskModal from '@/plugins/tm@modal/sub-task/z-add-time-task-modal.vue'
 
 
 export default {
 	components: {
 		ZCompleteTaskModal,
 		ZDeleteTaskModal,
-		ZSubTaskModal,
-		ZAddTimeTaskModal
+		ZAddTimeTaskModal,
+		ZSubTaskModal
 	},
 
 	props: {
@@ -231,7 +230,19 @@ export default {
 
 		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)
+		// },
 	}
 }
 </script>

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

@@ -1,7 +1,9 @@
 <template>
 	<div>
-		<A-project-filter :projects="projects" @filterChanged="onFilterChanged" />
-		<A-project-calendar :events="filteredEvents" :month="filterSettings.selectedMonth" />
+		<W-loadable :content="events" empty-message="Nepodarilo sa nacitat data!">
+			<A-project-filter :projects="projects" @filterChanged="onFilterChanged" />
+			<A-project-calendar :events="filteredEvents" :month="filterSettings.selectedMonth" />
+		</W-loadable>
 	</div>
 </template>
 

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

@@ -3,14 +3,22 @@
 		<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-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" /> -->
 		</W-loadable>
 	</div>
 </template>
 
 <script>
-import ATaskFilter from './_components/a-tasks-filter.vue'
-import ZTimeline from '@/plugins/tm@dashboard/_components/z-timeline.vue'
+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'
 
@@ -18,6 +26,9 @@ export default {
 	components: {
 		ATaskFilter,
 		ZTimeline,
+		// ZDeleteTaskModal,
+		// ZCompleteTaskModal,
+		// ZSubTaskModal
 	},
 
 	data() {
@@ -154,6 +165,18 @@ export default {
 		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)
+
+		// 	// TODO: Remove after BE integration
+		// 	this.timelineData.tasks.splice(this.timelineData.tasks.findIndex(item => item.id === id), 1)
+		// }
 	}
 }
 </script>