JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 06:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix(SubtaskModal) Fixed estimated_duration property.

Browse Source
This commit is contained in:
Matej Glasnák committed 2025-03-19 03:30:51 +01:00
1 parent e1712c8fcd
commit b2495b7035
2 files changed
+35 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/dist/js/index.js
Vendored
+1 -1
View File
@@ -2923,7 +2923,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpac
/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) { /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
"use strict"; "use strict";
eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */ \"render\": function() { return /* binding */ render; }\n/* harmony export */ });\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vue */ \"./node_modules/vue/dist/vue.runtime.esm-bundler.js\");\n\nfunction render(_ctx, _cache, $props, $setup, $data, $options) {\n const _component_A_mastertask_name = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-mastertask-name\");\n const _component_A_mastertask_status = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-mastertask-status\");\n const _component_A_task_deadline = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-deadline\");\n const _component_A_task_timeblocks = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-timeblocks\");\n const _component_Z_created_by = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"Z-created-by\");\n const _component_A_task_assigned_employee = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-assigned-employee\");\n const _component_A_task_estimated_duration = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-estimated-duration\");\n const _component_A_task_planned_time = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-planned-time\");\n const _component_A_task_remaining_time = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-remaining-time\");\n const _component_A_task_spent_time = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-spent-time\");\n const _component_A_task_description = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-description\");\n const _component_Z_files = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"Z-files\");\n return (0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)(vue__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_mastertask_name, {\n name: $props.subtask._master_task.name,\n id: $props.subtask.master_task_id,\n color: $props.subtask._master_task.color,\n onCloseModal: _cache[0] || (_cache[0] = $event => _ctx.$emit('close-modal'))\n }, null, 8 /* PROPS */, [\"name\", \"id\", \"color\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_mastertask_status, {\n isFinished: $props.subtask.is_finished\n }, null, 8 /* PROPS */, [\"isFinished\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_deadline, {\n subtask: $props.subtask\n }, null, 8 /* PROPS */, [\"subtask\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_timeblocks, {\n timeblocks: $props.subtask.timeblocks,\n subtask: $props.subtask,\n onUpdateSubtask: _cache[1] || (_cache[1] = $event => _ctx.$emit('update-subtask', $event))\n }, null, 8 /* PROPS */, [\"timeblocks\", \"subtask\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Z_created_by, {\n \"employee-id\": $props.subtask.created_by\n }, null, 8 /* PROPS */, [\"employee-id\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_assigned_employee, {\n employee: $props.subtask._employee\n }, null, 8 /* PROPS */, [\"employee\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_estimated_duration, {\n hours: $props.subtask.estimated_duration\n }, null, 8 /* PROPS */, [\"hours\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_planned_time, {\n hours: $props.subtask.duration\n }, null, 8 /* PROPS */, [\"hours\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_remaining_time, {\n hours: $props.subtask.duration - $props.subtask.spent_time\n }, null, 8 /* PROPS */, [\"hours\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_spent_time, {\n hours: $props.subtask.spent_time,\n subtask: $props.subtask\n }, null, 8 /* PROPS */, [\"hours\", \"subtask\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_description, {\n description: $props.subtask.description,\n \"mastertask-description\": $props.subtask.master_task_description\n }, null, 8 /* PROPS */, [\"description\", \"mastertask-description\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Z_files, {\n files: $props.subtask.files\n }, null, 8 /* PROPS */, [\"files\"])], 64 /* STABLE_FRAGMENT */);\n}\n\n//# sourceURL=webpack://jandl/./src/plugins/tm@modal/task/_components/z-task-readonly-info.vue?./node_modules/webpack-plugin-vuetify/dist/scriptLoader.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use%5B0%5D!./node_modules/vue-loader/dist/templateLoader.js??ruleSet%5B1%5D.rules%5B5%5D!./node_modules/vue-loader/dist/index.js??ruleSet%5B0%5D.use%5B0%5D"); eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */ \"render\": function() { return /* binding */ render; }\n/* harmony export */ });\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vue */ \"./node_modules/vue/dist/vue.runtime.esm-bundler.js\");\n\nfunction render(_ctx, _cache, $props, $setup, $data, $options) {\n const _component_A_mastertask_name = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-mastertask-name\");\n const _component_A_mastertask_status = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-mastertask-status\");\n const _component_A_task_deadline = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-deadline\");\n const _component_A_task_timeblocks = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-timeblocks\");\n const _component_Z_created_by = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"Z-created-by\");\n const _component_A_task_assigned_employee = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-assigned-employee\");\n const _component_A_task_estimated_duration = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-estimated-duration\");\n const _component_A_task_planned_time = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-planned-time\");\n const _component_A_task_remaining_time = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-remaining-time\");\n const _component_A_task_spent_time = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-spent-time\");\n const _component_A_task_description = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"A-task-description\");\n const _component_Z_files = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)(\"Z-files\");\n return (0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)(vue__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_mastertask_name, {\n name: $props.subtask._master_task.name,\n id: $props.subtask.master_task_id,\n color: $props.subtask._master_task.color,\n onCloseModal: _cache[0] || (_cache[0] = $event => _ctx.$emit('close-modal'))\n }, null, 8 /* PROPS */, [\"name\", \"id\", \"color\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_mastertask_status, {\n isFinished: $props.subtask.is_finished\n }, null, 8 /* PROPS */, [\"isFinished\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_deadline, {\n subtask: $props.subtask\n }, null, 8 /* PROPS */, [\"subtask\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_timeblocks, {\n timeblocks: $props.subtask.timeblocks,\n subtask: $props.subtask,\n onUpdateSubtask: _cache[1] || (_cache[1] = $event => _ctx.$emit('update-subtask', $event))\n }, null, 8 /* PROPS */, [\"timeblocks\", \"subtask\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Z_created_by, {\n \"employee-id\": $props.subtask.created_by\n }, null, 8 /* PROPS */, [\"employee-id\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_assigned_employee, {\n employee: $props.subtask._employee\n }, null, 8 /* PROPS */, [\"employee\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_estimated_duration, {\n hours: $props.subtask.master_task_estimated_duration\n }, null, 8 /* PROPS */, [\"hours\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_planned_time, {\n hours: $props.subtask.duration\n }, null, 8 /* PROPS */, [\"hours\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_remaining_time, {\n hours: $props.subtask.duration - $props.subtask.spent_time\n }, null, 8 /* PROPS */, [\"hours\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_spent_time, {\n hours: $props.subtask.spent_time,\n subtask: $props.subtask\n }, null, 8 /* PROPS */, [\"hours\", \"subtask\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_A_task_description, {\n description: $props.subtask.description,\n \"mastertask-description\": $props.subtask.master_task_description\n }, null, 8 /* PROPS */, [\"description\", \"mastertask-description\"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Z_files, {\n files: $props.subtask.files\n }, null, 8 /* PROPS */, [\"files\"])], 64 /* STABLE_FRAGMENT */);\n}\n\n//# sourceURL=webpack://jandl/./src/plugins/tm@modal/task/_components/z-task-readonly-info.vue?./node_modules/webpack-plugin-vuetify/dist/scriptLoader.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use%5B0%5D!./node_modules/vue-loader/dist/templateLoader.js??ruleSet%5B1%5D.rules%5B5%5D!./node_modules/vue-loader/dist/index.js??ruleSet%5B0%5D.use%5B0%5D");
/***/ }), /***/ }),
app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
+34 -34
View File
@@ -1,49 +1,49 @@
<template> <template>
<A-mastertask-name :name="subtask._master_task.name" :id="subtask.master_task_id" :color="subtask._master_task.color" @close-modal="$emit('close-modal')" /> <A-mastertask-name :name="subtask._master_task.name" :id="subtask.master_task_id" :color="subtask._master_task.color" @close-modal="$emit('close-modal')" />
<A-mastertask-status :isFinished="subtask.is_finished" /> <A-mastertask-status :isFinished="subtask.is_finished" />
<A-task-deadline :subtask="subtask" /> <A-task-deadline :subtask="subtask" />
<A-task-timeblocks :timeblocks="subtask.timeblocks" :subtask="subtask" @update-subtask="$emit('update-subtask', $event)" /> <A-task-timeblocks :timeblocks="subtask.timeblocks" :subtask="subtask" @update-subtask="$emit('update-subtask', $event)" />
<Z-created-by :employee-id="subtask.created_by" /> <Z-created-by :employee-id="subtask.created_by" />
<A-task-assigned-employee :employee="subtask._employee" /> <A-task-assigned-employee :employee="subtask._employee" />
<A-task-estimated-duration :hours="subtask.estimated_duration" /> <A-task-estimated-duration :hours="subtask.master_task_estimated_duration" />
<A-task-planned-time :hours="subtask.duration" /> <A-task-planned-time :hours="subtask.duration" />
<A-task-remaining-time :hours="subtask.duration - subtask.spent_time" /> <A-task-remaining-time :hours="subtask.duration - subtask.spent_time" />
<A-task-spent-time :hours="subtask.spent_time" :subtask="subtask" /> <A-task-spent-time :hours="subtask.spent_time" :subtask="subtask" />
<A-task-description :description="subtask.description" :mastertask-description="subtask.master_task_description" /> <A-task-description :description="subtask.description" :mastertask-description="subtask.master_task_description" />
<Z-files :files="subtask.files" /> <Z-files :files="subtask.files" />
</template> </template>
<script> <script>
import AMastertaskName from './_components/a-mastertask-name.vue' import AMastertaskName from './_components/a-mastertask-name.vue'
import AMastertaskStatus from './_components/a-mastertask-status.vue' import AMastertaskStatus from './_components/a-mastertask-status.vue'
import ATaskTimeblocks from './_components/a-task-timeblocks.vue' import ATaskTimeblocks from './_components/a-task-timeblocks.vue'
import ZCreatedBy from '../../_components/read-only/z-created-by.vue' import ZCreatedBy from '../../_components/read-only/z-created-by.vue'
import ATaskAssignedEmployee from './_components/a-task-assigned-employee.vue' import ATaskAssignedEmployee from './_components/a-task-assigned-employee.vue'
import ATaskPlannedTime from './_components/a-task-planned-time.vue' import ATaskPlannedTime from './_components/a-task-planned-time.vue'
import ATaskSpentTime from './_components/a-task-spent-time.vue' import ATaskSpentTime from './_components/a-task-spent-time.vue'
import ATaskRemainingTime from './_components/a-task-remaining-time.vue' import ATaskRemainingTime from './_components/a-task-remaining-time.vue'
import ATaskDeadline from './_components/a-task-deadline.vue' import ATaskDeadline from './_components/a-task-deadline.vue'
import ATaskDescription from './_components/a-task-description.vue' import ATaskDescription from './_components/a-task-description.vue'
import ATaskEstimatedDuration from './_components/a-task-estimated-duration.vue' import ATaskEstimatedDuration from './_components/a-task-estimated-duration.vue'
import ZFiles from '@/plugins/tm@modal/_components/read-only/z-files.vue' import ZFiles from '@/plugins/tm@modal/_components/read-only/z-files.vue'
export default { export default {
emits: ['close-modal', 'update-subtask'], emits: ['close-modal', 'update-subtask'],
components: { components: {
ZFiles, ZFiles,
AMastertaskName, AMastertaskName,
AMastertaskStatus, AMastertaskStatus,
ATaskTimeblocks, ATaskTimeblocks,
ZCreatedBy, ZCreatedBy,
ATaskAssignedEmployee, ATaskAssignedEmployee,
ATaskPlannedTime, ATaskPlannedTime,
ATaskSpentTime, ATaskSpentTime,
ATaskRemainingTime, ATaskRemainingTime,
ATaskDescription, ATaskDescription,
ATaskDeadline, ATaskDeadline,
ATaskEstimatedDuration ATaskEstimatedDuration
}, },
props: { props: {
subtask: { subtask: {