refs #6551 feature/WorkerTimeControl #254

Merged
alexm merged 40 commits from :feature/WorkerTimeControl into dev 2024-04-23 13:12:51 +00:00
2 changed files with 3 additions and 11 deletions
Showing only changes of commit 0006761201 - Show all commits

View File

@ -18,10 +18,9 @@ defineEmits(['update:selected']);
<template>
<QChip
class="chip"
class="text-white q-ma-none"
:selected="selected"
:style="selected ? { backgroundColor: color } : null"
:text-color="selected ? 'white' : null"
:style="{ backgroundColor: selected ? color : 'black' }"
@update:selected="$emit('update:selected', $event)"
>
<QAvatar
@ -32,9 +31,3 @@ defineEmits(['update:selected']);
<slot />
</QChip>
</template>
<style scoped lang="scss">
.chip {
background-color: var(--vn-light-gray);
}
</style>

View File

@ -531,11 +531,10 @@ onMounted(async () => {
>
<div class="column-title-container">
<span class="text-primary">{{ t(col.label) }}</span>
<span>{{ col.formattedDate }}</span>
<span class="q-mb-xs">{{ col.formattedDate }}</span>
<WorkerDateLabel
v-if="col.dayData?.event"
:color="col.dayData.event.color"
selected
>
<span>
{{ col.dayData.event.name }}