diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index d8a1cda624..cfa9faa20e 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -175,8 +175,8 @@ export default { firstPaymentConfirmed: 'vn-client-web-payment vn-tr:nth-child(1) vn-icon[icon="check"]' }, dms: { - deleteFileButton: 'vn-client-dms-index vn-table vn-tr:nth-child(1) vn-icon-button[icon="delete"]', - firstDocWorker: 'vn-client-dms-index vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(8) > span', + deleteFileButton: 'vn-client-dms-index vn-tr:nth-child(1) vn-icon-button[icon="delete"]', + firstDocWorker: 'vn-client-dms-index vn-td:nth-child(8) > span', firstDocWorkerDescriptor: '.vn-popover.shown vn-worker-descriptor', acceptDeleteButton: 'vn-client-dms-index > vn-confirm button[response="ACCEPT"]' }, @@ -494,9 +494,9 @@ export default { }, ticketLog: { logButton: 'vn-left-menu a[ui-sref="ticket.card.log"]', - changedBy: 'vn-ticket-log > vn-log > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(2) > span', - actionTaken: 'vn-ticket-log > vn-log > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(1) > div > div:nth-child(3) > span.value.ng-scope.ng-binding', - id: 'vn-ticket-log > vn-log > vn-vertical > vn-card > div > vn-vertical > vn-table > div > vn-tbody > vn-tr > vn-td.before > vn-one:nth-child(1) > div > span.value.ng-scope.ng-binding' + changedBy: 'vn-ticket-log > vn-log vn-tr:nth-child(1) > vn-td:nth-child(2) > span', + actionTaken: 'vn-ticket-log > vn-log vn-td:nth-child(1) > div > div:nth-child(3) > span.value', + id: 'vn-ticket-log > vn-log vn-td.before > vn-one:nth-child(1) > div > span.value' }, ticketService: { addServiceButton: 'vn-ticket-service vn-icon-button[vn-tooltip="Add service"] > button', diff --git a/front/core/components/check/style.scss b/front/core/components/check/style.scss index 0d1669a689..1816e01639 100644 --- a/front/core/components/check/style.scss +++ b/front/core/components/check/style.scss @@ -7,7 +7,7 @@ vn-check { cursor: pointer; &.disabled { - cursor: initial; + cursor: inherit; } & > .check { position: relative; diff --git a/front/core/components/radio/style.scss b/front/core/components/radio/style.scss index de49286b49..a459cb96f8 100644 --- a/front/core/components/radio/style.scss +++ b/front/core/components/radio/style.scss @@ -7,7 +7,7 @@ vn-radio { outline: none; &.disabled { - cursor: initial; + cursor: inherit; } & > .radio { position: relative; diff --git a/front/core/components/table/style.scss b/front/core/components/table/style.scss index 29b1639503..9c14e3e034 100644 --- a/front/core/components/table/style.scss +++ b/front/core/components/table/style.scss @@ -51,14 +51,15 @@ vn-table { } & > * > vn-tr, & > * > a.vn-tr { - display: table-row + display: table-row; + height: 3em; } vn-thead, vn-tbody, vn-tfoot { & > * { display: table-row; & > vn-th { - font-weight: bold; + color: $color-font-light; padding-top: 1em; padding-bottom: .8em; } @@ -97,10 +98,10 @@ vn-table { } } & > :last-child { - padding-right: 1em; + padding-right: 1.4em; } & > :first-child { - padding-left: 1em; + padding-left: 1.4em; } } & > a.vn-tr { diff --git a/front/core/styles/index.js b/front/core/styles/index.js index c3503f3d57..0912fcd202 100644 --- a/front/core/styles/index.js +++ b/front/core/styles/index.js @@ -1,4 +1,3 @@ -import './md-override.scss'; import './mdl-override.scss'; import './mdi-override.css'; import './zoom-image.scss'; diff --git a/front/core/styles/md-override.scss b/front/core/styles/md-override.scss deleted file mode 100644 index ba71a9a773..0000000000 --- a/front/core/styles/md-override.scss +++ /dev/null @@ -1,11 +0,0 @@ - -html { - background-color: initial; -} - -// Disable ng-repeat effects - -.ng-enter, -.ng-leave { - transition: none !important; -} diff --git a/front/salix/styles/responsive.scss b/front/salix/styles/responsive.scss index fc47180ba7..9cc58dd12c 100644 --- a/front/salix/styles/responsive.scss +++ b/front/salix/styles/responsive.scss @@ -1,3 +1,4 @@ +@import "variables"; /* Desktop - Laptop 1360x768 */ @media (max-resolution: 119dpi) and (min-device-width: 1340px) and (max-device-width: 1899px) @@ -46,3 +47,9 @@ { body { font-size: 11pt; } } + +.vn-hide-narrow { + @media (max-width: $mobile-width) { + display: none; + } +} diff --git a/front/salix/styles/variables.scss b/front/salix/styles/variables.scss index be4b94d700..6bc311c33b 100644 --- a/front/salix/styles/variables.scss +++ b/front/salix/styles/variables.scss @@ -7,7 +7,7 @@ $mobile-width: 800px; $width-xs: 25em; $width-sm: 32em; -$width-md: 60em; +$width-md: 50em; $width-lg: 80em; $width-xl: 100em; @@ -31,7 +31,8 @@ $margin-huge: 100px; $color-header: #3d3d3d; $color-bg: #e5e5e5; $color-bg-dark: #3d3d3d; -$color-font: #222222; +$color-font: #222; +$color-font-light: #555; $color-font-secondary: #9b9b9b; $color-font-dark: white; $color-font-bg: rgba(0, 0, 0, .7); @@ -49,7 +50,7 @@ $color-spacer: rgba(0, 0, 0, .3); $color-spacer-light: rgba(0, 0, 0, .12); $color-input-underline: rgba(0, 0, 0, .12); $color-shadow: rgba(0, 0, 0, .2); -$color-hightlight: rgba(0, 0, 0, .15); +$color-hightlight: rgba(0, 0, 0, .05); $color-hover-cd: rgba(0, 0, 0, .1); $color-hover-dc: .7; $color-disabled: .6; @@ -72,6 +73,7 @@ $color-header: #3d3d3d; $color-bg: #222; $color-bg-dark: #222; $color-font: white; +$color-font-light: #aaa; $color-font-secondary: #777; $color-font-dark: white; $color-font-bg: rgba(0, 0, 0, .8); @@ -106,5 +108,5 @@ $color-alert-light: darken($color-alert, 35%); // Border -$border-thin: .1em solid $color-spacer; -$border-thin-light: .1em solid $color-spacer-light; +$border-thin: .05em solid $color-spacer; +$border-thin-light: .05em solid $color-spacer-light; diff --git a/modules/agency/front/location/index.html b/modules/agency/front/location/index.html index b3025a8e0b..63291c6b28 100644 --- a/modules/agency/front/location/index.html +++ b/modules/agency/front/location/index.html @@ -4,7 +4,7 @@ filter="::$ctrl.filter" auto-load="false"> -
+
- +
+ translate-attr="{title: 'Default address'}"> - - + ng-click="$ctrl.setDefault(address)" + translate-attr="{title: 'Set as default'}"> {{::observation.observationType.description}}: diff --git a/modules/client/front/address/index/index.js b/modules/client/front/address/index/index.js index 96859a0c02..8dc9b4394a 100644 --- a/modules/client/front/address/index/index.js +++ b/modules/client/front/address/index/index.js @@ -56,8 +56,7 @@ class Controller { } isDefaultAddress(address) { - if (this.client) - return this.client.defaultAddressFk === address.id; + return this.client && this.client.defaultAddressFk === address.id; } /** diff --git a/modules/client/front/balance/index/index.html b/modules/client/front/balance/index/index.html index 045eb1f803..34a75c39a5 100644 --- a/modules/client/front/balance/index/index.html +++ b/modules/client/front/balance/index/index.html @@ -11,8 +11,8 @@ filter="$ctrl.filter" data="$ctrl.clientRisks"> - - +
+ @@ -23,7 +23,7 @@ url="/client/api/Companies" show-field="code" value-field="id" - label="Select company"> + label="Company"> @@ -38,68 +38,67 @@
- - - - - Date - Creation date - Employee - Reference - Bank - Debit - Havings - Balance - Conciliated - - - - - - {{::balance.payed | dateTime:'dd/MM/yyyy'}} - {{::balance.created | dateTime:'dd/MM/yyyy HH:mm'}} - - - {{::balance.userNickname}} - - - - {{balance.isInvoice ? 'BILL' : balance.ref | translate: {ref: balance.ref} }} - - - {{::balance.bankFk}} - {{::balance.debit | currency: 'EUR':2}} - {{::balance.credit | currency: 'EUR':2}} - {{balance.balance | currency: 'EUR':2}} - - - - - -
- - - - - - - - - - - + + + + + Date + Creation date + Employee + Reference + Bank + Debit + Havings + Balance + Conciliated + + + + + + {{::balance.payed | dateTime:'dd/MM/yyyy'}} + {{::balance.created | dateTime:'dd/MM/yyyy HH:mm'}} + + + {{::balance.userNickname}} + + + + {{balance.isInvoice ? 'BILL' : balance.ref | translate: {ref: balance.ref} }} + + + {{::balance.bankFk}} + {{::balance.debit | currency: 'EUR':2}} + {{::balance.credit | currency: 'EUR':2}} + {{balance.balance | currency: 'EUR':2}} + + + + + + + + + + + + + + + +
- - + - - diff --git a/modules/client/front/credit-insurance/index/index.html b/modules/client/front/credit-insurance/index/index.html index 37840d0b90..f66897dad3 100644 --- a/modules/client/front/credit-insurance/index/index.html +++ b/modules/client/front/credit-insurance/index/index.html @@ -1,8 +1,8 @@ -
- +
+ - -
+ + - - - - - - - Credit - Since - Employee - - - - - {{::credit.amount | number:2}} € - {{::credit.created | dateTime:'dd/MM/yyyy HH:mm'}} - {{::credit.worker.user.nickname}} - - - - - +
+ + + + + Since + Employee + Credit + + + + + {{::credit.created | dateTime:'dd/MM/yyyy HH:mm'}} + {{::credit.worker.user.nickname}} + {{::credit.amount | currency:'EUR':2}} + + + - - - +
+ + vn-bind="+" + fixed-bottom-right> diff --git a/modules/client/front/dms/index/index.html b/modules/client/front/dms/index/index.html index c147a74e06..32b8f81d74 100644 --- a/modules/client/front/dms/index/index.html +++ b/modules/client/front/dms/index/index.html @@ -6,99 +6,97 @@ limit="20" data="$ctrl.clientDms"> - - - - - - - Id - Type - Order - Reference - Description - Original - File - Employee - Created - - - - - - - - {{::document.dmsFk}} - - - {{::document.dms.dmsType.name}} - - - - - {{::document.dms.hardCopyNumber}} - - - - - {{::document.dms.reference}} - - - - - {{::document.dms.description}} - - - - - - - - {{::document.dms.file}} - - - - - {{::document.dms.worker.user.nickname | dashIfEmpty}} - - - {{::document.dms.created | dateTime:'dd/MM/yyyy HH:mm'}} - - - - - - - - - - - - +
+ + + + + Id + Type + Order + Reference + Description + Original + File + Employee + Created + + + + + + + + {{::document.dmsFk}} + + + {{::document.dms.dmsType.name}} + + + + + {{::document.dms.hardCopyNumber}} + + + + + {{::document.dms.reference}} + + + + + {{::document.dms.description}} + + + + + + + + {{::document.dms.file}} + + + + + {{::document.dms.worker.user.nickname | dashIfEmpty}} + + + {{::document.dms.created | dateTime:'dd/MM/yyyy HH:mm'}} + + + + icon="cloud_download" + title="{{'Download file' | translate}}"> - - - - - - + + + + + + + + + + + + + - +
+ diff --git a/modules/client/front/greuge/index/index.html b/modules/client/front/greuge/index/index.html index 537e676029..a5e7e5f569 100644 --- a/modules/client/front/greuge/index/index.html +++ b/modules/client/front/greuge/index/index.html @@ -4,49 +4,53 @@ filter="::$ctrl.filter" link="{clientFk: $ctrl.$stateParams.id}" limit="20" - data="greuges" auto-load="true"> + data="greuges" + auto-load="true"> - - - -
- - -
-
+
+ + + + + Date Comment - Amount Type + Amount {{::greuge.shipped | dateTime:'dd/MM/yyyy HH:mm' }} {{::greuge.description}} - {{::greuge.amount | currency: 'EUR': 2}} {{::greuge.greugeType.name}} + {{::greuge.amount | currency: 'EUR': 2}} - - - - +
+ + vn-bind="+" + fixed-bottom-right> diff --git a/modules/client/front/mandate/index.html b/modules/client/front/mandate/index.html index ad6345dd9f..b4db8970d3 100644 --- a/modules/client/front/mandate/index.html +++ b/modules/client/front/mandate/index.html @@ -4,32 +4,31 @@ filter="::$ctrl.filter" link="{clientFk: $ctrl.$stateParams.id}" limit="20" - data="mandates" auto-load="false"> + data="mandates" + auto-load="false"> - - - - - - - Id - Company - Type - Register date - End date - - - - - {{::mandate.id}} - {{::mandate.company.code}} - {{::mandate.mandateType.name}} - {{::mandate.created | dateTime:'dd/MM/yyyy HH:mm' }} - {{::mandate.finished | dateTime:'dd/MM/yyyy HH:mm' || '-'}} - - - - - +
+ + + + + Id + Company + Type + Register date + End date + + + + + {{::mandate.id}} + {{::mandate.company.code}} + {{::mandate.mandateType.name}} + {{::mandate.created | dateTime:'dd/MM/yyyy HH:mm' }} + {{::mandate.finished | dateTime:'dd/MM/yyyy HH:mm' || '-'}} + + + + \ No newline at end of file diff --git a/modules/client/front/mandate/index.js b/modules/client/front/mandate/index.js index a406fcab37..607bb335b3 100644 --- a/modules/client/front/mandate/index.js +++ b/modules/client/front/mandate/index.js @@ -6,15 +6,14 @@ class Controller { this.filter = { include: [ { - relation: "mandateType", + relation: 'mandateType', scope: { - fields: ["id", "name"] + fields: ['id', 'name'] } - }, - { - relation: "company", + }, { + relation: 'company', scope: { - fields: ["id", "code"] + fields: ['id', 'code'] } } ] diff --git a/modules/client/front/note/index/index.html b/modules/client/front/note/index/index.html index 179a0d9a74..a9182634eb 100644 --- a/modules/client/front/note/index/index.html +++ b/modules/client/front/note/index/index.html @@ -6,9 +6,9 @@ data="notes" auto-load="true"> - - - + +
{{::note.text}} - - - - No results - - +
+
+ No results +
-
+
+ data="recoveries" + auto-load="false"> - - - - - - - - Since - To - Amount - Period - - - - - - - - - {{::recovery.started | dateTime:'dd/MM/yyyy' }} - {{recovery.finished | dateTime:'dd/MM/yyyy' }} - {{::recovery.amount | currency: 'EUR': 0}} - {{::recovery.period}} - - - - - +
+ + + + + + Since + To + Amount + Period + + + + + + + + + {{::recovery.started | dateTime:'dd/MM/yyyy' }} + {{recovery.finished | dateTime:'dd/MM/yyyy' }} + {{::recovery.amount | currency: 'EUR': 0}} + {{::recovery.period}} + + + - - - +
+ - \ No newline at end of file + diff --git a/modules/client/front/sample/index/index.html b/modules/client/front/sample/index/index.html index 48543d1353..aea357426d 100644 --- a/modules/client/front/sample/index/index.html +++ b/modules/client/front/sample/index/index.html @@ -4,43 +4,40 @@ filter="::$ctrl.filter" link="{clientFk: $ctrl.$stateParams.id}" limit="20" - data="samples" auto-load="false"> + data="samples" + auto-load="false"> - - - - - - - - - Sent - Description - Worker - Company - - - - - {{::sample.created | dateTime:'dd/MM/yyyy HH:mm' }} - - {{::sample.type.description}} - - - - {{::sample.worker.user.nickname}} - - - {{::sample.company.code}} - - - - - +
+ + + + + Sent + Description + Worker + Company + + + + + {{::sample.created | dateTime:'dd/MM/yyyy HH:mm' }} + + {{::sample.type.description}} + + + + {{::sample.worker.user.nickname}} + + + {{::sample.company.code}} + + + - + +
diff --git a/modules/client/front/summary/locale/es.yml b/modules/client/front/summary/locale/es.yml index a21be4523d..24068e4ad8 100644 --- a/modules/client/front/summary/locale/es.yml +++ b/modules/client/front/summary/locale/es.yml @@ -1,4 +1,4 @@ -Default address: Consignatario pred. +Default address: Consignatario predeterminado Total greuge: Greuge total Financial information: Datos financieros Mana: Maná diff --git a/modules/client/front/web-payment/index.html b/modules/client/front/web-payment/index.html index e9c45dc533..bd3cbe4461 100644 --- a/modules/client/front/web-payment/index.html +++ b/modules/client/front/web-payment/index.html @@ -5,50 +5,48 @@ limit="20" data="transactions" auto-load="false"> - - - - - - - State - Id - Amount - Payed - Confirm - - - - - - - +
+ + + + + State + Id + Amount + Payed + Confirm + + + + + - - - {{::transaction.id}} - {{::transaction.amount | currency: 'EUR':2}} - {{::transaction.created | dateTime:'dd/MM/yyyy HH:mm'}} - - - - - - - - - + vn-tooltip="{{$ctrl.getFormattedMessage(transaction)}}" + ng-show="::((transaction.errorMessage || transaction.responseMessage) && !transaction.isConfirmed)" + icon="clear"> + + + + + {{::transaction.id}} + {{::transaction.amount | currency: 'EUR':2}} + {{::transaction.created | dateTime:'dd/MM/yyyy HH:mm'}} + + + + + + + - \ No newline at end of file + +
\ No newline at end of file diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index 8b2060e420..3c32c6fcfd 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -122,8 +122,8 @@ {{::ticket.warehouse}} {{::ticket.refFk | dashIfEmpty}} {{::ticket.zoneLanding | dateTime: 'HH:mm'}} - - + + {{::ticket.total | currency: 'EUR': 2}} diff --git a/modules/worker/front/log/index.html b/modules/worker/front/log/index.html index 1a4ac0a5f0..0de0eadf61 100644 --- a/modules/worker/front/log/index.html +++ b/modules/worker/front/log/index.html @@ -7,98 +7,95 @@ limit="20" auto-load="true"> - - - - History - - - - Date - Changed by - Model - Action - Name - Before - After - - - - - - {{::log.creationDate | dateTime:'dd/MM/yyyy HH:mm'}} -
-
- Changed by: - {{::log.user.name | dashIfEmpty}} - -
-
- Model: - {{::log.changedModel | dashIfEmpty}} -
-
- Action: - {{::$ctrl.actionsText[log.action] | dashIfEmpty}} -
-
- Name: - {{::log.changedModelValue | dashIfEmpty}} -
+
+ + + + + Date + Changed by + Model + Action + Name + Before + After + + + + + + {{::log.creationDate | dateTime:'dd/MM/yyyy HH:mm'}} +
+
+ Changed by: + {{::log.user.name | dashIfEmpty}} +
- - - {{::log.user.name | dashIfEmpty}} - - - - {{::log.changedModel}} - - - {{::$ctrl.actionsText[log.action]}} - - - {{::log.changedModelValue}} - - - -
- {{::old.key}}: - {{::old.value}} -
-
-
- - -
- {{::new.key}}: - {{::new.value}} -
-
- -
- {{log.description}} -
-
-
- - - - +
+ Model: + {{::log.changedModel | dashIfEmpty}} +
+
+ Action: + {{::$ctrl.actionsText[log.action] | dashIfEmpty}} +
+
+ Name: + {{::log.changedModelValue | dashIfEmpty}} +
+
+
+ + {{::log.user.name | dashIfEmpty}} + + + + {{::log.changedModel}} + + + {{::$ctrl.actionsText[log.action]}} + + + {{::log.changedModelValue}} + + + +
+ {{::old.key}}: + {{::old.value}} +
+
+
+ + +
+ {{::new.key}}: + {{::new.value}} +
+
+ +
+ {{log.description}} +
+
+
+
+
+
- +