From 72d709cd13c3d044a49e0d23079320b9b2028440 Mon Sep 17 00:00:00 2001 From: romankko2 Date: Wed, 8 Feb 2023 18:41:07 +0100 Subject: [PATCH 1/8] [subtask, masterTask] delete requests --- app/src/plugins/app/_config/main.ts | 8 ++-- .../master-task/z-master-task-modal.vue | 45 ++++++++++++------- .../tm@modal/task/z-delete-task-modal.vue | 4 +- .../plugins/tm@modal/task/z-task-modal.vue | 16 +++---- 4 files changed, 44 insertions(+), 29 deletions(-) diff --git a/app/src/plugins/app/_config/main.ts b/app/src/plugins/app/_config/main.ts index 07945f5..dc4d824 100644 --- a/app/src/plugins/app/_config/main.ts +++ b/app/src/plugins/app/_config/main.ts @@ -54,17 +54,17 @@ const options: Options = { // 'GET v1/master-tasks/(id)': true, // 'GET v1/master-tasks': true, 'POST v1/master-tasks/(id)': true, - 'DELETE v1/master-tasks/(id)': true, - 'POST v1/master-tasks': true, + // 'DELETE v1/master-tasks/(id)': true, + // 'POST v1/master-tasks': true, - 'GET v1/overview/projects': true, + // 'GET v1/overview/projects': true, 'GET v1/overview/tasks': true, 'GET v1/overview/teams': true, 'GET v1/overview/ongoing-tasks': true, 'GET v1/overview/unscheduled-tasks': true, 'GET v1/tasks/(id)': true, - 'POST v1/tasks/(id)': true, + // 'POST v1/tasks/(id)': true, 'DELETE v1/tasks/(id)': true, // 'GET v1/teams/(id)': true, diff --git a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue index 4c659b3..be661e1 100644 --- a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue +++ b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue @@ -12,19 +12,22 @@ - + > checkmark-icon pencil-icon - trash-icon + trash-icon @@ -336,6 +339,7 @@ export default { errorUtils, v$: useVuelidate(), teams: null, + projects: null, employees: null, employeeSelect: null, teamSelect: '', @@ -348,9 +352,11 @@ export default { validations() { return { masterTask: { - project_code: { required }, + project_id: { required }, name: { required }, team: { required }, + // duration: { required }, + // description: { required }, deadline: { required }, employees: { atLeastOne } }, @@ -364,10 +370,6 @@ export default { }, methods: { - itemSelected(x) { - console.log(x) - }, - getFullNameByEmployeeId(employee_id) { let fullName = '' let initials = '' @@ -394,6 +396,7 @@ export default { try { this.teams = await this.$axios.get_auth_data('v1/teams') const employees = await this.$axios.get_auth_data('v1/employees') + this.projects = await this.$axios.get_auth_data('v1/projects') this.employees = tmUtils.enrichEmployeesByFullName(employees) if (masterTask?.id) { @@ -414,15 +417,23 @@ export default { return try { + this.masterTask.duration = 5 + this.masterTask.description = 'popis' + this.masterTask.employees = this.masterTask.employees.map(employee => { + employee.duration = 5 + return employee + }) + this.masterTask.deadline = moment(this.masterTask.deadline).format("YYYY-MM-DD HH:MM:SS") + if (this.masterTask.id) await this.$axios.put_auth(`v1/mastertasks/${this.masterTask.id}`, this.masterTask) else - await this.$axios.post_auth('v1/mastertasks', this.masterTask) + await this.$axios.post_auth_data('v1/mastertasks', this.masterTask) this.closeModal() } catch (error) { - this.$toast(error) + this.$toast.error(error) } }, @@ -435,6 +446,10 @@ export default { this.$events.emit('show-delete-master-task-modal', { masterTask }) }, + openDeleteTaskModal(task) { + this.$events.emit('show-delete-task-modal', { task }) + }, + employeeSelected(selectedOption) { const employee = this.employees.find((empl) => empl.id == selectedOption.key) this.masterTask.employees.push(employee) diff --git a/app/src/plugins/tm@modal/task/z-delete-task-modal.vue b/app/src/plugins/tm@modal/task/z-delete-task-modal.vue index 5ca82b4..dff68a2 100644 --- a/app/src/plugins/tm@modal/task/z-delete-task-modal.vue +++ b/app/src/plugins/tm@modal/task/z-delete-task-modal.vue @@ -2,7 +2,7 @@
-

Ste si istý, že chcete zmazať {{ task.title }}?

+

Ste si istý, že chcete zmazať task z masterTasku {{ task.project_code }}?

masterTask.id == value) + const selectedMasterTask = this.masterTasks.find(masterTask => masterTask.id === value) + if (selectedMasterTask) { + this.task.project_code = selectedMasterTask.project_code + } }, employeeIdSelect(value) { From 05e038df7251b8846ae918a3e9432a71cfeaaaa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= Date: Thu, 9 Feb 2023 00:49:35 +0100 Subject: [PATCH 2/8] . --- app/src/plugins/lib@auth/login/_components/a-login-form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/plugins/lib@auth/login/_components/a-login-form.vue b/app/src/plugins/lib@auth/login/_components/a-login-form.vue index 45e1942..e1f5c5f 100644 --- a/app/src/plugins/lib@auth/login/_components/a-login-form.vue +++ b/app/src/plugins/lib@auth/login/_components/a-login-form.vue @@ -6,7 +6,7 @@ :class="{ error: v$.form.password.$errors.length }" :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'" @click:append="showPassword = !showPassword" />
- Log In + Log In

Forgotten password ?

From 6e8f57d06dc5cc0b97109bf0aae6b9933d5c5b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= Date: Thu, 9 Feb 2023 03:43:32 +0100 Subject: [PATCH 3/8] [Master task, sub task] API --- app/package-lock.json | 14 +-- app/package.json | 2 +- app/src/plugins/app/_config/App.vue | 13 ++- app/src/plugins/app/_theme/global.sass | 6 +- .../plugins/lib@auth/_theme/auth.theme.sass | 22 ++-- .../_components/a-project-calendar.vue | 3 +- .../tm@dashboard/projects/projects.vue | 10 ++ .../master-task/z-master-task-modal.vue | 103 +++++++++++++----- .../plugins/tm@modal/task/z-task-modal.vue | 52 +++++---- app/src/plugins/w/toast/utils/toast.utils.ts | 33 ++++-- .../plugins/w@custom/axios/models/axios.ts | 41 +++---- 11 files changed, 188 insertions(+), 111 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index 0db4b55..7913c87 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -18,7 +18,7 @@ "@vuelidate/core": "^2.0.0", "@vuelidate/validators": "^2.0.0", "@vuepic/vue-datepicker": "^3.6.0", - "@vueup/vue-quill": "^1.0.1", + "@vueup/vue-quill": "^1.0.0-beta.11", "axios": "^1.1.3", "axios-auth-refresh": "^3.3.4", "core-js": "^3.8.3", @@ -3481,9 +3481,9 @@ } }, "node_modules/@vueup/vue-quill": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@vueup/vue-quill/-/vue-quill-1.0.1.tgz", - "integrity": "sha512-/VJHwUxH2BAms7gwIlNhHb0KfCqn/58onOK1H0ZZX9juEha4nrb32yZbv2xLsqLxf+JKsNbJgQ8Ne6VF8ACNGw==", + "version": "1.0.0-beta.11", + "resolved": "https://registry.npmjs.org/@vueup/vue-quill/-/vue-quill-1.0.0-beta.11.tgz", + "integrity": "sha512-TeCgXPyVbN5muBPKm3EZjmIg/s8R8O0YmTp0RRG4J48skJVe035scLjeWZTDVrt/TEagmzcRUcB+9nPIyvF9fQ==", "dependencies": { "quill": "^1.3.7", "quill-delta": "^4.2.2" @@ -16417,9 +16417,9 @@ } }, "@vueup/vue-quill": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@vueup/vue-quill/-/vue-quill-1.0.1.tgz", - "integrity": "sha512-/VJHwUxH2BAms7gwIlNhHb0KfCqn/58onOK1H0ZZX9juEha4nrb32yZbv2xLsqLxf+JKsNbJgQ8Ne6VF8ACNGw==", + "version": "1.0.0-beta.11", + "resolved": "https://registry.npmjs.org/@vueup/vue-quill/-/vue-quill-1.0.0-beta.11.tgz", + "integrity": "sha512-TeCgXPyVbN5muBPKm3EZjmIg/s8R8O0YmTp0RRG4J48skJVe035scLjeWZTDVrt/TEagmzcRUcB+9nPIyvF9fQ==", "requires": { "quill": "^1.3.7", "quill-delta": "^4.2.2" diff --git a/app/package.json b/app/package.json index 33f8fb8..ccc7ce2 100644 --- a/app/package.json +++ b/app/package.json @@ -18,7 +18,7 @@ "@vuelidate/core": "^2.0.0", "@vuelidate/validators": "^2.0.0", "@vuepic/vue-datepicker": "^3.6.0", - "@vueup/vue-quill": "^1.0.1", + "@vueup/vue-quill": "^1.0.0-beta.11", "axios": "^1.1.3", "axios-auth-refresh": "^3.3.4", "core-js": "^3.8.3", diff --git a/app/src/plugins/app/_config/App.vue b/app/src/plugins/app/_config/App.vue index 6de527d..8135608 100644 --- a/app/src/plugins/app/_config/App.vue +++ b/app/src/plugins/app/_config/App.vue @@ -10,12 +10,12 @@ - + - + diff --git a/app/src/plugins/tm@dashboard/projects/projects.vue b/app/src/plugins/tm@dashboard/projects/projects.vue index 331cce5..b5547cc 100644 --- a/app/src/plugins/tm@dashboard/projects/projects.vue +++ b/app/src/plugins/tm@dashboard/projects/projects.vue @@ -84,6 +84,7 @@ export default { }) this.$events.on('on-master-task-edited', (masterTask) => { + this.masterTasks = this.masterTasks.map(mTask => mTask.id == masterTask.id ? masterTask : mTask) this._getData() }) }, @@ -92,7 +93,7 @@ export default { async _getData() { try { this.teams = await this.$axios.get_auth_data('v1/teams') - this.projects = await this.$axios.get_auth_data('v1/projects') + this.projects = await this.$axios.get_auth_data('v1/projects') this.employees = await this.$axios.get_auth_data('v1/employees') this.masterTasks = await this.$axios.get_auth_data('v1/mastertasks') } catch (error) { 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 68b9f88..734335a 100644 --- a/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue +++ b/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue @@ -46,6 +46,7 @@ >
+ + + +
+ +

Status

+
+ + + + +

Ukončený

+

Neukončený

+ + + + + + +
+ +

Deadline

+
+ + + + +

{{ tmUtils.formatDateTime(masterTask.deadline) }}

+ + + + + + +
+ +

Tím

+
+ + + + +

{{ masterTask.team?.name }}

+
+

+ {{ employee.name.charAt(0) + employee.surname.charAt(0) }} +

+

+

+ + + + + + +
+ +

Naplánovaný čas

+
+ + + + +

{{ masterTask?.duration?.toFixed(2) }} h

+ + + + + + +
+ +

Odpracovaný čas

+
+ + + + +

{{ masterTask.time_worked?.toFixed(2) }} h

+ + + + + + +
+ +

Zostávajúci čas

+
+ + + + +

{{ (masterTask.duration - masterTask.time_worked)?.toFixed(2) }} h

+ + + +
+

Popis zadania

+
+

Prílohy

+
+
+ +

{{ file.name }}

+ + +
+
+
+ + + + \ No newline at end of file diff --git a/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue b/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue new file mode 100644 index 0000000..827ca12 --- /dev/null +++ b/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue @@ -0,0 +1,71 @@ + + + + + \ No newline at end of file diff --git a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts new file mode 100644 index 0000000..d6d003e --- /dev/null +++ b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts @@ -0,0 +1,58 @@ +export default { + computed: { + employeesOptions() { + const selectedEmployees = [...this.masterTask.employees, ...this.masterTask.team?.employees] + .map(employee => employee.id) + + const employees = this.employees.filter( + (employee) => !selectedEmployees.includes(employee.id) + ) || [] + + return employees.map((employee) => { + return { + key: employee.id, + value: `${employee.name} ${employee.surname}`, + } + }) + } + }, + + methods: { + onProjectSelected({ key }) { + const project = this.projects.find(project => project.id == key) + this.masterTask.project_code = project.code + this.masterTask.project_id = project.id + }, + + onEmployeeSelected({ key }) { + const employee = this.employees.find(employee => employee.id == key) + this.masterTask.employees.push(employee) + this.showAddEmployeeInput = false + }, + + onEmployeeDurationChanged() { + let totalDuration = 0 + + this.masterTask.employees = this.masterTask.employees.map(employee => { + if (typeof employee.duration == 'string') { + totalDuration += parseInt(employee.duration) + employee.duration = parseInt(employee.duration) + } + else if (typeof employee.duration == 'number') { + totalDuration += employee.duration + } + + return employee + }) + + this.masterTask.duration = totalDuration + } + }, + + watch: { + 'masterTask.team_id'(value) { + if (!value) return + this.masterTask.team = this.teams.find(team => team.id == value) + } + } +} \ No newline at end of file diff --git a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue index fcf79e2..2046ea1 100644 --- a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue +++ b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue @@ -4,138 +4,50 @@

{{ masterTask?.id ? 'Upraviť master task' : 'Vytvoriť master task' }}

- +
- + - + - + - + - + - +

{{ employee.name.charAt(0) + employee.surname.charAt(0) }}

- + +

+ {{ employee.name.charAt(0) + employee.surname.charAt(0) }} +

+ - - Pridať zamestnanca - + -
- + Pridať zamestnanca + +
+
- + - {{ masterTask.id ? 'ULOŽIŤ' : 'VYTVORIŤ'}} + {{ masterTask.id ? 'ULOŽIŤ' : 'VYTVORIŤ' }}

{{ masterTask.project_code }}

- +

{{ masterTask.name }}

@@ -147,159 +59,15 @@
- - - -
- -

Status

-
- - - - -

Ukončený

-

Neukončený

- - - - - - -
- -

Deadline

-
- - - - -

{{ tmUtils.formatDateTime(masterTask.deadline) }}

- - - - - - -
- -

Tím

-
- - - - -

{{ masterTask.team?.name }}

-
-

- {{ employee.name.charAt(0) + employee.surname.charAt(0) }} -

-

-

- - - - - - -
- -

Naplánovaný čas

-
- - - - -

{{ masterTask?.duration?.toFixed(2) }} h

- - - - - - -
- -

Odpracovaný čas

-
- - - - -

{{ (masterTask.time_worked)?.toFixed(2) }} h

- - - - - - -
- -

Zostávajúci čas

-
- - - - -

{{ (masterTask.duration - masterTask.time_worked)?.toFixed(2) }} h

- - - -
-

Popis zadania

-
-

Prílohy

-
-
- -

{{ file.name }}

- - -
-
-
+
Ukončiť mastertask
- - - - {{ task.project_code }} - -

- {{ getFullNameByEmployeeId(task.employee_id).initials }} -

-

{{ getFullNameByEmployeeId(task.employee_id).fullName }}

- - -
- checkmark-icon - pencil-icon - trash-icon -
- - - - + + +
- Pridať Subtask + Pridať task
@@ -309,26 +77,35 @@ diff --git a/app/src/plugins/tm@modal/team/z-team-modal.vue b/app/src/plugins/tm@modal/team/z-team-modal.vue index 8e96329..e578c78 100644 --- a/app/src/plugins/tm@modal/team/z-team-modal.vue +++ b/app/src/plugins/tm@modal/team/z-team-modal.vue @@ -48,6 +48,7 @@
response.data) .catch(error => Promise.reject(error)) }, @@ -42,14 +42,14 @@ export default { async post_auth(url: string, params = null, config?: any) { config = this._config(config) - return axios.post(url, {data: params}, config) + return axios.post(url, params, config) .then(response => response.data) .catch(error => Promise.reject(error)) }, async post_data(url: string, params = null, config?: any) { - return axios.post(url, {data: params}, config) + return axios.post(url, params, config) .then(response => response.data.data) .catch(error => Promise.reject(error.response || error)) }, @@ -57,7 +57,7 @@ export default { async post_auth_data(url: string, params = null, config?: any) { config = this._config(config) - return axios.post(url, {data: params}, config) + return axios.post(url, params, config) .then(response => response.data.data) .catch(error => Promise.reject(error.response || error)) }, @@ -91,7 +91,7 @@ export default { }, async patch(url: string, params = null, config?: any) { - return axios.patch(url, {data: params}, config) + return axios.patch(url, params, config) .then(response => response.data) .catch(error => Promise.reject(error)) }, @@ -99,13 +99,13 @@ export default { async patch_auth(url: string, params = null, config?: any) { config = this._config(config) - return axios.patch(url, {data: params}, config) + return axios.patch(url, params, config) .then(response => response.data) .catch(error => Promise.reject(error)) }, async patch_data(url: string, params = null, config?: any) { - return axios.patch(url, {data: params}, config) + return axios.patch(url, params, config) .then(response => response.data.data) .catch(error => Promise.reject(error.response || error)) }, @@ -113,13 +113,13 @@ export default { async patch_auth_data(url: string, params = null, config?: any) { config = this._config(config) - return axios.patch(url, {data: params}, config) + return axios.patch(url, params, config) .then(response => response.data.data) .catch(error => Promise.reject(error.response || error)) }, async put(url: string, params = null, config?: any) { - return axios.put(url, {data: params}, config) + return axios.put(url, params, config) .then(response => response.data) .catch(error => Promise.reject(error)) }, @@ -133,7 +133,7 @@ export default { }, async put_data(url: string, params = null, config?: any) { - return axios.put(url, {data: params}, config) + return axios.put(url, params, config) .then(response => response.data.data) .catch(error => Promise.reject(error.response || error)) }, @@ -141,7 +141,7 @@ export default { async put_auth_data(url: string, params = null, config?: any) { config = this._config(config) - return axios.put(url, {data: params}, config) + return axios.put(url, params, config) .then(response => response.data.data) .catch(error => Promise.reject(error.response || error)) }, diff --git a/app/src/plugins/w@custom/axios/models/axios.ts b/app/src/plugins/w@custom/axios/models/axios.ts index aca5f20..4dcf821 100644 --- a/app/src/plugins/w@custom/axios/models/axios.ts +++ b/app/src/plugins/w@custom/axios/models/axios.ts @@ -142,7 +142,7 @@ export default { async put_auth_data(url: string, params = null, config?: any) { config = this._config(config) - return axios.put(url, this._objectToFormData(params), config) + return axios.put(url, {data: params}, config) .then(response => response.data.data) .catch(error => Promise.reject(toastUtils.parseAndTranslate(error.response || error))) }, From 4e8fa39e34bd7d27f77ce14c9a07c2d0bc3dd7dc Mon Sep 17 00:00:00 2001 From: romankko2 Date: Fri, 10 Feb 2023 17:33:51 +0100 Subject: [PATCH 7/8] fixy --- app/src/plugins/app/_theme/global.sass | 3 +++ .../plugins/tm@_components/z-autocomplete.vue | 1 + .../tm@dashboard/_components/z-timeline.vue | 2 +- .../master-task/_components/a-tasks-table.vue | 25 ++++++++++++++++++- .../master-task/_mixins/selects.mixin.ts | 13 ++++++++-- .../master-task/z-master-task-modal.vue | 24 +++++++++++++++--- .../tm@modal/task/z-complete-task-modal.vue | 5 ++-- .../plugins/tm@modal/task/z-task-modal.vue | 19 ++++++++++++-- 8 files changed, 79 insertions(+), 13 deletions(-) diff --git a/app/src/plugins/app/_theme/global.sass b/app/src/plugins/app/_theme/global.sass index 92e5121..50a3b0a 100644 --- a/app/src/plugins/app/_theme/global.sass +++ b/app/src/plugins/app/_theme/global.sass @@ -41,6 +41,9 @@ height: 24px width: 24px +.is-finished + background: #06dece !important + .add-date color: white border-radius: 50% diff --git a/app/src/plugins/tm@_components/z-autocomplete.vue b/app/src/plugins/tm@_components/z-autocomplete.vue index 86b5865..1667a3c 100644 --- a/app/src/plugins/tm@_components/z-autocomplete.vue +++ b/app/src/plugins/tm@_components/z-autocomplete.vue @@ -5,6 +5,7 @@ variant="solo" v-model="search" @keydown.enter="optionSelected()" + @keydown.tab="optionSelected()" :class="{ error: validations?.$errors?.length }" :hint=" validations?.$errors diff --git a/app/src/plugins/tm@dashboard/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/_components/z-timeline.vue index a723dab..63bc559 100644 --- a/app/src/plugins/tm@dashboard/_components/z-timeline.vue +++ b/app/src/plugins/tm@dashboard/_components/z-timeline.vue @@ -196,7 +196,7 @@ export default { } else { event.completed = !event.completed try { - await this.$axios.patch_auth(`v1/tasks/${event.id}`, event) + await this.$axios.patch_auth(`v1/subtasks/${event.id}`, event) this.$emit('reopenTask', event) } catch (error) { this.$toast.error(error) diff --git a/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue b/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue index 827ca12..9bebed8 100644 --- a/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue +++ b/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue @@ -9,9 +9,14 @@

{{ task._employeeFullName }}

+ +

Ukončený

+

Neukončený

+
- checkmark-icon + checkmark-icon + checkmark-icon pencil-icon trash-icon
@@ -56,6 +61,24 @@ export default { openEditTaskModal(task) { this.$events.emit('show-task-modal', { task, editMode: false }) + }, + + async clickCompleteTask(task) { + if (!task.is_finished) { + this.openCompleteTaskModal(task) + } else { + task.is_finished = !task.is_finished + try { + await this.$axios.patch_auth(`v1/subtasks/${task.id}`, task) + this.$emit('reopenTask', task) + } catch (error) { + this.$toast.error(error) + } + } + }, + + openCompleteTaskModal(task) { + this.$events.emit('show-complete-task-modal', { task }) } } } diff --git a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts index d6d003e..85d8ee9 100644 --- a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts +++ b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts @@ -24,6 +24,13 @@ export default { this.masterTask.project_id = project.id }, + onMasterTaskSelected({ key }) { + const masterTask = this.masterTasks.find(masterTask => masterTask.id == key) + this.masterTask.name = masterTask.name + console.log(masterTask.name) + this.masterTask.master_task.id = masterTask.id + }, + onEmployeeSelected({ key }) { const employee = this.employees.find(employee => employee.id == key) this.masterTask.employees.push(employee) @@ -50,9 +57,11 @@ export default { }, watch: { - 'masterTask.team_id'(value) { - if (!value) return + 'masterTask.team_id'(value, oldValue) { + if (!value || !oldValue) return + this.masterTask.team = this.teams.find(team => team.id == value) + this.masterTask.employees = this.masterTask.team.employees } } } \ No newline at end of file diff --git a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue index 2046ea1..1caecf3 100644 --- a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue +++ b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue @@ -24,11 +24,11 @@

- + @@ -184,6 +184,16 @@ export default { this.masterTask.team_id = this.masterTask.team.id this.masterTask.project_id = project.id this.masterTask.project_code = project.code + + // TODO refactor + this.masterTask.employees = this.masterTask.employees.map(employee => { + const subtask = this.masterTask?.subtasks.find(subtask => subtask.employee_id == employee.id) + employee.duration = subtask.duration + + return employee + }) + + console.log(this.masterTask.employees) } else { this.masterTask = { employees: [], duration: 0 } } @@ -198,9 +208,15 @@ export default { if (!(await this.v$.$validate())) return this.masterTask.description = this.$refs['description'].getHTML() - this.masterTask.employees = [...this.masterTask.employees, ...this.masterTask.team?.employees] - this.masterTask.project_code = null + // this.masterTask.subtasks = this.masterTask.subtasks.map(subtask => { + // const employee = this.masterTask.employees.find(employee => employee.id == subtask.employee_id) + // subtask.duration = employee.duration + + // return subtask + // }) + + // this.masterTask.project_code = null try { this.masterTask.deadline = moment(this.masterTask.deadline).format('YYYY-MM-DD HH:MM:SS') diff --git a/app/src/plugins/tm@modal/task/z-complete-task-modal.vue b/app/src/plugins/tm@modal/task/z-complete-task-modal.vue index b16f3ef..861ec5d 100644 --- a/app/src/plugins/tm@modal/task/z-complete-task-modal.vue +++ b/app/src/plugins/tm@modal/task/z-complete-task-modal.vue @@ -2,8 +2,7 @@
-

Ste si istý, že chcete ukončiť {{ task.title }}?

- +

Ste si istý, že chcete {{ this.task?.id ? 'ukončiť' : 'obnoviť' }} task, z masterTasku {{ task.master_task }}?

+ + Date: Mon, 13 Feb 2023 18:40:47 +0100 Subject: [PATCH 8/8] full text search subtask, files fixy --- app/src/plugins/app/_config/router.ts | 14 ++++++++ .../plugins/tm@_components/z-files-upload.vue | 34 +++++++++++++------ .../master-task/_mixins/selects.mixin.ts | 6 ++-- .../master-task/z-master-task-modal.vue | 5 +-- .../plugins/tm@modal/task/z-task-modal.vue | 33 ++++++------------ 5 files changed, 53 insertions(+), 39 deletions(-) diff --git a/app/src/plugins/app/_config/router.ts b/app/src/plugins/app/_config/router.ts index 9b5d54b..6801cca 100644 --- a/app/src/plugins/app/_config/router.ts +++ b/app/src/plugins/app/_config/router.ts @@ -113,4 +113,18 @@ const router = createRouter({ routes }) +// router.afterEach((to) => { +// if (to.fullPath.includes('?master-task')) { +// const searchParams = new URLSearchParams(to.fullPath.split('?')[1]) +// const id = searchParams.get('id') + +// this.$events.emit('show-master-task-modal', { id }) +// } else if (to.fullPath.includes('?task')) { +// const searchParams = new URLSearchParams(to.fullPath.split('?')[1]) +// const id = searchParams.get('id') + +// this.$events.emit('show-task-modal', { id }) +// } +// }) + export default router diff --git a/app/src/plugins/tm@_components/z-files-upload.vue b/app/src/plugins/tm@_components/z-files-upload.vue index 700472b..2156398 100644 --- a/app/src/plugins/tm@_components/z-files-upload.vue +++ b/app/src/plugins/tm@_components/z-files-upload.vue @@ -8,16 +8,16 @@ NAHRAŤ -
+
{{ file.name }} - +
@@ -28,20 +28,32 @@ export default { emit: ['files-uploaded'], - data() { - return { - files: [], - } - }, + props: { + files: { + type: Array, + default: () => [] + } + }, + + data() { + return { + uploadedFiles: [] + } + }, + + created() { + this.uploadedFiles = this.files + console.log(this.uploadedFiles) + }, methods: { onChange() { - this.files = [...this.files, ...this.$refs.fileUpload.files] - this.$emit('files-uploaded', this.files) + this.uploadedFiles = [...this.uploadedFiles, ...this.$refs.fileUpload.files] + this.$emit('files-uploaded', this.uploadedFiles) }, remove(index) { - this.files.splice(index, 1) + this.uploadedFiles.splice(index, 1) }, }, } diff --git a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts index 85d8ee9..64ab9bc 100644 --- a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts +++ b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts @@ -26,9 +26,9 @@ export default { onMasterTaskSelected({ key }) { const masterTask = this.masterTasks.find(masterTask => masterTask.id == key) - this.masterTask.name = masterTask.name - console.log(masterTask.name) - this.masterTask.master_task.id = masterTask.id + this.task.master_task.name = masterTask.name + this.task.master_task.id = masterTask.id + this.task.project_code = masterTask.project_code }, onEmployeeSelected({ key }) { diff --git a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue index 1caecf3..d6e94e8 100644 --- a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue +++ b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue @@ -38,7 +38,7 @@
- + {{ masterTask.id ? 'ULOŽIŤ' : 'VYTVORIŤ' }} @@ -122,7 +122,8 @@ export default { projects: null, employees: null, masterTask: null, - showAddEmployeeInput: false + showAddEmployeeInput: false, + date: null, } }, diff --git a/app/src/plugins/tm@modal/task/z-task-modal.vue b/app/src/plugins/tm@modal/task/z-task-modal.vue index c759ec7..8f6b64a 100644 --- a/app/src/plugins/tm@modal/task/z-task-modal.vue +++ b/app/src/plugins/tm@modal/task/z-task-modal.vue @@ -10,36 +10,24 @@ - - - - + />
- + {{ @@ -398,7 +385,7 @@ export default { Datepicker, ZFilesUpload, QuillEditor, - // ZAutocomplete + ZAutocomplete }, data() {