7383-testToMaster #370

Merged
alexm merged 365 commits from 7383-testToMaster into master 2024-05-14 05:46:56 +00:00
2 changed files with 18 additions and 3 deletions
Showing only changes of commit 9283b190b0 - Show all commits

View File

@ -573,6 +573,7 @@ onMounted(async () => {
v-for="(hour, ind) in day.dayData?.hours" v-for="(hour, ind) in day.dayData?.hours"
:key="ind" :key="ind"
:hour="hour.timed" :hour="hour.timed"
:manual="hour.manual"
:direction="hour.direction" :direction="hour.direction"
:id="hour.id" :id="hour.id"
@on-hour-entry-deleted="updateData()" @on-hour-entry-deleted="updateData()"

View File

@ -12,6 +12,10 @@ const $props = defineProps({
type: Number, type: Number,
required: true, required: true,
}, },
manual: {
type: Boolean,
required: true,
},
hour: { hour: {
type: String, type: String,
required: true, required: true,
@ -67,7 +71,12 @@ const showWorkerTimeForm = () => emit('showWorkerTimeForm');
<QIcon class="direction-icon" :name="directionIconName" size="sm"> <QIcon class="direction-icon" :name="directionIconName" size="sm">
<QTooltip>{{ directionIconTooltip }}</QTooltip> <QTooltip>{{ directionIconTooltip }}</QTooltip>
</QIcon> </QIcon>
<QBadge rounded class="chip" @click="showWorkerTimeForm()"> <QBadge
rounded
class="chip"
:class="{ '--manual': manual }"
@click="showWorkerTimeForm()"
>
<QIcon name="edit" size="sm" class="fill-icon"> <QIcon name="edit" size="sm" class="fill-icon">
<QTooltip>{{ t('Edit') }}</QTooltip></QIcon <QTooltip>{{ t('Edit') }}</QTooltip></QIcon
> >
@ -93,10 +102,15 @@ const showWorkerTimeForm = () => emit('showWorkerTimeForm');
<style scoped lang="scss"> <style scoped lang="scss">
.chip { .chip {
height: 28px; height: 28px;
color: var(--vn-accent-color);
cursor: pointer; cursor: pointer;
background-color: $primary;
opacity: 0.8; opacity: 0.8;
color: #eee;
background-color: #222;
&.--manual {
color: var(--vn-accent-color);
background-color: $primary;
}
&:hover { &:hover {
opacity: 1; opacity: 1;