diff --git a/modules/travel/front/extra-community/index.js b/modules/travel/front/extra-community/index.js
index 44527d45e..a380c1ed8 100644
--- a/modules/travel/front/extra-community/index.js
+++ b/modules/travel/front/extra-community/index.js
@@ -17,16 +17,18 @@ class Controller extends Section {
this.draggableElement = 'a[draggable]';
this.droppableElement = 'vn-tbody[vn-droppable]';
- const scopeDays = 14;
- const landedFrom = new Date();
- landedFrom.setHours(0, 0, 0, 0);
+ const twoDays = 2;
+ const shippedFrom = new Date();
+ shippedFrom.setDate(shippedFrom.getDate() - twoDays);
+ shippedFrom.setHours(0, 0, 0, 0);
+ const sevenDays = 7;
const landedTo = new Date();
- landedTo.setDate(landedTo.getDate() + scopeDays);
+ landedTo.setDate(landedTo.getDate() + sevenDays);
landedTo.setHours(23, 59, 59, 59);
this.defaultFilter = {
- landedFrom: landedFrom,
+ shippedFrom: shippedFrom,
landedTo: landedTo,
continent: 'AM'
};
@@ -34,10 +36,12 @@ class Controller extends Section {
get hasDateRange() {
const userParams = this.$.model.userParams;
- const hasLanded = userParams.landedFrom || userParams.landedTo;
- const hasShipped = userParams.shippedFrom || userParams.shippedTo;
+ const hasLanded = userParams.landedTo;
+ const hasShipped = userParams.shippedFrom;
+ const hasContinent = userParams.continent;
+ const hasWarehouseOut = userParams.warehouseOutFk;
- return hasLanded || hasShipped;
+ return hasLanded || hasShipped || hasContinent || hasWarehouseOut;
}
findDraggable($event) {
diff --git a/modules/travel/front/extra-community/style.scss b/modules/travel/front/extra-community/style.scss
index 41544242d..f903f94ea 100644
--- a/modules/travel/front/extra-community/style.scss
+++ b/modules/travel/front/extra-community/style.scss
@@ -9,8 +9,8 @@ vn-travel-extra-community {
padding-bottom: 7px;
padding-bottom: 4px;
font-weight: lighter;
- background-color: #fde6ca;
- color: $color-font-light;
+ background-color: $color-bg;
+ color: white;
border-bottom: 1px solid #f7931e;
white-space: nowrap;
overflow: hidden;
diff --git a/modules/worker/back/methods/worker/holidays.js b/modules/worker/back/methods/worker/holidays.js
index bcf4d7f51..339b84b7b 100644
--- a/modules/worker/back/methods/worker/holidays.js
+++ b/modules/worker/back/methods/worker/holidays.js
@@ -1,4 +1,5 @@
const UserError = require('vn-loopback/util/user-error');
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
module.exports = Self => {
Self.remoteMethodCtx('holidays', {
@@ -33,7 +34,8 @@ module.exports = Self => {
Self.holidays = async(ctx, id, options) => {
const models = Self.app.models;
const args = ctx.args;
-
+ const conn = Self.dataSource.connector;
+ const stmts = [];
const myOptions = {};
if (typeof options == 'object')
@@ -56,42 +58,6 @@ module.exports = Self => {
ended.setHours(23, 59, 59, 59);
const filter = {
- include: [{
- relation: 'holidays',
- scope: {
- where: {year: args.year}
- }
- },
- {
- relation: 'absences',
- scope: {
- include: {
- relation: 'absenceType',
- },
- where: {
- dated: {between: [started, ended]}
- }
- }
- },
- {
- relation: 'workCenter',
- scope: {
- include: {
- relation: 'holidays',
- scope: {
- include: [{
- relation: 'detail'
- },
- {
- relation: 'type'
- }],
- where: {
- dated: {between: [started, ended]}
- }
- }
- }
- }
- }],
where: {
and: [
{workerFk: id},
@@ -107,76 +73,32 @@ module.exports = Self => {
}
};
- if (args.businessFk)
- filter.where.and.push({businessFk: args.businessFk});
-
const contracts = await models.WorkerLabour.find(filter, myOptions);
-
let [firstContract] = contracts;
- let payedHolidays;
+ const payedHolidays = firstContract.payedHolidays;
- if (firstContract.payedHolidays)
- payedHolidays = firstContract.payedHolidays;
- else payedHolidays = 0;
+ let queryIndex;
+ const year = started.getFullYear();
- let totalHolidays = 0;
- let holidaysEnjoyed = 0;
-
- for (let contract of contracts) {
- const contractStarted = contract.started;
- contractStarted.setHours(0, 0, 0, 0);
- const contractEnded = contract.ended;
- if (contractEnded)
- contractEnded.setHours(23, 59, 59, 59);
-
- let startedTime;
- if (contractStarted < started)
- startedTime = started.getTime();
- else startedTime = contractStarted.getTime();
-
- let endedTime;
- if (!contractEnded || (contractEnded && contractEnded > ended))
- endedTime = ended.getTime();
- else endedTime = contractEnded.getTime();
-
- const dayTimestamp = 1000 * 60 * 60 * 24;
-
- // Get number of worked days between dates
- let workedDays = Math.floor((endedTime - startedTime) / dayTimestamp);
- workedDays += 1; // 1 day inclusion
-
- // Calculates absences
- let entitlementRate = 0;
- for (let absence of contract.absences()) {
- const absenceType = absence.absenceType();
- const isHoliday = absenceType.code === 'holiday';
- const isHalfHoliday = absenceType.code === 'halfHoliday';
-
- if (isHoliday) holidaysEnjoyed += 1;
- if (isHalfHoliday) holidaysEnjoyed += 0.5;
-
- entitlementRate += absenceType.holidayEntitlementRate;
- }
-
- workedDays -= entitlementRate;
-
- // Max holidays for the selected year
- const maxHolidays = contract.holidays() && contract.holidays().days;
-
- if (workedDays < daysInYear())
- totalHolidays += Math.round(2 * maxHolidays * (workedDays) / daysInYear()) / 2;
- else totalHolidays = maxHolidays;
+ if (args.businessFk) {
+ stmts.push(new ParameterizedSQL('CALL vn.workerCalendar_calculateBusiness(?,?)', [year, args.businessFk]));
+ queryIndex = stmts.push('SELECT * FROM tmp.workerCalendarCalculateBusiness') - 1;
+ stmts.push('DROP TEMPORARY TABLE tmp.workerCalendarCalculateBusiness');
+ } else {
+ stmts.push(new ParameterizedSQL('CALL vn.workerCalendar_calculateYear(?,?)', [year, id]));
+ queryIndex = stmts.push('SELECT * FROM tmp.workerCalendarCalculateYear') - 1;
+ stmts.push('DROP TEMPORARY TABLE tmp.workerCalendarCalculateYear');
}
- function daysInYear() {
- const year = started.getFullYear();
+ const sql = ParameterizedSQL.join(stmts, ';');
+ const result = await conn.executeStmt(sql, myOptions);
+ const [holidays] = result[queryIndex];
- return isLeapYear(year) ? 366 : 365;
- }
- return {totalHolidays, holidaysEnjoyed, payedHolidays};
+ const totalHolidays = holidays.days;
+ const holidaysEnjoyed = holidays.daysEnjoyed;
+ const totalHours = holidays.hours;
+ const hoursEnjoyed = holidays.hoursEnjoyed;
+
+ return {totalHolidays, holidaysEnjoyed, totalHours, hoursEnjoyed, payedHolidays};
};
-
- function isLeapYear(year) {
- return year % 400 === 0 || (year % 100 !== 0 && year % 4 === 0);
- }
};
diff --git a/modules/worker/back/models/department.json b/modules/worker/back/models/department.json
index 7d6f7a7be..c3f627e93 100644
--- a/modules/worker/back/models/department.json
+++ b/modules/worker/back/models/department.json
@@ -34,6 +34,9 @@
},
"notificationEmail": {
"type": "string"
+ },
+ "hasToMistake": {
+ "type": "number"
}
}
}
diff --git a/modules/worker/front/calendar/index.html b/modules/worker/front/calendar/index.html
index 7ef586b36..cff4d0bc9 100644
--- a/modules/worker/front/calendar/index.html
+++ b/modules/worker/front/calendar/index.html
@@ -25,20 +25,28 @@
{{'Contract' | translate}} #{{$ctrl.businessId}}
- {{'Used' | translate}} {{$ctrl.contractHolidays.holidaysEnjoyed}}
+ {{'Used' | translate}} {{$ctrl.contractHolidays.holidaysEnjoyed || 0}}
{{'of' | translate}} {{$ctrl.contractHolidays.totalHolidays || 0}} {{'days' | translate}}
- {{'Paid holidays' | translate}} {{$ctrl.contractHolidays.payedHolidays}} {{'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}}
+ {{'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}}
+
diff --git a/modules/worker/front/calendar/index.js b/modules/worker/front/calendar/index.js
index 92bad1f0f..95e1fc134 100644
--- a/modules/worker/front/calendar/index.js
+++ b/modules/worker/front/calendar/index.js
@@ -198,7 +198,7 @@ class Controller extends Section {
const event = this.events[stamp];
const calendar = $event.target.closest('vn-calendar').$ctrl;
- if (event) {
+ if (event && event.absenceId) {
if (event.type == this.absenceType.code)
this.delete(calendar, day, event);
else
@@ -230,6 +230,7 @@ class Controller extends Section {
.then(calendar.repaint())
.then(() => this.getContractHolidays())
.then(() => this.getYearHolidays())
+ .then(() => this.repaint())
);
});
}
@@ -266,6 +267,7 @@ class Controller extends Section {
.then(calendar.repaint())
.then(() => this.getContractHolidays())
.then(() => this.getYearHolidays())
+ .then(() => this.repaint())
);
});
}
diff --git a/modules/worker/front/calendar/index.spec.js b/modules/worker/front/calendar/index.spec.js
index 3d5775663..1da4066d9 100644
--- a/modules/worker/front/calendar/index.spec.js
+++ b/modules/worker/front/calendar/index.spec.js
@@ -191,7 +191,8 @@ describe('Worker', () => {
const selectedDay = new Date();
const expectedEvent = {
dated: selectedDay,
- type: 'holiday'
+ type: 'holiday',
+ absenceId: 1
};
const $event = {
target: {
@@ -214,7 +215,8 @@ describe('Worker', () => {
const selectedDay = new Date();
const expectedEvent = {
dated: selectedDay,
- type: 'leaveOfAbsence'
+ type: 'leaveOfAbsence',
+ absenceId: 1
};
const $event = {
target: {
diff --git a/modules/worker/front/calendar/locale/es.yml b/modules/worker/front/calendar/locale/es.yml
index 8e9f9cdf8..bd75458aa 100644
--- a/modules/worker/front/calendar/locale/es.yml
+++ b/modules/worker/front/calendar/locale/es.yml
@@ -2,9 +2,11 @@ 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
diff --git a/modules/zone/back/models/agency.json b/modules/zone/back/models/agency.json
index edec36f87..be262b670 100644
--- a/modules/zone/back/models/agency.json
+++ b/modules/zone/back/models/agency.json
@@ -16,5 +16,12 @@
"type": "string",
"required": false
}
+ },
+ "relations": {
+ "supplierAgencyTerm": {
+ "type": "hasOne",
+ "model": "SupplierAgencyTerm",
+ "foreignKey": "agencyFk"
+ }
}
}
diff --git a/print/templates/reports/extra-community/extra-community.js b/print/templates/reports/extra-community/extra-community.js
index c9d2fb2f3..9843d6bb7 100755
--- a/print/templates/reports/extra-community/extra-community.js
+++ b/print/templates/reports/extra-community/extra-community.js
@@ -8,11 +8,16 @@ module.exports = {
async serverPrefetch() {
this.filters = this.$options.filters;
const args = {
- landedFrom: this.landedStart,
landedTo: this.landedEnd,
shippedFrom: this.shippedStart,
- shippedTo: this.shippedEnd,
- continent: this.continent
+ continent: this.continent,
+ id: this.id,
+ agencyFk: this.agencyFk,
+ warehouseInFk: this.warehouseInFk,
+ warehouseOutFk: this.warehouseOutFk,
+ totalEntries: this.totalEntries,
+ ref: this.ref,
+ cargoSupplierFk: this.cargoSupplierFk
};
const travels = await this.fetchTravels(args);
@@ -38,11 +43,6 @@ module.exports = {
dated: function() {
return this.filters.date(new Date(), '%d-%m-%Y');
},
- landedStart: function() {
- if (!this.landedFrom) return;
-
- return this.filters.date(this.landedFrom, '%Y-%m-%d');
- },
landedEnd: function() {
if (!this.landedTo) return;
@@ -52,11 +52,6 @@ module.exports = {
if (!this.shippedFrom) return;
return this.filters.date(this.shippedFrom, '%Y-%m-%d');
- },
- shippedEnd: function() {
- if (!this.shippedTo) return;
-
- return this.filters.date(this.shippedTo, '%Y-%m-%d');
}
},
methods: {
@@ -65,20 +60,29 @@ module.exports = {
switch (key) {
case 'shippedFrom':
return `t.shipped >= ${value}`;
- case 'shippedTo':
- return `t.shipped <= ${value}`;
- case 'landedFrom':
- return `t.landed >= ${value}`;
case 'landedTo':
return `t.landed <= ${value}`;
case 'continent':
return `cnt.code = ${value}`;
+ case 'ref':
+ return {'t.ref': {like: `%${value}%`}};
+ case 'id':
+ return `t.id = ${value}`;
+ case 'agencyFk':
+ return `am.id = ${value}`;
+ case 'warehouseOutFk':
+ return `wo.id = ${value}`;
+ case 'warehouseInFk':
+ return `w.id = ${value}`;
+ case 'cargoSupplierFk':
+ return `s.id = ${value}`;
}
});
let query = this.getSqlFromDef('travels');
query = db.merge(query, where);
query = db.merge(query, 'GROUP BY t.id');
+ query = db.merge(query, 'ORDER BY `shipped` ASC, `landed` ASC, `travelFk`, `loadPriority`, `agencyModeFk`, `evaNotes`');
return this.rawSql(query);
},
@@ -92,10 +96,15 @@ module.exports = {
'report-footer': reportFooter.build()
},
props: [
- 'landedFrom',
'landedTo',
'shippedFrom',
- 'shippedTo',
- 'continent'
+ 'continent',
+ 'ref',
+ 'id',
+ 'agencyFk',
+ 'warehouseOutFk',
+ 'warehouseInFk',
+ 'totalEntries',
+ 'cargoSupplierFk'
]
};
diff --git a/print/templates/reports/extra-community/sql/travels.sql b/print/templates/reports/extra-community/sql/travels.sql
index 022767608..167c8b1f8 100644
--- a/print/templates/reports/extra-community/sql/travels.sql
+++ b/print/templates/reports/extra-community/sql/travels.sql
@@ -4,6 +4,7 @@ SELECT
t.shipped,
t.landed,
t.kg,
+ am.id AS agencyModeFk,
SUM(b.stickers) AS stickers,
CAST(SUM(i.density * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000 ) as DECIMAL(10,0)) as loadedKg,
CAST(SUM(167.5 * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000 ) as DECIMAL(10,0)) as volumeKg