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

Merge branch 'feature/office365' of bitbucket.org:studiotem/jandl-taskmanager-app

Browse Source
This commit is contained in:
Matej Glasnák committed 2024-11-21 11:08:05 +01:00
2 parents c62762afe5 7b09fe15c7
commit b56aee8166
3 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/plugins/app@vendor/vue-cal/event.vue
+1 -1
View File
@@ -157,7 +157,7 @@ export default {
},
onDragStart(e) {
if (this.event.type == 'blocker' || this.event.type == 'non-working-hours') return //|| this.event._timeblock_is_finished || this.event.subtask?.is_finished
if (this.event.type == 'blocker' || this.event.type == 'non-working-hours' || this.event.type == 'office365_blocker') return //|| this.event._timeblock_is_finished || this.event.subtask?.is_finished
this.event.draggingStatic = false
this.dnd && this.dnd.eventDragStart(e, this.event);
},
app/src/plugins/tm@dashboard/_components/a-timeline-event.vue
+1 -1
View File
@@ -7,7 +7,7 @@
</div>
</div>
<div v-else-if="['subtask', 'blocker', 'adhoc', 'vacation', 'free_day', 'office365'].includes(event.type)" class="custom-event-body colWidth h-100 d-flex flex-column justify-space-between" :class="subtaskCssClass" :style="{ backgroundColor: event._timeblock_is_finished || event.subtask?.is_finished ? '#dedfe0' : event.color || event.subtask?.color }">
<div v-else-if="['subtask', 'blocker', 'adhoc', 'vacation', 'free_day', 'office365', 'office365_blocker'].includes(event.type)" class="custom-event-body colWidth h-100 d-flex flex-column justify-space-between" :class="subtaskCssClass" :style="{ backgroundColor: event._timeblock_is_finished || event.subtask?.is_finished ? '#dedfe0' : event.color || event.subtask?.color }">
<div class="event-content" :class="{ 'is-blocker': props.event.isBlocker }">
<template v-if="['subtask', 'office365'].includes(event.type)">
<small v-if="props.event.subtask.project_code" class="project-code">{{ props.event.subtask.project_code }}</small>
app/src/plugins/tm@dashboard/tasks/_utils/timeline.utils.ts
+1 -1
View File
@@ -30,7 +30,7 @@ export default {
const tasks = []
subtasks.forEach(subtask => {
if (['blocker', 'adhoc', 'home_office', 'vacation', 'free_day'].includes(subtask.type)) {
if (['blocker', 'adhoc', 'home_office', 'vacation', 'free_day', 'office365_blocker'].includes(subtask.type)) {
blockers = [...blockers, ...this._generateEventsFromBlocker(subtask, date)]
} else {
subtask.timeblocks?.forEach((timeblock) => {