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

Feat(Office365) Changed Office 365 event color to Blue. Removed deadline from Office 365 blocker event.

Browse Source
This commit is contained in:
Matej Glasnák committed 2025-02-18 10:06:01 +01:00
1 parent 7436f6e0b8
commit b37e91663a
1 file changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files
app/src/plugins/tm@dashboard/_components/a-timeline-event.vue
+5 -5
View File
@@ -10,7 +10,7 @@
<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: eventColor.backgroundColor, color: eventColor.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: eventColor.backgroundColor, color: eventColor.color }">
<div class="event-content" :class="{ 'is-blocker': props.event.isBlocker }"> <div class="event-content" :class="{ 'is-blocker': props.event.isBlocker }">
<template v-if="['subtask', 'office365'].includes(event.type)"> <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> <small v-if="props.event.subtask.project_code" class="project-code" :style="{ color: eventColor.color }">{{ props.event.subtask.project_code }}</small>
<h3 class="text-inherit">{{ props.event.subtask.title ?? props.event.subtask.master_task?.name ?? props.event.subtask.master_task }}</h3> <h3 class="text-inherit">{{ props.event.subtask.title ?? props.event.subtask.master_task?.name ?? props.event.subtask.master_task }}</h3>
</template> </template>
<template v-else> <template v-else>
@@ -30,7 +30,7 @@
<small class="event-initials-date text-inherit">{{ props.event.date?.toLocaleDateString('sk-SK') }}</small> <small class="event-initials-date text-inherit">{{ props.event.date?.toLocaleDateString('sk-SK') }}</small>
</div> </div>
<div v-if="['subtask', 'office365'].includes(event.type)" class="d-flex align-center"> <div v-if="['subtask'].includes(event.type)" class="d-flex align-center">
<v-icon icon="mdi-skull-outline" size="small" /> <v-icon icon="mdi-skull-outline" size="small" />
<small v-if="props.event?.subtask.deadline" class="ml-1">{{ deadline }}</small> <small v-if="props.event?.subtask.deadline" class="ml-1">{{ deadline }}</small>
<v-tooltip v-else text="Deadline z Mastertasku" location="bottom"> <v-tooltip v-else text="Deadline z Mastertasku" location="bottom">
@@ -42,10 +42,10 @@
<div v-if="['office365'].includes(event.type)" class="d-flex align-center mt-1"> <div v-if="['office365'].includes(event.type)" class="d-flex align-center mt-1">
<v-icon icon="mdi-pin-outline" size="small" /> <v-icon icon="mdi-pin-outline" size="small" />
<small v-if="props.event?.subtask.office365_location" class="ml-1">{{ props.event?.subtask.office365_location }}</small> <small v-if="props.event?.subtask.office365_location" :style="{ color: eventColor.color }" class="ml-1">{{ props.event?.subtask.office365_location }}</small>
<v-tooltip v-else text="Miesto" location="bottom"> <v-tooltip v-else text="Miesto" location="bottom">
<template v-slot:activator="{ props }"> <template v-slot:activator="{ props }">
<small class="cursor-pointer ml-1" v-if="!props.event?.subtask?.office365_location" v-bind="props">{{ office365_location }}*</small> <small class="cursor-pointer ml-1" :style="{ color: eventColor.color }" v-if="!props.event?.subtask?.office365_location" v-bind="props">{{ office365_location }}*</small>
</template> </template>
</v-tooltip> </v-tooltip>
</div> </div>
@@ -108,7 +108,7 @@ const deadline: ComputedRef<string | undefined> = computed(() => {
const eventLength: ComputedRef<number> = computed(() => props.event.end.getTime() - props.event.start.getTime()) const eventLength: ComputedRef<number> = computed(() => props.event.end.getTime() - props.event.start.getTime())
const eventColor: ComputedRef<{ color: string, backgroundColor: string }> = computed(() => { const eventColor: ComputedRef<{ color: string, backgroundColor: string }> = computed(() => {
if (props.event.type === 'office365_blocker') { if (props.event.type === 'office365_blocker' || props.event.type === 'office365') {
return { return {
color: '#ffffff', color: '#ffffff',
backgroundColor: '#326cb8' backgroundColor: '#326cb8'