diff --git a/src/boot/axios.js b/src/boot/axios.js
index 99a163cca..3bd80f487 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -2,9 +2,11 @@ import axios from 'axios';
import { useSession } from 'src/composables/useSession';
import { Router } from 'src/router';
import useNotify from 'src/composables/useNotify.js';
+import { useStateQueryStore } from 'src/stores/useStateQueryStore';
const session = useSession();
const { notify } = useNotify();
+const stateQuery = useStateQueryStore();
const baseUrl = '/api/';
axios.defaults.baseURL = baseUrl;
@@ -15,7 +17,7 @@ const onRequest = (config) => {
if (token.length && !config.headers.Authorization) {
config.headers.Authorization = token;
}
-
+ stateQuery.add(config);
return config;
};
@@ -24,10 +26,10 @@ const onRequestError = (error) => {
};
const onResponse = (response) => {
- const { method } = response.config;
+ const config = response.config;
+ stateQuery.remove(config);
- const isSaveRequest = method === 'patch';
- if (isSaveRequest) {
+ if (config.method === 'patch') {
notify('globals.dataSaved', 'positive');
}
@@ -35,6 +37,8 @@ const onResponse = (response) => {
};
const onResponseError = (error) => {
+ stateQuery.remove(error.config);
+
let message = '';
const response = error.response;
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 00faaebc2..9b0393489 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -3,6 +3,7 @@ import { onMounted, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { useState } from 'src/composables/useState';
import { useStateStore } from 'stores/useStateStore';
+import { useStateQueryStore } from 'src/stores/useStateQueryStore';
import { useQuasar } from 'quasar';
import PinnedModules from './PinnedModules.vue';
import UserPanel from 'components/UserPanel.vue';
@@ -12,6 +13,7 @@ import VnAvatar from './ui/VnAvatar.vue';
const { t } = useI18n();
const stateStore = useStateStore();
const quasar = useQuasar();
+const stateQuery = useStateQueryStore();
const state = useState();
const user = state.getUser();
const appName = 'Lilium';
@@ -50,6 +52,14 @@ const pinnedModulesRef = ref();
+
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 5a30f4d53..5239fe859 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -134,6 +134,7 @@ const splittedColumns = ref({ columns: [] });
const columnsVisibilitySkipped = ref();
const createForm = ref();
const tableFilterRef = ref([]);
+const tableRef = ref();
const tableModes = [
{
@@ -321,6 +322,13 @@ function handleOnDataSaved(_) {
if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
else $props.create.onDataSaved(_);
}
+
+function handleScroll() {
+ const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
+ const { scrollHeight, scrollTop, clientHeight } = tMiddle;
+ const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
+ if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
+}
- event.index > rows.length - 2 &&
- ($props.crudModel?.paginate ?? true) &&
- CrudModelRef.vnPaginateRef.paginate()
- "
+ @virtual-scroll="handleScroll"
@row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
@update:selected="emit('update:selected', $event)"
>
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 952b7dd8c..b0aa648c1 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -141,6 +141,7 @@ function findKeyInOptions() {
function setOptions(data) {
myOptions.value = JSON.parse(JSON.stringify(data));
myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
+ emit('update:options', data);
}
function filter(val, options) {
diff --git a/src/css/app.scss b/src/css/app.scss
index 905934d4c..d4c76ad6b 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -288,3 +288,7 @@ input::-webkit-inner-spin-button {
color: $info;
}
}
+
+.no-visible {
+ visibility: hidden;
+}
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index aa6e3ba2c..235a836f3 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -297,6 +297,7 @@ globals:
medical: Mutual
RouteExtendedList: Router
wasteRecalc: Waste recaclulate
+ operator: Operator
supplier: Supplier
created: Created
worker: Worker
@@ -594,6 +595,7 @@ worker:
timeControl: Time control
locker: Locker
medical: Medical
+ operator: Operator
list:
department: Department
schedule: Schedule
@@ -664,6 +666,18 @@ worker:
debit: Debt
credit: Have
concept: Concept
+ operator:
+ numberOfWagons: Number of wagons
+ train: Train
+ itemPackingType: Item packing type
+ warehouse: Warehouse
+ sector: Sector
+ labeler: Printer
+ linesLimit: Lines limit
+ volumeLimit: Volume limit
+ sizeLimit: Size limit
+ isOnReservationMode: Reservation mode
+ machine: Machine
wagon:
pageTitles:
wagons: Wagons
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 92507db40..c527f18ce 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -301,6 +301,7 @@ globals:
serial: Facturas por serie
medical: Mutua
wasteRecalc: Recalcular mermas
+ operator: Operario
supplier: Proveedor
created: Fecha creación
worker: Trabajador
@@ -602,6 +603,7 @@ worker:
locker: Taquilla
formation: Formación
medical: Mutua
+ operator: Operario
list:
department: Departamento
schedule: Horario
@@ -663,6 +665,19 @@ worker:
debit: Debe
credit: Haber
concept: Concepto
+ operator:
+ numberOfWagons: Número de vagones
+ train: tren
+ itemPackingType: Tipo de embalaje
+ warehouse: Almacén
+ sector: Sector
+ labeler: Impresora
+ linesLimit: Líneas límite
+ volumeLimit: Volumen límite
+ sizeLimit: Tamaño límite
+ isOnReservationMode: Modo de reserva
+ machine: Máquina
+
wagon:
pageTitles:
wagons: Vagones
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 946296e67..f6013dea9 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -6,7 +6,7 @@ import { useRoute, useRouter } from 'vue-router';
import { date } from 'quasar';
import { toDateFormat } from 'src/filters/date.js';
-import { toCurrency } from 'src/filters';
+import { dashIfEmpty, toCurrency } from 'src/filters';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
@@ -32,6 +32,16 @@ const filter = {
},
{ relation: 'invoiceOut', scope: { fields: ['id'] } },
{ relation: 'agencyMode', scope: { fields: ['name'] } },
+ {
+ relation: 'ticketSales',
+ scope: {
+ fields: ['id', 'concept', 'itemFk'],
+ include: { relation: 'item' },
+ scope: {
+ fields: ['id', 'name', 'itemPackingTypeFk'],
+ },
+ },
+ },
],
where: { clientFk: route.params.id },
order: ['shipped DESC', 'id'],
@@ -87,7 +97,12 @@ const columns = computed(() => [
label: t('Total'),
name: 'total',
},
-
+ {
+ align: 'left',
+ name: 'itemPackingTypeFk',
+ label: t('ticketSale.packaging'),
+ format: (row) => getItemPackagingType(row),
+ },
{
align: 'right',
label: '',
@@ -135,6 +150,15 @@ const setShippedColor = (date) => {
if (difference == 0) return 'warning';
if (difference < 0) return 'success';
};
+
+const getItemPackagingType = (row) => {
+ const packagingType = row?.ticketSales
+ .map((sale) => sale.item?.itemPackingTypeFk || '-')
+ .filter((value) => value !== '-')
+ .join(', ');
+
+ return dashIfEmpty(packagingType);
+};
diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index be378893e..6cb01bb0a 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -229,7 +229,7 @@ onBeforeMount(() => {
>
- {{ row.ticketFk }}
+ {{ row.ticketFk }}
@@ -251,7 +251,7 @@ onBeforeMount(() => {
- {{ row.requesterName }}
+ {{ row.requesterName }}
@@ -292,7 +292,7 @@ onBeforeMount(() => {
- {{ row.itemDescription }}
+ {{ row.itemDescription }}
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index 0e81ff5a5..64bc0e575 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -174,6 +174,16 @@ const decrement = (paramsObj, key) => {
+
+
+
+
+
@@ -274,11 +284,11 @@ en:
to: To
mine: For me
state: State
+ myTeam: My team
dateFiltersTooltip: Cannot choose a range of dates and days onward at the same time
denied: Denied
accepted: Accepted
pending: Pending
-
es:
params:
search: Búsqueda general
@@ -291,6 +301,7 @@ es:
to: Hasta
mine: Para mi
state: Estado
+ myTeam: Mi equipo
dateFiltersTooltip: No se puede seleccionar un rango de fechas y días en adelante a la vez
denied: Denegada
accepted: Aceptada
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 90c579c4c..5561abc82 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -12,6 +12,7 @@ import VnInputTime from 'components/common/VnInputTime.vue';
import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
+import { useAcl } from 'src/composables/useAcl';
import { useValidator } from 'src/composables/useValidator';
import { toTimeFormat } from 'filters/date.js';
@@ -28,14 +29,17 @@ const { validate } = useValidator();
const { notify } = useNotify();
const router = useRouter();
const { t } = useI18n();
-const agencyFetchRef = ref(null);
-const zonesFetchRef = ref(null);
+const canEditZone = useAcl().hasAny([
+ { model: 'Ticket', props: 'editZone', accessType: 'WRITE' },
+]);
+const agencyFetchRef = ref();
const warehousesOptions = ref([]);
const companiesOptions = ref([]);
const agenciesOptions = ref([]);
const zonesOptions = ref([]);
const addresses = ref([]);
+const zoneSelectRef = ref();
const formData = ref($props.formData);
watch(
@@ -44,6 +48,8 @@ watch(
{ deep: true }
);
+onMounted(() => onFormModelInit());
+
const agencyByWarehouseFilter = computed(() => ({
fields: ['id', 'name'],
order: 'name ASC',
@@ -52,18 +58,16 @@ const agencyByWarehouseFilter = computed(() => ({
},
}));
-function zoneWhere() {
- if (formData?.value?.agencyModeFk) {
- return formData.value?.agencyModeFk
- ? {
- shipped: formData.value?.shipped,
- addressFk: formData.value?.addressFk,
- agencyModeFk: formData.value?.agencyModeFk,
- warehouseFk: formData.value?.warehouseFk,
- }
- : {};
- }
-}
+const zoneWhere = computed(() => {
+ return formData.value?.agencyModeFk
+ ? {
+ shipped: formData.value?.shipped,
+ addressFk: formData.value?.addressFk,
+ agencyModeFk: formData.value?.agencyModeFk,
+ warehouseFk: formData.value?.warehouseFk,
+ }
+ : {};
+});
const getLanded = async (params) => {
try {
@@ -270,7 +274,17 @@ const redirectToCustomerAddress = () => {
});
};
-onMounted(() => onFormModelInit());
+async function getZone(options) {
+ if (!zoneId.value) return;
+
+ const zone = options.find((z) => z.id == zoneId.value);
+ if (zone) return;
+
+ const { data } = await axios.get('Zones/' + zoneId.value, {
+ params: { filter: JSON.stringify({ fields: ['id', 'name'] }) },
+ });
+ zoneSelectRef.value.opts.push(data);
+}
onFormModelInit());
:rules="validate('basicData.agency')"
/>
onFormModelInit());
:fields="['id', 'name']"
sort-by="id"
:where="zoneWhere"
- hide-selected
- map-options
- :required="true"
- @focus="zonesFetchRef.fetch()"
:rules="validate('ticketList.zone')"
+ :required="true"
+ :disable="!canEditZone"
+ @update:options="getZone"
>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index d50dc5a1b..150d45425 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -95,6 +95,7 @@ const columns = computed(() => [
columnField: {
component: null,
},
+ columnClass: 'expand',
format: (row, dashIfEmpty) => dashIfEmpty(row.salesPerson),
},
{
@@ -153,11 +154,6 @@ const columns = computed(() => [
},
columnClass: 'expand',
},
- {
- align: 'left',
- name: 'refFk',
- label: t('ticketList.ref'),
- },
{
align: 'left',
name: 'zoneFk',
@@ -191,6 +187,12 @@ const columns = computed(() => [
},
format: (row) => toCurrency(row.totalWithVat),
},
+ {
+ align: 'left',
+ name: 'packing',
+ label: t('ticketSale.packaging'),
+ format: (row, dashIfEmpty) => dashIfEmpty(row.packing),
+ },
{
align: 'right',
name: 'tableActions',
@@ -548,7 +550,7 @@ function setReference(data) {
- {{ row.salesPerson }}
+ {{ dashIfEmpty(row.salesPerson) }}
@@ -577,16 +579,16 @@ function setReference(data) {
{{ row.state }}
+
+
+ {{ row.refFk }}
+
+
+
{{ row.state }}
-
-
- {{ dashIfEmpty(row.refFk) }}
-
-
-
{{ dashIfEmpty(row.zoneName) }}
diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
new file mode 100644
index 000000000..cdacc72c0
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -0,0 +1,204 @@
+
+
+
+
+ (trainsData = data)" auto-load />
+ (itemPackingTypesData = data)"
+ auto-load
+ />
+ (warehousesData = data)"
+ auto-load
+ />
+ (PrintersData = data)" auto-load />
+ (sectorsData = data)" auto-load />
+ (machinesData = data)" auto-load />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID: {{ scope.opt?.id }}
+
+ {{ scope.opt?.id }},
+ {{ scope.opt?.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+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?
+ 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
+
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 7258881be..c2a9e668f 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -27,6 +27,7 @@ export default {
'WorkerBalance',
'WorkerFormation',
'WorkerMedical',
+ 'WorkerOperator',
],
},
children: [
@@ -208,6 +209,15 @@ export default {
},
component: () => import('src/pages/Worker/Card/WorkerMedical.vue'),
},
+ {
+ name: 'WorkerOperator',
+ path: 'operator',
+ meta: {
+ title: 'operator',
+ icon: 'person',
+ },
+ component: () => import('src/pages/Worker/Card/WorkerOperator.vue'),
+ },
],
},
],
diff --git a/src/stores/useStateQueryStore.js b/src/stores/useStateQueryStore.js
new file mode 100644
index 000000000..d25dbb921
--- /dev/null
+++ b/src/stores/useStateQueryStore.js
@@ -0,0 +1,31 @@
+import { ref, computed } from 'vue';
+import { defineStore } from 'pinia';
+
+export const useStateQueryStore = defineStore('stateQueryStore', () => {
+ const queries = ref(new Set());
+
+ function add(query) {
+ queries.value.add(query);
+ return query;
+ }
+
+ function isLoading() {
+ return computed(() => queries.value.size);
+ }
+
+ function remove(query) {
+ queries.value.delete(query);
+ }
+
+ function reset() {
+ queries.value = new Set();
+ }
+
+ return {
+ add,
+ isLoading,
+ remove,
+ queries,
+ reset,
+ };
+});
diff --git a/test/vitest/__tests__/boot/axios.spec.js b/test/vitest/__tests__/boot/axios.spec.js
index feb0d93ea..7a802b4d2 100644
--- a/test/vitest/__tests__/boot/axios.spec.js
+++ b/test/vitest/__tests__/boot/axios.spec.js
@@ -7,41 +7,46 @@ vi.mock('src/composables/useSession', () => ({
getToken: () => 'DEFAULT_TOKEN',
isLoggedIn: () => vi.fn(),
destroy: () => vi.fn(),
- })
+ }),
+}));
+
+vi.mock('src/stores/useStateQueryStore', () => ({
+ useStateQueryStore: () => ({
+ add: () => vi.fn(),
+ remove: () => vi.fn(),
+ }),
}));
describe('Axios boot', () => {
-
describe('onRequest()', async () => {
it('should set the "Authorization" property on the headers', async () => {
const config = { headers: {} };
const resultConfig = onRequest(config);
- expect(resultConfig).toEqual(expect.objectContaining({
- headers: {
- Authorization: 'DEFAULT_TOKEN'
- }
- }));
+ expect(resultConfig).toEqual(
+ expect.objectContaining({
+ headers: {
+ Authorization: 'DEFAULT_TOKEN',
+ },
+ })
+ );
});
- })
+ });
describe('onResponseError()', async () => {
it('should call to the Notify plugin with a message error for an status code "500"', async () => {
- Notify.create = vi.fn()
+ Notify.create = vi.fn();
const error = {
response: {
- status: 500
- }
+ status: 500,
+ },
};
const result = onResponseError(error);
-
- expect(result).rejects.toEqual(
- expect.objectContaining(error)
- );
+ expect(result).rejects.toEqual(expect.objectContaining(error));
expect(Notify.create).toHaveBeenCalledWith(
expect.objectContaining({
message: 'An internal server error has ocurred',
@@ -51,25 +56,22 @@ describe('Axios boot', () => {
});
it('should call to the Notify plugin with a message from the response property', async () => {
- Notify.create = vi.fn()
+ Notify.create = vi.fn();
const error = {
response: {
status: 401,
data: {
error: {
- message: 'Invalid user or password'
- }
- }
- }
+ message: 'Invalid user or password',
+ },
+ },
+ },
};
const result = onResponseError(error);
-
- expect(result).rejects.toEqual(
- expect.objectContaining(error)
- );
+ expect(result).rejects.toEqual(expect.objectContaining(error));
expect(Notify.create).toHaveBeenCalledWith(
expect.objectContaining({
message: 'Invalid user or password',
@@ -77,5 +79,5 @@ describe('Axios boot', () => {
})
);
});
- })
+ });
});
diff --git a/test/vitest/__tests__/stores/useStateQueryStore.spec.js b/test/vitest/__tests__/stores/useStateQueryStore.spec.js
new file mode 100644
index 000000000..ab3afb007
--- /dev/null
+++ b/test/vitest/__tests__/stores/useStateQueryStore.spec.js
@@ -0,0 +1,58 @@
+import { describe, expect, it, beforeEach, beforeAll } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+
+import { useStateQueryStore } from 'src/stores/useStateQueryStore';
+
+describe('useStateQueryStore', () => {
+ beforeAll(() => {
+ createWrapper({}, {});
+ });
+
+ const stateQueryStore = useStateQueryStore();
+ const { add, isLoading, remove, reset } = useStateQueryStore();
+ const firstQuery = { url: 'myQuery' };
+
+ function getQueries() {
+ return stateQueryStore.queries;
+ }
+
+ beforeEach(() => {
+ reset();
+ expect(getQueries().size).toBeFalsy();
+ });
+
+ it('should add two queries', async () => {
+ expect(getQueries().size).toBeFalsy();
+ add(firstQuery);
+
+ expect(getQueries().size).toBeTruthy();
+ expect(getQueries().has(firstQuery)).toBeTruthy();
+
+ add();
+ expect(getQueries().size).toBe(2);
+ });
+
+ it('should add and remove loading state', async () => {
+ expect(isLoading().value).toBeFalsy();
+ add(firstQuery);
+ expect(isLoading().value).toBeTruthy();
+ remove(firstQuery);
+ expect(isLoading().value).toBeFalsy();
+ });
+
+ it('should add and remove query', async () => {
+ const secondQuery = { ...firstQuery };
+ const thirdQuery = { ...firstQuery };
+
+ add(firstQuery);
+ add(secondQuery);
+
+ const beforeCount = getQueries().size;
+ add(thirdQuery);
+ expect(getQueries().has(thirdQuery)).toBeTruthy();
+
+ remove(thirdQuery);
+ expect(getQueries().has(thirdQuery)).toBeFalsy();
+ expect(getQueries().size).toBe(beforeCount);
+ });
+});