verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

Merge branch 'dev' into 2493-route_ticket_drag_and_drop
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Bernat Exposito 2020-11-24 07:36:52 +00:00
parent 37ac312bd5 7d5b66be89
commit 6a7568eb29
47 changed files with 205 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/core/styles/font-family.scss
View File

@ -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 {

BIN
front/core/styles/fonts/MaterialIcons-Regular.woff2 Normal file
View File

Binary file not shown.

BIN
front/core/styles/icons/MaterialIcons-Regular.woff2
View File

Binary file not shown.

8
front/salix/components/summary/index.js
View File

@ -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
});

38
front/salix/components/summary/style.scss
View File

@ -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;

1
modules/account/front/locale/es.yml
View File

@ -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

10
modules/account/front/summary/index.html
View File

@ -1,5 +1,13 @@
<vn-card class="summary">
<h5>{{summary.nickname}}</h5>
<h5>
<a ng-if="::summary.id"
vn-tooltip="Go to the user"
ui-sref="account.card.summary({id: {{::summary.id}}})"
name="goToSummary">
<vn-icon-button icon="launch"></vn-icon-button>
</a>
<span>{{summary.id}} - {{summary.nickname}}</span>
</h5>
<vn-horizontal class="vn-pa-md">
<vn-one>
<h4 translate>Basic data</h4>

4
modules/account/front/summary/index.js
View File

@ -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;

1
modules/claim/front/locale/es.yml
View File

@ -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

10
modules/claim/front/summary/index.html
View File

@ -3,7 +3,15 @@
data="photos">
</vn-crud-model>
<vn-card class="summary">
<h5>{{::$ctrl.summary.claim.id}} - {{::$ctrl.summary.claim.client.name}}</h5>
<h5>
<a ng-if="::$ctrl.summary.claim.id"
vn-tooltip="Go to the claim"
ui-sref="claim.card.summary({id: {{::$ctrl.summary.claim.id}}})"
name="goToSummary">
<vn-icon-button icon="launch"></vn-icon-button>
</a>
<span>{{::$ctrl.summary.claim.id}} - {{::$ctrl.summary.claim.client.name}}</span>
</h5>
<vn-horizontal>
<vn-one>
<vn-label-value

4
modules/claim/front/summary/index.js
View File

@ -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 {
constructor($element, $, vnFile) {
super($element, $);
this.vnFile = vnFile;

12
modules/client/front/summary/index.html
View File

@ -1,5 +1,15 @@
<vn-card class="summary">
<h5>{{$ctrl.summary.name}} - {{$ctrl.summary.id}} - {{$ctrl.summary.salesPersonUser.name}}</h5>
<h5>
<a ng-if="::$ctrl.summary.id"
vn-tooltip="Go to the client"
ui-sref="client.card.summary({id: {{::$ctrl.summary.id}}})"
name="goToSummary">
<vn-icon-button icon="launch"></vn-icon-button>
</a>
<span>
{{$ctrl.summary.name}} - {{$ctrl.summary.id}} - {{$ctrl.summary.salesPersonUser.name}}
</span>
</h5>
<vn-horizontal>
<vn-one>
<h4 translate>Basic data</h4>

4
modules/client/front/summary/index.js
View File

@ -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;

1
modules/client/front/summary/locale/es.yml
View File

@ -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

10
modules/entry/front/summary/index.html
View File

@ -1,5 +1,13 @@
<vn-card class="summary">
<h5><span translate>Entry</span> #{{$ctrl.entryData.id}} - {{$ctrl.entryData.supplier.nickname}}</h5>
<h5>
<a ng-if="::$ctrl.entryData.id"
vn-tooltip="Go to the entry"
ui-sref="entry.card.summary({id: {{::$ctrl.entryData.id}}})"
name="goToSummary">
<vn-icon-button icon="launch"></vn-icon-button>
</a>
<span> #{{$ctrl.entryData.id}} - {{$ctrl.entryData.supplier.nickname}}</span>
</h5>
<vn-horizontal>
<vn-one>
<vn-label-value label="Commission"

4
modules/entry/front/summary/index.js
View File

@ -1,8 +1,8 @@
import ngModule from '../module';
import './style.scss';
import Section from 'salix/components/section';
import Summary from 'salix/components/summary';
class Controller extends Section {
class Controller extends Summary {
get entry() {
return this._entry;
}

2
modules/entry/front/summary/locale/es.yml
View File

@ -7,3 +7,5 @@ Item type: Tipo
Minimum price: Precio mínimo
Buys: Compras
Travel: Envio
Go to the entry: Ir a la entrada

10
modules/invoiceOut/front/summary/index.html
View File

@ -1,5 +1,13 @@
<vn-card class="summary">
<h5>{{$ctrl.summary.invoiceOut.ref}} - {{$ctrl.summary.invoiceOut.client.socialName}}</h5>
<h5>
<a ng-if="::$ctrl.summary.invoiceOut.id"
vn-tooltip="Go to the Invoice Out"
ui-sref="invoiceOut.card.summary({id: {{::$ctrl.summary.invoiceOut.id}}})"
name="goToSummary">
<vn-icon-button icon="launch"></vn-icon-button>
</a>
<span>{{$ctrl.summary.invoiceOut.ref}} - {{$ctrl.summary.invoiceOut.client.socialName}}</span>
</h5>
<vn-horizontal>
<vn-one>
<vn-label-value label="Date"

4
modules/invoiceOut/front/summary/index.js
View File

@ -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 {
set invoiceOut(value) {
this._invoiceOut = value;
if (value && value.id)

1
modules/invoiceOut/front/summary/locale/es.yml
View File

@ -10,3 +10,4 @@ Rate: Tasa
Fee: Cuota
Taxable base: Base imp.
Tax breakdown: Desglose impositivo
Go to the Invoice Out: Ir a la factura emitida

10
modules/item/front/summary/index.html
View File

@ -1,5 +1,13 @@
<vn-card class="summary">
<h5>{{$ctrl.item.id}} - {{$ctrl.summary.item.name}}</h5>
<h5>
<a ng-if="::$ctrl.item.id"
vn-tooltip="Go to the item"
ui-sref="item.card.summary({id: {{::$ctrl.item.id}}})"
name="goToSummary">
<vn-icon-button icon="launch"></vn-icon-button>
</a>
<span>{{$ctrl.item.id}} - {{$ctrl.summary.item.name}}</span>
</h5>
<vn-horizontal>
<vn-one>
<img style="width: 100%; display: block;"

4
modules/item/front/summary/index.js
View File

@ -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 {
getSummary() {
this.$http.get(`Items/${this.item.id}/getSummary`).then(response => {
this.summary = response.data;

1
modules/item/front/summary/locale/es.yml
View File

@ -1,3 +1,4 @@
Niche: Nichos
Barcode: Códigos de barras
Other data: Otros datos
Go to the item: Ir al artículo

1
modules/order/front/locale/es.yml
View File

@ -27,3 +27,4 @@ Confirm: Confirmar
Real hour: Hora real
T. Hour: Hora T.
Theoretical hour: Hora Teórica
Go to the order: Ir al pedido

6
modules/order/front/summary/index.html
View File

@ -1,5 +1,11 @@
<vn-card class="summary">
<h5>
<a ng-if="::$ctrl.summary.id"
vn-tooltip="Go to the order"
ui-sref="order.card.summary({id: {{::$ctrl.summary.id}}})"
name="goToSummary">
<vn-icon-button icon="launch"></vn-icon-button>
</a>
<span>
Ticket #{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}}
({{$ctrl.summary.client.salesPersonFk}})

4
modules/order/front/summary/index.js
View File

@ -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);

15
modules/order/front/summary/style.scss
View File

@ -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;

10
modules/route/front/summary/index.html
View File

@ -1,5 +1,13 @@
<vn-card class="summary">
<h5>{{$ctrl.summary.route.id}} - {{$ctrl.summary.route.description}}</h5>
<h5>
<a ng-if="::$ctrl.summary.route.id"
vn-tooltip="Go to the route"
ui-sref="route.card.summary({id: {{::$ctrl.summary.route.id}}})"
name="goToSummary">
<vn-icon-button icon="launch"></vn-icon-button>
</a>
<span>{{$ctrl.summary.route.id}} - {{$ctrl.summary.route.description}}</span>
</h5>
<vn-horizontal>
<vn-one>
<vn-label-value label="Id"

4
modules/route/front/summary/index.js
View File

@ -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 {
set route(value) {
this._route = value;
if (value && value.id)

1
modules/route/front/summary/locale/es.yml
View File

@ -6,3 +6,4 @@ Finishing time: H. Fin
Km Start: Km de inicio
Km End: Km de fin
PC: CP
Go to the route: Ir a la ruta

10
modules/supplier/front/summary/index.html
View File

@ -1,5 +1,13 @@
<vn-card class="summary">
<h5>{{::$ctrl.summary.name}} - {{::$ctrl.summary.id}}</h5>
<h5>
<a ng-if="::$ctrl.summary.id"
vn-tooltip="Go to the supplier"
ui-sref="supplier.card.summary({id: {{::$ctrl.summary.id}}})"
name="goToSummary">
<vn-icon-button icon="launch"></vn-icon-button>
</a>
<span>{{::$ctrl.summary.name}} - {{::$ctrl.summary.id}}</span>
</h5>
<vn-horizontal>
<vn-one>
<h4 translate>Basic data</h4>

4
modules/supplier/front/summary/index.js
View File

@ -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;

1
modules/supplier/front/summary/locale/es.yml
View File

@ -6,3 +6,4 @@ Is Farmer: Es agrícola
Sage tax type: Tipo de impuesto Sage
Sage transaction type: Tipo de transacción Sage
Sage withholding: Retencion Sage
Go to the supplier: Ir al proveedor

6
modules/ticket/front/summary/index.html
View File

@ -1,10 +1,10 @@
<vn-card class="summary">
<h5>
<a ng-if="::$ctrl.summary.id"
translate-attr="{title: 'Go to ticket summary'}"
vn-tooltip="Go to the ticket"
ui-sref="ticket.card.summary({id: {{::$ctrl.summary.id}}})"
name="goToTicketSummary">
<vn-icon-button icon="open_in_full"></vn-icon-button>
name="goToSummary">
<vn-icon-button icon="launch"></vn-icon-button>
</a>
<span>
Ticket #{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}}

4
modules/ticket/front/summary/index.js
View File

@ -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;
}

2
modules/ticket/front/summary/locale/es.yml
View File

@ -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
Go to the ticket: Ir al ticket

43
modules/ticket/front/summary/style.scss
View File

@ -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 {

10
modules/travel/front/summary/index.html
View File

@ -1,5 +1,13 @@
<vn-card class="summary">
<h5>{{$ctrl.travelData.id}} - {{$ctrl.travelData.ref}}</h5>
<h5>
<a ng-if="::$ctrl.travelData.id"
vn-tooltip="Go to the travel"
ui-sref="travel.card.summary({id: {{::$ctrl.travelData.id}}})"
name="goToSummary">
<vn-icon-button icon="launch"></vn-icon-button>
</a>
<span>{{$ctrl.travelData.id}} - {{$ctrl.travelData.ref}}</span>
</h5>
<vn-horizontal>
<vn-one>
<vn-label-value

4
modules/travel/front/summary/index.js
View File

@ -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 {
$onInit() {
this.entries = [];
}

1
modules/travel/front/summary/locale/es.yml
View File

@ -15,3 +15,4 @@ Pallet: Pallet
Freight: Porte
Package: Embalaje
Half box: Media caja
Go to the travel: Ir al envío

1
modules/worker/front/locale/es.yml
View File

@ -19,3 +19,4 @@ View worker: Ver trabajador
Worker id: Id trabajador
Workers: Trabajadores
worker: trabajador
Go to the worker: Ir al trabajador

10
modules/worker/front/summary/index.html
View File

@ -1,5 +1,13 @@
<vn-card class="summary">
<h5>{{worker.firstName}} {{worker.lastName}}</h5>
<h5>
<a ng-if="::$ctrl.worker.id"
vn-tooltip="Go to the worker"
ui-sref="worker.card.summary({id: {{::$ctrl.worker.id}}})"
name="goToSummary">
<vn-icon-button icon="launch"></vn-icon-button>
</a>
<span>{{worker.firstName}} {{worker.lastName}}</span>
</h5>
<vn-horizontal class="vn-pa-md">
<vn-one>
<h4 translate>Basic data</h4>

4
modules/worker/front/summary/index.js
View File

@ -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;
}

2
modules/zone/front/index/index.html
View File

@ -20,7 +20,7 @@
<a
ng-repeat="zone in model.data"
ui-sref="zone.card.summary({id: zone.id})"
class="clickable n-tr search-result">
class="clickable vn-tr search-result">
<vn-td number>{{::zone.id}}</vn-td>
<vn-td expand>{{::zone.name}}</vn-td>
<vn-td expand>{{::zone.agencyMode.name}}</vn-td>

1
modules/zone/front/locale/es.yml
View File

@ -31,3 +31,4 @@ Warehouses: Almacenes
Week days: Días de la semana
Zones: Zonas
zone: zona
Go to the zone: Ir a la zona

10
modules/zone/front/summary/index.html
View File

@ -1,5 +1,13 @@
<vn-card class="summary">
<h5>#{{$ctrl.summary.id}} - {{$ctrl.summary.name}}</h5>
<h5>
<a ng-if="::$ctrl.summary.id"
vn-tooltip="Go to the zone"
ui-sref="zone.card.summary({id: {{::$ctrl.summary.id}}})"
name="goToSummary">
<vn-icon-button icon="launch"></vn-icon-button>
</a>
<span>#{{$ctrl.summary.id}} - {{$ctrl.summary.name}}</span>
</h5>
<vn-horizontal class="vn-pa-md">
<vn-one>
<vn-label-value label="Agency"

4
modules/zone/front/summary/index.js
View File

@ -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 zone() {
return this._zone;
}