From 924dea66d484502bcc19bb85c4fa82f2cf40708a Mon Sep 17 00:00:00 2001 From: pablone Date: Tue, 12 Sep 2023 18:27:31 +0200 Subject: [PATCH 01/22] refs #6118 importSalixVariables --- src/css/app.scss | 12 ++ src/css/variables.scss | 136 ++++++++++++++++++ src/css/width.scss | 26 ++++ src/pages/Claim/Card/ClaimBasicData.vue | 7 - src/pages/Customer/Card/CustomerBasicData.vue | 6 +- 5 files changed, 175 insertions(+), 12 deletions(-) create mode 100644 src/css/variables.scss create mode 100644 src/css/width.scss diff --git a/src/css/app.scss b/src/css/app.scss index 3c8cc50b6..d746fb8be 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -1,5 +1,6 @@ // app global css in SCSS form @import './icons.scss'; +@import './width.scss'; a { text-decoration: none; @@ -14,6 +15,17 @@ a { color: $orange-4; } +.q-card { + width: 100%; + max-width: $width-md; +} + +@media screen and (max-width: $width-md) { + .q-form > div { + flex-direction: column; // Cambia la dirección cuando pase de cierto tamaño + } +} + // Removes chrome autofill background input:-webkit-autofill, select:-webkit-autofill { diff --git a/src/css/variables.scss b/src/css/variables.scss new file mode 100644 index 000000000..0a74c8277 --- /dev/null +++ b/src/css/variables.scss @@ -0,0 +1,136 @@ +$font-size: 11pt; +$menu-width: 256px; +$topbar-height: 56px; +$mobile-width: 800px; +$float-spacing: 20px; + +// Width + +$width-xs: 400px; +$width-sm: 544px; +$width-md: 800px; +$width-lg: 1280px; +$width-xl: 1600px; + +// Spacing + +$spacing-xs: 4px; +$spacing-sm: 8px; +$spacing-md: 16px; +$spacing-lg: 32px; +$spacing-xl: 70px; + +// Light theme + +/* $color-primary: #f7931e; +$color-secondary: $color-primary; + +$color-font: #222; +$color-font-light: #555; +$color-font-secondary: #9b9b9b; +$color-font-dark: white; +$color-font-link: #005a9a; +$color-font-bg: rgba(0, 0, 0, .7); +$color-font-bg-marginal: rgba(0, 0, 0, .4); +$color-font-bg-dark: rgba(255, 255, 255, .7); +$color-font-bg-dark-marginal: rgba(255, 255, 255, .4); + +$color-header: #3d3d3d; +$color-menu-header: #3d3d3d; +$color-bg: #e5e5e5; +$color-bg-dark: #3d3d3d; +$color-active: #3d3d3d; +$color-active-font: $color-font-dark; +$color-bg-panel: white; +$color-main: $color-primary; +$color-marginal: #ccc; +$color-success: #a3d131; +$color-notice: #32b1ce; +$color-alert: #f42121; +$color-button: $color-secondary; + +$color-spacer: rgba(0, 0, 0, .3); +$color-spacer-light: rgba(0, 0, 0, .12); +$color-input-underline: rgba(0, 0, 0, .12); +$color-input-underline-hover: rgba(0, 0, 0, .6); +$color-shadow: rgba(0, 0, 0, .2); +$color-hightlight: rgba(0, 0, 0, .05); +$color-hover-cd: rgba(0, 0, 0, .1); +$color-hover-dc: .7; +$color-disabled: .6; + +$color-primary-medium: lighten($color-primary, 20%); +$color-primary-light: lighten($color-primary, 35%); +$color-font-link-medium: lighten($color-font-link, 20%); +$color-font-link-light: lighten($color-font-link, 35%); +$color-main-medium: lighten($color-main, 20%); +$color-main-light: lighten($color-main, 35%); +$color-success-medium: lighten($color-success, 20%); +$color-success-light: lighten($color-success, 35%); +$color-notice-medium: lighten($color-notice, 20%); +$color-notice-light: lighten($color-notice, 35%); +$color-alert-medium: lighten($color-alert, 20%); +$color-alert-light: lighten($color-alert, 35%); */ +/**/ + +// Dark theme +$color-primary: #ec8916; +$color-secondary: $color-primary; + +$color-font: #eee; +$color-font-light: #aaa; +$color-font-secondary: #777; +$color-font-dark: white; +$color-font-link: #66bfff; +$color-font-bg: rgba(0, 0, 0, .8); +$color-font-bg-marginal: rgba(255, 255, 255, .4); +$color-font-bg-dark: rgba(255, 255, 255, .7); +$color-font-bg-dark-marginal: rgba(255, 255, 255, .4); + +$color-header: #3d3d3d; +$color-menu-header: #3d3d3d; +$color-bg: #222; +$color-bg-dark: #222; +$color-active: #666; +$color-active-font: white; +$color-bg-panel: #3c3b3b; +$color-main: $color-primary; +$color-marginal: #222; +$color-success: #a3d131; +$color-notice: #32b1ce; +$color-alert: #fa3939; +$color-pink: #ff99cc; +$color-yellow: #ffff00; +$color-button: $color-secondary; + +$color-spacer: rgba(255, 255, 255, .3); +$color-spacer-light: rgba(255, 255, 255, .12); +$color-input-underline: rgba(255, 255, 255, .12); +$color-input-underline-hover: rgba(255, 255, 255, .6); +$color-shadow: rgba(0, 0, 0, .2); +$color-border: rgba(0, 0, 0, .3); +$color-hightlight: rgba(255, 255, 255, .15); +$color-hover-cd: rgba(255, 255, 255, .1); +$color-hover-dc: .7; +$color-disabled: .6; + +$color-primary-medium: lighten($color-primary, 20%); +$color-primary-light: lighten($color-primary, 35%); +$color-font-link-medium: lighten($color-font-link, 20%); +$color-font-link-light: lighten($color-font-link, 35%); +$color-main-medium: lighten($color-main, 20%); +$color-main-light: lighten($color-main, 35%); +$color-success-medium: lighten($color-success, 20%); +$color-success-light: lighten($color-success, 35%); +$color-notice-medium: lighten($color-notice, 20%); +$color-notice-light: lighten($color-notice, 35%); +$color-alert-medium: lighten($color-alert, 20%); +$color-alert-light: lighten($color-alert, 35%); +/**/ + +// Border + +$border-thin: 1px solid $color-border; +$border-thin-light: 1px solid $color-spacer-light; +$border: 2px solid $color-border; +$shadow: 0 2px 2px 0 rgba(0, 0, 0, .3); diff --git a/src/css/width.scss b/src/css/width.scss new file mode 100644 index 000000000..e017de3ea --- /dev/null +++ b/src/css/width.scss @@ -0,0 +1,26 @@ +@import "./variables"; + +%margin-auto { + margin-left: auto; + margin-right: auto; +} +.vn-w-xs { + @extend %margin-auto; + max-width: $width-xs; +} +.vn-w-sm { + @extend %margin-auto; + max-width: $width-sm; +} +.vn-w-md { + @extend %margin-auto; + max-width: $width-md; +} +.vn-w-lg { + @extend %margin-auto; + max-width: $width-lg; +} +.vn-w-xl { + @extend %margin-auto; + max-width: $width-xl; +} diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue index ddf669dd0..3dc5b0a59 100644 --- a/src/pages/Claim/Card/ClaimBasicData.vue +++ b/src/pages/Claim/Card/ClaimBasicData.vue @@ -218,10 +218,3 @@ const statesFilter = { - - diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue index ffd3c3476..889dc2376 100644 --- a/src/pages/Customer/Card/CustomerBasicData.vue +++ b/src/pages/Customer/Card/CustomerBasicData.vue @@ -171,8 +171,4 @@ const filterOptions = { - + From ae1ba448f73091c1cbd60c77a76d78e41391eb7a Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 13 Sep 2023 16:24:54 +0200 Subject: [PATCH 02/22] refs #6118 fix --- src/pages/Customer/Card/CustomerBasicData.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue index 889dc2376..8032735e1 100644 --- a/src/pages/Customer/Card/CustomerBasicData.vue +++ b/src/pages/Customer/Card/CustomerBasicData.vue @@ -170,5 +170,3 @@ const filterOptions = { - - From 39cbc32547a136a457dea68dbf361e493478c085 Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 13 Sep 2023 16:30:20 +0200 Subject: [PATCH 03/22] refs #6118 newVariable --- src/css/app.scss | 2 +- src/css/variables.scss | 32 +++++++++++++++++--------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/css/app.scss b/src/css/app.scss index d746fb8be..65495de93 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -16,7 +16,7 @@ a { } .q-card { - width: 100%; + width: $width-full; max-width: $width-md; } diff --git a/src/css/variables.scss b/src/css/variables.scss index 0a74c8277..9f047456c 100644 --- a/src/css/variables.scss +++ b/src/css/variables.scss @@ -12,6 +12,8 @@ $width-md: 800px; $width-lg: 1280px; $width-xl: 1600px; +$width-full: 100%; + // Spacing $spacing-xs: 4px; @@ -82,10 +84,10 @@ $color-font-light: #aaa; $color-font-secondary: #777; $color-font-dark: white; $color-font-link: #66bfff; -$color-font-bg: rgba(0, 0, 0, .8); -$color-font-bg-marginal: rgba(255, 255, 255, .4); -$color-font-bg-dark: rgba(255, 255, 255, .7); -$color-font-bg-dark-marginal: rgba(255, 255, 255, .4); +$color-font-bg: rgba(0, 0, 0, 0.8); +$color-font-bg-marginal: rgba(255, 255, 255, 0.4); +$color-font-bg-dark: rgba(255, 255, 255, 0.7); +$color-font-bg-dark-marginal: rgba(255, 255, 255, 0.4); $color-header: #3d3d3d; $color-menu-header: #3d3d3d; @@ -103,16 +105,16 @@ $color-pink: #ff99cc; $color-yellow: #ffff00; $color-button: $color-secondary; -$color-spacer: rgba(255, 255, 255, .3); -$color-spacer-light: rgba(255, 255, 255, .12); -$color-input-underline: rgba(255, 255, 255, .12); -$color-input-underline-hover: rgba(255, 255, 255, .6); -$color-shadow: rgba(0, 0, 0, .2); -$color-border: rgba(0, 0, 0, .3); -$color-hightlight: rgba(255, 255, 255, .15); -$color-hover-cd: rgba(255, 255, 255, .1); -$color-hover-dc: .7; -$color-disabled: .6; +$color-spacer: rgba(255, 255, 255, 0.3); +$color-spacer-light: rgba(255, 255, 255, 0.12); +$color-input-underline: rgba(255, 255, 255, 0.12); +$color-input-underline-hover: rgba(255, 255, 255, 0.6); +$color-shadow: rgba(0, 0, 0, 0.2); +$color-border: rgba(0, 0, 0, 0.3); +$color-hightlight: rgba(255, 255, 255, 0.15); +$color-hover-cd: rgba(255, 255, 255, 0.1); +$color-hover-dc: 0.7; +$color-disabled: 0.6; $color-primary-medium: lighten($color-primary, 20%); $color-primary-light: lighten($color-primary, 35%); @@ -133,4 +135,4 @@ $color-alert-light: lighten($color-alert, 35%); $border-thin: 1px solid $color-border; $border-thin-light: 1px solid $color-spacer-light; $border: 2px solid $color-border; -$shadow: 0 2px 2px 0 rgba(0, 0, 0, .3); +$shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.3); From c727480569d547a2e07ca1c3bd0475ee3705ca53 Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 13 Sep 2023 16:46:09 +0200 Subject: [PATCH 04/22] refs #6118 scoppedcss --- src/css/app.scss | 8 +- src/css/quasar.variables.scss | 10 ++ src/css/variables.scss | 138 ------------------ src/css/width.scss | 26 ---- src/pages/Customer/Card/CustomerBasicData.vue | 7 + 5 files changed, 18 insertions(+), 171 deletions(-) delete mode 100644 src/css/variables.scss delete mode 100644 src/css/width.scss diff --git a/src/css/app.scss b/src/css/app.scss index 65495de93..a65fcfec6 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -1,6 +1,5 @@ // app global css in SCSS form @import './icons.scss'; -@import './width.scss'; a { text-decoration: none; @@ -15,14 +14,9 @@ a { color: $orange-4; } -.q-card { - width: $width-full; - max-width: $width-md; -} - @media screen and (max-width: $width-md) { .q-form > div { - flex-direction: column; // Cambia la dirección cuando pase de cierto tamaño + flex-direction: column; } } diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index 808bf3468..558aa63f0 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -47,3 +47,13 @@ $dark-shadow-color: #000; $dark: #292929; $layout-shadow-dark: 0 0 10px 2px rgba(0, 0, 0, 0.2), 0 0px 10px rgba(0, 0, 0, 0.24); $spacing-md: 16px; + +// Width from Salix variables.scss + +$width-xs: 400px; +$width-sm: 544px; +$width-md: 800px; +$width-lg: 1280px; +$width-xl: 1600px; + +$width-full: 100%; diff --git a/src/css/variables.scss b/src/css/variables.scss deleted file mode 100644 index 9f047456c..000000000 --- a/src/css/variables.scss +++ /dev/null @@ -1,138 +0,0 @@ -$font-size: 11pt; -$menu-width: 256px; -$topbar-height: 56px; -$mobile-width: 800px; -$float-spacing: 20px; - -// Width - -$width-xs: 400px; -$width-sm: 544px; -$width-md: 800px; -$width-lg: 1280px; -$width-xl: 1600px; - -$width-full: 100%; - -// Spacing - -$spacing-xs: 4px; -$spacing-sm: 8px; -$spacing-md: 16px; -$spacing-lg: 32px; -$spacing-xl: 70px; - -// Light theme - -/* $color-primary: #f7931e; -$color-secondary: $color-primary; - -$color-font: #222; -$color-font-light: #555; -$color-font-secondary: #9b9b9b; -$color-font-dark: white; -$color-font-link: #005a9a; -$color-font-bg: rgba(0, 0, 0, .7); -$color-font-bg-marginal: rgba(0, 0, 0, .4); -$color-font-bg-dark: rgba(255, 255, 255, .7); -$color-font-bg-dark-marginal: rgba(255, 255, 255, .4); - -$color-header: #3d3d3d; -$color-menu-header: #3d3d3d; -$color-bg: #e5e5e5; -$color-bg-dark: #3d3d3d; -$color-active: #3d3d3d; -$color-active-font: $color-font-dark; -$color-bg-panel: white; -$color-main: $color-primary; -$color-marginal: #ccc; -$color-success: #a3d131; -$color-notice: #32b1ce; -$color-alert: #f42121; -$color-button: $color-secondary; - -$color-spacer: rgba(0, 0, 0, .3); -$color-spacer-light: rgba(0, 0, 0, .12); -$color-input-underline: rgba(0, 0, 0, .12); -$color-input-underline-hover: rgba(0, 0, 0, .6); -$color-shadow: rgba(0, 0, 0, .2); -$color-hightlight: rgba(0, 0, 0, .05); -$color-hover-cd: rgba(0, 0, 0, .1); -$color-hover-dc: .7; -$color-disabled: .6; - -$color-primary-medium: lighten($color-primary, 20%); -$color-primary-light: lighten($color-primary, 35%); -$color-font-link-medium: lighten($color-font-link, 20%); -$color-font-link-light: lighten($color-font-link, 35%); -$color-main-medium: lighten($color-main, 20%); -$color-main-light: lighten($color-main, 35%); -$color-success-medium: lighten($color-success, 20%); -$color-success-light: lighten($color-success, 35%); -$color-notice-medium: lighten($color-notice, 20%); -$color-notice-light: lighten($color-notice, 35%); -$color-alert-medium: lighten($color-alert, 20%); -$color-alert-light: lighten($color-alert, 35%); */ -/**/ - -// Dark theme -$color-primary: #ec8916; -$color-secondary: $color-primary; - -$color-font: #eee; -$color-font-light: #aaa; -$color-font-secondary: #777; -$color-font-dark: white; -$color-font-link: #66bfff; -$color-font-bg: rgba(0, 0, 0, 0.8); -$color-font-bg-marginal: rgba(255, 255, 255, 0.4); -$color-font-bg-dark: rgba(255, 255, 255, 0.7); -$color-font-bg-dark-marginal: rgba(255, 255, 255, 0.4); - -$color-header: #3d3d3d; -$color-menu-header: #3d3d3d; -$color-bg: #222; -$color-bg-dark: #222; -$color-active: #666; -$color-active-font: white; -$color-bg-panel: #3c3b3b; -$color-main: $color-primary; -$color-marginal: #222; -$color-success: #a3d131; -$color-notice: #32b1ce; -$color-alert: #fa3939; -$color-pink: #ff99cc; -$color-yellow: #ffff00; -$color-button: $color-secondary; - -$color-spacer: rgba(255, 255, 255, 0.3); -$color-spacer-light: rgba(255, 255, 255, 0.12); -$color-input-underline: rgba(255, 255, 255, 0.12); -$color-input-underline-hover: rgba(255, 255, 255, 0.6); -$color-shadow: rgba(0, 0, 0, 0.2); -$color-border: rgba(0, 0, 0, 0.3); -$color-hightlight: rgba(255, 255, 255, 0.15); -$color-hover-cd: rgba(255, 255, 255, 0.1); -$color-hover-dc: 0.7; -$color-disabled: 0.6; - -$color-primary-medium: lighten($color-primary, 20%); -$color-primary-light: lighten($color-primary, 35%); -$color-font-link-medium: lighten($color-font-link, 20%); -$color-font-link-light: lighten($color-font-link, 35%); -$color-main-medium: lighten($color-main, 20%); -$color-main-light: lighten($color-main, 35%); -$color-success-medium: lighten($color-success, 20%); -$color-success-light: lighten($color-success, 35%); -$color-notice-medium: lighten($color-notice, 20%); -$color-notice-light: lighten($color-notice, 35%); -$color-alert-medium: lighten($color-alert, 20%); -$color-alert-light: lighten($color-alert, 35%); -/**/ - -// Border - -$border-thin: 1px solid $color-border; -$border-thin-light: 1px solid $color-spacer-light; -$border: 2px solid $color-border; -$shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.3); diff --git a/src/css/width.scss b/src/css/width.scss deleted file mode 100644 index e017de3ea..000000000 --- a/src/css/width.scss +++ /dev/null @@ -1,26 +0,0 @@ -@import "./variables"; - -%margin-auto { - margin-left: auto; - margin-right: auto; -} -.vn-w-xs { - @extend %margin-auto; - max-width: $width-xs; -} -.vn-w-sm { - @extend %margin-auto; - max-width: $width-sm; -} -.vn-w-md { - @extend %margin-auto; - max-width: $width-md; -} -.vn-w-lg { - @extend %margin-auto; - max-width: $width-lg; -} -.vn-w-xl { - @extend %margin-auto; - max-width: $width-xl; -} diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue index 8032735e1..bc27baf6c 100644 --- a/src/pages/Customer/Card/CustomerBasicData.vue +++ b/src/pages/Customer/Card/CustomerBasicData.vue @@ -170,3 +170,10 @@ const filterOptions = { + + From 8d27ef5402a027d5867fbfe0d808ee01729c2cef Mon Sep 17 00:00:00 2001 From: pablone Date: Tue, 19 Sep 2023 09:42:47 +0200 Subject: [PATCH 05/22] refs #6118 fixResponsive --- src/components/FormModel.vue | 50 ++-- src/css/app.scss | 6 - src/css/quasar.variables.scss | 8 - src/pages/Claim/Card/ClaimBasicData.vue | 235 +++++++++--------- src/pages/Customer/Card/CustomerBasicData.vue | 214 ++++++++-------- 5 files changed, 252 insertions(+), 261 deletions(-) diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 9d0916a8e..5c40dfdd5 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -107,21 +107,28 @@ watch(formUrl, async () => { {{ t('globals.changesToSave') }} - - -
- - - - -
+ + + +
+ + + + +
+ { color="primary" /> + + diff --git a/src/css/app.scss b/src/css/app.scss index a65fcfec6..3c8cc50b6 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -14,12 +14,6 @@ a { color: $orange-4; } -@media screen and (max-width: $width-md) { - .q-form > div { - flex-direction: column; - } -} - // Removes chrome autofill background input:-webkit-autofill, select:-webkit-autofill { diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index 558aa63f0..d6a55ff93 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -48,12 +48,4 @@ $dark: #292929; $layout-shadow-dark: 0 0 10px 2px rgba(0, 0, 0, 0.2), 0 0px 10px rgba(0, 0, 0, 0.24); $spacing-md: 16px; -// Width from Salix variables.scss - -$width-xs: 400px; -$width-sm: 544px; -$width-md: 800px; -$width-lg: 1280px; -$width-xl: 1600px; - $width-full: 100%; diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue index 3dc5b0a59..f6ba556e9 100644 --- a/src/pages/Claim/Card/ClaimBasicData.vue +++ b/src/pages/Claim/Card/ClaimBasicData.vue @@ -92,129 +92,124 @@ const statesFilter = {
- - - +
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue index bc27baf6c..c9460bce6 100644 --- a/src/pages/Customer/Card/CustomerBasicData.vue +++ b/src/pages/Customer/Card/CustomerBasicData.vue @@ -59,121 +59,111 @@ const filterOptions = { auto-load />
- - - +
- - From b66c265deeffdd440e156803c778f1ad3926c430 Mon Sep 17 00:00:00 2001 From: pablone Date: Tue, 19 Sep 2023 09:43:21 +0200 Subject: [PATCH 06/22] refs #6118 removeVariables --- src/css/quasar.variables.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index d6a55ff93..808bf3468 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -47,5 +47,3 @@ $dark-shadow-color: #000; $dark: #292929; $layout-shadow-dark: 0 0 10px 2px rgba(0, 0, 0, 0.2), 0 0px 10px rgba(0, 0, 0, 0.24); $spacing-md: 16px; - -$width-full: 100%; From 318e2f22777a9f9ebbde267f04ce99dff4951793 Mon Sep 17 00:00:00 2001 From: jorgep Date: Fri, 6 Oct 2023 09:11:29 +0200 Subject: [PATCH 07/22] ref #6248 breadcrumbs created --- src/components/NavBar.vue | 3 + src/components/common/VnBreadCrumbs.vue | 100 ++++++++++++++++ src/components/ui/VnSearchbar.vue | 6 +- src/composables/useCamelCase.js | 3 + src/composables/useFirstUpper.js | 3 + src/pages/Wagon/Card/WagonCard.vue | 29 +++++ src/pages/Wagon/Type/Card/WagonTypeCard.vue | 26 +++++ src/router/modules/route.js | 4 +- src/router/modules/wagon.js | 107 +++++++++++------- .../cypress/integration/vnBreadCrumbs.spec.js | 19 ++++ test/cypress/integration/workerList.spec.js | 10 +- 11 files changed, 261 insertions(+), 49 deletions(-) create mode 100644 src/components/common/VnBreadCrumbs.vue create mode 100644 src/composables/useCamelCase.js create mode 100644 src/composables/useFirstUpper.js create mode 100644 src/pages/Wagon/Card/WagonCard.vue create mode 100644 src/pages/Wagon/Type/Card/WagonTypeCard.vue create mode 100644 test/cypress/integration/vnBreadCrumbs.spec.js diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index 7d09b09b8..6102dca55 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -7,6 +7,7 @@ import { useStateStore } from 'stores/useStateStore'; import { useQuasar } from 'quasar'; import PinnedModules from './PinnedModules.vue'; import UserPanel from 'components/UserPanel.vue'; +import VnBreadCrumbs from './common/VnBreadCrumbs.vue'; const { t } = useI18n(); const session = useSession(); @@ -61,6 +62,7 @@ const pinnedModulesRef = ref(); {{ appName }} + @@ -112,6 +114,7 @@ const pinnedModulesRef = ref();
+ diff --git a/src/components/common/VnBreadCrumbs.vue b/src/components/common/VnBreadCrumbs.vue new file mode 100644 index 000000000..64c01ae28 --- /dev/null +++ b/src/components/common/VnBreadCrumbs.vue @@ -0,0 +1,100 @@ + + + diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue index af6999b5b..693d6fce2 100644 --- a/src/components/ui/VnSearchbar.vue +++ b/src/components/ui/VnSearchbar.vue @@ -105,7 +105,11 @@ async function search() { class="cursor-pointer" /> - + {{ props.info }} diff --git a/src/composables/useCamelCase.js b/src/composables/useCamelCase.js new file mode 100644 index 000000000..5285b022a --- /dev/null +++ b/src/composables/useCamelCase.js @@ -0,0 +1,3 @@ +export function useCamelCase(value) { + return value.replace(/[-_](.)/g, (_, char) => char.toUpperCase()); +} diff --git a/src/composables/useFirstUpper.js b/src/composables/useFirstUpper.js new file mode 100644 index 000000000..36378c05f --- /dev/null +++ b/src/composables/useFirstUpper.js @@ -0,0 +1,3 @@ +export function useFirstUpper(str) { + return str && str.charAt(0).toUpperCase() + str.substr(1); +} diff --git a/src/pages/Wagon/Card/WagonCard.vue b/src/pages/Wagon/Card/WagonCard.vue new file mode 100644 index 000000000..18ec121e3 --- /dev/null +++ b/src/pages/Wagon/Card/WagonCard.vue @@ -0,0 +1,29 @@ + + + + +es: + Search customer: Buscar cliente + You can search by customer id or name: Puedes buscar por id o nombre del cliente + diff --git a/src/pages/Wagon/Type/Card/WagonTypeCard.vue b/src/pages/Wagon/Type/Card/WagonTypeCard.vue new file mode 100644 index 000000000..a23122947 --- /dev/null +++ b/src/pages/Wagon/Type/Card/WagonTypeCard.vue @@ -0,0 +1,26 @@ + + + + +es: + Search customer: Buscar cliente + You can search by customer id or name: Puedes buscar por id o nombre del cliente + diff --git a/src/router/modules/route.js b/src/router/modules/route.js index a3550885c..acda898de 100644 --- a/src/router/modules/route.js +++ b/src/router/modules/route.js @@ -21,13 +21,13 @@ export default { redirect: { name: 'CmrList' }, children: [ { - path: 'cmr/list', + path: 'cmr', name: 'CmrList', meta: { title: 'cmrsList', icon: 'fact_check', }, - component: () => import('src/pages/Route/Cmr/CmrList.vue') + component: () => import('src/pages/Route/Cmr/CmrList.vue'), }, ], }, diff --git a/src/router/modules/wagon.js b/src/router/modules/wagon.js index 02513d5a8..5a491cf1e 100644 --- a/src/router/modules/wagon.js +++ b/src/router/modules/wagon.js @@ -11,11 +11,11 @@ export default { redirect: { name: 'WagonMain' }, menus: { main: ['WagonList', 'WagonTypeList'], - card: [], + card: ['WagonEdit'], }, children: [ { - path: '/wagon', + path: '', name: 'WagonMain', component: () => import('src/pages/Wagon/WagonMain.vue'), redirect: { name: 'WagonList' }, @@ -27,7 +27,7 @@ export default { title: 'wagonsList', icon: 'vn:trolley', }, - component: () => import('src/pages/Wagon/WagonList.vue') + component: () => import('src/pages/Wagon/WagonList.vue'), }, { path: 'create', @@ -36,53 +36,78 @@ export default { title: 'wagonCreate', icon: 'create', }, - component: () => import('src/pages/Wagon/WagonCreate.vue') + component: () => import('src/pages/Wagon/WagonCreate.vue'), }, { - path: ':id/edit', + path: 'type', + name: 'WagonTypeMain', + meta: { + title: 'typesList', + icon: 'view_list', + }, + redirect: { name: 'WagonTypeList' }, + children: [ + { + path: 'list', + name: 'WagonTypeList', + meta: { + title: 'typesList', + icon: 'view_list', + }, + component: () => + import('src/pages/Wagon/Type/WagonTypeList.vue'), + }, + { + path: 'create', + name: 'WagonTypeCreate', + meta: { + title: 'typeCreate', + icon: 'create', + }, + component: () => + import('src/pages/Wagon/Type/WagonTypeCreate.vue'), + }, + { + path: ':id', + name: 'WagonTypeCard', + component: () => + import('src/pages/Wagon/Type/Card/WagonTypeCard.vue'), + redirect: { name: 'WagonTypeEdit' }, + children: [ + { + path: 'edit', + name: 'WagonTypeEdit', + meta: { + title: 'typeEdit', + icon: 'edit', + }, + component: () => + import( + 'src/pages/Wagon/Type/WagonTypeCreate.vue' + ), + }, + ], + }, + ], + }, + ], + }, + { + name: 'WagonCard', + path: ':id', + component: () => import('src/pages/Wagon/Card/WagonCard.vue'), + redirect: { name: 'WagonEdit' }, + children: [ + { + path: 'edit', name: 'WagonEdit', meta: { title: 'wagonEdit', icon: 'edit', }, - component: () => import('src/pages/Wagon/WagonCreate.vue') + component: () => import('src/pages/Wagon/WagonCreate.vue'), }, ], }, - { - path: '/wagon/type', - name: 'WagonTypeMain', - component: () => import('src/pages/Wagon/WagonMain.vue'), - redirect: { name: 'WagonTypeList' }, - children: [ - { - path: 'list', - name: 'WagonTypeList', - meta: { - title: 'typesList', - icon: 'view_list', - }, - component: () => import('src/pages/Wagon/Type/WagonTypeList.vue') - }, - { - path: 'create', - name: 'WagonTypeCreate', - meta: { - title: 'typeCreate', - icon: 'create', - }, - component: () => import('src/pages/Wagon/Type/WagonTypeCreate.vue') - }, - { - path: ':id/edit', - name: 'WagonTypeEdit', - meta: { - title: 'typeEdit', - icon: 'edit', - }, - component: () => import('src/pages/Wagon/Type/WagonTypeCreate.vue') - }, - ], - } ], }; diff --git a/test/cypress/integration/vnBreadCrumbs.spec.js b/test/cypress/integration/vnBreadCrumbs.spec.js new file mode 100644 index 000000000..9e17b6b80 --- /dev/null +++ b/test/cypress/integration/vnBreadCrumbs.spec.js @@ -0,0 +1,19 @@ +/// +describe('VnBreadCrumbs', () => { + beforeEach(() => { + cy.login('developer'); + cy.visit('/'); + }); + + it('should not be breadcrumbs', () => { + cy.get('.q-breadcrumbs').should('not.exist'); + }); + it('should get the correct breadcrumbs', () => { + cy.get('[href="#/customer"]').click(); + cy.get('.q-breadcrumbs .q-breadcrumbs--last').should('have.length', 1); + cy.get('.q-breadcrumbs .q-breadcrumbs--last').contains('Clientes'); + cy.get('.q-infinite-scroll > :nth-child(1)').click(); + cy.get('.q-breadcrumbs .q-breadcrumbs__el').should('have.length', 2); + cy.get('.q-breadcrumbs .q-breadcrumbs__el').eq(1).contains('Resumen'); + }); +}); diff --git a/test/cypress/integration/workerList.spec.js b/test/cypress/integration/workerList.spec.js index d76958367..8d4dd770d 100644 --- a/test/cypress/integration/workerList.spec.js +++ b/test/cypress/integration/workerList.spec.js @@ -8,17 +8,17 @@ describe('WorkerList', () => { it('should load workers', () => { cy.get('.card-list-body > .list-items > :nth-child(2) > .value > span') .eq(0) - .should('have.text', 'victorvd'); - cy.get('.card-list-body > .list-items > :nth-child(2) > .value > span') - .eq(1) .should('have.text', 'JessicaJones'); cy.get('.card-list-body > .list-items > :nth-child(2) > .value > span') - .eq(2) + .eq(1) .should('have.text', 'BruceBanner'); + cy.get('.card-list-body > .list-items > :nth-child(2) > .value > span') + .eq(2) + .should('have.text', 'CharlesXavier'); }); it('should open the worker summary', () => { - cy.get('.card-list-body .actions .q-btn:nth-child(2)').eq(1).click(); + cy.get('.card-list-body .actions .q-btn:nth-child(2)').eq(0).click(); cy.get('.summaryHeader div').should('have.text', '1110 - Jessica Jones'); cy.get('.summary .header').eq(0).invoke('text').should('include', 'Basic data'); cy.get('.summary .header').eq(1).should('have.text', 'User data'); From 0c930e5de19cc691d1e1a1b9f5450bbf5c96d356 Mon Sep 17 00:00:00 2001 From: jorgep Date: Fri, 13 Oct 2023 12:36:25 +0200 Subject: [PATCH 08/22] ref #6248 test fixed --- test/cypress/integration/vnBreadCrumbs.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cypress/integration/vnBreadCrumbs.spec.js b/test/cypress/integration/vnBreadCrumbs.spec.js index 9e17b6b80..dd74fbfd4 100644 --- a/test/cypress/integration/vnBreadCrumbs.spec.js +++ b/test/cypress/integration/vnBreadCrumbs.spec.js @@ -11,9 +11,9 @@ describe('VnBreadCrumbs', () => { it('should get the correct breadcrumbs', () => { cy.get('[href="#/customer"]').click(); cy.get('.q-breadcrumbs .q-breadcrumbs--last').should('have.length', 1); - cy.get('.q-breadcrumbs .q-breadcrumbs--last').contains('Clientes'); + cy.get('.q-breadcrumbs .q-breadcrumbs--last').contains('List'); cy.get('.q-infinite-scroll > :nth-child(1)').click(); cy.get('.q-breadcrumbs .q-breadcrumbs__el').should('have.length', 2); - cy.get('.q-breadcrumbs .q-breadcrumbs__el').eq(1).contains('Resumen'); + cy.get('.q-breadcrumbs .q-breadcrumbs__el').eq(1).contains('Summary'); }); }); From 7c20ee2a420c92e8a53dc2421ad94864730e1501 Mon Sep 17 00:00:00 2001 From: pablone Date: Fri, 13 Oct 2023 13:10:29 +0200 Subject: [PATCH 09/22] refs #6118 modelfixes --- src/components/FormModel.vue | 8 +------- src/components/RowWrapper.vue | 11 +++++++++++ src/pages/Customer/Card/CustomerBasicData.vue | 5 +++-- 3 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 src/components/RowWrapper.vue diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 5c40dfdd5..4187c9eea 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -138,13 +138,7 @@ watch(formUrl, async () => { /> - diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue index c9460bce6..b2c1eee0b 100644 --- a/src/pages/Customer/Card/CustomerBasicData.vue +++ b/src/pages/Customer/Card/CustomerBasicData.vue @@ -6,6 +6,7 @@ import { useI18n } from 'vue-i18n'; import { useSession } from 'src/composables/useSession'; import FetchData from 'components/FetchData.vue'; import FormModel from 'components/FormModel.vue'; +import RowWrapper from 'components/RowWrapper.vue'; const route = useRoute(); const { t } = useI18n(); @@ -61,7 +62,7 @@ const filterOptions = {
diff --git a/src/components/common/VnBreadCrumbs.vue b/src/components/common/VnBreadCrumbs.vue deleted file mode 100644 index 64c01ae28..000000000 --- a/src/components/common/VnBreadCrumbs.vue +++ /dev/null @@ -1,100 +0,0 @@ - - - diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue new file mode 100644 index 000000000..792671e21 --- /dev/null +++ b/src/components/common/VnBreadcrumbs.vue @@ -0,0 +1,82 @@ + + + diff --git a/src/pages/Wagon/Type/Card/WagonTypeCard.vue b/src/pages/Wagon/Type/Card/WagonTypeCard.vue deleted file mode 100644 index a23122947..000000000 --- a/src/pages/Wagon/Type/Card/WagonTypeCard.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - -es: - Search customer: Buscar cliente - You can search by customer id or name: Puedes buscar por id o nombre del cliente - diff --git a/src/router/modules/wagon.js b/src/router/modules/wagon.js index 5a491cf1e..3fb808778 100644 --- a/src/router/modules/wagon.js +++ b/src/router/modules/wagon.js @@ -11,11 +11,11 @@ export default { redirect: { name: 'WagonMain' }, menus: { main: ['WagonList', 'WagonTypeList'], - card: ['WagonEdit'], + card: [], }, children: [ { - path: '', + path: '/wagon', name: 'WagonMain', component: () => import('src/pages/Wagon/WagonMain.vue'), redirect: { name: 'WagonList' }, @@ -39,67 +39,7 @@ export default { component: () => import('src/pages/Wagon/WagonCreate.vue'), }, { - path: 'type', - name: 'WagonTypeMain', - meta: { - title: 'typesList', - icon: 'view_list', - }, - redirect: { name: 'WagonTypeList' }, - children: [ - { - path: 'list', - name: 'WagonTypeList', - meta: { - title: 'typesList', - icon: 'view_list', - }, - component: () => - import('src/pages/Wagon/Type/WagonTypeList.vue'), - }, - { - path: 'create', - name: 'WagonTypeCreate', - meta: { - title: 'typeCreate', - icon: 'create', - }, - component: () => - import('src/pages/Wagon/Type/WagonTypeCreate.vue'), - }, - { - path: ':id', - name: 'WagonTypeCard', - component: () => - import('src/pages/Wagon/Type/Card/WagonTypeCard.vue'), - redirect: { name: 'WagonTypeEdit' }, - children: [ - { - path: 'edit', - name: 'WagonTypeEdit', - meta: { - title: 'typeEdit', - icon: 'edit', - }, - component: () => - import( - 'src/pages/Wagon/Type/WagonTypeCreate.vue' - ), - }, - ], - }, - ], - }, - ], - }, - { - name: 'WagonCard', - path: ':id', - component: () => import('src/pages/Wagon/Card/WagonCard.vue'), - redirect: { name: 'WagonEdit' }, - children: [ - { - path: 'edit', + path: ':id/edit', name: 'WagonEdit', meta: { title: 'wagonEdit', @@ -109,5 +49,40 @@ export default { }, ], }, + { + path: '/wagon/type', + name: 'WagonTypeMain', + component: () => import('src/pages/Wagon/WagonMain.vue'), + redirect: { name: 'WagonTypeList' }, + children: [ + { + path: 'list', + name: 'WagonTypeList', + meta: { + title: 'typesList', + icon: 'view_list', + }, + component: () => import('src/pages/Wagon/Type/WagonTypeList.vue'), + }, + { + path: 'create', + name: 'WagonTypeCreate', + meta: { + title: 'typeCreate', + icon: 'create', + }, + component: () => import('src/pages/Wagon/Type/WagonTypeCreate.vue'), + }, + { + path: ':id/edit', + name: 'WagonTypeEdit', + meta: { + title: 'typeEdit', + icon: 'edit', + }, + component: () => import('src/pages/Wagon/Type/WagonTypeCreate.vue'), + }, + ], + }, ], }; diff --git a/test/cypress/integration/vnBreadCrumbs.spec.js b/test/cypress/integration/vnBreadCrumbs.spec.js deleted file mode 100644 index dd74fbfd4..000000000 --- a/test/cypress/integration/vnBreadCrumbs.spec.js +++ /dev/null @@ -1,19 +0,0 @@ -/// -describe('VnBreadCrumbs', () => { - beforeEach(() => { - cy.login('developer'); - cy.visit('/'); - }); - - it('should not be breadcrumbs', () => { - cy.get('.q-breadcrumbs').should('not.exist'); - }); - it('should get the correct breadcrumbs', () => { - cy.get('[href="#/customer"]').click(); - cy.get('.q-breadcrumbs .q-breadcrumbs--last').should('have.length', 1); - cy.get('.q-breadcrumbs .q-breadcrumbs--last').contains('List'); - cy.get('.q-infinite-scroll > :nth-child(1)').click(); - cy.get('.q-breadcrumbs .q-breadcrumbs__el').should('have.length', 2); - cy.get('.q-breadcrumbs .q-breadcrumbs__el').eq(1).contains('Summary'); - }); -}); diff --git a/test/cypress/integration/vnBreadcrumbs.spec.js b/test/cypress/integration/vnBreadcrumbs.spec.js new file mode 100644 index 000000000..3c839c1c7 --- /dev/null +++ b/test/cypress/integration/vnBreadcrumbs.spec.js @@ -0,0 +1,21 @@ +/// +describe('VnBreadcrumbs', () => { + const firstCard = '.q-infinite-scroll > :nth-child(1)'; + const lastBreadcrumb = '.q-breadcrumbs--last > .q-breadcrumbs__el'; + beforeEach(() => { + cy.login('developer'); + cy.visit('/'); + }); + + it('should not be breadcrumbs', () => { + cy.get('.q-breadcrumbs').should('not.exist'); + }); + + it('should get the correct breadcrumbs', () => { + cy.visit('#/customer/list'); + cy.get('.q-breadcrumbs__el').should('have.length', 2); + + cy.get(firstCard).click(); + cy.get(`${lastBreadcrumb} > .q-icon`).should('have.text', 'launch'); + }); +}); From edf6de25106fe591633f7b60f793852b94841fff Mon Sep 17 00:00:00 2001 From: pablone Date: Thu, 19 Oct 2023 14:51:22 +0200 Subject: [PATCH 14/22] feat(app.scss): vn-horizontal flex direction column refs #6118 --- src/components/ui/VnRow.vue | 12 ------------ src/css/app.scss | 8 ++++++++ src/pages/Claim/Card/ClaimBasicData.vue | 17 ++++++++--------- src/pages/Customer/Card/CustomerBasicData.vue | 18 +++++++++--------- 4 files changed, 25 insertions(+), 30 deletions(-) delete mode 100644 src/components/ui/VnRow.vue diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue deleted file mode 100644 index c3c951528..000000000 --- a/src/components/ui/VnRow.vue +++ /dev/null @@ -1,12 +0,0 @@ - - diff --git a/src/css/app.scss b/src/css/app.scss index 3c8cc50b6..92bddc304 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -39,3 +39,11 @@ body.body--dark { --vn-gray: #313131; --vn-label: #a8a8a8; } + +html [vn-horizontal], +vn-horizontal, +.vn-horizontal { + @media screen and (max-width: 800px) { + flex-direction: column; + } +} diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue index dd4fe2f88..4a7f61930 100644 --- a/src/pages/Claim/Card/ClaimBasicData.vue +++ b/src/pages/Claim/Card/ClaimBasicData.vue @@ -6,7 +6,6 @@ import { useI18n } from 'vue-i18n'; import { useSession } from 'src/composables/useSession'; import FetchData from 'components/FetchData.vue'; import FormModel from 'components/FormModel.vue'; -import VnRow from 'components/ui/VnRow.vue'; const route = useRoute(); const { t } = useI18n(); @@ -100,7 +99,7 @@ const statesFilter = { model="claim" >
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue index 952020a82..230ebc8db 100644 --- a/src/pages/Customer/Card/CustomerBasicData.vue +++ b/src/pages/Customer/Card/CustomerBasicData.vue @@ -6,7 +6,7 @@ import { useI18n } from 'vue-i18n'; import { useSession } from 'src/composables/useSession'; import FetchData from 'components/FetchData.vue'; import FormModel from 'components/FormModel.vue'; -import VnRow from 'components/ui/VnRow.vue'; +import vn-horizontal from 'components/ui/vn-horizontal.vue'; const route = useRoute(); const { t } = useI18n(); @@ -62,7 +62,7 @@ const filterOptions = {
From 8c3998ea4021df51b174364e7c8d2026456a95e5 Mon Sep 17 00:00:00 2001 From: pablone Date: Fri, 20 Oct 2023 14:22:02 +0200 Subject: [PATCH 15/22] feat(vnRow): se cambia de vn-horizontal vnRow por el kebab case refs #6118 --- src/css/app.scss | 6 +++--- src/pages/Claim/Card/ClaimBasicData.vue | 16 ++++++++-------- src/pages/Customer/Card/CustomerBasicData.vue | 18 ++++++++---------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/css/app.scss b/src/css/app.scss index 92bddc304..fa43bdcef 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -40,9 +40,9 @@ body.body--dark { --vn-label: #a8a8a8; } -html [vn-horizontal], -vn-horizontal, -.vn-horizontal { +html [vnRow], +vnRow, +.vnRow { @media screen and (max-width: 800px) { flex-direction: column; } diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue index 4a7f61930..6985e45ab 100644 --- a/src/pages/Claim/Card/ClaimBasicData.vue +++ b/src/pages/Claim/Card/ClaimBasicData.vue @@ -99,7 +99,7 @@ const statesFilter = { model="claim" > diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue index 230ebc8db..b7e6fd283 100644 --- a/src/pages/Customer/Card/CustomerBasicData.vue +++ b/src/pages/Customer/Card/CustomerBasicData.vue @@ -6,8 +6,6 @@ import { useI18n } from 'vue-i18n'; import { useSession } from 'src/composables/useSession'; import FetchData from 'components/FetchData.vue'; import FormModel from 'components/FormModel.vue'; -import vn-horizontal from 'components/ui/vn-horizontal.vue'; - const route = useRoute(); const { t } = useI18n(); const session = useSession(); @@ -62,7 +60,7 @@ const filterOptions = {
From 36cf762857a64c1ee377807559ce35c7ef70dc19 Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 25 Oct 2023 18:45:29 +0200 Subject: [PATCH 16/22] feat(VnRow): add new conponenet VnRow refs #6118 --- src/components/FormModel.vue | 14 +++++++++----- src/components/ui/VnRow.vue | 13 +++++++++++++ src/pages/Claim/Card/ClaimBasicData.vue | 17 +++++++++-------- src/pages/Customer/Card/CustomerBasicData.vue | 2 ++ 4 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 src/components/ui/VnRow.vue diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 7f283f3b4..61ad34ea4 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -122,8 +122,10 @@ watch(formUrl, async () => { {{ t('globals.changesToSave') }} - - + + + +
@@ -156,10 +158,12 @@ watch(formUrl, async () => { color="primary" /> - - diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue new file mode 100644 index 000000000..a243d7546 --- /dev/null +++ b/src/components/ui/VnRow.vue @@ -0,0 +1,13 @@ + + + diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue index 6985e45ab..dd4fe2f88 100644 --- a/src/pages/Claim/Card/ClaimBasicData.vue +++ b/src/pages/Claim/Card/ClaimBasicData.vue @@ -6,6 +6,7 @@ import { useI18n } from 'vue-i18n'; import { useSession } from 'src/composables/useSession'; import FetchData from 'components/FetchData.vue'; import FormModel from 'components/FormModel.vue'; +import VnRow from 'components/ui/VnRow.vue'; const route = useRoute(); const { t } = useI18n(); @@ -99,7 +100,7 @@ const statesFilter = { model="claim" >
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue index b7e6fd283..d8d3f3ece 100644 --- a/src/pages/Customer/Card/CustomerBasicData.vue +++ b/src/pages/Customer/Card/CustomerBasicData.vue @@ -6,6 +6,8 @@ import { useI18n } from 'vue-i18n'; import { useSession } from 'src/composables/useSession'; import FetchData from 'components/FetchData.vue'; import FormModel from 'components/FormModel.vue'; +import VnRow from 'components/ui/VnRow.vue'; + const route = useRoute(); const { t } = useI18n(); const session = useSession(); From 157a2b854e42a4deae817d8d7c3943e44562eabf Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 25 Oct 2023 18:49:44 +0200 Subject: [PATCH 17/22] fix(vnRow): refs #6118 remove script label --- src/components/ui/VnRow.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue index a243d7546..c3c951528 100644 --- a/src/components/ui/VnRow.vue +++ b/src/components/ui/VnRow.vue @@ -1,4 +1,3 @@ - diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue index d8d3f3ece..f3abca2cc 100644 --- a/src/pages/Customer/Card/CustomerBasicData.vue +++ b/src/pages/Customer/Card/CustomerBasicData.vue @@ -59,112 +59,109 @@ const filterOptions = { @on-fetch="(data) => (businessTypes = data)" auto-load /> -
- - - -
+ + + + From 065d2307f8945b9a2bc46e2e9ad34ade21aa5e9f Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 25 Oct 2023 21:00:29 +0200 Subject: [PATCH 20/22] fix(ticketDescriptorMenu): refs #6303 remove console.log modify clientLang --- src/pages/Ticket/Card/TicketDescriptorMenu.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue index 7177db593..95f6a94d9 100644 --- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue +++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue @@ -64,7 +64,6 @@ async function sendDeliveryNote({ address, type, documentType }) { const shipped = toDate(ticket.value.shipped); function showSmsDialog(template, customData) { - console.log('Entra'); const address = ticket.value.address; const client = ticket.value.client; const phone = @@ -88,7 +87,7 @@ function showSmsDialog(template, customData) { componentProps: { phone: phone, template: template, - locale: client.user ? client.user.lang : 'default_locale', + locale: client?.user?.lang ?? 'default_locale', data: data, promise: sendSms, }, From 1a44937898f6c0fd0be0cc7ea143b93838459b25 Mon Sep 17 00:00:00 2001 From: pablone Date: Thu, 26 Oct 2023 15:02:19 +0200 Subject: [PATCH 21/22] fix(CustomerBasicData): refs #6118 correct component format --- src/pages/Customer/Card/CustomerBasicData.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue index f3abca2cc..08c661f0b 100644 --- a/src/pages/Customer/Card/CustomerBasicData.vue +++ b/src/pages/Customer/Card/CustomerBasicData.vue @@ -62,7 +62,7 @@ const filterOptions = { From a32aab709a94862d67c616885779c4e8ed9eb496 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 9 Nov 2023 09:29:20 +0100 Subject: [PATCH 22/22] refs #6415 feat: package version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7ab5883b3..7a9331870 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-front", - "version": "23.42.01", + "version": "23.48.01", "description": "Salix frontend", "productName": "Salix", "author": "Verdnatura", @@ -53,4 +53,4 @@ "vite": "^4.3.5", "vitest": "^0.31.1" } -} +} \ No newline at end of file