wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

resolve conflicts and adapt tree

This commit is contained in:
William Buezas 2024-05-28 11:20:43 -03:00
parent b783adfc31 d98717f253
commit d4600a1181
59 changed files with 901 additions and 3568 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Jenkinsfile vendored
View File

@ -54,7 +54,6 @@ pipeline {
}
environment {
PROJECT_NAME = 'lilium'
STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
}
stages {
stage('Install') {
@ -104,15 +103,18 @@ pipeline {
when {
expression { PROTECTED_BRANCH }
}
environment {
DOCKER_HOST = "${env.SWARM_HOST}"
}
steps {
script {
def packageJson = readJSON file: 'package.json'
env.VERSION = packageJson.version
}
sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
withKubeConfig([
serverUrl: "$KUBERNETES_API",
credentialsId: 'kubernetes',
namespace: 'lilium'
]) {
sh 'kubectl set image deployment/lilium-$BRANCH_NAME lilium-$BRANCH_NAME=$REGISTRY/salix-frontend:$VERSION'
}
}
}
}

12
docker-compose.yml
View File

@ -1,17 +1,7 @@
version: '3.7'
services:
main:
image: registry.verdnatura.es/salix-frontend:${BRANCH_NAME:?}
image: registry.verdnatura.es/salix-frontend:${VERSION:?}
build:
context: .
dockerfile: ./Dockerfile
ports:
- 4000
deploy:
replicas: ${FRONT_REPLICAS:?}
placement:
constraints:
- node.role == worker
resources:
limits:
memory: 1G

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "salix-front",
"version": "24.24.0",
"version": "24.24.1",
"description": "Salix frontend",
"productName": "Salix",
"author": "Verdnatura",

6
src/components/CreateManualInvoiceForm.vue
View File

@ -48,7 +48,11 @@ const onDataSaved = async (formData, requestResponse) => {
/>
<FetchData
url="Tickets"
:filter="{ fields: ['id', 'nickname'], order: 'shipped DESC', limit: 30 }"
:filter="{
fields: ['id', 'nickname'],
where: { refFk: null },
order: 'shipped DESC',
}"
@on-fetch="(data) => (ticketsOptions = data)"
auto-load
/>

2
src/components/common/VnDmsList.vue
View File

@ -35,7 +35,7 @@ const $props = defineProps({
downloadModel: {
type: String,
required: false,
default: null,
default: undefined,
},
defaultDmsCode: {
type: String,

3
src/components/common/VnInputTime.vue
View File

@ -2,6 +2,7 @@
import { computed, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import isValidDate from 'filters/isValidDate';
import VnInput from 'components/common/VnInput.vue';
const props = defineProps({
modelValue: {
@ -74,7 +75,7 @@ const styleAttrs = computed(() => {
@click="isPopupOpen = true"
>
<template #append>
<QIcon name="schedule" class="cursor-pointer">
<QIcon name="Schedule" class="cursor-pointer">
<QPopupProxy
v-model="isPopupOpen"
cover

17
src/components/ui/CardSummary.vue
View File

@ -56,11 +56,20 @@ async function fetch() {
}
const showRedirectToSummaryIcon = computed(() => {
const routeExists = route.matched.some(
(route) => route.name === `${route.meta.moduleName}Summary`
);
return !isSummary.value && route.meta.moduleName && routeExists;
const exist = existSummary(route.matched);
return !isSummary.value && route.meta.moduleName && exist;
});
function existSummary(routes) {
const hasSummary = routes.some((r) => r.name === `${route.meta.moduleName}Summary`);
if (hasSummary) return hasSummary;
for (const current of routes) {
if (current.path != '/' && current.children) {
const exist = existSummary(current.children);
if (exist) return exist;
}
}
}
</script>
<template>

74
src/components/ui/FetchedTags.vue
View File

@ -1,5 +1,7 @@
<script setup>
defineProps({
import { computed } from 'vue';
const $props = defineProps({
maxLength: {
type: Number,
required: true,
@ -8,53 +10,40 @@ defineProps({
type: Object,
required: true,
},
tag: {
type: String,
required: false,
default: 'tag',
},
value: {
type: String,
required: false,
default: 'value',
},
});
const tags = computed(() => {
return Object.keys($props.item)
.filter((i) => i.startsWith(`${$props.tag}`))
.reduce((acc, tag) => {
const n = tag.split(`${$props.tag}`)[1];
const key = `${$props.tag}${n}`;
const value = `${$props.value}${n}`;
acc[$props.item[key] ?? key] = $props.item[value] ?? '';
return acc;
}, {});
});
</script>
<template>
<div class="fetchedTags">
<div class="wrap">
<div
v-for="(val, key) in tags"
:key="key"
class="inline-tag"
:class="{ empty: !$props.item.value5 }"
:title="$props.item.tag5 + ': ' + $props.item.value5"
:title="`${key}: ${val}`"
:class="{ empty: !val }"
>
{{ $props.item.value5 }}
</div>
<div
class="inline-tag"
:class="{ empty: !$props.item.tag6 }"
:title="$props.item.tag6 + ': ' + $props.item.value6"
>
{{ $props.item.value6 }}
</div>
<div
class="inline-tag"
:class="{ empty: !$props.item.value7 }"
:title="$props.item.tag7 + ': ' + $props.item.value7"
>
{{ $props.item.value7 }}
</div>
<div
class="inline-tag"
:class="{ empty: !$props.item.value8 }"
:title="$props.item.tag8 + ': ' + $props.item.value8"
>
{{ $props.item.value8 }}
</div>
<div
class="inline-tag"
:class="{ empty: !$props.item.value9 }"
:title="$props.item.tag9 + ': ' + $props.item.value9"
>
{{ $props.item.value9 }}
</div>
<div
class="inline-tag"
:class="{ empty: !$props.item.value10 }"
:title="$props.item.tag10 + ': ' + $props.item.value10"
>
{{ $props.item.value10 }}
{{ val }}
</div>
</div>
</div>
@ -72,7 +61,7 @@ defineProps({
.inline-tag {
height: 1rem;
margin: 0.05rem;
color: $secondary;
color: $color-font-secondary;
text-align: center;
font-size: smaller;
padding: 1px;
@ -83,9 +72,8 @@ defineProps({
min-width: 4rem;
max-width: 4rem;
}
.empty {
border: 1px solid $color-spacer-light;
border: 1px solid #2b2b2b;
}
}
</style>

5
src/components/ui/QCalendarMonthWrapper.vue
View File

@ -59,12 +59,10 @@ const containerClasses = computed(() => {
// Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
.q-dark div .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
background-color: $primary !important;
color: white !important;
}
.q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
background-color: $primary !important;
color: white !important;
}
.q-calendar-month__head--weekday {
@ -112,7 +110,6 @@ const containerClasses = computed(() => {
cursor: pointer;
}
}
.q-calendar-month__week--days > div:nth-child(6),
.q-calendar-month__week--days > div:nth-child(7) {
// Cambia el color de los días sábado y domingo
@ -150,7 +147,7 @@ const containerClasses = computed(() => {
.q-calendar-month__head--workweek,
.q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
text-transform: capitalize;
color: #777;
color: var(---color-font-secondary);
font-weight: bold;
font-size: 0.8rem;
text-align: center;

7
src/css/app.scss
View File

@ -169,6 +169,13 @@ select:-webkit-autofill {
/* q-notification row items-stretch q-notification--standard bg-negative text-white */
.q-card,
.q-table,
.q-table__bottom,
.q-drawer {
background-color: var(--vn-section-color);
}
input[type='number'] {
-moz-appearance: textfield;
}

BIN
src/css/fonts/icon.eot
View File

Binary file not shown.

255
src/css/fonts/icon.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 173 KiB

After

Width:  |  Height:  |  Size: 174 KiB

BIN
src/css/fonts/icon.ttf
View File

Binary file not shown.

BIN
src/css/fonts/icon.woff
View File

Binary file not shown.

2925
src/css/fonts/selection.json
View File

File diff suppressed because one or more lines are too long

345
src/css/icons.scss
View File

@ -1,418 +1,435 @@
@font-face {
font-family: 'icon';
src: url('fonts/icon.eot?2omjsr');
src: url('fonts/icon.eot?2omjsr#iefix') format('embedded-opentype'),
url('fonts/icon.ttf?2omjsr') format('truetype'),
url('fonts/icon.woff?2omjsr') format('woff'),
url('fonts/icon.svg?2omjsr#icon') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
font-family: 'icon';
src: url('fonts/icon.eot?1om04h');
src: url('fonts/icon.eot?1om04h#iefix') format('embedded-opentype'),
url('fonts/icon.ttf?1om04h') format('truetype'),
url('fonts/icon.woff?1om04h') format('woff'),
url('fonts/icon.svg?1om04h#icon') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
}
[class^='icon-'],
[class*=' icon-'] {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: 'icon' !important;
speak: never;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
[class^="icon-"], [class*=" icon-"] {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: 'icon' !important;
speak: never;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-100:before {
content: '\e926';
content: "\e901";
}
.icon-Client_unpaid:before {
content: '\e925';
}
.icon-Client_unpaid:before {
content: '\e925';
content: "\e98c";
}
.icon-History:before {
content: '\e964';
content: "\e902";
}
.icon-Person:before {
content: '\e984';
content: "\e903";
}
.icon-accessory:before {
content: '\e948';
content: "\e904";
}
.icon-account:before {
content: '\e927';
content: "\e905";
}
.icon-actions:before {
content: '\e928';
content: "\e907";
}
.icon-addperson:before {
content: '\e929';
content: "\e908";
}
.icon-agency:before {
content: '\e92a';
}
.icon-agency:before {
content: '\e92a';
content: "\e92a";
}
.icon-agency-term:before {
content: '\e92b';
content: "\e909";
}
.icon-albaran:before {
content: '\e92c';
}
.icon-albaran:before {
content: '\e92c';
content: "\e92c";
}
.icon-anonymous:before {
content: '\e92d';
content: "\e90b";
}
.icon-apps:before {
content: '\e92e';
content: "\e90c";
}
.icon-artificial:before {
content: '\e92f';
content: "\e90d";
}
.icon-attach:before {
content: '\e930';
content: "\e90e";
}
.icon-barcode:before {
content: '\e932';
content: "\e90f";
}
.icon-basket:before {
content: '\e933';
content: "\e910";
}
.icon-basketadd:before {
content: '\e934';
content: "\e911";
}
.icon-bin:before {
content: '\e935';
content: "\e913";
}
.icon-botanical:before {
content: '\e936';
content: "\e914";
}
.icon-bucket:before {
content: '\e937';
content: "\e915";
}
.icon-buscaman:before {
content: '\e938';
content: "\e916";
}
.icon-buyrequest:before {
content: '\e939';
content: "\e917";
}
.icon-calc_volum:before {
content: '\e93a';
.icon-calc_volum .path1:before {
content: "\e918";
color: rgb(0, 0, 0);
}
.icon-calc_volum .path2:before {
content: "\e919";
margin-left: -1em;
color: rgb(0, 0, 0);
}
.icon-calc_volum .path3:before {
content: "\e91c";
margin-left: -1em;
color: rgb(0, 0, 0);
}
.icon-calc_volum .path4:before {
content: "\e91d";
margin-left: -1em;
color: rgb(0, 0, 0);
}
.icon-calc_volum .path5:before {
content: "\e91e";
margin-left: -1em;
color: rgb(0, 0, 0);
}
.icon-calc_volum .path6:before {
content: "\e91f";
margin-left: -1em;
color: rgb(255, 255, 255);
}
.icon-calendar:before {
content: '\e940';
content: "\e920";
}
.icon-catalog:before {
content: '\e941';
content: "\e921";
}
.icon-claims:before {
content: '\e942';
content: "\e922";
}
.icon-client:before {
content: '\e943';
content: "\e923";
}
.icon-clone:before {
content: '\e945';
content: "\e924";
}
.icon-columnadd:before {
content: '\e946';
content: "\e925";
}
.icon-columndelete:before {
content: '\e947';
content: "\e926";
}
.icon-components:before {
content: '\e949';
content: "\e927";
}
.icon-consignatarios:before {
content: '\e94b';
content: "\e928";
}
.icon-control:before {
content: '\e94c';
content: "\e929";
}
.icon-credit:before {
content: '\e94d';
content: "\e92b";
}
.icon-defaulter:before {
content: '\e94e';
.icon-deaulter:before {
content: "\e92d";
}
.icon-deletedTicket:before {
content: '\e94f';
content: "\e92e";
}
.icon-deleteline:before {
content: '\e950';
content: "\e92f";
}
.icon-delivery:before {
content: '\e951';
content: "\e930";
}
.icon-deliveryprices:before {
content: '\e952';
content: "\e932";
}
.icon-details:before {
content: '\e954';
content: "\e933";
}
.icon-dfiscales:before {
content: '\e955';
content: "\e934";
}
.icon-disabled:before {
content: '\e965';
content: "\e935";
}
.icon-doc:before {
content: '\e956';
content: "\e936";
}
.icon-entry:before {
content: '\e958';
content: "\e937";
}
.icon-exit:before {
content: '\e959';
content: "\e938";
}
.icon-eye:before {
content: '\e95a';
content: "\e939";
}
.icon-fixedPrice:before {
content: '\e95b';
content: "\e93a";
}
.icon-flower:before {
content: '\e95c';
content: "\e93b";
}
.icon-frozen:before {
content: '\e95d';
content: "\e93c";
}
.icon-fruit:before {
content: '\e95e';
content: "\e93d";
}
.icon-funeral:before {
content: '\e95f';
content: "\e93e";
}
.icon-grafana:before {
content: '\e931';
}
.icon-grafana:before {
content: '\e931';
content: "\e906";
}
.icon-greenery:before {
content: '\e91e';
content: "\e93f";
}
.icon-greuge:before {
content: '\e960';
content: "\e940";
}
.icon-grid:before {
content: '\e961';
content: "\e941";
}
.icon-handmade:before {
content: '\e94a';
content: "\e942";
}
.icon-handmadeArtificial:before {
content: '\e962';
content: "\e943";
}
.icon-headercol:before {
content: '\e963';
content: "\e945";
}
.icon-info:before {
content: '\e966';
content: "\e946";
}
.icon-inventory:before {
content: '\e967';
content: "\e947";
}
.icon-invoice:before {
content: '\e969';
content: "\e968";
color: #5f5f5f;
}
.icon-invoice-in:before {
content: '\e96a';
content: "\e949";
}
.icon-invoice-in-create:before {
content: '\e96b';
content: "\e94a";
}
.icon-invoice-out:before {
content: '\e96c';
content: "\e94b";
}
.icon-isTooLittle:before {
content: '\e96e';
content: "\e94c";
}
.icon-item:before {
content: '\e96f';
content: "\e94d";
}
.icon-languaje:before {
content: '\e912';
content: "\e970";
}
.icon-lines:before {
content: '\e971';
content: "\e94e";
}
.icon-linesprepaired:before {
content: '\e972';
content: "\e94f";
}
.icon-link-to-corrected:before {
content: '\e900';
content: "\e931";
}
.icon-link-to-correcting:before {
content: '\e906';
content: "\e944";
}
.icon-logout:before {
content: '\e90a';
content: "\e973";
}
.icon-mana:before {
content: '\e974';
content: "\e950";
}
.icon-mandatory:before {
content: '\e975';
content: "\e951";
}
.icon-net:before {
content: '\e976';
content: "\e952";
}
.icon-newalbaran:before {
content: '\e977';
content: "\e954";
}
.icon-niche:before {
content: '\e979';
content: "\e955";
}
.icon-no036:before {
content: '\e97a';
content: "\e956";
}
.icon-noPayMethod:before {
content: '\e97b';
content: "\e958";
}
.icon-notes:before {
content: '\e97c';
content: "\e959";
}
.icon-noweb:before {
content: '\e97e';
content: "\e95a";
}
.icon-onlinepayment:before {
content: '\e97f';
content: "\e95b";
}
.icon-package:before {
content: '\e980';
content: "\e95c";
}
.icon-payment:before {
content: '\e982';
content: "\e95d";
}
.icon-pbx:before {
content: '\e983';
content: "\e95e";
}
.icon-pets:before {
content: '\e985';
content: "\e95f";
}
.icon-photo:before {
content: '\e986';
content: "\e960";
}
.icon-plant:before {
content: '\e987';
content: "\e961";
}
.icon-polizon:before {
content: '\e989';
content: "\e962";
}
.icon-preserved:before {
content: '\e98a';
content: "\e963";
}
.icon-recovery:before {
content: '\e98b';
content: "\e964";
}
.icon-regentry:before {
content: '\e901';
content: "\e965";
}
.icon-reserva:before {
content: '\e902';
content: "\e966";
}
.icon-revision:before {
content: '\e903';
content: "\e967";
}
.icon-risk:before {
content: '\e904';
content: "\e969";
}
.icon-saysimple:before {
content: "\e912";
}
.icon-services:before {
content: '\e905';
content: "\e96a";
}
.icon-settings:before {
content: '\e907';
content: "\e96b";
}
.icon-shipment:before {
content: '\e908';
content: "\e96c";
}
.icon-sign:before {
content: '\e909';
content: "\e90a";
}
.icon-sms:before {
content: '\e90b';
content: "\e96e";
}
.icon-solclaim:before {
content: '\e90c';
content: "\e96f";
}
.icon-solunion:before {
content: '\e90d';
content: "\e971";
}
.icon-splitline:before {
content: '\e90e';
content: "\e972";
}
.icon-splur:before {
content: '\e90f';
content: "\e974";
}
.icon-stowaway:before {
content: '\e910';
content: "\e975";
}
.icon-supplier:before {
content: '\e911';
content: "\e976";
}
.icon-supplierfalse:before {
content: '\e913';
content: "\e977";
}
.icon-tags:before {
content: '\e914';
content: "\e979";
}
.icon-tax:before {
content: '\e915';
content: "\e97a";
}
.icon-thermometer:before {
content: '\e916';
content: "\e97b";
}
.icon-ticket:before {
content: '\e917';
content: "\e97c";
}
.icon-ticketAdd:before {
content: '\e918';
content: "\e97e";
}
.icon-traceability:before {
content: '\e919';
content: "\e97f";
}
.icon-transaction:before {
content: '\e93b';
}
.icon-transaction:before {
content: '\e93b';
content: "\e91b";
}
.icon-treatments:before {
content: '\e91c';
content: "\e980";
}
.icon-trolley:before {
content: '\e91a';
content: "\e900";
}
.icon-troncales:before {
content: '\e91b';
content: "\e982";
}
.icon-unavailable:before {
content: '\e91d';
content: "\e983";
}
.icon-visible_columns_Icono:before {
content: "\e984";
}
.icon-volume:before {
content: '\e91f';
content: "\e985";
}
.icon-wand:before {
content: '\e920';
content: "\e986";
}
.icon-web:before {
content: '\e921';
content: "\e987";
}
.icon-wiki:before {
content: '\e922';
content: "\e989";
}
.icon-worker:before {
content: '\e923';
content: "\e98a";
}
.icon-zone:before {
content: '\e924';
content: "\e98b";
}

2
src/css/quasar.variables.scss
View File

@ -32,7 +32,7 @@ $primary-light: lighten($primary, 35%);
$dark-shadow-color: black;
$layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d;
$spacing-md: 16px;
$color-font-secondary: #777;
.bg-success {
background-color: $positive;
}

2
src/filters/dateRange.js
View File

@ -1,7 +1,7 @@
export default function dateRange(value) {
const minHour = new Date(value);
minHour.setHours(0, 0, 0, 0);
const maxHour = new Date(value);
const maxHour = new Date();
maxHour.setHours(23, 59, 59, 59);
return [minHour, maxHour];

2
src/i18n/locale/en.yml
View File

@ -867,7 +867,7 @@ worker:
sex: Sexo
seniority: Antigüedad
fi: DNI/NIE/NIF
birth: Cumpleaños
birth: Fecha de nacimiento
isFreelance: Autónomo
isSsDiscounted: Bonificación SS
hasMachineryAuthorized: Autorizado para llevar maquinaria

85
src/pages/Customer/Defaulter/CustomerDefaulter.vue
View File

@ -14,9 +14,10 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import VnInput from 'src/components/common/VnInput.vue';
import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
import axios from 'axios';
const stateStore = useStateStore();
const { t, locale } = useI18n();
const { t } = useI18n();
const quasar = useQuasar();
const dataRef = ref(null);
@ -26,7 +27,7 @@ const selected = ref([]);
const tableColumnComponents = {
client: {
component: QBtn,
props: () => ({ flat: true, color: 'blue', noCaps: true }),
props: () => ({ flat: true, class: 'link', noCaps: true }),
event: () => {},
},
isWorker: {
@ -39,7 +40,12 @@ const tableColumnComponents = {
},
salesPerson: {
component: QBtn,
props: () => ({ flat: true, color: 'blue', noCaps: true }),
props: () => ({ flat: true, class: 'link', noCaps: true }),
event: () => {},
},
department: {
component: 'span',
props: () => {},
event: () => {},
},
country: {
@ -59,7 +65,7 @@ const tableColumnComponents = {
},
author: {
component: QBtn,
props: () => ({ flat: true, color: 'blue', noCaps: true }),
props: () => ({ flat: true, class: 'link', noCaps: true }),
event: () => {},
},
lastObservation: {
@ -82,6 +88,16 @@ const tableColumnComponents = {
props: () => {},
event: () => {},
},
finished: {
component: QCheckbox,
props: (prop) => ({
disable: true,
'model-value': prop.value,
class: 'disabled-checkbox',
}),
event: () => {},
},
};
const columns = computed(() => [
@ -105,6 +121,13 @@ const columns = computed(() => [
name: 'salesPerson',
sortable: true,
},
{
align: 'left',
field: 'departmentName',
label: t('Department'),
name: 'department',
sortable: true,
},
{
align: 'left',
field: 'country',
@ -166,6 +189,12 @@ const columns = computed(() => [
name: 'from',
sortable: true,
},
{
align: 'left',
field: 'finished',
label: t('Has recover'),
name: 'finished',
},
]);
const viewAddObservation = (rowsSelected) => {
@ -178,7 +207,39 @@ const viewAddObservation = (rowsSelected) => {
});
};
const onFetch = (data) => {
const departments = ref(new Map());
const onFetch = async (data) => {
const salesPersonFks = data.map((item) => item.salesPersonFk);
const departmentNames = salesPersonFks.map(async (salesPersonFk) => {
try {
const { data: workerDepartment } = await axios.get(
`WorkerDepartments/${salesPersonFk}`
);
const { data: department } = await axios.get(
`Departments/${workerDepartment.departmentFk}`
);
departments.value.set(salesPersonFk, department.name);
} catch (error) {
console.error('Err: ', error);
}
});
const recoveryData = await axios.get('Recoveries');
const recoveries = recoveryData.data.map(({ clientFk, finished }) => ({
clientFk,
finished,
}));
await Promise.all(departmentNames);
data.forEach((item) => {
item.departmentName = departments.value.get(item.salesPersonFk);
item.isWorker = item.businessTypeFk === 'worker';
const recovery = recoveries.find(({ clientFk }) => clientFk === item.clientFk);
item.finished = recovery?.finished === null;
});
for (const element of data) element.isWorker = element.businessTypeFk === 'worker';
balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
@ -191,6 +252,7 @@ function exprBuilder(param, value) {
case 'creditInsurance':
case 'amount':
case 'workerFk':
case 'departmentFk':
case 'countryFk':
case 'payMethod':
case 'salesPersonFk':
@ -243,7 +305,6 @@ function exprBuilder(param, value) {
</div>
</template>
</VnSubToolbar>
<QPage class="column items-center q-pa-md">
<VnPaginate
ref="dataRef"
@ -259,13 +320,13 @@ function exprBuilder(param, value) {
<QTable
:columns="columns"
:rows="rows"
class="full-width q-mt-md"
class="full-width"
row-key="clientFk"
selection="multiple"
v-model:selected="selected"
>
<template #header="props">
<QTr :props="props" class="bg">
<QTr :props="props" class="bg" style="min-height: 200px">
<QTh>
<QCheckbox v-model="props.selected" />
</QTh>
@ -302,7 +363,7 @@ function exprBuilder(param, value) {
)
"
>
<template v-if="props.col.name !== 'isWorker'">
<template v-if="typeof props.value !== 'boolean'">
<div
v-if="
props.col.name === 'lastObservation'
@ -311,8 +372,9 @@ function exprBuilder(param, value) {
<VnInput
type="textarea"
v-model="props.value"
autogrow
:disable="true"
readonly
dense
rows="2"
/>
</div>
<div v-else>{{ props.value }}</div>
@ -354,6 +416,7 @@ es:
Client: Cliente
Is worker: Es trabajador
Salesperson: Comercial
Department: Departamento
Country: País
P. Method: F. Pago
Pay method: Forma de pago

10
src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
View File

@ -45,11 +45,10 @@ const authors = ref();
</div>
</template>
<template #body="{ params }">
<QItem class="q-mb-sm q-mt-sm">
<template #body="{ params, searchFn }">
<QItem class="q-mb-sm">
<QItemSection v-if="clients">
<VnSelect
:input-debounce="0"
:label="t('Client')"
:options="clients"
dense
@ -62,6 +61,8 @@ const authors = ref();
rounded
use-input
v-model="params.clientFk"
@update:model-value="searchFn()"
auto-load
/>
</QItemSection>
<QItemSection v-else>
@ -85,6 +86,7 @@ const authors = ref();
rounded
use-input
v-model="params.salesPersonFk"
@update:model-value="searchFn()"
/>
</QItemSection>
<QItemSection v-else>
@ -108,6 +110,7 @@ const authors = ref();
rounded
use-input
v-model="params.countryFk"
@update:model-value="searchFn()"
/>
</QItemSection>
<QItemSection v-else>
@ -153,6 +156,7 @@ const authors = ref();
rounded
use-input
v-model="params.workerFk"
@update:model-value="searchFn()"
/>
</QItemSection>
<QItemSection v-else>

2
src/pages/Entry/Card/EntryBuys.vue
View File

@ -410,7 +410,7 @@ const lockIconType = (groupingMode, mode) => {
<span v-if="props.row.item.subName" class="subName">
{{ props.row.item.subName }}
</span>
<fetched-tags :item="props.row.item" :max-length="5" />
<FetchedTags :item="props.row.item" :max-length="5" />
</QTd>
</QTr>
<!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->

2
src/pages/Entry/Card/EntrySummary.vue
View File

@ -338,7 +338,7 @@ const fetchEntryBuys = async () => {
<span v-if="row.item.subName" class="subName">
{{ row.item.subName }}
</span>
<fetched-tags :item="row.item" :max-length="5" />
<FetchedTags :item="row.item" :max-length="5" />
</QTd>
</QTr>
<!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->

2
src/pages/Entry/EntryLatestBuys.vue
View File

@ -707,7 +707,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
</template>
<template #body-cell-tags="{ row }">
<QTd>
<fetched-tags :item="row" :max-length="6" />
<FetchedTags :item="row" :max-length="6" />
</QTd>
</template>
<template #body-cell-entryFk="{ row }">

2
src/pages/Item/ItemFixedPrice.vue
View File

@ -459,7 +459,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
{{ row.name }}
</span>
<ItemDescriptorProxy :id="row.itemFk" />
<fetched-tags :item="row" :max-length="6" />
<FetchedTags :item="row" :max-length="6" />
</QTd>
</template>
<template #body-cell-groupingPrice="props">

2
src/pages/Item/ItemList.vue
View File

@ -521,7 +521,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
<template #body-cell-description="{ row }">
<QTd class="col">
<span>{{ row.name }} {{ row.subName }}</span>
<fetched-tags :item="row" :max-length="6" />
<FetchedTags :item="row" :max-length="6" />
</QTd>
</template>
<template #body-cell-isActive="{ row }">

7
src/pages/Item/locale/en.yml
View File

@ -81,3 +81,10 @@ itemTags:
searchbar:
label: Search item
info: Search by item id
itemType:
shared:
code: Code
name: Name
worker: Worker
category: Category
temperature: Temperature

7
src/pages/Item/locale/es.yml
View File

@ -81,3 +81,10 @@ itemTags:
searchbar:
label: Buscar artículo
info: Buscar por id de artículo
itemType:
shared:
code: Código
name: Nombre
worker: Trabajador
category: Reino
temperature: Temperatura

5
src/pages/Order/Card/OrderSummary.vue
View File

@ -176,10 +176,7 @@ const detailsColumns = ref([
{{ props.row.item.subName }}
</span>
</div>
<fetched-tags
:item="props.row.item"
:max-length="5"
/>
<FetchedTags :item="props.row.item" :max-length="5" />
</QTd>
<QTd key="quantity" :props="props">
{{ props.row.quantity }}

2
src/pages/Order/OrderLines.vue
View File

@ -160,7 +160,7 @@ async function confirmOrder() {
<span class="text-uppercase subname">
{{ row.item.subName }}
</span>
<fetched-tags :item="row.item" :max-length="5" />
<FetchedTags :item="row.item" :max-length="5" />
</div>
<VnLv :label="t('item')" :value="String(row.item.id)" />
<VnLv

2
src/pages/Order/OrderVolume.vue
View File

@ -77,7 +77,7 @@ const loadVolumes = async (rows) => {
>
<template #list-items>
<div class="q-mb-sm">
<fetched-tags :item="row.item" :max-length="5" />
<FetchedTags :item="row.item" :max-length="5" />
</div>
<VnLv :label="t('item')" :value="row.item.id" />
<VnLv :label="t('subName')">

28
src/pages/Route/Card/RouteForm.vue
View File

@ -28,7 +28,7 @@ const defaultInitialData = {
workerFk: null,
isOk: false,
};
const maxDistance = ref();
const workerList = ref([]);
const agencyList = ref([]);
const vehicleList = ref([]);
@ -81,12 +81,7 @@ const onSave = (data, response) => {
};
</script>
<template>
<VnSubToolbar />
<template v-if="stateStore.isHeaderMounted()">
<Teleport to="#searchbar">
<RouteSearchbar />
</Teleport>
</template>
<VnSubToolbar v-if="isNew" />
<FetchData
url="Workers/search"
:filter="{ fields: ['id', 'nickname'] }"
@ -111,6 +106,12 @@ const onSave = (data, response) => {
@on-fetch="(data) => (vehicleList = data)"
auto-load
/>
<FetchData
url="RouteConfigs/findOne"
@on-fetch="({ kmMax }) => (maxDistance = kmMax)"
auto-load
sort-by="id ASC"
/>
<FormModel
:url="isNew ? null : `Routes/${route.params?.id}`"
:url-create="isNew ? 'Routes' : null"
@ -174,7 +175,17 @@ const onSave = (data, response) => {
<template v-if="!isNew">
<VnRow class="row q-gutter-md q-mb-md">
<VnInput v-model="data.kmStart" :label="t('Km Start')" clearable />
<VnInput v-model="data.kmEnd" :label="t('Km End')" clearable />
<QInput
v-model.number="data.kmEnd"
:label="t('Km End')"
:rules="[
(val) =>
val < maxDistance ||
t('Distance must be lesser than 4000'),
]"
clearable
type="number"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnInputTime
@ -221,4 +232,5 @@ es:
Description: Descripción
Is served: Se ha servido
Created: Creado
Distance must be lesser than {maxDistance}: La distancia debe ser inferior a {maxDistance}
</i18n>

66
src/pages/Route/RouteList.vue
View File

@ -12,6 +12,7 @@ import VnInput from 'components/common/VnInput.vue';
import VnInputTime from 'components/common/VnInputTime.vue';
import axios from 'axios';
import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@ -19,6 +20,7 @@ import { useSession } from 'composables/useSession';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
import { useQuasar } from 'quasar';
import { useArrayData } from 'composables/useArrayData';
const stateStore = useStateStore();
const { t } = useI18n();
@ -26,10 +28,7 @@ const { validate } = useValidator();
const quasar = useQuasar();
const session = useSession();
const { viewSummary } = useSummaryDialog();
onMounted(() => (stateStore.rightDrawer = true));
onUnmounted(() => (stateStore.rightDrawer = false));
const visibleColumns = ref([]);
const selectedRows = ref([]);
const columns = computed(() => [
{
@ -83,14 +82,14 @@ const columns = computed(() => [
},
{
name: 'started',
label: t('Hour started'),
label: t('hourStarted'),
field: (row) => toHour(row.started),
sortable: true,
align: 'left',
},
{
name: 'finished',
label: t('Hour finished'),
label: t('hourFinished'),
field: (row) => toHour(row.finished),
sortable: true,
align: 'left',
@ -109,7 +108,10 @@ const columns = computed(() => [
align: 'right',
},
]);
const arrayData = useArrayData('EntryLatestBuys', {
url: 'Buys/latestBuysFilter',
order: ['itemFk DESC'],
});
const refreshKey = ref(0);
const workers = ref([]);
const agencyList = ref([]);
@ -121,7 +123,7 @@ const updateRoute = async (route) => {
return err;
}
};
const allColumnNames = ref([]);
const confirmationDialog = ref(false);
const startingDate = ref(null);
@ -174,6 +176,13 @@ const openTicketsDialog = (id) => {
})
.onOk(() => refreshKey.value++);
};
onMounted(async () => {
stateStore.rightDrawer = true;
allColumnNames.value = columns.value.map((col) => col.name);
await arrayData.fetch({ append: false });
});
onUnmounted(() => (stateStore.rightDrawer = false));
</script>
<template>
@ -231,7 +240,16 @@ const openTicketsDialog = (id) => {
<FetchData url="AgencyModes" @on-fetch="(data) => (agencyList = data)" auto-load />
<FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
<QPage class="column items-center">
<VnSubToolbar class="justify-end">
<VnSubToolbar>
<template #st-data>
<TableVisibleColumns
class="LeftIcon"
:all-columns="allColumnNames"
table-code="routesList"
labels-traductions-path="globals"
@on-config-saved="visibleColumns = [...$event]"
/>
</template>
<template #st-actions>
<QBtn
icon="vn:clone"
@ -267,7 +285,7 @@ const openTicketsDialog = (id) => {
:key="refreshKey"
data-key="RouteList"
url="Routes/filter"
:order="['created DESC', 'id DESC']"
:order="['created ASC', 'started ASC', 'id ASC']"
:limit="20"
auto-load
>
@ -281,9 +299,10 @@ const openTicketsDialog = (id) => {
row-key="id"
selection="multiple"
:rows-per-page-options="[0]"
:visible-columns="visibleColumns"
hide-pagination
:pagination="{ sortBy: 'ID', descending: true }"
:no-data-label="t('globals.noResults')"
style="max-height: 82vh"
>
<template #body-cell-worker="{ row }">
<QTd class="table-input-cell">
@ -336,7 +355,7 @@ const openTicketsDialog = (id) => {
</QTd>
</template>
<template #body-cell-vehicle="{ row }">
<QTd class="table-input-cell">
<QTd class="table-input-cell small-column">
<VnSelect
:label="t('Vehicle')"
v-model="row.vehicleFk"
@ -353,7 +372,7 @@ const openTicketsDialog = (id) => {
</QTd>
</template>
<template #body-cell-date="{ row }">
<QTd class="table-input-cell">
<QTd class="table-input-cell small-column">
<VnInputDate
v-model="row.created"
hide-bottom-space
@ -378,10 +397,10 @@ const openTicketsDialog = (id) => {
</QTd>
</template>
<template #body-cell-started="{ row }">
<QTd class="table-input-cell">
<QTd class="table-input-cell small-column">
<VnInputTime
v-model="row.started"
:label="t('Hour started')"
:label="t('hourStarted')"
:rules="validate('route.started')"
:is-clearable="false"
hide-bottom-space
@ -391,11 +410,11 @@ const openTicketsDialog = (id) => {
</QTd>
</template>
<template #body-cell-finished="{ row }">
<QTd class="table-input-cell">
<QTd class="table-input-cell small-column">
<VnInputTime
v-model="row.finished"
autofocus
:label="t('Hour finished')"
:label="t('hourFinished')"
:rules="validate('route.finished')"
:is-clearable="false"
hide-bottom-space
@ -405,7 +424,7 @@ const openTicketsDialog = (id) => {
</QTd>
</template>
<template #body-cell-isServed="props">
<QTd>
<QTd class="table-input-cell small-column">
<QCheckbox v-model="props.value" disable>
<QTooltip>
{{
@ -486,15 +505,18 @@ const openTicketsDialog = (id) => {
.table-actions {
gap: 12px;
}
.lock-icon-cell {
text-align: center;
margin-left: -20%;
th:last-child,
td:last-child {
background-color: var(--vn-section-color);
position: sticky;
right: 0;
}
</style>
<i18n>
en:
newRoute: New Route
hourStarted: Started hour
hourFinished: Finished hour
es:
ID: ID
Worker: Trabajador

2
src/pages/Route/RouteMain.vue
View File

@ -1,8 +1,10 @@
<script setup>
import { useStateStore } from 'stores/useStateStore';
import LeftMenu from 'src/components/LeftMenu.vue';
import { onMounted } from 'vue';
const stateStore = useStateStore();
onMounted(() => (stateStore.leftDrawer = false));
</script>
<template>

5
src/pages/Route/RouteTickets.vue
View File

@ -222,11 +222,6 @@ const openSmsDialog = async () => {
</script>
<template>
<template v-if="stateStore.isHeaderMounted()">
<Teleport to="#searchbar">
<RouteSearchbar />
</Teleport>
</template>
<FetchData
@on-fetch="(data) => (routeEntity = data)"
auto-load

2
src/pages/Supplier/Card/SupplierConsumption.vue
View File

@ -204,7 +204,7 @@ onMounted(async () => {
<QTd no-hover>
<span>{{ buy.subName }}</span>
<fetched-tags :item="buy" :max-length="5" />
<FetchedTags :item="buy" :max-length="5" />
</QTd>
<QTd no-hover> {{ dashIfEmpty(buy.quantity) }}</QTd>
<QTd no-hover> {{ dashIfEmpty(buy.price) }}</QTd>

2
src/pages/Worker/Card/WorkerBasicData.vue
View File

@ -201,6 +201,6 @@ es:
isDisable: Trabajador desactivado
fi: DNI/NIE/NIF
sex: Sexo
birth: Cumpleaños
birth: Fecha de Nacimiento
isSsDiscounted: Bonificación SS
</i18n>

18
src/pages/Worker/Card/WorkerCalendar.vue
View File

@ -82,6 +82,7 @@ const onFetchAbsences = (data) => {
type: type.code,
absenceId: absence.id,
isFestive: false,
isHoliday: false,
});
});
}
@ -170,23 +171,6 @@ watch([year, businessFk], () => refreshData());
ref="WorkerFreelanceRef"
auto-load
/>
<template v-if="stateStore.isHeaderMounted()">
<Teleport to="#actions-append">
<div class="row q-gutter-x-sm">
<QBtn
flat
@click="stateStore.toggleRightDrawer()"
round
dense
icon="menu"
>
<QTooltip bottom anchor="bottom right">
{{ t('globals.collapseMenu') }}
</QTooltip>
</QBtn>
</div>
</Teleport>
</template>
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
<QScrollArea class="fit text-grey-8">
<WorkerCalendarFilter

33
src/pages/Worker/Card/WorkerCalendarItem.vue
View File

@ -126,7 +126,7 @@ const handleEventSelected = (event, { year, month, day }) => {
}
const date = new Date(year, month - 1, day);
if (!event.absenceId) createEvent(date);
if (!event?.absenceId) createEvent(date);
else if (event.type == props.absenceType.code) deleteEvent(event, date);
else editEvent(event);
};
@ -136,24 +136,31 @@ const getEventByTimestamp = ({ year, month, day }) => {
return props.events[stamp] || null;
};
const isFestive = (timestamp) => {
const event = getEventByTimestamp(timestamp);
if (!event) return false;
const { isFestive } = event;
return isFestive;
};
const getEventAttrs = (timestamp) => {
const event = getEventByTimestamp(timestamp);
if (!event) return {};
const { name, color, isFestive } = event;
const { name, color, isFestive, type } = event;
// Atributos a asignar a cada slot que representa un evento en el calendario
const attrs = {
title: name,
style: color ? `background-color: ${color};` : '',
style: color ? `background-color: ${color};` : ``,
label: timestamp.day,
};
if (isFestive) {
attrs.class = '--festive';
attrs.label = event.absenceId ? timestamp.day : '';
}
attrs.label = event.absenceId ?? timestamp.day;
} else attrs.class = `--${type}`;
return attrs;
};
@ -162,7 +169,6 @@ const isToday = (timestamp) => {
const { year, month, day } = timestamp;
return todayTimestamp.value === new Date(year, month - 1, day).getTime();
};
onBeforeMount(() => {
updateSelectedDate(_year.value);
});
@ -203,7 +209,6 @@ watch(_year, (newValue) => {
<template #day="{ scope: { timestamp } }">
<!-- Este slot representa cada día del calendario y muestra un botón representando el correspondiente evento -->
<QBtn
v-if="getEventByTimestamp(timestamp)"
v-bind="{ ...getEventAttrs(timestamp) }"
@click="
handleEventSelected(getEventByTimestamp(timestamp), timestamp)
@ -223,6 +228,11 @@ watch(_year, (newValue) => {
</template>
<style lang="scss">
.q-calendar-month__day:has(.q-calendar-month__day--content):has(.q-btn.--festive)
.q-calendar-month__day--label__wrapper
button {
color: transparent;
}
.calendar-event {
display: flex;
justify-content: center;
@ -231,14 +241,19 @@ watch(_year, (newValue) => {
font-size: 13px;
line-height: 1.715em;
cursor: pointer;
color: white;
&.--today {
border: 2px solid $info;
}
&.--festive {
border: 2px solid $negative;
color: $negative;
}
&.--holiday {
& > span:nth-child(2) .block {
color: white;
}
}
&:hover {

123
src/pages/Worker/Card/WorkerPda.vue
View File

@ -71,66 +71,47 @@ function reloadData() {
bordered
:key="row.id"
v-for="row of rows"
class="card q-pt-xs q-mb-sm"
class="card q-px-md q-mb-sm container"
>
<QItem>
<QItemSection side-left>
<VnRow>
<QField
:label="t('worker.pda.currentPDA')"
:model-value="row?.deviceProductionFk"
disable
>
<template #control>
<div tabindex="0" style="padding: none">
<span>Id: </span>
<span>
{{ row?.deviceProductionFk }}&nbsp;
</span>
<span>{{ t('Model') }}: </span>
<span>
{{ row?.deviceProduction?.modelFk }}&nbsp;
</span>
<span>{{ t('SIM serial number') }}: </span>
<span>
{{
row?.deviceProduction?.serialNumber
}}&nbsp;
</span>
</div>
</template>
</QField>
<QField
:label="t('Current SIM')"
:model-value="row?.simSerialNumber"
disable
>
<template #control>
<div tabindex="0">{{ row?.simSerialNumber }}</div>
</template>
</QField>
</VnRow>
</QItemSection>
<QItemSection side>
<QIcon
name="delete"
size="sm"
class="cursor-pointer"
color="primary"
@click="
openConfirmationModal(
t(`Remove PDA`),
t('Do you want to remove this PDA?'),
() => deallocatePDA(row.deviceProductionFk)
)
"
>
<QTooltip>
{{ t('worker.pda.removePDA') }}
</QTooltip>
</QIcon>
</QItemSection>
</QItem>
<VnRow>
<VnInput
:label="t('worker.pda.currentPDA')"
:model-value="row?.deviceProductionFk"
disable
/>
<VnInput
:label="t('Model')"
:model-value="row?.deviceProduction?.modelFk"
disable
/>
<VnInput
:label="t('Serial number')"
:model-value="row?.deviceProduction?.serialNumber"
disable
/>
<VnInput
:label="t('Current SIM')"
:model-value="row?.simSerialNumber"
disable
/>
<QBtn
flat
icon="delete"
color="primary"
class="btn-delete"
@click="
openConfirmationModal(
t(`Remove PDA`),
t('Do you want to remove this PDA?'),
() => deallocatePDA(row.deviceProductionFk)
)
"
>
<QTooltip>
{{ t('worker.pda.removePDA') }}
</QTooltip>
</QBtn>
</VnRow>
</QCard>
</template>
</VnPaginate>
@ -187,26 +168,20 @@ function reloadData() {
</QPage>
</template>
<style lang="scss" scoped>
.centerCard {
padding: 5%;
width: 100%;
max-width: 70%;
margin: 0 auto;
}
.label {
color: red;
}
.q-field {
height: 65px;
.btn-delete {
max-width: 4%;
margin-top: 30px;
}
</style>
<i18n>
es:
Model: Modelo
Serial number: Número de serie
Current SIM: SIM actual
Add new device: Añadir nuevo dispositivo
PDA deallocated: PDA desasignada
Remove PDA: Eliminar PDA
Do you want to remove this PDA?: ¿Desea eliminar este PDA?
PDA deallocated: PDA desasignada
SIM serial number: Número de serie de la SIM
Model: Modelo
You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
Add new device: Añadir nuevo dispositivo
</i18n>

4
src/pages/Worker/Card/WorkerSummary.vue
View File

@ -73,7 +73,7 @@ const filter = {
<template #body="{ entity: worker }">
<QCard class="vn-one">
<VnTitle
:url="workerUrl + `basic-data`"
:url="`#/worker/${entityId}/basic-data`"
:text="t('worker.summary.basicData')"
/>
<VnLv :label="t('worker.card.name')" :value="worker.user?.nickname" />
@ -113,7 +113,7 @@ const filter = {
</QCard>
<QCard class="vn-one">
<VnTitle
:url="workerUrl + `basic-data`"
:url="`#/worker/${entityId}/basic-data`"
:text="t('worker.summary.basicData')"
/>
<VnLv

17
src/pages/Worker/Card/WorkerTimeControl.vue
View File

@ -489,23 +489,6 @@ onMounted(async () => {
</QBtnGroup>
</div>
</Teleport>
<template v-if="stateStore.isHeaderMounted()">
<Teleport to="#actions-append">
<div class="row q-gutter-x-sm">
<QBtn
flat
@click="stateStore.toggleRightDrawer()"
round
dense
icon="menu"
>
<QTooltip bottom anchor="bottom right">
{{ t('globals.collapseMenu') }}
</QTooltip>
</QBtn>
</div>
</Teleport>
</template>
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="260" class="q-pa-md">
<div class="q-pa-md q-mb-md" style="border: 2px solid #222">
<QCardSection horizontal>

0
src/components/CreateDepartmentChild.vue → src/pages/Worker/CreateDepartmentChild.vue
View File

4
src/pages/Worker/WorkerDepartment.vue
View File

@ -1,10 +1,10 @@
<script setup>
import VnTree from 'components/ui/VnTree.vue';
import WorkerDepartmentTree from './WorkerDepartmentTree.vue';
</script>
<template>
<QPage class="column items-center q-pa-md">
<VnTree />
<WorkerDepartmentTree />
</QPage>
</template>

2
src/components/ui/VnTree.vue → src/pages/Worker/WorkerDepartmentTree.vue
View File

@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
import { useState } from 'src/composables/useState';
import { useQuasar } from 'quasar';
import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
import CreateDepartmentChild from '../CreateDepartmentChild.vue';
import CreateDepartmentChild from './CreateDepartmentChild.vue';
import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
import { useRouter } from 'vue-router';

6
src/pages/Zone/Card/ZoneEventExclusionForm.vue
View File

@ -158,11 +158,15 @@ onMounted(() => {
:label="t('eventsExclusionForm.specificLocations')"
/>
</div>
<div v-if="excludeType === 'specificLocations'">
<div
v-if="excludeType === 'specificLocations'"
style="max-height: 400px; overflow-y: scroll"
>
<ZoneLocationsTree
:root-label="t('eventsExclusionForm.rootTreeLabel')"
v-model:tickedNodes="tickedNodes"
show-search-bar
show-default-checkboxes
>
<template #content="{ node }">
<span>{{ node.name }}</span>

82
src/pages/Zone/Card/ZoneLocations.vue
View File

@ -1 +1,81 @@
<template>Zone Locations</template>
<script setup>
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import ZoneLocationsTree from './ZoneLocationsTree.vue';
import axios from 'axios';
const { t } = useI18n();
const route = useRoute();
const onSelected = async (val, node) => {
try {
if (val === null) val = undefined;
const params = { geoId: node.id, isIncluded: val };
await axios.post(`Zones/${route.params.id}/toggleIsIncluded`, params);
} catch (err) {
console.error('Error updating included', err);
}
};
</script>
<template>
<QPage class="column items-center q-pa-md">
<QCard class="full-width q-pa-md" style="max-width: 800px">
<ZoneLocationsTree :root-label="t('zoneLocations.locations')">
<template #content="{ node }">
<span v-if="!node.id">{{ node.name }}</span>
<QCheckbox
v-if="node.id"
v-model="node.selected"
:label="node.name"
@update:model-value="($event) => onSelected($event, node)"
toggle-indeterminate
color="transparent"
:class="[
'checkbox',
node.selected
? '--checked'
: node.selected == false
? '--unchecked'
: '--indeterminate',
]"
/>
</template>
</ZoneLocationsTree>
</QCard>
</QPage>
</template>
<style lang="scss">
.checkbox {
&.--checked {
.q-checkbox__bg {
border: 1px solid $info !important;
}
.q-checkbox__svg {
color: white !important;
background-color: $info !important;
}
}
&.--unchecked {
.q-checkbox__bg {
border: 1px solid $negative !important;
}
.q-checkbox__svg {
background-color: $negative !important;
}
}
&.--indeterminate {
.q-checkbox__bg {
border: 1px solid $white !important;
}
.q-checkbox__svg {
color: transparent !important;
}
}
}
</style>

13
src/pages/Zone/Card/ZoneLocationsTree.vue
View File

@ -22,6 +22,10 @@ const props = defineProps({
type: Boolean,
default: false,
},
showDefaultCheckboxes: {
type: Boolean,
default: false,
},
});
const emit = defineEmits(['update:tickedNodes']);
@ -137,8 +141,7 @@ watch(storeData, async (val) => {
formatNodeSelected(n);
});
} else {
if (!props.showSearchBar)
for (let n of state.get('Tree')) await fetchNodeLeaves(n);
for (let n of state.get('Tree')) await fetchNodeLeaves(n);
expanded.value = [null, ...fetchedNodeKeys];
}
previousExpandedNodes.value = new Set(expanded.value);
@ -149,7 +152,7 @@ const reFetch = async () => {
};
onMounted(async () => {
if (store.userParams?.search) {
if (store.userParams?.search && !props.showSearchBar) {
await reFetch();
return;
}
@ -173,7 +176,7 @@ onMounted(async () => {
}
}, 1000);
expanded.value = [null];
expanded.value.unshift(null);
previousExpandedNodes.value = new Set(expanded.value);
});
@ -199,7 +202,7 @@ onUnmounted(() => {
node-key="id"
label-key="name"
children-key="childs"
tick-strategy="strict"
:tick-strategy="props.showDefaultCheckboxes ? 'strict' : 'none'"
v-model:expanded="expanded"
@update:expanded="onNodeExpanded($event)"
v-model:ticked="_tickedNodes"

50
src/pages/Zone/ZoneList.vue
View File

@ -6,8 +6,6 @@ import { toCurrency } from 'src/filters';
import VnPaginate from 'src/components/ui/VnPaginate.vue';
import ZoneSummary from 'src/pages/Zone/Card/ZoneSummary.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import ZoneFilterPanel from './ZoneFilterPanel.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { toTimeFormat } from 'src/filters/date';
@ -71,35 +69,6 @@ const columns = computed(() => [
},
]);
const exprBuilder = (param, value) => {
switch (param) {
case 'name':
return {
name: { like: `%${value}%` },
};
case 'code':
return {
code: { like: `%${value}%` },
};
case 'agencyModeFk':
return {
agencyModeFk: value,
};
case 'search':
if (value) {
if (!isNaN(value)) {
return { id: value };
} else {
return {
name: {
like: `%${value}%`,
},
};
}
}
}
};
async function clone(id) {
const { data } = await axios.post(`Zones/${id}/clone`);
notify(t('globals.dataSaved'), 'positive');
@ -116,25 +85,6 @@ onMounted(() => (stateStore.rightDrawer = true));
</script>
<template>
<template v-if="stateStore.isHeaderMounted()">
<Teleport to="#searchbar">
<VnSearchbar
data-key="ZoneList"
url="Zones"
:filter="{
include: { relation: 'agencyMode', scope: { fields: ['name'] } },
}"
:expr-builder="exprBuilder"
:label="t('list.searchZone')"
:info="t('list.searchInfo')"
/>
</Teleport>
</template>
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
<QScrollArea class="fit text-grey-8">
<ZoneFilterPanel data-key="ZoneList" :expr-builder="exprBuilder" />
</QScrollArea>
</QDrawer>
<QPage class="column items-center q-pa-md">
<div class="vn-card-list">
<VnPaginate

61
src/pages/Zone/ZoneMain.vue
View File

@ -1,11 +1,72 @@
<script setup>
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import { useStateStore } from 'stores/useStateStore';
import LeftMenu from 'src/components/LeftMenu.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import ZoneFilterPanel from './ZoneFilterPanel.vue';
const { t } = useI18n();
const stateStore = useStateStore();
const route = useRoute();
const exprBuilder = (param, value) => {
switch (param) {
case 'name':
return {
name: { like: `%${value}%` },
};
case 'code':
return {
code: { like: `%${value}%` },
};
case 'agencyModeFk':
return {
agencyModeFk: value,
};
case 'search':
if (value) {
if (!isNaN(value)) {
return { id: value };
} else {
return {
name: {
like: `%${value}%`,
},
};
}
}
}
};
</script>
<template>
<template v-if="stateStore.isHeaderMounted()">
<Teleport to="#searchbar">
<VnSearchbar
data-key="ZoneList"
url="Zones"
:filter="{
include: { relation: 'agencyMode', scope: { fields: ['name'] } },
}"
:expr-builder="exprBuilder"
:label="t('list.searchZone')"
:info="t('list.searchInfo')"
custom-route-redirect-name="ZoneSummary"
/>
</Teleport>
</template>
<QDrawer
v-if="route.name === 'ZoneList'"
v-model="stateStore.rightDrawer"
side="right"
:width="256"
show-if-above
>
<QScrollArea class="fit text-grey-8">
<ZoneFilterPanel data-key="ZoneList" :expr-builder="exprBuilder" />
</QScrollArea>
</QDrawer>
<QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
<QScrollArea class="fit text-grey-8">
<LeftMenu />

88
src/pages/Zone/ZoneUpcoming.vue
View File

@ -1,53 +1,85 @@
<script setup>
import { ref, computed } from 'vue';
import ZoneFilterPanel from 'components/InvoiceOutNegativeFilter.vue';
import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
import { ref, computed, onMounted } from 'vue';
import { useI18n } from 'vue-i18n';
import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
import FetchData from 'components/FetchData.vue';
import { toDateFormat } from 'src/filters/date.js';
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
const { t } = useI18n();
const arrayData = ref(null);
const rows = computed(() => arrayData.value.store.data);
const weekdayStore = useWeekdayStore();
const details = ref([]);
const columns = computed(() => [
{
label: t('Province'),
//field: '',
//name: '',
label: t('upcomingDeliveries.province'),
name: 'province',
field: 'name',
align: 'left',
},
{
label: t('Closing'),
//field: '',
//name: '',
label: t('upcomingDeliveries.closing'),
name: 'closing',
field: 'hour',
align: 'left',
},
{
label: t('Id'),
//field: '',
//name: '',
label: t('upcomingDeliveries.id'),
name: 'id',
field: 'zoneFk',
align: 'left',
},
]);
function getWeekDay(jsonDate) {
const weekDay = new Date(jsonDate).getDay();
const getWeekDayName = (date) => {
const weekDay = new Date(date).getDay();
return t(`weekdays.${weekdayStore.weekdays[weekDay].code}`);
};
return this.days[weekDay].locale;
}
const getHeaderTitle = (date) => {
return `${getWeekDayName(date)} - ${toDateFormat(date)}`;
};
onMounted(() => weekdayStore.initStore());
</script>
<template>
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
<QScrollArea class="fit text-grey-8">
<ZoneFilterPanel data-key="ZoneUpcoming" />
</QScrollArea>
</QDrawer>
<FetchData
url="Zones/getUpcomingDeliveries"
@on-fetch="(data) => (details = data)"
auto-load
/>
<VnSubToolbar />
<QPage class="column items-center q-pa-md">
<span>
{{ t(`${getWeekDay(/*detail.shipped*/)}`) }} -
{{ t /*'detail.shipped'*/() }}
</span>
<QTable :columns="columns" :rows="rows" class="full-width q-mt-md"> </QTable>
<QCard class="full-width q-pa-md">
<div
v-for="(detail, index) in details"
:key="index"
class="full-width flex q-mb-lg"
>
<span class="header">
{{ getHeaderTitle(detail.shipped) }}
</span>
<QTable flat :columns="columns" :rows="detail.lines" class="full-width" />
</div>
</QCard>
</QPage>
</template>
<style scoped lang="scss">
.header {
min-width: 100% !important;
display: flex;
align-items: center;
padding-left: 8px;
height: 35px;
border-bottom: 1px solid $primary;
background-color: var(--vn-page-color);
font-size: 19px;
font-weight: bold;
text-transform: uppercase;
}
</style>

8
src/pages/Zone/locale/en.yml
View File

@ -5,7 +5,7 @@ zone:
zoneCreate: Create zone
locations: Locations
deliveryDays: Delivery days
upcomingList: Upcoming deliveries
upcomingDeliveries: Upcoming deliveries
warehouses: Warehouses
calendar: Calendar
list:
@ -43,6 +43,8 @@ summary:
filterPanel:
name: Name
agencyModeFk: Agency
zoneLocations:
locations: Locations
deliveryPanel:
pickup: Pick up
delivery: Delivery
@ -100,3 +102,7 @@ eventsInclusionForm:
m3Max: Max m³
from: From
to: To
upcomingDeliveries:
province: Province
closing: Closing
id: Id

8
src/pages/Zone/locale/es.yml
View File

@ -5,7 +5,7 @@ zone:
zoneCreate: Nueva zona
locations: Localizaciones
deliveryDays: Días de entrega
upcomingList: Próximos repartos
upcomingDeliveries: Próximos repartos
warehouses: Almacenes
calendar: Calendario
list:
@ -43,6 +43,8 @@ summary:
filterPanel:
name: Nombre
agencyModeFk: Agencia
zoneLocations:
locations: Localizaciones
deliveryPanel:
pickup: Recogida
delivery: Entrega
@ -102,3 +104,7 @@ eventsInclusionForm:
m3Max: Medida máxima
from: Desde
to: Hasta
upcomingDeliveries:
province: Provincia
closing: Cierre
id: Id

27
src/router/modules/zone.js
View File

@ -11,7 +11,12 @@ export default {
component: RouterView,
redirect: { name: 'ZoneMain' },
menus: {
main: ['ZoneList', 'ZoneDeliveryDays', 'ZoneUpcomingList'],
main: [
'ZoneList',
'ZoneDeliveryDays',
'ZoneUpcomingList',
'ZoneUpcomingDeliveries',
],
card: [
'ZoneBasicData',
'ZoneWarehouses',
@ -63,6 +68,24 @@ export default {
},
component: () => import('src/pages/Zone/ZoneCreate.vue'),
},
// {
// path: 'counter',
// name: 'ZoneCounter',
// meta: {
// title: 'zoneCounter',
// icon: 'add_circle',
// },
// component: () => import('src/pages/Zone/ZoneCounter.vue'),
// },
{
name: 'ZoneUpcomingDeliveries',
path: 'upcoming-deliveries',
meta: {
title: 'upcomingDeliveries',
icon: 'vn:calendar',
},
component: () => import('src/pages/Zone/ZoneUpcoming.vue'),
},
],
},
{
@ -94,7 +117,7 @@ export default {
path: 'location',
meta: {
title: 'locations',
icon: 'vn:greuge',
icon: 'my_location',
},
component: () => import('src/pages/Zone/Card/ZoneLocations.vue'),
},

2
test/cypress/integration/VnLocation.spec.js
View File

@ -39,7 +39,7 @@ describe('VnLocation', () => {
});
it('Create postCode', function () {
cy.get(
':nth-child(6) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
':nth-child(6) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon'
).click();
cy.get('.q-card > h1').should('have.text', 'New postcode');
cy.get(dialogInputs).eq(0).clear('12');

13
test/cypress/integration/claim/claimPhoto.spec.js
View File

@ -21,8 +21,7 @@ describe('ClaimPhoto', () => {
cy.get('.q-notification__message').should('have.text', 'Data saved');
});
/* it.skip('should open first image dialog change to second and close', () => {
skiped fix on https://redmine.verdnatura.es/issues/7113
it('should open first image dialog change to second and close', () => {
cy.get(
':nth-child(1) > .q-card > .q-img > .q-img__container > .q-img__image'
).click();
@ -38,19 +37,23 @@ describe('ClaimPhoto', () => {
cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
'not.be.visible'
);
}); */
});
it('should remove third and fourth file', () => {
cy.get(
'.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
).click();
cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
cy.get(
'.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
).click();
cy.get('.q-notification__message').should('have.text', 'Data deleted');
cy.get(
'.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
).click();
cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
cy.get(
'.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
).click();
cy.get('.q-notification__message').should('have.text', 'Data deleted');
});
});

2
test/cypress/integration/worker/workerList.spec.js
View File

@ -20,6 +20,6 @@ describe('WorkerList', () => {
.eq(0)
.invoke('text')
.should('include', 'Basic data');
cy.get('.summary .header-link').eq(1).should('have.text', 'User data ');
cy.get('.summary .header-link').eq(2).should('have.text', 'User data ');
});
});

2
test/cypress/integration/worker/workerLocker.spec.js
View File

@ -1,6 +1,6 @@
describe('WorkerList', () => {
const workerId = 1109;
const lockerCode = '201A';
const lockerCode = '2F';
const input = '.q-card input';
const firstOpt = '[role="listbox"] .q-item:nth-child(1)';
beforeEach(() => {

2
test/cypress/integration/worker/workerPda.spec.js
View File

@ -15,7 +15,7 @@ describe('WorkerPda', () => {
});
it('delete pda', () => {
cy.get('.q-card > .q-item > .q-item__section--side > .q-icon').click();
cy.get('.btn-delete').click();
cy.get(
'.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
).click();