From d4a89895b4a4008fb0c020659a764a31bfaec222 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Thu, 18 Jan 2024 11:19:23 -0300 Subject: [PATCH 001/522] WIP --- src/i18n/en/index.js | 12 ++- src/i18n/es/index.js | 10 ++ src/pages/Travel/Card/TravelBasicData.vue | 104 ++++++++++++++++++++ src/pages/Travel/Card/TravelLog.vue | 6 ++ src/pages/Travel/Card/TravelTermographs.vue | 1 + src/router/modules/travel.js | 10 +- 6 files changed, 136 insertions(+), 7 deletions(-) create mode 100644 src/pages/Travel/Card/TravelBasicData.vue create mode 100644 src/pages/Travel/Card/TravelLog.vue create mode 100644 src/pages/Travel/Card/TravelTermographs.vue diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 742134ecd..afef477af 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -1032,7 +1032,7 @@ export default { extraCommunity: 'Extra community', travelCreate: 'New travel', basicData: 'Basic data', - history: 'History', + history: 'Log', thermographs: 'Termographs', }, summary: { @@ -1057,6 +1057,16 @@ export default { continent: 'Continent out', totalEntries: 'Total entries', }, + basicData: { + reference: 'Reference', + agency: 'Agency', + shipped: 'Shipped', + landed: 'Landed', + warehouseOut: 'Warehouse Out', + warehouseIn: 'Warehouse In', + delivered: 'Delivered', + received: 'Received', + }, }, components: { topbar: {}, diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index ed6633bd9..523b7e2d5 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -1057,6 +1057,16 @@ export default { continent: 'Cont. Salida', totalEntries: 'Ent. totales', }, + basicData: { + reference: 'Referencia', + agency: 'Agencia', + shipped: 'F. Envío', + landed: 'F. entrega', + warehouseOut: 'Alm. salida', + warehouseIn: 'Alm. entrada', + delivered: 'Enviada', + received: 'Recibida', + }, }, components: { topbar: {}, diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue new file mode 100644 index 000000000..2edaac853 --- /dev/null +++ b/src/pages/Travel/Card/TravelBasicData.vue @@ -0,0 +1,104 @@ + + diff --git a/src/pages/Travel/Card/TravelLog.vue b/src/pages/Travel/Card/TravelLog.vue new file mode 100644 index 000000000..1a2667ff7 --- /dev/null +++ b/src/pages/Travel/Card/TravelLog.vue @@ -0,0 +1,6 @@ + + diff --git a/src/pages/Travel/Card/TravelTermographs.vue b/src/pages/Travel/Card/TravelTermographs.vue new file mode 100644 index 000000000..c86c49242 --- /dev/null +++ b/src/pages/Travel/Card/TravelTermographs.vue @@ -0,0 +1 @@ + diff --git a/src/router/modules/travel.js b/src/router/modules/travel.js index 43c444ae2..f9b2153da 100644 --- a/src/router/modules/travel.js +++ b/src/router/modules/travel.js @@ -69,9 +69,8 @@ export default { meta: { title: 'basicData', icon: 'vn:settings', - // roles: [], }, - // component: () => import(), + component: () => import('src/pages/Travel/Card/TravelBasicData.vue'), }, { name: 'TravelHistory', @@ -79,9 +78,8 @@ export default { meta: { title: 'history', icon: 'history', - // roles: [], }, - // component: () => import(), + component: () => import('src/pages/Travel/Card/TravelLog.vue'), }, { name: 'TravelThermographs', @@ -89,9 +87,9 @@ export default { meta: { title: 'thermographs', icon: 'vn:thermometer', - // roles: [], }, - // component: () => import(), + component: () => + import('src/pages/Travel/Card/TravelTermographs.vue'), }, ], }, From 1c689ce9665bb574b85499c9da5b79b1f9a8a363 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Fri, 19 Jan 2024 09:24:57 -0300 Subject: [PATCH 002/522] Travel termographs WIP --- src/i18n/en/index.js | 9 +- src/i18n/es/index.js | 7 + src/pages/Travel/Card/TravelTermographs.vue | 134 +++++++++++++++++++- 3 files changed, 148 insertions(+), 2 deletions(-) diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index afef477af..2bd7e02f6 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -886,7 +886,7 @@ export default { RouteList: 'List', create: 'Create', basicData: 'Basic Data', - summary: 'Summary' + summary: 'Summary', }, cmr: { list: { @@ -1067,6 +1067,13 @@ export default { delivered: 'Delivered', received: 'Received', }, + termographs: { + code: 'Code', + temperature: 'Temperature', + state: 'State', + destination: 'Destination', + created: 'Created', + }, }, components: { topbar: {}, diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 523b7e2d5..ea159d16f 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -1067,6 +1067,13 @@ export default { delivered: 'Enviada', received: 'Recibida', }, + termographs: { + code: 'Código', + temperature: 'Temperatura', + state: 'Estado', + destination: 'Destino', + created: 'Fecha creación', + }, }, components: { topbar: {}, diff --git a/src/pages/Travel/Card/TravelTermographs.vue b/src/pages/Travel/Card/TravelTermographs.vue index c86c49242..0d43843e7 100644 --- a/src/pages/Travel/Card/TravelTermographs.vue +++ b/src/pages/Travel/Card/TravelTermographs.vue @@ -1 +1,133 @@ - + + + + + +es: + Add termograph: Añadir termógrafo + + From 0c385d9a6fb5c1f73f42db3e1ada86d8ec0c5ac4 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Mon, 22 Jan 2024 11:22:22 -0300 Subject: [PATCH 003/522] WIP --- src/composables/useState.js | 3 + src/composables/useUserConfig.js | 1 + src/i18n/en/index.js | 11 +- src/i18n/es/index.js | 9 +- src/pages/Travel/Card/TravelCard.vue | 1 - src/pages/Travel/Card/TravelTermographs.vue | 133 --------- src/pages/Travel/Card/TravelThermographs.vue | 188 ++++++++++++ .../Travel/Card/TravelThermographsForm.vue | 271 ++++++++++++++++++ src/router/modules/travel.js | 31 +- 9 files changed, 509 insertions(+), 139 deletions(-) delete mode 100644 src/pages/Travel/Card/TravelTermographs.vue create mode 100644 src/pages/Travel/Card/TravelThermographs.vue create mode 100644 src/pages/Travel/Card/TravelThermographsForm.vue diff --git a/src/composables/useState.js b/src/composables/useState.js index 1c797e992..e0b742a73 100644 --- a/src/composables/useState.js +++ b/src/composables/useState.js @@ -9,6 +9,7 @@ const user = ref({ lang: '', darkMode: null, companyFk: null, + warehouseFk: null, }); const roles = ref([]); @@ -25,6 +26,7 @@ export function useState() { lang: user.value.lang, darkMode: user.value.darkMode, companyFk: user.value.companyFk, + warehouseFk: user.value.warehouseFk, }; }); } @@ -37,6 +39,7 @@ export function useState() { lang: data.lang, darkMode: data.darkMode, companyFk: data.companyFk, + warehouseFk: data.warehouseFk, }; } diff --git a/src/composables/useUserConfig.js b/src/composables/useUserConfig.js index e05d7fb5c..a33779be7 100644 --- a/src/composables/useUserConfig.js +++ b/src/composables/useUserConfig.js @@ -12,6 +12,7 @@ export function useUserConfig() { const user = state.getUser().value; user.darkMode = data.darkMode; user.companyFk = data.companyFk; + user.warehouseFk = data.warehouseFk; state.setUser(user); return data; diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 2bd7e02f6..9788eedf6 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -1033,7 +1033,7 @@ export default { travelCreate: 'New travel', basicData: 'Basic data', history: 'Log', - thermographs: 'Termographs', + thermographs: 'Thermograph', }, summary: { confirmed: 'Confirmed', @@ -1067,12 +1067,19 @@ export default { delivered: 'Delivered', received: 'Received', }, - termographs: { + thermographs: { code: 'Code', temperature: 'Temperature', state: 'State', destination: 'Destination', created: 'Created', + thermograph: 'Thermograph', + reference: 'Reference', + type: 'Type', + company: 'Company', + warehouse: 'Warehouse', + travelFileDescription: 'Travel id { travelId }', + file: 'File', }, }, components: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index ea159d16f..89efef79e 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -1067,12 +1067,19 @@ export default { delivered: 'Enviada', received: 'Recibida', }, - termographs: { + thermographs: { code: 'Código', temperature: 'Temperatura', state: 'Estado', destination: 'Destino', created: 'Fecha creación', + thermograph: 'Termógrafo', + reference: 'Referencia', + type: 'Tipo', + company: 'Empresa', + warehouse: 'Almacén', + travelFileDescription: 'Id envío { travelId }', + file: 'Fichero', }, }, components: { diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue index 34ecc25ee..1b185592b 100644 --- a/src/pages/Travel/Card/TravelCard.vue +++ b/src/pages/Travel/Card/TravelCard.vue @@ -17,7 +17,6 @@ const stateStore = useStateStore(); -
diff --git a/src/pages/Travel/Card/TravelTermographs.vue b/src/pages/Travel/Card/TravelTermographs.vue deleted file mode 100644 index 0d43843e7..000000000 --- a/src/pages/Travel/Card/TravelTermographs.vue +++ /dev/null @@ -1,133 +0,0 @@ - - - - - -es: - Add termograph: Añadir termógrafo - - diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue new file mode 100644 index 000000000..33160f2b5 --- /dev/null +++ b/src/pages/Travel/Card/TravelThermographs.vue @@ -0,0 +1,188 @@ + + + + + +es: + Add thermograph: Añadir termógrafo + Download file: Descargar fichero + Edit file: Editar fichero + Remove thermograph: Eliminar termógrafo + Thermograph removed: Termógrafo eliminado + Are you sure you want to remove the thermograph?: ¿Seguro que quieres quitar el termógrafo? + diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue new file mode 100644 index 000000000..da0a4ee2b --- /dev/null +++ b/src/pages/Travel/Card/TravelThermographsForm.vue @@ -0,0 +1,271 @@ + + + + + +es: + Select files: Selecciona ficheros + Thermograph created: Termógrafo creado + diff --git a/src/router/modules/travel.js b/src/router/modules/travel.js index f9b2153da..5d9884dc2 100644 --- a/src/router/modules/travel.js +++ b/src/router/modules/travel.js @@ -88,8 +88,35 @@ export default { title: 'thermographs', icon: 'vn:thermometer', }, - component: () => - import('src/pages/Travel/Card/TravelTermographs.vue'), + redirect: { + name: 'TravelThermographsIndex', + }, + children: [ + { + name: 'TravelThermographsIndex', + path: 'index', + component: () => + import('src/pages/Travel/Card/TravelThermographs.vue'), + }, + { + name: 'TravelThermographsCreate', + path: 'create', + props: { viewAction: 'create' }, + component: () => + import( + 'src/pages/Travel/Card/TravelThermographsForm.vue' + ), + }, + { + name: 'TravelThermographsEdit', + path: 'edit', + props: { viewAction: 'edit' }, + component: () => + import( + 'src/pages/Travel/Card/TravelThermographsForm.vue' + ), + }, + ], }, ], }, From cbd8af7fae1a5b754ab0c1a86b291dc8d4bc082d Mon Sep 17 00:00:00 2001 From: wbuezas Date: Sat, 27 Jan 2024 10:49:49 -0300 Subject: [PATCH 004/522] In TravelList show warehouses name instead warehouseFk --- src/pages/Travel/TravelList.vue | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue index 889f096aa..39e439f6f 100644 --- a/src/pages/Travel/TravelList.vue +++ b/src/pages/Travel/TravelList.vue @@ -1,5 +1,5 @@