-
+
{{ t('purchaseRequest.newRequest') }}
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index bd7297b56b..2ea12bb05a 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -656,7 +656,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
{{ row.concept }}
{{ row.item?.subName }}
-
+
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index e699d2bfdf..6978d92c84 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -412,7 +412,7 @@ const qCheckBoxController = (sale, action) => {
{{ row.subName }}
-
+
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 1773846636..3851bf5d63 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -383,7 +383,11 @@ async function changeState(value) {
{{ props.row.itemFk }}
-
+
{{ props.row.visible }}
@@ -399,7 +403,6 @@ async function changeState(value) {
{{ props.row.price }} €
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index 53f59adf95..f7cbb14e9c 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -82,7 +82,7 @@ const openCreateModal = () => createTrackingDialogRef.value.show();
data-key="TicketTracking"
:filter="paginateFilter"
url="TicketTrackings"
- auto-load
+ auto-load
order="created DESC"
:limit="0"
>
@@ -114,7 +114,13 @@ const openCreateModal = () => createTrackingDialogRef.value.show();
-
+
{{ t('tracking.addState') }}
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 93da31e53a..68d2a1f734 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -145,7 +145,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
{{ row.item.name }}
{{ row.item.subName }}
-
+
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 9f224154c6..6d83581eeb 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -196,6 +196,7 @@ const removeThermograph = async (id) => {
icon="add"
color="primary"
@click="redirectToThermographForm('create')"
+ shortcut="+"
/>
{{ t('Add thermograph') }}
diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue
index 3ecca1ea3c..b7bbf8c5d8 100644
--- a/src/pages/Wagon/Type/WagonTypeList.vue
+++ b/src/pages/Wagon/Type/WagonTypeList.vue
@@ -74,7 +74,7 @@ async function remove(row) {
-
+
diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index a8b6728c3c..c4824b861a 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -94,7 +94,7 @@ async function remove(row) {
-
+
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 0abcdcafd3..5f9fa0f8e4 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -15,5 +15,6 @@ import WorkerFilter from '../WorkerFilter.vue';
label: 'Search worker',
info: 'You can search by worker id or name',
}"
+ :redirect-on-error="true"
/>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 154db1258a..8d7f4f683f 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -1,12 +1,11 @@
+
+
+
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 4e0abc20ca..a53aac2705 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -116,7 +116,7 @@ function reloadData() {
-
+
-
-
-
+
+
+
- {{ worker.user.role.name }}
-
+ {{ worker?.user?.role?.name }}
+
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index f560fcfed3..f686145752 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -629,6 +629,9 @@ onMounted(async () => {
margin-bottom: 0px;
}
}
+:deep(.q-td) {
+ min-width: 170px;
+}
diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index 21991481a5..32a7db4c48 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -44,15 +44,34 @@ onUnmounted(() => (stateStore.rightDrawer = false));
-
-
-
+
+
+
+
+
+ {{ t('globals.collapseMenu') }}
+
+
+
+
+
+
+
+
+
+
(stateStore.rightDrawer = false));
color="primary"
fab
icon="add"
+ shortcut="+"
/>
{{ t('eventsInclusionForm.addEvent') }}
diff --git a/src/pages/Zone/Card/ZoneWarehouses.vue b/src/pages/Zone/Card/ZoneWarehouses.vue
index 1d28bf3915..6b29332243 100644
--- a/src/pages/Zone/Card/ZoneWarehouses.vue
+++ b/src/pages/Zone/Card/ZoneWarehouses.vue
@@ -111,7 +111,13 @@ const openCreateWarehouseForm = () => createWarehouseDialogRef.value.show();
-
+
{{ t('warehouses.add') }}
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 98baab41ef..573bff8ac6 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -26,6 +26,7 @@ export default {
'WorkerLocker',
'WorkerBalance',
'WorkerFormation',
+ 'WorkerMedical',
],
},
children: [
@@ -206,6 +207,15 @@ export default {
},
component: () => import('src/pages/Worker/Card/WorkerFormation.vue'),
},
+ {
+ name: 'WorkerMedical',
+ path: 'medical',
+ meta: {
+ title: 'medical',
+ icon: 'medical_information',
+ },
+ component: () => import('src/pages/Worker/Card/WorkerMedical.vue'),
+ },
],
},
],
diff --git a/test/cypress/integration/worker/workerLocker.spec.js b/test/cypress/integration/worker/workerLocker.spec.js
index 9a4066f54e..8a169dfb26 100644
--- a/test/cypress/integration/worker/workerLocker.spec.js
+++ b/test/cypress/integration/worker/workerLocker.spec.js
@@ -1,12 +1,12 @@
describe('WorkerLocker', () => {
- const workerId = 1109;
+ const productionId = 49;
const lockerCode = '2F';
const input = '.q-card input';
const thirdOpt = '[role="listbox"] .q-item:nth-child(1)';
beforeEach(() => {
cy.viewport(1280, 720);
cy.login('productionBoss');
- cy.visit(`/#/worker/${workerId}/locker`);
+ cy.visit(`/#/worker/${productionId}/locker`);
});
it('should allocates a locker', () => {