diff --git a/back/model-config.json b/back/model-config.json index 277f933e1..adb67eaed 100644 --- a/back/model-config.json +++ b/back/model-config.json @@ -79,12 +79,6 @@ }, "UserLog": { "dataSource": "vn" - }, - "WorkerTimeControlParams": { - "dataSource": "vn" - }, - "WorkerTimeControlMail": { - "dataSource": "vn" } } diff --git a/back/models/worker-time-control-params.js b/back/models/worker-time-control-params.js deleted file mode 100644 index c71d4c237..000000000 --- a/back/models/worker-time-control-params.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = Self => { - require('../methods/imap-time-control/checkInbox')(Self); -}; diff --git a/front/core/styles/font-family.scss b/front/core/styles/font-family.scss index 24d9bbe43..91159c5b4 100644 --- a/front/core/styles/font-family.scss +++ b/front/core/styles/font-family.scss @@ -14,7 +14,7 @@ font-family: 'Material Icons'; font-style: normal; font-weight: 400; - src: url('./icons/MaterialIcons-Regular.woff2') format('woff2'); + src: url(./fonts/MaterialIcons-Regular.woff2) format('woff2'); } .material-icons { diff --git a/front/core/styles/fonts/MaterialIcons-Regular.woff2 b/front/core/styles/fonts/MaterialIcons-Regular.woff2 new file mode 100644 index 000000000..9d1dfcc70 Binary files /dev/null and b/front/core/styles/fonts/MaterialIcons-Regular.woff2 differ diff --git a/front/core/styles/icons/MaterialIcons-Regular.woff2 b/front/core/styles/icons/MaterialIcons-Regular.woff2 deleted file mode 100644 index 2b86ebfe6..000000000 Binary files a/front/core/styles/icons/MaterialIcons-Regular.woff2 and /dev/null differ diff --git a/front/salix/components/summary/index.js b/front/salix/components/summary/index.js index 423b033ce..5cbbec3e7 100644 --- a/front/salix/components/summary/index.js +++ b/front/salix/components/summary/index.js @@ -1 +1,9 @@ +import ngModule from '../../module'; +import Section from '../section'; import './style.scss'; + +export default class Summary extends Section {} + +ngModule.vnComponent('vnSummary', { + controller: Summary +}); diff --git a/front/salix/components/summary/style.scss b/front/salix/components/summary/style.scss index 5c53eea95..85da5aa03 100644 --- a/front/salix/components/summary/style.scss +++ b/front/salix/components/summary/style.scss @@ -1,10 +1,22 @@ +@import "./effects"; @import "./variables"; +ui-view > .vn-summary { + h5 > a[name="goToSummary"], + h5 * > vn-icon-button[icon="more_vert"] { + display: none + } +} + .summary { margin: 0 auto; max-width: 950px; & > h5 { + display: flex; + justify-content: space-between; + align-items: center; + align-content: center; padding: $spacing-sm; border: none; background: $color-main; @@ -15,6 +27,32 @@ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + + & > a > vn-icon-button[icon="launch"] { + @extend %clickable; + color: $color-font-dark; + display: flex; + min-width: 45px; + height: 45px; + box-sizing: border-box; + align-items: center; + justify-content: center; + + & > vn-icon { + padding: 10px; + } + vn-icon { + font-size: 1.75rem; + } + } + + span { + flex: 1; + } + + vn-button { + flex: none + } } & > vn-horizontal { flex-wrap: wrap; diff --git a/modules/account/front/locale/es.yml b/modules/account/front/locale/es.yml index 02c58a8b0..18e2c06a1 100644 --- a/modules/account/front/locale/es.yml +++ b/modules/account/front/locale/es.yml @@ -8,3 +8,4 @@ Role: Rol Mail aliases: Alias de correo Account not enabled: Cuenta no habilitada Inherited roles: Roles heredados +Go to the user: Ir al usuario \ No newline at end of file diff --git a/modules/account/front/summary/index.html b/modules/account/front/summary/index.html index 7f390f17c..9c96a9703 100644 --- a/modules/account/front/summary/index.html +++ b/modules/account/front/summary/index.html @@ -1,5 +1,13 @@ -
{{summary.nickname}}
+
+ + + + {{summary.id}} - {{summary.nickname}} +

Basic data

diff --git a/modules/account/front/summary/index.js b/modules/account/front/summary/index.js index 31c2d7d69..21be84660 100644 --- a/modules/account/front/summary/index.js +++ b/modules/account/front/summary/index.js @@ -1,7 +1,7 @@ import ngModule from '../module'; -import Component from 'core/lib/component'; +import Summary from 'salix/components/summary'; -class Controller extends Component { +class Controller extends Summary { set user(value) { this._user = value; this.$.summary = null; diff --git a/modules/claim/front/locale/es.yml b/modules/claim/front/locale/es.yml index 5570896c1..dcbb2c484 100644 --- a/modules/claim/front/locale/es.yml +++ b/modules/claim/front/locale/es.yml @@ -16,3 +16,4 @@ Search claim by id or client name: Buscar reclamaciones por identificador o nomb Claim deleted!: Reclamación eliminada! claim: reclamación Photos: Fotos +Go to the claim: Ir a la reclamación diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html index 399a6299b..f4e9c1471 100644 --- a/modules/claim/front/summary/index.html +++ b/modules/claim/front/summary/index.html @@ -3,7 +3,15 @@ data="photos"> -
{{::$ctrl.summary.claim.id}} - {{::$ctrl.summary.claim.client.name}}
+
+ + + + {{::$ctrl.summary.claim.id}} - {{::$ctrl.summary.claim.client.name}} +
diff --git a/modules/client/front/routes.json b/modules/client/front/routes.json index a3ee4dd86..a2d559645 100644 --- a/modules/client/front/routes.json +++ b/modules/client/front/routes.json @@ -185,7 +185,7 @@ "state": "client.card.greuge.create", "component": "vn-client-greuge-create", "description": "New greuge", - "acl": ["salesAssistant"], + "acl": ["salesAssistant", "claimManager"], "params": { "client": "$ctrl.client" } diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html index a15fed1ee..775911717 100644 --- a/modules/client/front/summary/index.html +++ b/modules/client/front/summary/index.html @@ -1,5 +1,15 @@ -
{{$ctrl.summary.name}} - {{$ctrl.summary.id}} - {{$ctrl.summary.salesPersonUser.name}}
+
+ + + + + {{$ctrl.summary.name}} - {{$ctrl.summary.id}} - {{$ctrl.summary.salesPersonUser.name}} + +

Basic data

diff --git a/modules/client/front/summary/index.js b/modules/client/front/summary/index.js index 5737e2df4..cf5991247 100644 --- a/modules/client/front/summary/index.js +++ b/modules/client/front/summary/index.js @@ -1,8 +1,8 @@ import ngModule from '../module'; -import Section from 'salix/components/section'; +import Summary from 'salix/components/summary'; import './style.scss'; -class Controller extends Section { +class Controller extends Summary { $onChanges() { if (!this.client) return; diff --git a/modules/client/front/summary/locale/es.yml b/modules/client/front/summary/locale/es.yml index 24068e4ad..0a101f6ef 100644 --- a/modules/client/front/summary/locale/es.yml +++ b/modules/client/front/summary/locale/es.yml @@ -17,3 +17,4 @@ Verdnatura's maximum risk: Riesgo máximo asumido por Verdnatura Solunion's maximum risk: Riesgo máximo asumido por Solunion Invoices minus payments: Facturas menos recibos Deviated invoices minus payments: Facturas fuera de plazo menos recibos +Go to the client: Ir al cliente diff --git a/modules/entry/front/summary/index.html b/modules/entry/front/summary/index.html index d97adfdd7..6d5387459 100644 --- a/modules/entry/front/summary/index.html +++ b/modules/entry/front/summary/index.html @@ -1,5 +1,13 @@ -
Entry #{{$ctrl.entryData.id}} - {{$ctrl.entryData.supplier.nickname}}
+
+ + + + #{{$ctrl.entryData.id}} - {{$ctrl.entryData.supplier.nickname}} +
-
{{$ctrl.summary.invoiceOut.ref}} - {{$ctrl.summary.invoiceOut.client.socialName}}
+
+ + + + {{$ctrl.summary.invoiceOut.ref}} - {{$ctrl.summary.invoiceOut.client.socialName}} +
-
{{$ctrl.item.id}} - {{$ctrl.summary.item.name}}
+
+ + + + {{$ctrl.item.id}} - {{$ctrl.summary.item.name}} +
{ this.summary = response.data; diff --git a/modules/item/front/summary/locale/es.yml b/modules/item/front/summary/locale/es.yml index 3324e13d5..28e1e964b 100644 --- a/modules/item/front/summary/locale/es.yml +++ b/modules/item/front/summary/locale/es.yml @@ -1,3 +1,4 @@ Niche: Nichos Barcode: Códigos de barras -Other data: Otros datos \ No newline at end of file +Other data: Otros datos +Go to the item: Ir al artículo \ No newline at end of file diff --git a/modules/order/front/locale/es.yml b/modules/order/front/locale/es.yml index 5ecc1093f..62f711659 100644 --- a/modules/order/front/locale/es.yml +++ b/modules/order/front/locale/es.yml @@ -26,4 +26,5 @@ Confirm lines: Confirmar las lineas Confirm: Confirmar Real hour: Hora real T. Hour: Hora T. -Theoretical hour: Hora Teórica \ No newline at end of file +Theoretical hour: Hora Teórica +Go to the order: Ir al pedido \ No newline at end of file diff --git a/modules/order/front/summary/index.html b/modules/order/front/summary/index.html index e66d1024b..8f78ce460 100644 --- a/modules/order/front/summary/index.html +++ b/modules/order/front/summary/index.html @@ -1,5 +1,11 @@
+ + + Ticket #{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}} ({{$ctrl.summary.client.salesPersonFk}}) diff --git a/modules/order/front/summary/index.js b/modules/order/front/summary/index.js index 2ee07872c..cc1df8f5d 100644 --- a/modules/order/front/summary/index.js +++ b/modules/order/front/summary/index.js @@ -1,8 +1,8 @@ import ngModule from '../module'; -import Section from 'salix/components/section'; +import Summary from 'salix/components/summary'; import './style.scss'; -class Controller extends Section { +class Controller extends Summary { setSummary() { this.$http.get(`Orders/${this.order.id}/summary`) .then(res => this.summary = res.data); diff --git a/modules/order/front/summary/style.scss b/modules/order/front/summary/style.scss index 63de20fe9..a2537c58f 100644 --- a/modules/order/front/summary/style.scss +++ b/modules/order/front/summary/style.scss @@ -3,21 +3,6 @@ vn-order-summary .summary{ max-width: $width-lg; - h5 { - display: flex; - justify-content: space-between; - align-items: center; - align-content: center; - - - span { - flex: 1; - } - - vn-button { - flex: none - } - } & > vn-horizontal > vn-one { min-width: 160px; diff --git a/modules/route/front/summary/index.html b/modules/route/front/summary/index.html index a6d482a2c..6dd01c8b0 100644 --- a/modules/route/front/summary/index.html +++ b/modules/route/front/summary/index.html @@ -1,5 +1,13 @@ -
{{$ctrl.summary.route.id}} - {{$ctrl.summary.route.description}}
+
+ + + + {{$ctrl.summary.route.id}} - {{$ctrl.summary.route.description}} +
-
{{::$ctrl.summary.name}} - {{::$ctrl.summary.id}}
+
+ + + + {{::$ctrl.summary.name}} - {{::$ctrl.summary.id}} +

Basic data

diff --git a/modules/supplier/front/summary/index.js b/modules/supplier/front/summary/index.js index 2fe289c49..099257848 100644 --- a/modules/supplier/front/summary/index.js +++ b/modules/supplier/front/summary/index.js @@ -1,8 +1,8 @@ import ngModule from '../module'; -import Section from 'salix/components/section'; +import Summary from 'salix/components/summary'; import './style.scss'; -class Controller extends Section { +class Controller extends Summary { $onChanges() { if (!this.supplier) return; diff --git a/modules/supplier/front/summary/locale/es.yml b/modules/supplier/front/summary/locale/es.yml index d39d107f8..6afaf857d 100644 --- a/modules/supplier/front/summary/locale/es.yml +++ b/modules/supplier/front/summary/locale/es.yml @@ -5,4 +5,5 @@ Search suppliers by id, name or alias: Busca proveedores por id, nombre o alias Is Farmer: Es agrícola Sage tax type: Tipo de impuesto Sage Sage transaction type: Tipo de transacción Sage -Sage withholding: Retencion Sage \ No newline at end of file +Sage withholding: Retencion Sage +Go to the supplier: Ir al proveedor \ No newline at end of file diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html index 5ebfb7638..2faefadf2 100644 --- a/modules/ticket/front/summary/index.html +++ b/modules/ticket/front/summary/index.html @@ -1,10 +1,10 @@
- + name="goToSummary"> + Ticket #{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}} diff --git a/modules/ticket/front/summary/index.js b/modules/ticket/front/summary/index.js index 4d8318e32..42e5fcb69 100644 --- a/modules/ticket/front/summary/index.js +++ b/modules/ticket/front/summary/index.js @@ -1,8 +1,8 @@ import ngModule from '../module'; -import Section from 'salix/components/section'; +import Summary from 'salix/components/summary'; import './style.scss'; -class Controller extends Section { +class Controller extends Summary { get ticket() { return this._ticket; } diff --git a/modules/ticket/front/summary/locale/es.yml b/modules/ticket/front/summary/locale/es.yml index b9848d2cf..afa06f206 100644 --- a/modules/ticket/front/summary/locale/es.yml +++ b/modules/ticket/front/summary/locale/es.yml @@ -2,4 +2,4 @@ Address phone: Tel. consignatario Address mobile: Móv. consignatario Client phone: Tel. cliente Client mobile: Móv. cliente -Go to ticket summary: Ir a la vista previa del ticket \ No newline at end of file +Go to the ticket: Ir al ticket \ No newline at end of file diff --git a/modules/ticket/front/summary/style.scss b/modules/ticket/front/summary/style.scss index d08bf5f54..e92ff0d42 100644 --- a/modules/ticket/front/summary/style.scss +++ b/modules/ticket/front/summary/style.scss @@ -1,51 +1,8 @@ @import "./effects"; @import "./variables"; -vn-ticket-card vn-ticket-summary { - a[name="goToTicketSummary"], - vn-ticket-descriptor-menu { - display: none - } -} vn-ticket-summary .summary { max-width: $width-lg; - - h5 { - display: flex; - justify-content: space-between; - align-items: center; - align-content: center; - - & > a > vn-icon-button[icon="open_in_full"] { - display: flex; - min-width: 45px; - height: 45px; - box-sizing: border-box; - align-items: center; - justify-content: center; - } - & > a > vn-icon-button[icon="open_in_full"] { - @extend %clickable; - color: $color-font-dark; - - & > vn-icon { - padding: 10px; - } - vn-icon { - font-size: 1.75rem; - } - } - - - span { - flex: 1; - } - - vn-button { - flex: none - } - } - vn-button { max-height: 27px; button { diff --git a/modules/travel/front/summary/index.html b/modules/travel/front/summary/index.html index 18f1af435..8815c09e2 100644 --- a/modules/travel/front/summary/index.html +++ b/modules/travel/front/summary/index.html @@ -1,5 +1,13 @@ -
{{$ctrl.travelData.id}} - {{$ctrl.travelData.ref}}
+
+ + + + {{$ctrl.travelData.id}} - {{$ctrl.travelData.ref}} +
{ imap.once('ready', function() { openInbox(function(err, box) { if (err) throw err; + const totalMessages = box.messages.total; + if (totalMessages == 0) + imap.end(); + let f = imap.seq.fetch('1:*', { bodies: ['HEADER.FIELDS (FROM SUBJECT)', '1'], struct: true diff --git a/modules/worker/back/model-config.json b/modules/worker/back/model-config.json index 7a498fce7..e35e39721 100644 --- a/modules/worker/back/model-config.json +++ b/modules/worker/back/model-config.json @@ -55,6 +55,12 @@ }, "WorkerLog": { "dataSource": "vn" + }, + "WorkerTimeControlParams": { + "dataSource": "vn" + }, + "WorkerTimeControlMail": { + "dataSource": "vn" } } diff --git a/modules/worker/back/models/worker-time-control-mail.js b/modules/worker/back/models/worker-time-control-mail.js new file mode 100644 index 000000000..36f3851b6 --- /dev/null +++ b/modules/worker/back/models/worker-time-control-mail.js @@ -0,0 +1,3 @@ +module.exports = Self => { + require('../methods/worker-time-control-mail/checkInbox')(Self); +}; diff --git a/back/models/worker-time-control-mail.json b/modules/worker/back/models/worker-time-control-mail.json similarity index 100% rename from back/models/worker-time-control-mail.json rename to modules/worker/back/models/worker-time-control-mail.json diff --git a/back/models/worker-time-control-params.json b/modules/worker/back/models/worker-time-control-params.json similarity index 100% rename from back/models/worker-time-control-params.json rename to modules/worker/back/models/worker-time-control-params.json diff --git a/modules/worker/front/locale/es.yml b/modules/worker/front/locale/es.yml index 99cad90e4..63570ddf0 100644 --- a/modules/worker/front/locale/es.yml +++ b/modules/worker/front/locale/es.yml @@ -18,4 +18,5 @@ User id: Id de usuario View worker: Ver trabajador Worker id: Id trabajador Workers: Trabajadores -worker: trabajador \ No newline at end of file +worker: trabajador +Go to the worker: Ir al trabajador \ No newline at end of file diff --git a/modules/worker/front/summary/index.html b/modules/worker/front/summary/index.html index e2c93ea48..e44d2a5d1 100644 --- a/modules/worker/front/summary/index.html +++ b/modules/worker/front/summary/index.html @@ -1,5 +1,13 @@ -
{{worker.firstName}} {{worker.lastName}}
+
+ + + + {{worker.firstName}} {{worker.lastName}} +

Basic data

diff --git a/modules/worker/front/summary/index.js b/modules/worker/front/summary/index.js index adc248ee2..178df81a9 100644 --- a/modules/worker/front/summary/index.js +++ b/modules/worker/front/summary/index.js @@ -1,7 +1,7 @@ import ngModule from '../module'; -import Section from 'salix/components/section'; +import Summary from 'salix/components/summary'; -class Controller extends Section { +class Controller extends Summary { get worker() { return this._worker; } diff --git a/modules/zone/front/index/index.html b/modules/zone/front/index/index.html index 7f2540cb7..e75561cd0 100644 --- a/modules/zone/front/index/index.html +++ b/modules/zone/front/index/index.html @@ -20,7 +20,7 @@ + class="clickable vn-tr search-result"> {{::zone.id}} {{::zone.name}} {{::zone.agencyMode.name}} diff --git a/modules/zone/front/locale/es.yml b/modules/zone/front/locale/es.yml index 29f984287..c40dc5c20 100644 --- a/modules/zone/front/locale/es.yml +++ b/modules/zone/front/locale/es.yml @@ -30,4 +30,5 @@ Warehouse: Almacén Warehouses: Almacenes Week days: Días de la semana Zones: Zonas -zone: zona \ No newline at end of file +zone: zona +Go to the zone: Ir a la zona \ No newline at end of file diff --git a/modules/zone/front/summary/index.html b/modules/zone/front/summary/index.html index 20f74916e..9247087e6 100644 --- a/modules/zone/front/summary/index.html +++ b/modules/zone/front/summary/index.html @@ -1,5 +1,13 @@ -
#{{$ctrl.summary.id}} - {{$ctrl.summary.name}}
+
+ + + + #{{$ctrl.summary.id}} - {{$ctrl.summary.name}} +