From 31c0a58cecf957deeb1753748e149b0c59ec0b32 Mon Sep 17 00:00:00 2001 From: alexandre Date: Tue, 14 Mar 2023 14:20:37 +0100 Subject: [PATCH 01/33] refs #5056 working on section wagonTypeCreate --- src/i18n/en/index.js | 14 ++ src/i18n/es/index.js | 14 ++ src/pages/Wagon/WagonMain.vue | 17 +++ src/pages/Wagon/WagonTray.vue | 103 +++++++++++++++ src/pages/Wagon/WagonTypeCreate.vue | 191 ++++++++++++++++++++++++++++ src/router/modules/index.js | 4 +- src/router/modules/wagon.js | 35 +++++ src/router/routes.js | 2 + src/stores/useNavigationStore.js | 2 +- 9 files changed, 380 insertions(+), 2 deletions(-) create mode 100644 src/pages/Wagon/WagonMain.vue create mode 100644 src/pages/Wagon/WagonTray.vue create mode 100644 src/pages/Wagon/WagonTypeCreate.vue create mode 100644 src/router/modules/wagon.js diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index e61bbaab0..add2a29e9 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -386,6 +386,20 @@ export default { }, imageNotFound: 'Image not found', }, + wagon: { + pageTitles: { + wagons: 'Wagons', + list: 'List' + }, + type: { + name: 'Name', + nameNotEmpty: 'Name can not be empty', + maxTrays: 'You have reached the max number of trays', + saveMessage: 'Wagon type successfully saved', + submit: 'Submit', + reset: 'Reset' + } + }, components: { topbar: {}, userPanel: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 2ca9d5ee9..91e69b13b 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -386,6 +386,20 @@ export default { }, imageNotFound: 'No se ha encontrado la imagen', }, + wagon: { + pageTitles: { + wagons: 'Vagones', + list: 'Listado' + }, + type: { + name: 'Nombre', + nameNotEmpty: 'El nombre no puede estar vacío', + maxTrays: 'Has alcanzado el número máximo de bandejas', + saveMessage: 'Tipo de vagón guardado correctamente', + submit: 'Guardar', + reset: 'Deshacer cambios' + } + }, components: { topbar: {}, userPanel: { diff --git a/src/pages/Wagon/WagonMain.vue b/src/pages/Wagon/WagonMain.vue new file mode 100644 index 000000000..2fb079daa --- /dev/null +++ b/src/pages/Wagon/WagonMain.vue @@ -0,0 +1,17 @@ + + + diff --git a/src/pages/Wagon/WagonTray.vue b/src/pages/Wagon/WagonTray.vue new file mode 100644 index 000000000..ebbc0d0d3 --- /dev/null +++ b/src/pages/Wagon/WagonTray.vue @@ -0,0 +1,103 @@ + + + diff --git a/src/pages/Wagon/WagonTypeCreate.vue b/src/pages/Wagon/WagonTypeCreate.vue new file mode 100644 index 000000000..c431b808e --- /dev/null +++ b/src/pages/Wagon/WagonTypeCreate.vue @@ -0,0 +1,191 @@ + + + + + + diff --git a/src/router/modules/index.js b/src/router/modules/index.js index ca8b3c958..30c51939d 100644 --- a/src/router/modules/index.js +++ b/src/router/modules/index.js @@ -3,11 +3,13 @@ import Ticket from './ticket'; import Claim from './claim'; import InvoiceOut from './invoiceOut'; import Worker from './worker'; +import Wagon from './wagon'; export default [ Customer, Ticket, Claim, InvoiceOut, - Worker + Worker, + Wagon ] diff --git a/src/router/modules/wagon.js b/src/router/modules/wagon.js new file mode 100644 index 000000000..7059b3143 --- /dev/null +++ b/src/router/modules/wagon.js @@ -0,0 +1,35 @@ +import { RouterView } from 'vue-router'; + +export default { + path: '/wagon', + name: 'Wagon', + meta: { + title: 'wagons', + icon: 'contact_support', + }, + component: RouterView, + redirect: { name: 'WagonMain' }, + menus: { + main: ['WagonTypeList'], + card: [], + }, + children: [ + { + path: '', + name: 'WagonMain', + component: () => import('src/pages/Wagon/WagonMain.vue'), + redirect: { name: 'WagonTypeList' }, + children: [ + { + path: 'list', + name: 'WagonTypeCreate', + meta: { + title: 'list', + icon: 'view_list', + }, + component: () => import('src/pages/Wagon/WagonTypeCreate.vue'), + }, + ], + } + ], +}; diff --git a/src/router/routes.js b/src/router/routes.js index c92075a82..17a56505d 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -3,6 +3,7 @@ import ticket from './modules/ticket'; import claim from './modules/claim'; import worker from './modules/worker'; import invoiceOut from './modules/invoiceOut'; +import wagon from './modules/wagon'; const routes = [ { @@ -34,6 +35,7 @@ const routes = [ name: 'NotFound', component: () => import('../pages/NotFound.vue'), }, + wagon ], }, ]; diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js index 3b2c7e8a7..bcaeeb953 100644 --- a/src/stores/useNavigationStore.js +++ b/src/stores/useNavigationStore.js @@ -6,7 +6,7 @@ import { useRole } from 'src/composables/useRole'; import routes from 'src/router/modules'; export const useNavigationStore = defineStore('navigationStore', () => { - const modules = ['customer', 'claim', 'ticket', 'invoiceOut', 'worker']; + const modules = ['customer', 'claim', 'ticket', 'invoiceOut', 'worker', 'wagon']; const pinnedModules = ref([]); const role = useRole(); From b95ee3c247801714d670abb7d9891d796e6b40ac Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 15 Mar 2023 11:58:31 +0100 Subject: [PATCH 02/33] refs #5056 before making position dynamic --- src/i18n/en/index.js | 4 +- src/i18n/es/index.js | 4 +- src/pages/Wagon/{ => Type}/WagonTray.vue | 0 .../Wagon/{ => Type}/WagonTypeCreate.vue | 27 ++- src/pages/Wagon/Type/WagonTypeEdit.vue | 223 ++++++++++++++++++ src/pages/Wagon/Type/WagonTypeList.vue | 100 ++++++++ src/router/modules/wagon.js | 26 +- 7 files changed, 367 insertions(+), 17 deletions(-) rename src/pages/Wagon/{ => Type}/WagonTray.vue (100%) rename src/pages/Wagon/{ => Type}/WagonTypeCreate.vue (88%) create mode 100644 src/pages/Wagon/Type/WagonTypeEdit.vue create mode 100644 src/pages/Wagon/Type/WagonTypeList.vue diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index add2a29e9..1f0c58416 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -389,7 +389,9 @@ export default { wagon: { pageTitles: { wagons: 'Wagons', - list: 'List' + types: 'Types', + typeCreate: 'Create type', + typeEdit: 'Edit type' }, type: { name: 'Name', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 91e69b13b..d9ac390a4 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -389,7 +389,9 @@ export default { wagon: { pageTitles: { wagons: 'Vagones', - list: 'Listado' + types: 'Tipos', + typeCreate: 'Crear tipo', + typeEdit: 'Editar tipo' }, type: { name: 'Nombre', diff --git a/src/pages/Wagon/WagonTray.vue b/src/pages/Wagon/Type/WagonTray.vue similarity index 100% rename from src/pages/Wagon/WagonTray.vue rename to src/pages/Wagon/Type/WagonTray.vue diff --git a/src/pages/Wagon/WagonTypeCreate.vue b/src/pages/Wagon/Type/WagonTypeCreate.vue similarity index 88% rename from src/pages/Wagon/WagonTypeCreate.vue rename to src/pages/Wagon/Type/WagonTypeCreate.vue index c431b808e..3657e31b8 100644 --- a/src/pages/Wagon/WagonTypeCreate.vue +++ b/src/pages/Wagon/Type/WagonTypeCreate.vue @@ -32,10 +32,12 @@ import FetchData from 'components/FetchData.vue'; import { useQuasar } from 'quasar'; import { ref } from 'vue'; import { useI18n } from 'vue-i18n'; -import WagonTray from './WagonTray.vue'; +import { useRouter } from 'vue-router'; +import WagonTray from '../Type/WagonTray.vue'; const { t } = useI18n(); const quasar = useQuasar(); +const router = useRouter(); const wagonConfig = ref([]); const wagonTypeColors = ref([]); const wagon = ref([]); @@ -45,7 +47,7 @@ let currentPosition = 0; function addTray() { if (wagon.value.length < wagonConfig.value.maxTrays - 1) { - currentPosition += wagonConfig.value.trayStep; + currentPosition += wagonConfig.value.minTrayHeight; wagon.value.unshift({ position: currentPosition, color: { @@ -65,7 +67,7 @@ function deleteTray(position) { currentPosition = 0; wagon.value = wagon.value.filter((tray) => tray.position !== position); for (let i = wagon.value.length - 1; i >= 0; i--) { - currentPosition += wagonConfig.value.trayStep; + currentPosition += wagonConfig.value.minTrayHeight; wagon.value[i].position = currentPosition; } } @@ -76,20 +78,23 @@ async function onSubmit() { .post('WagonTypes', { name: name.value, }) - .then((res) => { - wagon.value.forEach(async (tray) => { - await axios.post('WagonTypeTrays', { + .then(async (res) => { + const trays = []; + wagon.value.forEach((tray) => { + trays.push({ typeFk: res.data.id, height: tray.position, colorFk: tray.color.id, }); }); + await axios.post('WagonTypeTrays', trays).then(() => { + router.push({ path: `/wagon/type/list` }); + quasar.notify({ + message: t('wagon.type.saveMessage'), + type: 'positive', + }); + }); }); - - quasar.notify({ - message: t('wagon.type.saveMessage'), - type: 'positive', - }); } catch (error) { // } diff --git a/src/pages/Wagon/Type/WagonTypeEdit.vue b/src/pages/Wagon/Type/WagonTypeEdit.vue new file mode 100644 index 000000000..0d466f129 --- /dev/null +++ b/src/pages/Wagon/Type/WagonTypeEdit.vue @@ -0,0 +1,223 @@ + + + + + + diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue new file mode 100644 index 000000000..a4e00e19d --- /dev/null +++ b/src/pages/Wagon/Type/WagonTypeList.vue @@ -0,0 +1,100 @@ + + + + + + + +es: + Search wagon type: Buscar tipo de vagón + You can search by wagon type id or name: Puedes buscar por id o nombre del tipo de vagón + diff --git a/src/router/modules/wagon.js b/src/router/modules/wagon.js index 7059b3143..56d8cd548 100644 --- a/src/router/modules/wagon.js +++ b/src/router/modules/wagon.js @@ -15,19 +15,37 @@ export default { }, children: [ { - path: '', + path: '/wagon/type', name: 'WagonMain', component: () => import('src/pages/Wagon/WagonMain.vue'), redirect: { name: 'WagonTypeList' }, children: [ { path: 'list', - name: 'WagonTypeCreate', + name: 'WagonTypeList', meta: { - title: 'list', + title: 'types', icon: 'view_list', }, - component: () => import('src/pages/Wagon/WagonTypeCreate.vue'), + component: () => import('src/pages/Wagon/Type/WagonTypeList.vue') + }, + { + path: 'create', + name: 'WagonTypeCreate', + meta: { + title: 'typeCreate', + icon: 'create', + }, + component: () => import('src/pages/Wagon/Type/WagonTypeCreate.vue') + }, + { + path: ':id/edit', + name: 'WagonTypeEdit', + meta: { + title: 'typeEdit', + icon: 'edit', + }, + component: () => import('src/pages/Wagon/Type/WagonTypeCreate.vue') }, ], } From e9acc6b687d4b55e935b8ec6f180984d41af4edf Mon Sep 17 00:00:00 2001 From: alexandre Date: Tue, 21 Mar 2023 10:46:43 +0100 Subject: [PATCH 03/33] refs #5056 new sections, missing tests --- src/pages/Wagon/WagonList.vue | 129 ++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 src/pages/Wagon/WagonList.vue diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue new file mode 100644 index 000000000..1f8634280 --- /dev/null +++ b/src/pages/Wagon/WagonList.vue @@ -0,0 +1,129 @@ + + + + + From f4286b5d280d2ddc1eed38f6121ef33657de8c4c Mon Sep 17 00:00:00 2001 From: alexandre Date: Tue, 21 Mar 2023 10:46:51 +0100 Subject: [PATCH 04/33] refs #5056 new sections --- src/css/fonts/icomoon.eot | Bin 45592 -> 46556 bytes src/css/fonts/icomoon.svg | 23 +- src/css/fonts/icomoon.ttf | Bin 45428 -> 46384 bytes src/css/fonts/icomoon.woff | Bin 45504 -> 46460 bytes src/css/icons.scss | 294 +++++++-------- src/i18n/en/index.js | 35 +- src/i18n/es/index.js | 34 +- src/pages/Wagon/Type/WagonTray.vue | 103 ------ src/pages/Wagon/Type/WagonTypeCreate.vue | 449 +++++++++++++++++------ src/pages/Wagon/Type/WagonTypeEdit.vue | 223 ----------- src/pages/Wagon/Type/WagonTypeList.vue | 71 ++-- src/pages/Wagon/WagonCreate.vue | 181 +++++++++ src/router/modules/wagon.js | 43 ++- 13 files changed, 807 insertions(+), 649 deletions(-) delete mode 100644 src/pages/Wagon/Type/WagonTray.vue delete mode 100644 src/pages/Wagon/Type/WagonTypeEdit.vue create mode 100644 src/pages/Wagon/WagonCreate.vue diff --git a/src/css/fonts/icomoon.eot b/src/css/fonts/icomoon.eot index cbe9d016ee2d28f8e496e2d424cbfbf844dba546..f85902086955f012e8540c4339d6e32c8cd42aef 100644 GIT binary patch delta 1710 zcmaJ?Z){Ul6hHUf*S@Z$UEkW**L4HizWy028(q6@wZQCPurbCq2H6w^DXiT_wso?x z3>eg*0YYM=)(;M&C>kXtGd^gnqU z?KQnfC@R?#0H-1a{u2$&Oh$x{iQna?6Y z67@_;Y6Ej~Pe}oK)giY6R3L&4-0&Q1h5c{{5{XNp=XF)~>Y7EwZ4g9{+(oR8C4@^% ztSnIroWx1BUQu!`MCQVKY(AW72v*J2L?TzuQ0p;>JUS7dB=_>ZIttC*Sm74Mb+&uyW|ol1DvjNU87o@ml{Qzfa#n9qA7@yZ$!99)CWQ1VOKMA58AB)` zpB}(yXlooh`xt%Bqt;j zVr~$Id7WS`hQZV%uA+(;Ow}b8FaLqkpvq1$B!bDpgehHEbQJvze%s7tsaA)@C$(k8 zq*_Kd6z3cW8lPb~HhU!!Ar+DA7bZ`vSivif%T#i0naC36APSMuH?*7_-!ui)Y?|J~ zw_ybbEC8_cl3>BNpdo_Z;Puq_svS_rlo=_j7-_o>wfrfgjVpl|Pm z$rlS3-vbqk{Q=zY-~aZXdp0wh!iW4N>Iz_TEG~?p>De>@8%2ADjpmsDtcg_1i4KxD zmb4^JCKUx6(FHKMDs?$oPPPUE!F|DW@NT`SentJyOLs0!E-PI&*6?b>rR86(_@uF^ zajNlt)2607D?3;I(Y$U|N6X=stE*pbwYDB^J=c1tZLsZPyS{x-d$RqNNXkbSkQ{=Wgw=fDF7J}&) zdtX%gSRi7VP9d;F5fnoFR1jf($hD|2B2ozF)|tLOSRS~X-|zh1Irp4oj>914955Y!0(2@P5e;@Dw?rc2k=Z2I)bj{8bX~R%auxGxia}tb*@?|rM}=X4Y#1tEO2zWr6uU&j4K+=ijfPC&&Q7r zcyHYGi3}91AYE6?r5H7s?G+X6iNz)!(@{+1Z=HL!?K+se(q; zB|4k8x~GNbAmn9P zW)67-p5C_M{V_A482}bg53npAz)tgce?6-vlmM?CSBfrUU8}ckTt%)I_7=X?CTMk9 zo3_8`V9}xubj`X~y7kjP&U`%UI{Ui#KyhzLN=aww{!-7m_OkhMwtS>QUol_twKAo0 zu=1x~s~^_C(+8`%s{H4VUkDgF4NF`iSB%?-d+<;fByY7s`Ps?6eELL8heXiAw=aQu zp;rcRzJOW8ZUKw%Wy%CB#(24aqaX$D<7E>z5+kvwY-5VpDqse2fq+@WcfweW2_i@e zznraPF$&cJj)FXR)M$3t9ggOm{|^6YBEzt&vTLx~Vs+b0Em+us-MGO9CTQ99OWro= F`~$tH>udl3 diff --git a/src/css/fonts/icomoon.svg b/src/css/fonts/icomoon.svg index 7465c400c..b4208013b 100644 --- a/src/css/fonts/icomoon.svg +++ b/src/css/fonts/icomoon.svg @@ -3,7 +3,7 @@ Generated by IcoMoon - + @@ -15,7 +15,7 @@ - + @@ -28,12 +28,12 @@ - - - - - - + + + + + + @@ -82,12 +82,12 @@ - + - + @@ -98,7 +98,8 @@ - + + diff --git a/src/css/fonts/icomoon.ttf b/src/css/fonts/icomoon.ttf index b5fdefb0b66cdaef145483429334ea9517395ccf..b69a350351f4cb2462d8fd93c63d731b467f450d 100644 GIT binary patch delta 1666 zcmaJ>eQZ-z6hHUf*S>zNTf4UJbzO&TUq8mmpzFt02Fwn|HpbY-Mm9x7I@WHGt)1Ig z1`G;nz?c}Q^`BuBL1RXgG3`WS5E?%)8g<4$2>2H<(HXN4V}uyfb)G^E`VS}f-1|Gf z^KsA1yE%XU#LWK2#DM^S5{?1|cYD_wPf@Y-9b_(}?%p#L8osJMBmp2Mv|s5DjSl0f zMtc@dS^waH2zVrQXnzDS;~NNv`oxR}<1a3vzj^=(*=qIzz^n~z+rZG+#NW>tdeLqM zVA#Rfp860U-7pRCek&GXhe8v>@G3J7km|q$b2Ky*-qmxn32nTXygnQo9m7UZKENix z43sV<(uayB&@f_O6cqS9=42~*BsoM@vPh8RSz<_CA`3@Kxi4z3m&P9SRES(mptP)6>uUa)_4Wcxdw^F-cIKYwL0LiyIgih zK#lSMzx|lHJ=_}ZDB^j6D3kMRT|twubX_QOH#E3&YSs}}Wl$ujgwTXaN)yK_9QJ@l zt=0tWjtbWU?5ZnYSSSzF)~2o>jZ5PyfaNqBqiJx03mf;tT4;xz5Qiyv4bH+vxB?*Y zi<+8RvX0aeuiq+G5Yg%)daqlrQ|onAqTcKAqQ~PUUX4gmHDYe#a3d>-;9pIgxJ0W| zEF_%1niqsRQiF_s1&Is9?ely6qNCc0`+8D^EDU4=-pi zi1p8T=vyO#OgVS#hh$xhm1-XgMwF#kB={+UhV37X>#)LU-83}li4rl z=6<=iex93S`dN-j3Zw-kDnG+AoQkux*q_t6^kwyq0zsAS+t|wz64_d4H(3?w@;*YyfTFa<#7Y=K3Hk5^l$-hry+W%{=oE&P#n}s#V+~a$YI9NC z+Tskl=^5g7ClcAW5(zh*&xGh3sAqCYG9l&`VVIKyYcUL#CJ7~#J!$lnTD+P!6}&P# z&5#Hd3lqk)ruZDj@d4Y?H)4$zFP~DEmk^(XK2?$nAn1IQ<=E_eBtj}9*-wm~c!^9S zJ19^?r zYf_CxqZM(p&~Ga<>B?f>W;EIb4Gn4pyU}Rli;-QmiUu=_we|>7w;_K*?f%0Jj2nzxwxF&Mc?!A%BLp z4452?f;lw3oCaWH=+CgR9P>XpmYROIlO&}xWyzwM0{Jcs0W7XemCsa=eZkt`@nAam zd%dx~vHr)62RF`aGHse@c)sE5&7U`3YHDtpZo1pNyZQE(?k#_`?AY4bdb;(-wxey< zw$p7_+HSW;+pl%#I*xSAbo{V==k|{~3%kDW?(RO<{cDf$UL(htF(|p$4ujJ~o1DK` z5YG*h`%N;y!AKrcki+^sW)YvrV+oF&(ma+T-;>7*99!pdQ;L-%Q;eSbn1Mn#kjE7H z&3VisK9$4kFhK%5{_y(=QgrOjV+Hu&@@Qyq??faP9fMH_!658~35Y-pqA->`IcteO z#QzXiXSjd=U}yw7Aq@SnAM1u-dt%#Sv1qdFy`Fyn DVxDVZ delta 872 zcmZvae@GKy7{{OY?%bSKHt8IR)(k_s6-9H_MdDofd(N`mNrdHCwu#$r_#=!$hlEi2 zM>dF(pnnWxSSjZpfh7w;A;iB5BC0=Bj07X1gmB(^POm=#UwC;x-{<>2?>*1G@7N0U zYk}$k0s!d{0UD0gT{wC?BU2Z{$Sa&p-k>Ku7`WdGKypw&_IcXFxb8;%64z8;;KsG7 z+}y9I;{dS%f3xSR`Pt+uz^D`bB0mQ7(@Zhy+o<#X!H%vqYVQ>45daDTlDE{8_&mQ1 z@Eik#3VOQ2FhpGkcrl6z=8z}Y{HWTnj(QILzOdBZfra82cdI_obYd`m(-=XKgLToc z1N$+5yA-V^`$=QePq@^qbqr&Z@&l6W<_Ur19~x-aW*4?R)@szVR@QXFX0;UwHw&C1au=yLg{wOogd|ujOA7T==@dl5iK1N9Ka$^o9c0~EF1V6$ z`ZuIAr~tmqPQL!PCKE}SVd!bpsrcu%26jcqlW_nB&`&Uo+UI{GB3F*p6GEa-#`6uh z4KCyK$#dfzX(|~g`C!kqJM01b!_vd0a}IEX9B&~nFnVu-Ww&?Y6XCyX CIn`zW diff --git a/src/css/fonts/icomoon.woff b/src/css/fonts/icomoon.woff index 64766848151e6987ec4deadafa4387be2816bc50..aa2d01bfb10ff120f7b62cc259f1b04f4f8ae642 100644 GIT binary patch delta 1682 zcmaJ>ZERCj7=F(^_x5(}y0u&Hy<0bM?OofkGU)oT)q=AdV}mibG03I_g#zt{*;Zs@ z4j9y_0b?{$u0I%lplHkpGQduahL6S%j7Guu!+<7+LTJm)_5 zdB4tS&poN{ne@+$_-K1m6A(aqdldAuPd5G`@>rRNH02`S8=v*C)X1m zRJAm|YqK!+^lgs9mqdcIIO%uz(RL=y2a<$^mkh@*bJTqAs;ful(XK&E;iYuJuZ? zb0G@fg*%-WjmCh(?sC~30VCRN{>J^r_DE}_BVQCHqE}9CbTyPp(_c$-+>MQH6=i0^ z8j5rY$`P6{XlP=r(qRvnj7C$y?x=L#=B~Pmt5+)m!61NQJUX5{J@x|^Hvr6}*ceTL z6I{3jKim!Num<8V4llv0a2(D6aDLfT8zhTJka+zzxsu2>7ZJQ}!E6-F)w1CAc+unW z60b?72$QT%JWgaTk^BpY6NhZm$a#bpYD7t@Bekdqb4gqxZlB-lmmM`uoEMX7bont1 zhY54D=`@dESG6Y!YCo~oBT6O=B7RvYM5PexsnszZhkXH&vARmJn3IjI)>4is(uum^ z;o)nDv#VA;J36}S&-kv<(aa}PQ&(okk5f}j56e?7SCd<8@G~sK8~E}T`x9oDFsI&; zD;YAI8aA+mL|5e5i?Cu<>)g_oDptdqt%f5E%US%EoK1v~UR_CTDa$d067ud-XqSXa zL072LnRP|;3Npti&lXh|8_V+Jwiai|O%D;bJCVq|o=CXqg>;y{f;gmtq{GZ*!Z6Pf zti>=`nk4j8yVl|>v3gCf=|p{If+0~X79mXO!h*vXCkD!=KbLC@vH7^MqL}zN`e3md zK+t(F%d?pa(I}~kW=>l?@nWq>dxX<#j1>|~n5Pkhqx+4#M*Si{Ka-+2@NC$?0rLUu zCRwoJS;!-TS@e2p{62@%Zx#OgN=;T%p^TH2eo>W9RTYTk7K>dn(U3{9TP)>b0jl%o z(@^?aknS0`kEeI=WoC=rZZVhfIXSmE^Ks@J2~PJBPv(5`#@>nYZoGsxKmNh^y8OjA zK#$)%+U3B_Pycz&q-TY`u8jV{Nv!gKcNpuD1`gpX)Gp?CzNC_-f^vmG5`vt@^U7tLt#r zPu-T;WsE7A*61DlcW`w^dbah2w?ZdGpa-^L-7svuL%h;)a?9T%oNbr@ delta 945 zcmZvae@IhN6vxlK@6GvRl}qPTG&Kxi+Fx_lDsiry=8svjH;J%%thJe&lev{q=r9sW z|FKu0(jWa%5MriH|B}oQ6e6TQ3L;7($0EUqC@Gv<=jkg5eDLLd?)RK~?!E7x$TFQ- zqNx|_O(r0K-}nq9ZHzvFpG@yBO6eN5x%oB#;zawdsD9VY76;#s9%XSJFDcpKx^xab z1;B8hsOjwN&rUmk7GPumb4o!H{)Jh&8ycb)T6wn}U@RSTdPEIYC#U_gPl&i!&yxI=PClQ2OvG;K{-Bssw~67D=m2*iFfz?d-?h%Qg1RmxRb zm3p5}t1D2_P;|eZo7d~-Ir`q~jfObul3u@LI5Pd(u$Rtru8!2SME(=;d*p0>CNRdQLE+zeO|n>t&xjCVPPmrA4L6} zm1wNi;O*Xr`HgsswCmx5(>o6Rge37P02b$`p8g$UkywyrnOU62Z~Rs<9LDW6xMYF)1PR_`Le#Uw}zbtqrqhuC@(61X#``d@r7~q z@V6tMDtr~MO}kBfm6?^@RlBMJM?0(MYS@~QT667O?Q&ga-B8_kv%x%UerJx>_tb}v z9XKAbbXyjA7pHtgktNZ2+x9wF1ZvFTS5+Jq_Z-}B@(m9eu-t+x+;m| z(65m=5i;QhJ~m+!(AkcWO{T~Wi5cWliCN?;BI|I04AQXEHW$QUph4n9D2DsZHjmrm tX@zF6fd||u53~x`Ch{y>Mz%B?><+(+_hMl?p2iO@;K93Prl6Q?`vXX^=GXuL diff --git a/src/css/icons.scss b/src/css/icons.scss index 1492a50d4..920a59626 100644 --- a/src/css/icons.scss +++ b/src/css/icons.scss @@ -1,399 +1,403 @@ @font-face { - font-family: 'icomoon'; - src: url('fonts/icomoon.eot?g6kvgn'); - src: url('fonts/icomoon.eot?g6kvgn#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?g6kvgn') format('truetype'), - url('fonts/icomoon.woff?g6kvgn') format('woff'), - url('fonts/icomoon.svg?g6kvgn#icomoon') format('svg'); - font-weight: normal; - font-style: normal; - font-display: block; + font-family: 'icomoon'; + src: url('fonts/icomoon.eot?g6kvgn'); + src: url('fonts/icomoon.eot?g6kvgn#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?g6kvgn') format('truetype'), + url('fonts/icomoon.woff?g6kvgn') format('woff'), + url('fonts/icomoon.svg?g6kvgn#icomoon') 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: 'icomoon' !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: 'icomoon' !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-pin:before { - content: "\e950"; + content: '\e950'; } .icon-pin_off:before { - content: "\e95b"; + content: '\e95b'; } .icon-frozen:before { - content: "\e900"; + content: '\e900'; } .icon-Person:before { - content: "\e901"; + content: '\e901'; } .icon-handmadeArtificial:before { - content: "\e902"; + content: '\e902'; } .icon-fruit:before { - content: "\e903"; + content: '\e903'; } .icon-funeral:before { - content: "\e904"; + content: '\e904'; } .icon-noPayMethod:before { - content: "\e905"; + content: '\e905'; } .icon-preserved:before { - content: "\e906"; + content: '\e906'; } .icon-greenery:before { - content: "\e907"; + content: '\e907'; } .icon-planta:before { - content: "\e908"; + content: '\e908'; } .icon-handmade:before { - content: "\e909"; + content: '\e909'; } .icon-accessory:before { - content: "\e90a"; + content: '\e90a'; } .icon-artificial:before { - content: "\e90b"; + content: '\e90b'; } .icon-flower:before { - content: "\e90c"; + content: '\e90c'; } .icon-fixedPrice:before { - content: "\e90d"; + content: '\e90d'; } .icon-addperson:before { - content: "\e90e"; + content: '\e90e'; } .icon-supplierfalse:before { - content: "\e90f"; + content: '\e90f'; } .icon-invoice-out:before { - content: "\e910"; + content: '\e910'; } .icon-invoice-in:before { - content: "\e911"; + content: '\e911'; } .icon-invoice-in-create:before { - content: "\e912"; + content: '\e912'; } .icon-basketadd:before { - content: "\e913"; + content: '\e913'; } .icon-basket:before { - content: "\e914"; + content: '\e914'; } .icon-uniE915:before { - content: "\e915"; + content: '\e915'; } .icon-uniE916:before { - content: "\e916"; + content: '\e916'; } .icon-uniE917:before { - content: "\e917"; + content: '\e917'; } .icon-uniE918:before { - content: "\e918"; + content: '\e918'; } .icon-uniE919:before { - content: "\e919"; + content: '\e919'; } .icon-uniE91A:before { - content: "\e91a"; + content: '\e91a'; } .icon-isTooLittle:before { - content: "\e91b"; + content: '\e91b'; } .icon-deliveryprices:before { - content: "\e91c"; + content: '\e91c'; } .icon-onlinepayment:before { - content: "\e91d"; + content: '\e91d'; } .icon-risk:before { - content: "\e91e"; + content: '\e91e'; } .icon-noweb:before { - content: "\e91f"; + content: '\e91f'; } .icon-no036:before { - content: "\e920"; + content: '\e920'; } .icon-disabled:before { - content: "\e921"; + content: '\e921'; } .icon-treatments:before { - content: "\e922"; + content: '\e922'; } .icon-invoice:before { - content: "\e923"; + content: '\e923'; } .icon-photo:before { - content: "\e924"; + content: '\e924'; } .icon-supplier:before { - content: "\e925"; + content: '\e925'; } .icon-languaje:before { - content: "\e926"; + content: '\e926'; } .icon-credit:before { - content: "\e927"; + content: '\e927'; } .icon-client:before { - content: "\e928"; + content: '\e928'; } .icon-shipment-01:before { - content: "\e929"; + content: '\e929'; } .icon-account:before { - content: "\e92a"; + content: '\e92a'; } .icon-inventory:before { - content: "\e92b"; + content: '\e92b'; } .icon-unavailable:before { - content: "\e92c"; + content: '\e92c'; } .icon-wiki:before { - content: "\e92d"; + content: '\e92d'; } .icon-attach:before { - content: "\e92e"; + content: '\e92e'; } .icon-exit:before { - content: "\e92f"; + content: '\e92f'; } .icon-anonymous:before { - content: "\e930"; + content: '\e930'; } .icon-net:before { - content: "\e931"; + content: '\e931'; } .icon-buyrequest:before { - content: "\e932"; + content: '\e932'; } .icon-thermometer:before { - content: "\e933"; + content: '\e933'; } .icon-entry:before { - content: "\e934"; + content: '\e934'; } .icon-deletedTicket:before { - content: "\e935"; + content: '\e935'; } .icon-logout:before { - content: "\e936"; + content: '\e936'; } .icon-catalog:before { - content: "\e937"; + content: '\e937'; } .icon-agency:before { - content: "\e938"; + content: '\e938'; } .icon-delivery:before { - content: "\e939"; + content: '\e939'; } .icon-wand:before { - content: "\e93a"; + content: '\e93a'; } .icon-buscaman:before { - content: "\e93b"; + content: '\e93b'; } .icon-pbx:before { - content: "\e93c"; + content: '\e93c'; } .icon-calendar:before { - content: "\e93d"; + content: '\e93d'; } .icon-splitline:before { - content: "\e93e"; + content: '\e93e'; } .icon-consignatarios:before { - content: "\e93f"; + content: '\e93f'; } .icon-tax:before { - content: "\e940"; + content: '\e940'; } .icon-notes:before { - content: "\e941"; + content: '\e941'; } .icon-lines:before { - content: "\e942"; + content: '\e942'; } .icon-zone:before { - content: "\e943"; + content: '\e943'; } .icon-greuge:before { - content: "\e944"; + content: '\e944'; } .icon-ticketAdd:before { - content: "\e945"; + content: '\e945'; } .icon-components:before { - content: "\e946"; + content: '\e946'; } .icon-pets:before { - content: "\e947"; + content: '\e947'; } .icon-linesprepaired:before { - content: "\e948"; + content: '\e948'; } .icon-control:before { - content: "\e949"; + content: '\e949'; } .icon-revision:before { - content: "\e94a"; + content: '\e94a'; } .icon-deaulter:before { - content: "\e94b"; + content: '\e94b'; } .icon-services:before { - content: "\e94c"; + content: '\e94c'; } .icon-albaran:before { - content: "\e94d"; + content: '\e94d'; } .icon-solunion:before { - content: "\e94e"; + content: '\e94e'; } .icon-stowaway:before { - content: "\e94f"; + content: '\e94f'; } .icon-apps:before { - content: "\e951"; + content: '\e951'; } .icon-info:before { - content: "\e952"; + content: '\e952'; } .icon-columndelete:before { - content: "\e953"; + content: '\e953'; } .icon-columnadd:before { - content: "\e954"; + content: '\e954'; } .icon-deleteline:before { - content: "\e955"; + content: '\e955'; } .icon-item:before { - content: "\e956"; + content: '\e956'; } .icon-worker:before { - content: "\e957"; + content: '\e957'; } .icon-headercol:before { - content: "\e958"; + content: '\e958'; } .icon-reserva:before { - content: "\e959"; + content: '\e959'; } .icon-100:before { - content: "\e95a"; + content: '\e95a'; } .icon-sign:before { - content: "\e95d"; + content: '\e95d'; } .icon-polizon:before { - content: "\e95e"; + content: '\e95e'; } .icon-solclaim:before { - content: "\e95f"; + content: '\e95f'; } .icon-actions:before { - content: "\e960"; + content: '\e960'; } .icon-details:before { - content: "\e961"; + content: '\e961'; } .icon-traceability:before { - content: "\e962"; + content: '\e962'; } .icon-claims:before { - content: "\e963"; + content: '\e963'; } .icon-regentry:before { - content: "\e964"; + content: '\e964'; } .icon-transaction:before { - content: "\e966"; + content: '\e966'; } .icon-History:before { - content: "\e968"; + content: '\e968'; } .icon-mana:before { - content: "\e96a"; + content: '\e96a'; } .icon-ticket:before { - content: "\e96b"; + content: '\e96b'; } .icon-niche:before { - content: "\e96c"; + content: '\e96c'; } .icon-tags:before { - content: "\e96d"; + content: '\e96d'; } .icon-volume:before { - content: "\e96e"; + content: '\e96e'; } .icon-bin:before { - content: "\e96f"; + content: '\e96f'; } .icon-splur:before { - content: "\e970"; + content: '\e970'; } .icon-barcode:before { - content: "\e971"; + content: '\e971'; } .icon-botanical:before { - content: "\e972"; + content: '\e972'; } .icon-clone:before { - content: "\e973"; + content: '\e973'; } .icon-sms:before { - content: "\e975"; + content: '\e975'; } .icon-eye:before { - content: "\e976"; + content: '\e976'; } .icon-doc:before { - content: "\e977"; + content: '\e977'; } .icon-package:before { - content: "\e978"; + content: '\e978'; } .icon-settings:before { - content: "\e979"; + content: '\e979'; } .icon-bucket:before { - content: "\e97a"; + content: '\e97a'; } .icon-mandatory:before { - content: "\e97b"; + content: '\e97b'; } .icon-recovery:before { - content: "\e97c"; + content: '\e97c'; } .icon-payment:before { - content: "\e97e"; + content: '\e97e'; } .icon-grid:before { - content: "\e980"; + content: '\e980'; } .icon-web:before { - content: "\e982"; + content: '\e982'; } .icon-dfiscales:before { - content: "\e984"; + content: '\e984'; +} +.icon-trolley:before { + content: '\e95c'; } diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 1f0c58416..d0d894af0 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -389,17 +389,42 @@ export default { wagon: { pageTitles: { wagons: 'Wagons', - types: 'Types', + wagonsList: 'Wagons List', + wagonCreate: 'Create wagon', + wagonEdit: 'Edit wagon', + typesList: 'Types List', typeCreate: 'Create type', typeEdit: 'Edit type' }, type: { name: 'Name', - nameNotEmpty: 'Name can not be empty', - maxTrays: 'You have reached the max number of trays', - saveMessage: 'Wagon type successfully saved', submit: 'Submit', - reset: 'Reset' + reset: 'Reset', + trayColor: 'Tray color', + + }, + list: { + plate: 'Plate', + volume: 'Volume', + type: 'Type', + remove: 'Remove' + }, + create: { + plate: 'Plate', + volume: 'Volume', + type: 'Type', + label: 'Label' + }, + warnings: { + nameNotEmpty: 'Name can not be empty', + labelNotEmpty: 'Label can not be empty', + plateNotEmpty: 'Plate can not be empty', + volumeNotEmpty: 'Volume can not be empty', + typeNotEmpty: 'Type can not be empty', + maxTrays: 'You have reached the max number of trays', + minHeightBetweenTrays: 'The minimum height between trays is ', + maxWagonHeight: 'The maximum height of the wagon is ', + uncompleteTrays: 'There are incomplete trays', } }, components: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index d9ac390a4..0ef85cd56 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -389,17 +389,41 @@ export default { wagon: { pageTitles: { wagons: 'Vagones', - types: 'Tipos', + wagonsList: 'Listado vagones', + wagonCreate: 'Crear tipo', + wagonEdit: 'Editar tipo', + typesList: 'Listado tipos', typeCreate: 'Crear tipo', typeEdit: 'Editar tipo' }, type: { name: 'Nombre', - nameNotEmpty: 'El nombre no puede estar vacío', - maxTrays: 'Has alcanzado el número máximo de bandejas', - saveMessage: 'Tipo de vagón guardado correctamente', submit: 'Guardar', - reset: 'Deshacer cambios' + reset: 'Deshacer cambios', + trayColor: 'Color de la bandeja', + }, + list: { + plate: 'Matrícula', + volume: 'Volumen', + type: 'Tipo', + remove: 'Borrar' + }, + create: { + plate: 'Matrícula', + volume: 'Volumen', + type: 'Tipo', + label: 'Etiqueta', + }, + warnings: { + nameNotEmpty: 'El nombre no puede estar vacío', + labelNotEmpty: 'La etiqueta no puede estar vacía', + plateNotEmpty: 'La matrícula no puede estar vacía', + volumeNotEmpty: 'El volumen no puede estar vacío', + typeNotEmpty: 'El tipo no puede estar vacío', + maxTrays: 'Has alcanzado el número máximo de bandejas', + minHeightBetweenTrays: 'La distancia mínima entre bandejas es ', + maxWagonHeight: 'La altura máxima del vagón es ', + uncompleteTrays: 'Hay bandejas sin completar', } }, components: { diff --git a/src/pages/Wagon/Type/WagonTray.vue b/src/pages/Wagon/Type/WagonTray.vue deleted file mode 100644 index ebbc0d0d3..000000000 --- a/src/pages/Wagon/Type/WagonTray.vue +++ /dev/null @@ -1,103 +0,0 @@ - -
-
{{ position }}
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- - diff --git a/src/pages/Wagon/Type/WagonTypeCreate.vue b/src/pages/Wagon/Type/WagonTypeCreate.vue index 3657e31b8..9dfc5baeb 100644 --- a/src/pages/Wagon/Type/WagonTypeCreate.vue +++ b/src/pages/Wagon/Type/WagonTypeCreate.vue @@ -1,150 +1,304 @@ -