7863-devToTest_2434 #613

Merged
alexm merged 131 commits from 7863-devToTest_2434 into test 2024-08-13 06:58:13 +00:00
7 changed files with 30 additions and 14 deletions
Showing only changes of commit f5ffe2a07b - Show all commits

View File

@ -136,7 +136,7 @@ const isEmployee = computed(() => useRole().isEmployee());
@update:model-value="saveLanguage" @update:model-value="saveLanguage"
:label="t(`globals.lang['${userLocale}']`)" :label="t(`globals.lang['${userLocale}']`)"
icon="public" icon="public"
color="orange" color="primary"
false-value="es" false-value="es"
true-value="en" true-value="en"
/> />
@ -145,7 +145,7 @@ const isEmployee = computed(() => useRole().isEmployee());
@update:model-value="saveDarkMode" @update:model-value="saveDarkMode"
:label="t(`globals.darkMode`)" :label="t(`globals.darkMode`)"
checked-icon="dark_mode" checked-icon="dark_mode"
color="orange" color="primary"
unchecked-icon="light_mode" unchecked-icon="light_mode"
/> />
</div> </div>
@ -156,7 +156,7 @@ const isEmployee = computed(() => useRole().isEmployee());
<VnAvatar <VnAvatar
:worker-id="user.id" :worker-id="user.id"
:title="user.name" :title="user.name"
size="80px" size="xxl"
color="transparent" color="transparent"
/> />
<div class="text-subtitle1 q-mt-md"> <div class="text-subtitle1 q-mt-md">
@ -170,7 +170,7 @@ const isEmployee = computed(() => useRole().isEmployee());
</div> </div>
<QBtn <QBtn
id="logout" id="logout"
color="orange" color="primary"
flat flat
:label="t('globals.logOut')" :label="t('globals.logOut')"
size="sm" size="sm"

View File

@ -3,6 +3,7 @@ import { computed, ref, watch } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useSession } from 'src/composables/useSession'; import { useSession } from 'src/composables/useSession';
import { useColor } from 'src/composables/useColor'; import { useColor } from 'src/composables/useColor';
import { getCssVar } from 'quasar';
const $props = defineProps({ const $props = defineProps({
workerId: { type: Number, required: true }, workerId: { type: Number, required: true },
@ -20,15 +21,17 @@ const title = computed(() =>
$props.title !== false ? $props.title || t('globals.system') : false $props.title !== false ? $props.title || t('globals.system') : false
); );
const showLetter = ref(false); const showLetter = ref(false);
const backgroundColor = computed(() => {
const color = $props.color || useColor(title.value);
return getCssVar(color) || color;
});
watch(src, () => (showLetter.value = false)); watch(src, () => (showLetter.value = false));
</script> </script>
<template> <template>
<div class="column items-center"> <div class="column items-center">
<QAvatar <QAvatar
:style="{ :style="{ backgroundColor }"
backgroundColor: color ? color : useColor(title),
}"
v-bind="$attrs" v-bind="$attrs"
:title="title !== false ? title : undefined" :title="title !== false ? title : undefined"
> >
@ -44,3 +47,16 @@ watch(src, () => (showLetter.value = false));
</div> </div>
</div> </div>
</template> </template>
<style lang="scss" scoped>
[size='xxl'] {
.q-avatar,
.q-img {
width: 80px;
height: 80px;
}
.q-img {
object-fit: cover;
}
}
</style>

View File

@ -221,7 +221,7 @@ defineExpose({ fetch, addFilter, paginate });
> >
<slot name="body" :rows="store.data"></slot> <slot name="body" :rows="store.data"></slot>
<div v-if="isLoading" class="info-row q-pa-md text-center"> <div v-if="isLoading" class="info-row q-pa-md text-center">
<QSpinner color="orange" size="md" /> <QSpinner color="primary" size="md" />
</div> </div>
</QInfiniteScroll> </QInfiniteScroll>
</template> </template>

View File

@ -93,9 +93,9 @@ const statesFilter = {
<template #before> <template #before>
<VnAvatar <VnAvatar
:worker-id="data.workerFk" :worker-id="data.workerFk"
size="160x160" size="md"
:title="false" :title="false"
color="orange" color="primary"
/> />
</template> </template>
</VnSelect> </VnSelect>

View File

@ -99,7 +99,7 @@ const contactChannels = ref([]);
<template #prepend> <template #prepend>
<VnAvatar <VnAvatar
:worker-id="data.salesPersonFk" :worker-id="data.salesPersonFk"
color="orange" color="primary"
:title="false" :title="false"
/> />
</template> </template>

View File

@ -105,14 +105,14 @@ async function getVideoList(expeditionId, timed) {
label label
markers markers
snap snap
color="orange" color="primary"
/> />
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem v-if="lastExpedition && videoList.length"> <QItem v-if="lastExpedition && videoList.length">
<QItemSection> <QItemSection>
<QSelect <QSelect
color="orange" color="primary"
v-model="slide" v-model="slide"
:options="videoList" :options="videoList"
:label="t('ticket.boxing.selectVideo')" :label="t('ticket.boxing.selectVideo')"

View File

@ -34,7 +34,7 @@ const cancel = () => {
<template> <template>
<QPopupProxy ref="QPopupProxyRef"> <QPopupProxy ref="QPopupProxyRef">
<div class="container"> <div class="container">
<QSpinner v-if="!mana" color="orange" size="md" /> <QSpinner v-if="!mana" color="primary" size="md" />
<div v-else> <div v-else>
<div class="header">Mana: {{ toCurrency(mana) }}</div> <div class="header">Mana: {{ toCurrency(mana) }}</div>
<div class="q-pa-md"> <div class="q-pa-md">