diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue index 15d88d615..98334460a 100644 --- a/src/components/UserPanel.vue +++ b/src/components/UserPanel.vue @@ -159,6 +159,14 @@ const isEmployee = computed(() => useRole().isEmployee()); size="xxl" color="transparent" /> +
{{ user.nickname }}
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue index 72d3516c5..2163d54d4 100644 --- a/src/components/common/VnLog.vue +++ b/src/components/common/VnLog.vue @@ -407,9 +407,12 @@ watch( @on-fetch=" (data) => (actions = data.map((item) => { + const changedModel = item.changedModel; return { - locale: useCapitalize(validations[item.changedModel].locale.name), - value: item.changedModel, + locale: useCapitalize( + validations[changedModel]?.locale?.name ?? changedModel + ), + value: changedModel, }; })) " diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue index 5c01d7216..34cdf88b8 100644 --- a/src/components/ui/VnRow.vue +++ b/src/components/ui/VnRow.vue @@ -9,6 +9,9 @@ > :deep(*) { flex: 1; } + &[wrap] { + flex-wrap: wrap; + } } @media screen and (max-width: 800px) { .vn-row { diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue index 5e2412437..5ded4be00 100644 --- a/src/components/ui/VnSubToolbar.vue +++ b/src/components/ui/VnSubToolbar.vue @@ -43,20 +43,9 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar()); - diff --git a/src/css/app.scss b/src/css/app.scss index 3efe92db4..c233b14f0 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -190,6 +190,10 @@ select:-webkit-autofill { font-size: medium; } +.q-toolbar { + background: var(--vn-section-color); +} + .q-card__actions { justify-content: center; } diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 6065ddaff..fae22b06d 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -264,6 +264,7 @@ globals: title: Unsaved changes will be lost subtitle: Are you sure exit without saving? createInvoiceIn: Create invoice in + myAccount: My account errors: statusUnauthorized: Access denied statusInternalServerError: An internal server error has ocurred diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index de3aa8fd1..e1946515c 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -266,7 +266,7 @@ globals: title: Los cambios que no haya guardado se perderán subtitle: ¿Seguro que quiere salir sin guardar? createInvoiceIn: Crear factura recibida - + myAccount: Mi cuenta errors: statusUnauthorized: Acceso denegado statusInternalServerError: Ha ocurrido un error interno del servidor diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue index eda2b1b10..cbd102317 100644 --- a/src/pages/Ticket/TicketList.vue +++ b/src/pages/Ticket/TicketList.vue @@ -298,6 +298,7 @@ onMounted(() => (stateStore.rightDrawer = true));
+ +es: + Create training course: Crear curso de formación + diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue index 0853791ef..765241341 100644 --- a/src/pages/Worker/WorkerFilter.vue +++ b/src/pages/Worker/WorkerFilter.vue @@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n'; import FetchData from 'components/FetchData.vue'; import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue'; import VnInput from 'src/components/common/VnInput.vue'; +import VnSelect from 'src/components/common/VnSelect.vue'; const { t } = useI18n(); const props = defineProps({ @@ -26,7 +27,7 @@ const departments = ref(); {{ formatFn(tag.value) }}
-