From 374bc4a70387cebacdc0f1dc06afda8872d448e7 Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 12 Mar 2024 09:58:24 +0100 Subject: [PATCH 1/7] refs #6905 add rows --- src/components/UserPanel.vue | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue index e0b6b86ed..5b51e283e 100644 --- a/src/components/UserPanel.vue +++ b/src/components/UserPanel.vue @@ -7,6 +7,8 @@ import axios from 'axios'; import { useState } from 'src/composables/useState'; import { useSession } from 'src/composables/useSession'; import { localeEquivalence } from 'src/i18n/index'; +import VnSelectFilter from 'src/components/common/VnSelectFilter.vue'; +import VnRow from 'components/ui/VnRow.vue'; const state = useState(); const session = useSession(); @@ -144,6 +146,28 @@ function copyUserToken() { /> + + +
+ +
+
+ +
+ + +
+ +
+
+ +
+ + +
+ +
+ @@ -158,3 +182,22 @@ function copyUserToken() { } } + + + en: + localWarehouse: Local warehouse + localBank: Local bank + localCompany: Local company + userWarehouse: User warehouse + userCompany: User company + es: + New province: Nueva provincia + Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos! + Name: Nombre + Autonomy: Autonomía + localWarehouse: Almacén local + localBank: Banco local + localCompany: Empresa local + userWarehouse: Almacén del usuario + userCompany: Empresa del usuario + From 2d880be0f8b748a50295c42b4208ea18fcf1b081 Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 12 Mar 2024 11:04:57 +0100 Subject: [PATCH 2/7] refs #6905 fix vnrow --- src/components/UserPanel.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue index 5b51e283e..d6acb9a99 100644 --- a/src/components/UserPanel.vue +++ b/src/components/UserPanel.vue @@ -116,7 +116,7 @@ function copyUserToken() { -
+
-
+
From d8419a146af82b3433dec238dff4261bcc6767cd Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 15 Mar 2024 10:48:02 +0100 Subject: [PATCH 3/7] refs #6905 fix userConfig --- src/components/UserPanel.vue | 114 +++++++++++++++++++++++++++-------- 1 file changed, 90 insertions(+), 24 deletions(-) diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue index d6acb9a99..6037b6405 100644 --- a/src/components/UserPanel.vue +++ b/src/components/UserPanel.vue @@ -9,12 +9,14 @@ import { useSession } from 'src/composables/useSession'; import { localeEquivalence } from 'src/i18n/index'; import VnSelectFilter from 'src/components/common/VnSelectFilter.vue'; import VnRow from 'components/ui/VnRow.vue'; +import FetchData from 'components/FetchData.vue'; const state = useState(); const session = useSession(); const router = useRouter(); const { t, locale } = useI18n(); import { useClipboard } from 'src/composables/useClipboard'; +import { ref } from 'vue'; const { copyText } = useClipboard(); const userLocale = computed({ get() { @@ -47,6 +49,9 @@ const darkMode = computed({ const user = state.getUser(); const token = session.getToken(); +const warehousesData = ref(); +const companiesData = ref(); +const accountBankData = ref(); onMounted(async () => { updatePreferences(); @@ -86,12 +91,35 @@ function logout() { function copyUserToken() { copyText(session.getToken(), { label: 'components.userPanel.copyToken' }); } + +console.log('userWarehouse1', user); +console.log('userWarehouse', user.value); +console.log('userWarehouse', user.value.warehouseFk); +console.log('userWarehouse', user.value.warehouseFk.name); @@ -181,6 +237,16 @@ function copyUserToken() { cursor: alias; } } + +.icon { + align-items: center; + padding-left: 7.5%; +} + +.center { + display: flex; + flex: 0.96; +} From cb4ec856fdc4bf6faa12d2cd8ceb5b2922233a0e Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 15 Mar 2024 14:08:16 +0100 Subject: [PATCH 4/7] refs #6905 fix css --- src/components/UserPanel.vue | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue index f134de495..a75826e95 100644 --- a/src/components/UserPanel.vue +++ b/src/components/UserPanel.vue @@ -91,11 +91,6 @@ function logout() { function copyUserToken() { copyText(session.getToken(), { label: 'components.userPanel.copyToken' }); } - -console.log('userWarehouse1', user); -console.log('userWarehouse', user.value); -console.log('userWarehouse', user.value.warehouseFk); -console.log('userWarehouse', user.value.warehouseFk.name); @@ -251,8 +237,6 @@ function copyUserToken() { userWarehouse: User warehouse userCompany: User company es: - New province: Nueva provincia - Autonomy: Autonomía localWarehouse: Almacén local localBank: Banco local localCompany: Empresa local diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 429e75a34..d5461748c 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -85,8 +85,6 @@ export default { selectFile: 'Select a file', copyClipboard: 'Copy on clipboard', salesPerson: 'SalesPerson', - Name: 'Name', - ensureCorrectData: 'Please, ensure you put the correct data!', }, errors: { statusUnauthorized: 'Access denied', @@ -956,7 +954,7 @@ export default { roadmap: 'Roadmap', summary: 'Summary', basicData: 'Basic Data', - stops: 'Stops' + stops: 'Stops', }, }, roadmap: { @@ -964,7 +962,7 @@ export default { roadmap: 'Roadmap', summary: 'Summary', basicData: 'Basic Data', - stops: 'Stops' + stops: 'Stops', }, }, route: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index fb97ff817..9e5570a8a 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -85,8 +85,6 @@ export default { selectFile: 'Seleccione un fichero', copyClipboard: 'Copiar en portapapeles', salesPerson: 'Comercial', - Name: 'Nombre', - ensureCorrectData: '¡Por favor, asegúrese de poner los datos correctos!', }, errors: { statusUnauthorized: 'Acceso denegado', @@ -956,7 +954,7 @@ export default { roadmap: 'Troncales', summary: 'Resumen', basicData: 'Datos básicos', - stops: 'Paradas' + stops: 'Paradas', }, }, roadmap: { @@ -964,7 +962,7 @@ export default { roadmap: 'Troncales', summary: 'Resumen', basicData: 'Datos básicos', - stops: 'Paradas' + stops: 'Paradas', }, }, route: { From a284f5ce5f3acf440ee10a696e927e17701302e0 Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 22 Mar 2024 11:56:44 +0100 Subject: [PATCH 7/7] refs #6905 fix --- src/components/UserPanel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue index ffb49df04..8b3731478 100644 --- a/src/components/UserPanel.vue +++ b/src/components/UserPanel.vue @@ -184,7 +184,7 @@ function copyUserToken() { hide-selected v-model="user.localBankFk" :options="accountBankData" - option-label="name" + option-label="bank" option-value="id" >