diff --git a/app/src/plugins/lib@search/search/_components/a-seach-result-task.vue b/app/src/plugins/lib@search/search/_components/a-search-result-task.vue similarity index 94% rename from app/src/plugins/lib@search/search/_components/a-seach-result-task.vue rename to app/src/plugins/lib@search/search/_components/a-search-result-task.vue index be23a4d..8b38681 100644 --- a/app/src/plugins/lib@search/search/_components/a-seach-result-task.vue +++ b/app/src/plugins/lib@search/search/_components/a-search-result-task.vue @@ -5,13 +5,13 @@ {{ subtask.project_code }} - {{ subtask.title }} - + {{ subtask.master_task }} +
checkmark-icon diff --git a/app/src/plugins/lib@search/search/search.vue b/app/src/plugins/lib@search/search/search.vue index 057a62b..5886941 100644 --- a/app/src/plugins/lib@search/search/search.vue +++ b/app/src/plugins/lib@search/search/search.vue @@ -8,7 +8,7 @@ \ No newline at end of file diff --git a/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue b/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue index b53e487..a4ac7cb 100644 --- a/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue +++ b/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue @@ -10,7 +10,7 @@ - - + + v-model="blocker.employee_id" + /> + @@ -40,7 +42,7 @@ import errorUtils from "@/plugins/lib@auth/_utils/error.utils" import VuetifyFixFocusMixin from "@/plugins/tm@modal/_mixins/vuetify-fix-focus" import { mapGetters } from "vuex" import moment from "moment" -import ZAutocomplete from '@/plugins/tm@_components/z-autocomplete.vue' +// import ZAutocomplete from '@/plugins/tm@_components/z-autocomplete.vue' export default { mixins: [VuetifyFixFocusMixin], @@ -49,7 +51,7 @@ export default { components: { Datepicker, - ZAutocomplete + // ZAutocomplete }, data() { @@ -76,7 +78,7 @@ export default { name: { required }, start: { required }, end: { required }, - employee: { required } + // employee: { required } }, starts_at_time: { required }, @@ -102,7 +104,8 @@ export default { this.starts_at_time = moment(blocker.start).format("HH:mm") this.ends_at_time = moment(blocker.end).format("HH:mm") this.datepicker = new Date(blocker.start) - + blocker.employee_id = blocker.employee.id + //fixnut validacie employee_id this.blocker = blocker } else { this.blocker = { start: null } @@ -116,7 +119,7 @@ export default { if (!(await this.v$.$validate())) return try { - this.blocker.employee_id = this.blocker.employee?.id + // this.blocker.employee_id = this.blocker.employee?.id if (this.blocker.id) { const { blocker } = await this.$axios.put_auth(`v1/blockers/${this.blocker.id}`, this.blocker)