-
-
-
-
-
-
-
-
-
-
- Autonomous worker
-
-
-
-
-
-
- {{'Contract' | translate}} #{{$ctrl.businessId}}
-
- {{'Used' | translate}} {{$ctrl.contractHolidays.holidaysEnjoyed || 0}}
- {{'of' | translate}} {{$ctrl.contractHolidays.totalHolidays || 0}} {{'days' | translate}}
-
-
- {{'Spent' | translate}} {{$ctrl.contractHolidays.hoursEnjoyed || 0}}
- {{'of' | translate}} {{$ctrl.contractHolidays.totalHours || 0}} {{'hours' | translate}}
-
-
- {{'Paid holidays' | translate}} {{$ctrl.contractHolidays.payedHolidays || 0}} {{'days' | translate}}
-
-
-
-
- {{'Year' | translate}} {{$ctrl.year}}
-
- {{'Used' | translate}} {{$ctrl.yearHolidays.holidaysEnjoyed || 0}}
- {{'of' | translate}} {{$ctrl.yearHolidays.totalHolidays || 0}} {{'days' | translate}}
-
-
- {{'Spent' | translate}} {{$ctrl.yearHolidays.hoursEnjoyed || 0}}
- {{'of' | translate}} {{$ctrl.yearHolidays.totalHours || 0}} {{'hours' | translate}}
-
-
-
-
-
-
-
-
-
-
-#{{businessFk}}
-
- {{started | date: 'dd/MM/yyyy'}} - {{ended ? (ended | date: 'dd/MM/yyyy') : 'Indef.'}}
-
-
-
-
-
- Festive
-
-
-
-
- Current day
-
-
-')[0];
- const dayNumber = dayElement.firstElementChild;
-
- controller.formatDay(today, dayElement);
-
- expect(dayNumber.title).toEqual('Holiday');
- expect(dayNumber.style.backgroundColor).toEqual('rgb(0, 0, 0)');
- });
- });
-
- describe('pick()', () => {
- it(`should set the absenceType property to null if they match with the current one`, () => {
- const absenceType = {id: 1, name: 'Holiday'};
- controller.absenceType = absenceType;
- controller.pick(absenceType);
-
- expect(controller.absenceType).toBeNull();
- });
-
- it(`should set the absenceType property`, () => {
- const absenceType = {id: 1, name: 'Holiday'};
- const expectedAbsence = {id: 2, name: 'Leave of absence'};
- controller.absenceType = absenceType;
- controller.pick(expectedAbsence);
-
- expect(controller.absenceType).toEqual(expectedAbsence);
- });
- });
-
- describe('onSelection()', () => {
- it(`should show an snackbar message if no absence type is selected`, () => {
- jest.spyOn(controller.vnApp, 'showMessage').mockReturnThis();
-
- const $event = {};
- const $days = [];
- controller.absenceType = null;
- controller.onSelection($event, $days);
-
- expect(controller.vnApp.showMessage).toHaveBeenCalledWith('Choose an absence type from the right menu');
- });
-
- it(`should call to the create() method`, () => {
- jest.spyOn(controller, 'create').mockReturnThis();
-
- const selectedDay = Date.vnNew();
- const $event = {
- target: {
- closest: () => {
- return {$ctrl: {}};
- }
- }
- };
- const $days = [selectedDay];
- controller.absenceType = {id: 1};
- controller.onSelection($event, $days);
-
- expect(controller.create).toHaveBeenCalledWith(jasmine.any(Object), selectedDay);
- });
-
- it(`should call to the delete() method`, () => {
- jest.spyOn(controller, 'delete').mockReturnThis();
-
- const selectedDay = Date.vnNew();
- const expectedEvent = {
- dated: selectedDay,
- type: 'holiday',
- absenceId: 1
- };
- const $event = {
- target: {
- closest: () => {
- return {$ctrl: {}};
- }
- }
- };
- const $days = [selectedDay];
- controller.events[selectedDay.getTime()] = expectedEvent;
- controller.absenceType = {id: 1, code: 'holiday'};
- controller.onSelection($event, $days);
-
- expect(controller.delete).toHaveBeenCalledWith(jasmine.any(Object), selectedDay, expectedEvent);
- });
-
- it(`should call to the edit() method`, () => {
- jest.spyOn(controller, 'edit').mockReturnThis();
-
- const selectedDay = Date.vnNew();
- const expectedEvent = {
- dated: selectedDay,
- type: 'leaveOfAbsence',
- absenceId: 1
- };
- const $event = {
- target: {
- closest: () => {
- return {$ctrl: {}};
- }
- }
- };
- const $days = [selectedDay];
- controller.events[selectedDay.getTime()] = expectedEvent;
- controller.absenceType = {id: 1, code: 'holiday'};
- controller.onSelection($event, $days);
-
- expect(controller.edit).toHaveBeenCalledWith(jasmine.any(Object), expectedEvent);
- });
- });
-
- describe('create()', () => {
- it(`should make a HTTP POST query and then call to the repaintCanceller() method`, () => {
- jest.spyOn(controller, 'repaintCanceller').mockReturnThis();
-
- const dated = Date.vnNew();
- const calendarElement = {};
- const expectedResponse = {id: 10};
-
- $httpBackend.expect('POST', `Workers/1106/createAbsence`).respond(200, expectedResponse);
- controller.create(calendarElement, dated);
- $httpBackend.flush();
-
- const createdEvent = controller.events[dated.getTime()];
- const absenceType = controller.absenceType;
-
- expect(createdEvent.absenceId).toEqual(expectedResponse.id);
- expect(createdEvent.color).toEqual(absenceType.rgb);
- expect(controller.repaintCanceller).toHaveBeenCalled();
- });
- });
-
- describe('edit()', () => {
- it(`should make a HTTP PATCH query and then call to the repaintCanceller() method`, () => {
- jest.spyOn(controller, 'repaintCanceller').mockReturnThis();
-
- const event = {absenceId: 10};
- const calendarElement = {};
- const newAbsenceType = {
- id: 2,
- name: 'Leave of absence',
- code: 'leaveOfAbsence',
- rgb: 'purple'
- };
- controller.absenceType = newAbsenceType;
-
- const expectedParams = {absenceId: 10, absenceTypeId: 2};
- $httpBackend.expect('PATCH', `Workers/1106/updateAbsence`, expectedParams).respond(200);
- controller.edit(calendarElement, event);
- $httpBackend.flush();
-
- expect(event.name).toEqual(newAbsenceType.name);
- expect(event.color).toEqual(newAbsenceType.rgb);
- expect(event.type).toEqual(newAbsenceType.code);
- expect(controller.repaintCanceller).toHaveBeenCalled();
- });
- });
-
- describe('delete()', () => {
- it(`should make a HTTP DELETE query and then call to the repaintCanceller() method`, () => {
- jest.spyOn(controller, 'repaintCanceller').mockReturnThis();
-
- const expectedParams = {absenceId: 10};
- const calendarElement = {};
- const selectedDay = Date.vnNew();
- const expectedEvent = {
- dated: selectedDay,
- type: 'leaveOfAbsence',
- absenceId: 10
- };
-
- controller.events[selectedDay.getTime()] = expectedEvent;
-
- const serializedParams = $httpParamSerializer(expectedParams);
- $httpBackend.expect('DELETE', `Workers/1106/deleteAbsence?${serializedParams}`).respond(200);
- controller.delete(calendarElement, selectedDay, expectedEvent);
- $httpBackend.flush();
-
- const event = controller.events[selectedDay.getTime()];
-
- expect(event).toBeUndefined();
- expect(controller.repaintCanceller).toHaveBeenCalled();
- });
- });
-
- describe('repaintCanceller()', () => {
- it(`should cancell the callback execution timer`, () => {
- jest.spyOn(window, 'clearTimeout');
- jest.spyOn(window, 'setTimeout');
-
- const timeoutId = 90;
- controller.canceller = timeoutId;
-
- controller.repaintCanceller(() => {
- return 'My callback';
- });
-
- expect(window.clearTimeout).toHaveBeenCalledWith(timeoutId);
- expect(window.setTimeout).toHaveBeenCalledWith(jasmine.any(Function), 500);
- });
- });
-
- describe('refresh()', () => {
- it(`should make a HTTP GET query and then call to the onData() method`, () => {
- jest.spyOn(controller, 'onData').mockReturnThis();
-
- const expecteResponse = [{id: 1}];
- const expectedParams = {workerFk: controller.worker.id, year: year};
- const serializedParams = $httpParamSerializer(expectedParams);
- $httpBackend.expect('GET', `Calendars/absences?${serializedParams}`).respond(200, expecteResponse);
- controller.refresh();
- $httpBackend.flush();
-
- expect(controller.onData).toHaveBeenCalledWith(expecteResponse);
- });
- });
- });
-});
diff --git a/modules/worker/front/calendar/locale/es.yml b/modules/worker/front/calendar/locale/es.yml
deleted file mode 100644
index 50bb4bb52..000000000
--- a/modules/worker/front/calendar/locale/es.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-Calendar: Calendario
-Contract: Contrato
-Festive: Festivo
-Used: Utilizados
-Spent: Utilizadas
-Year: Año
-of: de
-days: días
-hours: horas
-Choose an absence type from the right menu: Elige un tipo de ausencia desde el menú de la derecha
-To start adding absences, click an absence type from the right menu and then on the day you want to add an absence: Para empezar a añadir ausencias, haz clic en un tipo de ausencia desde el menu de la derecha y después en el día que quieres añadir la ausencia
-You can just add absences within the current year: Solo puedes añadir ausencias dentro del año actual
-Current day: Día actual
-Paid holidays: Vacaciones pagadas
-Autonomous worker: Trabajador autónomo
diff --git a/modules/worker/front/calendar/style.scss b/modules/worker/front/calendar/style.scss
deleted file mode 100644
index e99f64689..000000000
--- a/modules/worker/front/calendar/style.scss
+++ /dev/null
@@ -1,65 +0,0 @@
-@import "variables";
-
-vn-worker-calendar {
- .calendars {
- position: relative;
- display: flex;
- flex-wrap: wrap;
- justify-content: center;
- align-items: center;
- box-sizing: border-box;
- padding: $spacing-md;
-
- & > vn-calendar {
- border: $border-thin;
- margin: $spacing-md;
- padding: $spacing-xs;
- max-width: 288px;
- }
- }
-
- vn-chip.selectable {
- cursor: pointer
- }
-
- vn-chip.selectable:hover {
- opacity: 0.8
- }
-
- vn-chip vn-avatar {
- text-align: center;
- color: white
- }
-
- vn-icon[icon="info"] {
- position: absolute;
- top: 16px;
- right: 16px
- }
-
- vn-side-menu div > .input {
- border-bottom: $border-thin;
- }
-
- .festive,
- vn-avatar.today {
- color: $color-font;
- width: 24px;
- min-width: 24px;
- height: 24px
- }
-
- .festive {
- border: 2px solid $color-alert
- }
-
- vn-avatar.today {
- border: 2px solid $color-font-link
- }
-
- .check {
- margin-top: 0.5px;
- margin-left: -3px;
- font-size: 125%;
- }
-}
diff --git a/modules/worker/front/create/index.html b/modules/worker/front/create/index.html
deleted file mode 100644
index 3030ffecd..000000000
--- a/modules/worker/front/create/index.html
+++ /dev/null
@@ -1,198 +0,0 @@
-
-
- {{::note.user.nickname}}
- {{::note.created | date:'dd/MM/yyyy HH:mm'}}
-
-
- {{::note.text}}
-
-
-
-
-
diff --git a/modules/worker/front/search-panel/index.js b/modules/worker/front/search-panel/index.js
deleted file mode 100644
index ac7405e78..000000000
--- a/modules/worker/front/search-panel/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import ngModule from '../module';
-import SearchPanel from 'core/components/searchbar/search-panel';
-
-ngModule.vnComponent('vnWorkerSearchPanel', {
- template: require('./index.html'),
- controller: SearchPanel
-});
diff --git a/modules/worker/front/time-control/index.html b/modules/worker/front/time-control/index.html
deleted file mode 100644
index c34a1e3ca..000000000
--- a/modules/worker/front/time-control/index.html
+++ /dev/null
@@ -1,219 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{::hour.timed | date: 'HH:mm'}}
-
-
-
-
-
-
-
-
- {{$ctrl.formatHours(weekday.workedHours)}} h.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{{::$ctrl.weekdayNames[$index].name}}
-
- {{::weekday.dated | date: 'dd'}}
-
- {{::weekday.dated | date: 'MMMM'}}
-
-
-
- {{::weekday.event.name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Hours
-
-
-
-
-
-
+
-
+
diff --git a/print/templates/reports/entry-order/entry-order.js b/print/templates/reports/entry-order/entry-order.js
index d31ad1a36..56356e068 100755
--- a/print/templates/reports/entry-order/entry-order.js
+++ b/print/templates/reports/entry-order/entry-order.js
@@ -13,13 +13,17 @@ module.exports = {
return {totalBalance: 0.00};
},
methods: {
- getTotal() {
- let total = 0.00;
- this.buys.forEach(buy => {
- total += buy.quantity * buy.buyingValue;
- });
-
- return total;
+ getTotalBy(property) {
+ return this.buys.reduce((total, buy) => {
+ switch (property) {
+ case 'amount':
+ return total + buy.quantity * buy.buyingValue;
+ case 'quantity':
+ return total + buy.quantity;
+ case 'stickers':
+ return total + buy.stickers;
+ }
+ }, 0);
}
},
props: {
diff --git a/print/templates/reports/entry-order/locale/es.yml b/print/templates/reports/entry-order/locale/es.yml
index 5c633aeaa..5a6716ba1 100644
--- a/print/templates/reports/entry-order/locale/es.yml
+++ b/print/templates/reports/entry-order/locale/es.yml
@@ -2,7 +2,7 @@ reportName: pedido-de-entrada
title: Pedido
supplierName: Proveedor
supplierStreet: Dirección
-entryId: Referencia interna
+entryId: Nº Entrada
date: Fecha
ref: Nº Factura
boxes: Cajas
@@ -14,4 +14,6 @@ concept: Descripción
total: Total
entry: Entrada {0}
supplierData: Datos del proveedor
-notes: Notas
\ No newline at end of file
+notes: Notas
+reference: Referencia
+tags: Tags
\ No newline at end of file
diff --git a/print/templates/reports/entry-order/sql/buys.sql b/print/templates/reports/entry-order/sql/buys.sql
index 5bf9f2dfe..92c055483 100644
--- a/print/templates/reports/entry-order/sql/buys.sql
+++ b/print/templates/reports/entry-order/sql/buys.sql
@@ -1,16 +1,17 @@
-SELECT
- b.itemFk,
- b.quantity,
- b.buyingValue,
- b.stickers box,
- b.packing,
- i.name itemName,
- i.tag5,
- i.value5,
- i.tag6,
- i.value6,
- i.tag7,
- i.value7
-FROM buy b
- JOIN item i ON i.id = b.itemFk
-WHERE b.entryFk = ?
\ No newline at end of file
+SELECT b.itemFk,
+ b.quantity,
+ b.buyingValue,
+ b.stickers,
+ b.packing,
+ i.name,
+ IFNULL(i2.comment, i.comment) comment,
+ i.tag5,
+ i.value5,
+ i.tag6,
+ i.value6,
+ i.tag7,
+ i.value7
+ FROM buy b
+ JOIN item i ON i.id = b.itemFk
+ LEFT JOIN item i2 ON i2.id = b.itemOriginalFk
+ WHERE b.entryFk = ?
diff --git a/print/templates/reports/entry-order/sql/entry.sql b/print/templates/reports/entry-order/sql/entry.sql
index c30eebca8..2ab599123 100644
--- a/print/templates/reports/entry-order/sql/entry.sql
+++ b/print/templates/reports/entry-order/sql/entry.sql
@@ -1,9 +1,8 @@
-SELECT
- e.id,
- e.invoiceNumber,
- c.code companyCode,
- t.landed
-FROM entry e
- JOIN travel t ON t.id = e.travelFk
- JOIN company c ON c.id = e.companyFk
-WHERE e.id = ?
+SELECT e.id,
+ e.invoiceNumber,
+ c.code companyCode,
+ t.landed
+ FROM entry e
+ JOIN travel t ON t.id = e.travelFk
+ JOIN company c ON c.id = e.companyFk
+ WHERE e.id = ?
diff --git a/print/templates/reports/entry-order/sql/supplier.sql b/print/templates/reports/entry-order/sql/supplier.sql
index 81ed7e883..214f7913f 100644
--- a/print/templates/reports/entry-order/sql/supplier.sql
+++ b/print/templates/reports/entry-order/sql/supplier.sql
@@ -1,11 +1,10 @@
-SELECT
- s.name,
- s.street,
- s.nif,
- s.postCode,
- s.city,
- p.name province
-FROM supplier s
- JOIN entry e ON e.supplierFk = s.id
- LEFT JOIN province p ON p.id = s.provinceFk
-WHERE e.id = ?
+SELECT s.name,
+ s.street,
+ s.nif,
+ s.postCode,
+ s.city,
+ p.name province
+ FROM supplier s
+ JOIN entry e ON e.supplierFk = s.id
+ LEFT JOIN province p ON p.id = s.provinceFk
+ WHERE e.id = ?
{{$t('title')}}
+
-
@@ -38,42 +38,56 @@
{{$t('title')}}
| {{$t('entryId')}} | +{{$t('entryId')}} | {{entry.id}} | |
|---|---|---|---|
| {{$t('date')}} | +{{$t('date')}} | {{formatDate(entry.landed,'%d-%m-%Y')}} | |
| {{$t('ref')}} | -{{entry.invoiceNumber}} | +{{$t('ref')}} | +{{entry.invoiceNumber | dashIfEmpty}} |
| {{$t('boxes')}} | +{{$t('packing')}} | -{{$t('concept')}} | +{{$t('concept')}} | +{{$t('reference')}} | +{{$t('tags')}} | {{$t('quantity')}} | +{{$t('price')}} | +{{$t('amount')}} | ||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{buy.box}} | +{{buy.stickers}} | +x | {{buy.packing}} | -{{buy.itemName}} | +{{buy.name}} | +{{buy.comment}} | ++ {{buy.tag5}} → {{buy.value5}} + {{buy.tag6}} → {{buy.value6}} + {{buy.tag7}} → {{buy.value7}} + | {{buy.quantity | number($i18n.locale)}} | +x | {{buy.buyingValue | currency('EUR', $i18n.locale)}} | += | {{buy.buyingValue * buy.quantity | currency('EUR', $i18n.locale)}} |
| - {{buy.tag5}} {{buy.value5}} - {{buy.tag6}} {{buy.value6}} - {{buy.tag7}} {{buy.value7}} - | -||||||||||||
| - {{$t('total')}} - | -{{getTotal() | currency('EUR', $i18n.locale)}} | +|||||||||||
| {{getTotalBy('stickers')}} | ++ | + | + | + | + | {{getTotalBy('quantity') | number($i18n.locale)}} | ++ | + | + | {{getTotalBy('amount') | currency('EUR', $i18n.locale)}} | ||