From 5cf83284765e8de321a9d61d3f841d633db8a537 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Thu, 9 Jan 2020 13:58:50 +0100 Subject: [PATCH 1/3] added more rows to sms textarea --- modules/client/front/sms/index.html | 34 ++++++++++--------- modules/client/front/sms/style.scss | 6 ++-- modules/ticket/front/descriptor/locale/es.yml | 4 +-- modules/ticket/front/sale/locale/es.yml | 4 +-- 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/modules/client/front/sms/index.html b/modules/client/front/sms/index.html index 501558512..d968c1d05 100644 --- a/modules/client/front/sms/index.html +++ b/modules/client/front/sms/index.html @@ -2,22 +2,24 @@ vn-id="SMSDialog" on-response="$ctrl.onResponse($response)"> -
Send SMS
- - - - - - - - +
+
Send SMS
+ + + + + + + + +
diff --git a/modules/client/front/sms/style.scss b/modules/client/front/sms/style.scss index 60a625880..89723b196 100644 --- a/modules/client/front/sms/style.scss +++ b/modules/client/front/sms/style.scss @@ -1,7 +1,5 @@ @import "variables"; -vn-client-sms { - textarea { - height: 8em - } +.SMSDialog { + min-width: 25em } \ No newline at end of file diff --git a/modules/ticket/front/descriptor/locale/es.yml b/modules/ticket/front/descriptor/locale/es.yml index 947377e19..3df39fe28 100644 --- a/modules/ticket/front/descriptor/locale/es.yml +++ b/modules/ticket/front/descriptor/locale/es.yml @@ -13,9 +13,7 @@ Send Delivery Note: Enviar albarán Show pallet report: Ver hoja de pallet Change shipped hour: Cambiar hora de envío Shipped hour: Hora de envío -SMSPayment: >- - Verdnatura le comunica: Su pedido está pendiente de pago. - Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias. +SMSPayment: "Verdnatura le comunica:\rSu pedido está pendiente de pago.\rPor favor, entre en la página web y efectue el pago con tarjeta.\rMuchas gracias." Ticket invoiced: Ticket facturado Make invoice: Crear factura Regenerate invoice: Regenerar factura diff --git a/modules/ticket/front/sale/locale/es.yml b/modules/ticket/front/sale/locale/es.yml index 3ccdd528e..74f888f56 100644 --- a/modules/ticket/front/sale/locale/es.yml +++ b/modules/ticket/front/sale/locale/es.yml @@ -24,9 +24,7 @@ Sales to transfer: Líneas a transferir Destination ticket: Ticket destinatario Change ticket state to 'Ok': Cambiar estado del ticket a 'Ok' Reserved: Reservado -SMSAvailability: >- - Verdnatura le comunica: Pedido {{ticketFk}} día {{created | date: "dd/MM/yyyy"}}. - {{notAvailables}} no disponible/s. Disculpe las molestias. +SMSAvailability: "Verdnatura le comunica:\rPedido {{ticketFk}} día {{created | date: 'dd/MM/yyyy'}}.\r{{notAvailables}} no disponible/s.\rDisculpe las molestias." Continue anyway?: ¿Continuar de todas formas? This ticket is now empty: El ticket ha quedado vacio Do you want to delete it?: ¿Quieres eliminarlo? From 16a9a1f5f81150235e8f7850d9895fb47bb95626 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Fri, 10 Jan 2020 11:29:11 +0100 Subject: [PATCH 2/3] updated styles --- front/salix/components/layout/style.scss | 3 +-- front/salix/components/module-card/style.scss | 1 + front/salix/components/module-main/style.scss | 1 + modules/claim/front/index.js | 2 +- .../claim/front/{dms/index => photos}/index.html | 0 modules/claim/front/{dms/index => photos}/index.js | 4 ++-- .../claim/front/{dms/index => photos}/index.spec.js | 4 ++-- modules/claim/front/{dms => photos}/locale/es.yml | 0 .../claim/front/{dms/index => photos}/style.scss | 5 +++-- modules/claim/front/routes.json | 13 ++++--------- 10 files changed, 15 insertions(+), 18 deletions(-) rename modules/claim/front/{dms/index => photos}/index.html (100%) rename modules/claim/front/{dms/index => photos}/index.js (97%) rename modules/claim/front/{dms/index => photos}/index.spec.js (96%) rename modules/claim/front/{dms => photos}/locale/es.yml (100%) rename modules/claim/front/{dms/index => photos}/style.scss (93%) diff --git a/front/salix/components/layout/style.scss b/front/salix/components/layout/style.scss index b66c620ad..1a483ab96 100644 --- a/front/salix/components/layout/style.scss +++ b/front/salix/components/layout/style.scss @@ -87,8 +87,7 @@ vn-layout { & > * { display: block; padding: $spacing-md; - box-sizing: border-box; - height: 100% + box-sizing: border-box } &.ng-enter { vn-side-menu { diff --git a/front/salix/components/module-card/style.scss b/front/salix/components/module-card/style.scss index 0ae943efc..cc3c5b81b 100644 --- a/front/salix/components/module-card/style.scss +++ b/front/salix/components/module-card/style.scss @@ -2,4 +2,5 @@ .vn-module-card { padding: 0; + height: 100% } \ No newline at end of file diff --git a/front/salix/components/module-main/style.scss b/front/salix/components/module-main/style.scss index d9bdbd940..cab874d68 100644 --- a/front/salix/components/module-main/style.scss +++ b/front/salix/components/module-main/style.scss @@ -2,4 +2,5 @@ .vn-module-main { padding: 0; + height: 100% } \ No newline at end of file diff --git a/modules/claim/front/index.js b/modules/claim/front/index.js index 4ea9ac6cc..b6c39196e 100644 --- a/modules/claim/front/index.js +++ b/modules/claim/front/index.js @@ -10,4 +10,4 @@ import './descriptor'; import './development'; import './search-panel'; import './summary'; -import './dms/index'; +import './photos'; diff --git a/modules/claim/front/dms/index/index.html b/modules/claim/front/photos/index.html similarity index 100% rename from modules/claim/front/dms/index/index.html rename to modules/claim/front/photos/index.html diff --git a/modules/claim/front/dms/index/index.js b/modules/claim/front/photos/index.js similarity index 97% rename from modules/claim/front/dms/index/index.js rename to modules/claim/front/photos/index.js index e83204000..61256aad1 100644 --- a/modules/claim/front/dms/index/index.js +++ b/modules/claim/front/photos/index.js @@ -1,4 +1,4 @@ -import ngModule from '../../module'; +import ngModule from '../module'; import './style.scss'; class Controller { @@ -108,7 +108,7 @@ class Controller { Controller.$inject = ['$stateParams', '$scope', '$http', '$translate', 'vnToken', 'vnApp', 'vnConfig']; -ngModule.component('vnClaimDmsIndex', { +ngModule.component('vnClaimPhotos', { template: require('./index.html'), controller: Controller, bindings: { diff --git a/modules/claim/front/dms/index/index.spec.js b/modules/claim/front/photos/index.spec.js similarity index 96% rename from modules/claim/front/dms/index/index.spec.js rename to modules/claim/front/photos/index.spec.js index cbb24ac75..731988a84 100644 --- a/modules/claim/front/dms/index/index.spec.js +++ b/modules/claim/front/photos/index.spec.js @@ -2,7 +2,7 @@ import './index'; import crudModel from 'core/mocks/crud-model'; describe('Claim', () => { - describe('Component vnClaimDmsIndex', () => { + describe('Component vnClaimPhotos', () => { let $componentController; let $scope; let $httpBackend; @@ -16,7 +16,7 @@ describe('Claim', () => { $httpParamSerializer = _$httpParamSerializer_; $httpBackend = _$httpBackend_; $scope = $rootScope.$new(); - controller = $componentController('vnClaimDmsIndex', {$: $scope}); + controller = $componentController('vnClaimPhotos', {$: $scope}); controller.$.model = crudModel; controller.claim = { id: 1, diff --git a/modules/claim/front/dms/locale/es.yml b/modules/claim/front/photos/locale/es.yml similarity index 100% rename from modules/claim/front/dms/locale/es.yml rename to modules/claim/front/photos/locale/es.yml diff --git a/modules/claim/front/dms/index/style.scss b/modules/claim/front/photos/style.scss similarity index 93% rename from modules/claim/front/dms/index/style.scss rename to modules/claim/front/photos/style.scss index 28f9db6fc..35f548560 100644 --- a/modules/claim/front/dms/index/style.scss +++ b/modules/claim/front/photos/style.scss @@ -1,6 +1,8 @@ @import "./variables"; -vn-claim-dms-index { +vn-claim-photos { + height: 100%; + .drop-zone { color: $color-font-secondary; box-sizing: border-box; @@ -19,7 +21,6 @@ vn-claim-dms-index { } .photo-list { - padding: $spacing-md; min-height: 100%; diff --git a/modules/claim/front/routes.json b/modules/claim/front/routes.json index 80bc77c49..571ca0932 100644 --- a/modules/claim/front/routes.json +++ b/modules/claim/front/routes.json @@ -11,7 +11,7 @@ "card": [ {"state": "claim.card.basicData", "icon": "settings"}, {"state": "claim.card.detail", "icon": "icon-details"}, - {"state": "claim.card.dms.index", "icon": "image"}, + {"state": "claim.card.photos", "icon": "image"}, {"state": "claim.card.development", "icon": "icon-traceability"}, {"state": "claim.card.action", "icon": "icon-actions"} ] @@ -81,14 +81,9 @@ }, "acl": ["salesAssistant"] }, { - "url": "/dms", - "state": "claim.card.dms", - "abstract": true, - "component": "ui-view" - }, { - "url" : "/index", - "state": "claim.card.dms.index", - "component": "vn-claim-dms-index", + "url": "/photos", + "state": "claim.card.photos", + "component": "vn-claim-photos", "description": "Photos", "params": { "claim": "$ctrl.claim" From e235bf94a61e18eaa3209aea02e4de075fea36b9 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Fri, 10 Jan 2020 11:31:12 +0100 Subject: [PATCH 3/3] removed syntax error --- modules/claim/front/dms/style.scss | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 modules/claim/front/dms/style.scss diff --git a/modules/claim/front/dms/style.scss b/modules/claim/front/dms/style.scss new file mode 100644 index 000000000..28f9db6fc --- /dev/null +++ b/modules/claim/front/dms/style.scss @@ -0,0 +1,31 @@ +@import "./variables"; + +vn-claim-dms-index { + .drop-zone { + color: $color-font-secondary; + box-sizing: border-box; + border-radius: 0.5em; + text-align: center; + min-height: 100%; + + .empty-rows { + padding: 5em $spacing-md; + font-size: 1.4em + } + + vn-icon { + font-size: 3em + } + } + + .photo-list { + + padding: $spacing-md; + min-height: 100%; + + .photo { + width: 32em; + height: 18em; + } + } +} \ No newline at end of file