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

.

Browse Source
This commit is contained in:
Matej Glasnák committed 2023-01-27 00:56:16 +01:00
1 parent 4cd1504343
commit c95e5e8835
5 files changed
+37 -36
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/public/mock/v1/overview/tasks.GET.json
+12 -12
View File
@@ -38,8 +38,8 @@
"tasks": [
{
"id": 1,
"starts_at": "2023-01-18T08:01:00+00:00",
"ends_at": "2023-01-18T09:00:00+00:00",
"starts_at": "2023-01-26T08:01:00+00:00",
"ends_at": "2023-01-26T09:00:00+00:00",
"title": "Task DNES",
"project_code": "CO-2201",
"master_task_color": "#E9FFE6",
@@ -48,8 +48,8 @@
{
"id": 2,
"starts_at": "2023-01-19T08:30:00+00:00",
"ends_at": "2023-01-19T09:00:00+00:00",
"starts_at": "2023-01-27T08:30:00+00:00",
"ends_at": "2023-01-27T09:00:00+00:00",
"title": "Kratky 30min Lorem ipsum dolor sit amet, consectetur adipiscing e",
"project_code": "CO-2201",
"master_task_color": "#f27e57",
@@ -58,8 +58,8 @@
{
"id": 3,
"starts_at": "2023-01-19T10:30:00+00:00",
"ends_at": "2023-01-19T10:45:00+00:00",
"starts_at": "2023-01-27T10:30:00+00:00",
"ends_at": "2023-01-27T10:45:00+00:00",
"title": "Kratky 15min",
"project_code": "CO-2201",
"master_task_color": "#57e0f2",
@@ -68,8 +68,8 @@
{
"id": 4,
"starts_at": "2023-01-20T08:00:00+00:00",
"ends_at": "2023-01-20T10:00:00+00:00",
"starts_at": "2023-01-26T08:00:00+00:00",
"ends_at": "2023-01-26T10:00:00+00:00",
"title": "Task 2",
"project_code": "CO-2201",
"master_task_color": "#FDE1FF",
@@ -78,8 +78,8 @@
{
"id": 6,
"starts_at": "2023-01-20T09:00:00+00:00",
"ends_at": "2023-01-20T12:00:00+00:00",
"starts_at": "2023-01-27T09:00:00+00:00",
"ends_at": "2023-01-27T12:00:00+00:00",
"title": "Task 6",
"project_code": "CO-2201",
"master_task_color": "#57e0f2",
@@ -88,8 +88,8 @@
{
"id": 7,
"starts_at": "2023-01-20T12:00:00+00:00",
"ends_at": "2023-01-20T16:00:00+00:00",
"starts_at": "2023-01-28T12:00:00+00:00",
"ends_at": "2023-01-28T16:00:00+00:00",
"title": "Task 7",
"project_code": "CO-2201",
"master_task_color": "#E7DBF8",
app/public/mock/v1/overview/teams.GET.json
+18 -18
View File
@@ -10,8 +10,8 @@
"tasks": [
{
"id": 1,
"starts_at": "2023-01-19T08:01:00+00:00",
"ends_at": "2023-01-19T09:00:00+00:00",
"starts_at": "2023-01-27T08:01:00+00:00",
"ends_at": "2023-01-27T09:00:00+00:00",
"title": "Task DNES",
"project_code": "CO-2201",
"master_task_color": "#E9FFE6",
@@ -20,8 +20,8 @@
{
"id": 2,
"starts_at": "2023-01-19T08:30:00+00:00",
"ends_at": "2023-01-19T09:00:00+00:00",
"starts_at": "2023-01-27T08:30:00+00:00",
"ends_at": "2023-01-27T09:00:00+00:00",
"title": "Kratky 30min",
"project_code": "CO-2201",
"master_task_color": "#f27e57",
@@ -30,8 +30,8 @@
{
"id": 3,
"starts_at": "2023-01-20T10:30:00+00:00",
"ends_at": "2023-01-20T10:45:00+00:00",
"starts_at": "2023-01-28T10:30:00+00:00",
"ends_at": "2023-01-28T10:45:00+00:00",
"title": "Kratky 15min",
"project_code": "CO-2201",
"master_task_color": "#57e0f2",
@@ -49,8 +49,8 @@
"tasks": [
{
"id": 4,
"starts_at": "2023-01-19T08:01:00+00:00",
"ends_at": "2023-01-19T09:00:00+00:00",
"starts_at": "2023-01-27T08:01:00+00:00",
"ends_at": "2023-01-27T09:00:00+00:00",
"title": "Task DNES",
"project_code": "CO-2201",
"master_task_color": "#E9FFE6",
@@ -59,8 +59,8 @@
{
"id": 5,
"starts_at": "2023-01-19T08:30:00+00:00",
"ends_at": "2023-01-19T09:00:00+00:00",
"starts_at": "2023-01-28T08:30:00+00:00",
"ends_at": "2023-01-28T09:00:00+00:00",
"title": "Kratky 30min",
"project_code": "CO-2201",
"master_task_color": "#f27e57",
@@ -69,8 +69,8 @@
{
"id": 6,
"starts_at": "2023-01-19T10:30:00+00:00",
"ends_at": "2023-01-19T10:45:00+00:00",
"starts_at": "2023-01-28T10:30:00+00:00",
"ends_at": "2023-01-28T10:45:00+00:00",
"title": "Kratky 15min",
"project_code": "CO-2201",
"master_task_color": "#57e0f2",
@@ -88,8 +88,8 @@
"tasks": [
{
"id": 1,
"starts_at": "2023-01-20T08:01:00+00:00",
"ends_at": "2023-01-20T09:00:00+00:00",
"starts_at": "2023-01-27T08:01:00+00:00",
"ends_at": "2023-01-27T09:00:00+00:00",
"title": "Task DNES",
"project_code": "CO-2201",
"master_task_color": "#E9FFE6",
@@ -98,8 +98,8 @@
{
"id": 2,
"starts_at": "2023-01-19T08:30:00+00:00",
"ends_at": "2023-01-19T09:00:00+00:00",
"starts_at": "2023-01-27T08:30:00+00:00",
"ends_at": "2023-01-27T09:00:00+00:00",
"title": "Kratky 30min",
"project_code": "CO-2201",
"master_task_color": "#f27e57",
@@ -108,8 +108,8 @@
{
"id": 3,
"starts_at": "2023-01-20T10:30:00+00:00",
"ends_at": "2023-01-20T10:45:00+00:00",
"starts_at": "2023-01-27T10:30:00+00:00",
"ends_at": "2023-01-27T10:45:00+00:00",
"title": "Kratky 15min",
"project_code": "CO-2201",
"master_task_color": "#57e0f2",
app/src/plugins/app/_config/App.vue
+3 -3
View File
@@ -7,7 +7,7 @@
<Z-team-modal ref="z-team-modal" />
<Z-delete-team-modal ref="z-delete-team-modal" @deleted="onTeamDeleted" />
<Z-task-modal ref="z-task-modal" />
<Z-delete-task-modal ref="z-delete-task-modal" @deleted="onTaskDeleted" />
<Z-complete-task-modal ref="z-complete-task-modal" />
@@ -57,8 +57,8 @@ export default {
this.$refs['z-task-modal'].showModal(task, editMode)
})
this.$events.on('show-master-task-modal', ({task, editMode}) => {
this.$refs['z-master-task-modal'].showModal(task, editMode)
this.$events.on('show-master-task-modal', ({masterTask, editMode}) => {
this.$refs['z-master-task-modal'].showModal(masterTask, editMode)
})
this.$events.on('show-complete-task-modal', ({task}) => {
app/src/plugins/tm@dashboard/projects/projects.vue
+1
View File
@@ -93,6 +93,7 @@ export default {
openMasterTaskModal(masterTaskId) {
const masterTask = this.masterTasks.find(masterTask => masterTask.id == masterTaskId)
console.log(masterTask)
this.$events.emit('show-master-task-modal', {masterTask, editMode: false})
},
app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
+3 -3
View File
@@ -106,9 +106,9 @@
</v-btn>
<div class="w-100 modal-input">
<QuillEditor
<QuillEditor
v-model="masterTask.description"
placeholder="Popis"
placeholder="Popis"
theme="snow"
class="rich-text-editor"
/>
@@ -405,7 +405,7 @@ export default {
try {
if (this.masterTask.id)
await this._update()
else
await this._create()