diff --git a/app/src/plugins/app/_config/main.ts b/app/src/plugins/app/_config/main.ts index 4f8acb4..3470fd8 100644 --- a/app/src/plugins/app/_config/main.ts +++ b/app/src/plugins/app/_config/main.ts @@ -63,14 +63,14 @@ const options: Options = { 'POST v1/tasks/(id)': true, 'DELETE v1/tasks/(id)': true, - 'GET v1/teams/(id)': true, + 'GET v1/teams/(id)': false, 'POST v1/teams/(id)': true, 'DELETE v1/teams/(id)': true, // 'GET v1/teams': true, 'GET v1/teamsx': true, 'POST v1/teams': true, - 'GET v1/employees': true, + 'GET v1/employees': false, 'GET v1/search': true, 'POST v1/tasks': true, diff --git a/app/src/plugins/tm@dashboard/projects/projects.vue b/app/src/plugins/tm@dashboard/projects/projects.vue index b1f2a80..5cdef71 100644 --- a/app/src/plugins/tm@dashboard/projects/projects.vue +++ b/app/src/plugins/tm@dashboard/projects/projects.vue @@ -32,27 +32,30 @@ export default { filteredEvents: [] } }, - async created() { - try { - const events = await this.$axios.get_auth_data('v1/overview/projects') - this.events = events.map((item) => ({ - id: item.id, - title: `${item.project_code} - ${item.name}`, - title_html: `${item.project_code} - ${item.name}`, - start: item.starts_at, - end: item.deadline, - is_finished: item.is_finished, - project_code: item.project_code, - backgroundColor: item.color, - borderColor: item.color - })) - this.filteredEvents = this.events.filter((item) => !item.is_finished) - } catch (error) { - this.$toast.error(error) - } + created() { + this._getData() }, methods: { - // Kravarik: TODO prepojit filtrovanie na BE + async _getData() { + try { + const events = await this.$axios.get_auth_data('v1/overview/projects') + this.events = events.map((item) => ({ + id: item.id, + title: `${item.project_code} - ${item.name}`, + title_html: `${item.project_code} - ${item.name}`, + start: item.starts_at, + end: item.deadline, + is_finished: item.is_finished, + project_code: item.project_code, + backgroundColor: item.color, + borderColor: item.color + })) + this.filteredEvents = this.events.filter((item) => !item.is_finished) + } catch (error) { + this.$toast.error(error) + } + }, + onFilterChanged(filterValues) { this.filter = filterValues this.filteredEvents = this.events.filter((item) => this.filter.showFinishedTasks || item.is_finished == false) diff --git a/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue b/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue index 9da6e5c..07a0e32 100644 --- a/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue +++ b/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue @@ -4,7 +4,7 @@ v-model="selectedEmployee" class="subheader-input" :items="employees" - item-title="name" + item-title="fullName" item-value="id" label="Zamestnanec" variant="outlined" @@ -31,6 +31,7 @@