diff --git a/src/css/fonts/icomoon.eot b/src/css/fonts/icomoon.eot index cbe9d016e..f85902086 100644 Binary files a/src/css/fonts/icomoon.eot and b/src/css/fonts/icomoon.eot differ 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 b5fdefb0b..b69a35035 100644 Binary files a/src/css/fonts/icomoon.ttf and b/src/css/fonts/icomoon.ttf differ diff --git a/src/css/fonts/icomoon.woff b/src/css/fonts/icomoon.woff index 647668481..aa2d01bfb 100644 Binary files a/src/css/fonts/icomoon.woff and b/src/css/fonts/icomoon.woff differ 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 @@ -