mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
[Refactoring]
This commit is contained in:
1 parent
26138f69b3
commit
ca1cbd723a
25 files changed
+215
-206
No files matched your search
@@ -11,16 +11,16 @@
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
<tr class="cursor-pointer" v-for="task in tasks" :key="task.id" @click.stop="editTask(task, false)">
|
||||
<td>{{ task.project_code }}</td>
|
||||
<td>{{ task.master_task?.name || task.master_task }}</td>
|
||||
<td>{{ task.duration }} h</td>
|
||||
<td>{{ task.duration - task.spent_time }} h</td>
|
||||
<tr class="cursor-pointer" v-for="subtask in subtasks" :key="subtask.id" @click.stop="editTask(subtask, false)">
|
||||
<td>{{ subtask.project_code }}</td>
|
||||
<td>{{ subtask.master_task?.name || subtask.master_task }}</td>
|
||||
<td>{{ subtask.duration }} h</td>
|
||||
<td>{{ subtask.duration - subtask.spent_time }} h</td>
|
||||
<td class="task-action">
|
||||
<div class="d-flex justify-start">
|
||||
<img class="pencil-icon mr-3" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="editTask(task, false)">
|
||||
<img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editTask(task, true)" />
|
||||
<img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="deleteTask(task)" />
|
||||
<img class="pencil-icon mr-3" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="editTask(subtask, false)">
|
||||
<img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editTask(subtask, true)" />
|
||||
<img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="deleteTask(subtask)" />
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -33,19 +33,19 @@
|
||||
<script>
|
||||
export default {
|
||||
props: {
|
||||
tasks: {
|
||||
subtasks: {
|
||||
type: Array,
|
||||
required: true
|
||||
}
|
||||
},
|
||||
|
||||
methods: {
|
||||
editTask(task, editMode = false) {
|
||||
this.$events.emit('show-task-modal', {task, editMode})
|
||||
editTask(subtask, editMode = false) {
|
||||
this.$events.emit('show-subtask-modal', {subtask, editMode})
|
||||
},
|
||||
|
||||
deleteTask(task) {
|
||||
this.$events.emit('show-delete-task-modal', {task})
|
||||
deleteTask(subtask) {
|
||||
this.$events.emit('show-delete-task-modal', {subtask})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<Z-tasks-search @search="onSearch" @employee-selected="onEmployeeSelected" />
|
||||
|
||||
<W-loadable :content="filteredOngoingTasks" :emptyMessage="searchQuery.length ? 'Neboli nájdené žiadne úlohy' : 'Nenašli sa žiadne záznamy'">
|
||||
<A-ongoing-table :tasks="filteredOngoingTasks" />
|
||||
<A-ongoing-table :subtasks="filteredOngoingTasks" />
|
||||
</W-loadable>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
<tr class="cursor-pointer" v-for="task in tasks" :key="task.id" @click.stop="editTask(task, false)">
|
||||
<tr class="cursor-pointer" v-for="subtask in subtasks" :key="subtask.id" @click.stop="editTask(subtask, false)">
|
||||
|
||||
<td>{{ task.project_code }}</td>
|
||||
<td>{{ task.master_task?.name || task.master_task }}</td>
|
||||
<td>{{ task.spent_time }} h</td>
|
||||
<td>{{ subtask.project_code }}</td>
|
||||
<td>{{ subtask.master_task?.name || subtask.master_task }}</td>
|
||||
<td>{{ subtask.spent_time }} h</td>
|
||||
<td class="task-action">
|
||||
<div class="d-flex justify-start">
|
||||
<img class="pencil-icon mr-3" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="editTask(task, false)">
|
||||
<img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editTask(task, true)">
|
||||
<img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="deleteTask(task)">
|
||||
<img class="pencil-icon mr-3" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="editTask(subtask, false)">
|
||||
<img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editTask(subtask, true)">
|
||||
<img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="deleteTask(subtask)">
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -30,19 +30,19 @@
|
||||
<script>
|
||||
export default {
|
||||
props: {
|
||||
tasks: {
|
||||
subtasks: {
|
||||
type: Array,
|
||||
required: true
|
||||
}
|
||||
},
|
||||
|
||||
methods: {
|
||||
editTask(task, editMode) {
|
||||
this.$events.emit('show-task-modal', {task, editMode})
|
||||
editTask(subtask, editMode) {
|
||||
this.$events.emit('show-subtask-modal', {subtask, editMode})
|
||||
},
|
||||
|
||||
deleteTask(task) {
|
||||
this.$events.emit('show-delete-task-modal', {task})
|
||||
deleteTask(subtask) {
|
||||
this.$events.emit('show-delete-task-modal', {subtask})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<Z-tasks-search @search="onSearch" @employee-selected="onEmployeeSelected" />
|
||||
|
||||
<W-loadable :content="filteredUnscheduledTasks" :emptyMessage="searchQuery.length ? 'Neboli nájdené žiadne úlohy' : 'Nenašli sa žiadne záznamy'">
|
||||
<A-unscheduled-table :tasks="filteredUnscheduledTasks" />
|
||||
<A-unscheduled-table :subtasks="filteredUnscheduledTasks" />
|
||||
</W-loadable>
|
||||
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user