diff --git a/modules/item/back/methods/item-shelving/getItemsByReviewOrder.js b/modules/item/back/methods/item-shelving/getItemsByReviewOrder.js
new file mode 100644
index 000000000..7a960a8c8
--- /dev/null
+++ b/modules/item/back/methods/item-shelving/getItemsByReviewOrder.js
@@ -0,0 +1,89 @@
+module.exports = Self => {
+ const models = require('vn-loopback/server/server').models;
+ Self.remoteMethod('getItemsByReviewOrder', {
+ description:
+ 'Get list items if they are ordered by pickingOrder and their created regarding where they will be parked',
+ accessType: 'READ',
+ accepts: [{
+ arg: 'shelving',
+ type: 'string',
+ required: true,
+ description: 'Shelving code'
+ },
+ {
+ arg: 'parking',
+ type: 'string',
+ required: true,
+ description: 'Parking code'
+ },
+ {
+ arg: 'itemFk',
+ type: 'number',
+ description: 'Item id'
+ },
+ ],
+ returns: {
+ type: 'Array',
+ root: true
+ },
+ http: {
+ path: `/getItemsByReviewOrder`,
+ verb: 'GET'
+ }
+ });
+
+ Self.getItemsByReviewOrder = async(shelving, parking, itemFk, options) => {
+ const myOptions = {};
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const config = await models.ProductionConfig.findOne();
+ const hoursToCompare = config['itemOrderReviewHours'];
+ if (!hoursToCompare) return [];
+
+ const parkingItem = await models.Parking.findOne({where: {code: parking}}, myOptions);
+ if (!parkingItem) return [];
+ const pickingOrderToCompare = parkingItem['pickingOrder'];
+
+ const result = await Self.rawSql(`
+ WITH currentItemShelving AS (
+ SELECT is2.created, is2.itemFk, sh.code
+ FROM vn.itemShelving is2
+ JOIN vn.shelving sh ON sh.id = is2.shelvingFk
+ LEFT JOIN vn.parking p ON p.id = sh.parkingFk
+ LEFT JOIN vn.sector s ON s.id = p.sectorFk
+ WHERE sh.code = ? AND (? IS NULL OR is2.itemFk = ?)
+ ),
+ itemShelvings AS (
+ SELECT is2.itemFk, is2.created, sh.code, p.pickingOrder, p.code AS parkingFk
+ FROM vn.itemShelving is2
+ JOIN currentItemShelving ai ON is2.itemFk = ai.itemFk
+ JOIN vn.shelving sh ON sh.id = is2.shelvingFk AND ai.code <> sh.code
+ JOIN vn.parking p ON p.id = sh.parkingFk
+ JOIN vn.sector s ON s.id = p.sectorFk
+ ),
+ parkingDestiny AS (
+ SELECT ? AS pickingOrder
+ )
+ SELECT ish.*,
+ CASE
+ WHEN ish.pickingOrder < d.pickingOrder AND aish.created < ish.created
+ AND ABS(TIMESTAMPDIFF(HOUR, aish.created, ish.created)) > ? THEN "old"
+ WHEN ish.pickingOrder > d.pickingOrder AND aish.created > ish.created
+ AND ABS(TIMESTAMPDIFF(HOUR, aish.created, ish.created)) > ? THEN "new"
+ END AS itemCreated
+ FROM itemShelvings ish
+ JOIN parkingDestiny d ON d.pickingOrder IS NOT NULL
+ JOIN currentItemShelving aish ON ish.itemFk = aish.itemFk
+ WHERE ABS(TIMESTAMPDIFF(HOUR, aish.created, ish.created)) > ?
+ AND (
+ (ish.pickingOrder < d.pickingOrder AND aish.created < ish.created)
+ OR
+ (ish.pickingOrder > d.pickingOrder AND aish.created > ish.created)
+ );
+ `,
+ [shelving, itemFk, itemFk, pickingOrderToCompare,
+ hoursToCompare, hoursToCompare, hoursToCompare, hoursToCompare], myOptions);
+ return result;
+ };
+};
diff --git a/modules/item/back/methods/item-shelving/specs/getItemsByReviewOrder.spec.js b/modules/item/back/methods/item-shelving/specs/getItemsByReviewOrder.spec.js
new file mode 100644
index 000000000..8f368b57c
--- /dev/null
+++ b/modules/item/back/methods/item-shelving/specs/getItemsByReviewOrder.spec.js
@@ -0,0 +1,123 @@
+
+const {models} = require('vn-loopback/server/server');
+
+describe('itemShelving getItemsByReviewOrder()', () => {
+ it('should return empty because hoursToReview = 0', async() => {
+ const shelving = 'NBB';
+ const parking = '700-01';
+
+ const tx = await models.Sector.beginTransaction({});
+ const myOptions = {transaction: tx};
+
+ try {
+ const config = await models.ProductionConfig.findOne();
+ await config.updateAttributes({
+ itemOrderReviewHours: null,
+ });
+
+ const result = await models.ItemShelving.getItemsByReviewOrder(shelving, parking, myOptions);
+
+ expect(result.length).toEqual(0);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should return an item because you are trying parking a shelving and there is an older item', async() => {
+ const shelving = 'NBB';
+ const parking = 'K-26-2';
+ const itemFk = 1000000;
+
+ const tx = await models.Sector.beginTransaction({});
+ const myOptions = {transaction: tx};
+
+ try {
+ const config = await models.ProductionConfig.findOne();
+ await config.updateAttributes({
+ itemOrderReviewHours: 24,
+ });
+
+ const result = await models.ItemShelving.getItemsByReviewOrder(shelving, parking, itemFk, myOptions);
+
+ expect(result.length).toEqual(1);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should return an item because you are trying parking a shelving and there is an newer item', async() => {
+ const shelving = 'NBB';
+ const parking = 'K-26-2';
+ const itemFk = 1000000;
+
+ const tx = await models.Sector.beginTransaction({});
+ const myOptions = {transaction: tx};
+
+ try {
+ const config = await models.ProductionConfig.findOne();
+ await config.updateAttributes({
+ itemOrderReviewHours: 24,
+ });
+
+ const result = await models.ItemShelving.getItemsByReviewOrder(shelving, parking, itemFk, myOptions);
+
+ expect(result.length).toEqual(1);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should return a item list because you are trying parking a shelving and there is an newer item', async() => {
+ const shelving = 'NCC';
+ const parking = 'K-26-2';
+ const itemFk = 1000000;
+
+ const tx = await models.Sector.beginTransaction({});
+ const myOptions = {transaction: tx};
+
+ try {
+ const config = await models.ProductionConfig.findOne();
+ await config.updateAttributes({
+ itemOrderReviewHours: 24,
+ });
+
+ const result = await models.ItemShelving.getItemsByReviewOrder(shelving, parking, itemFk, myOptions);
+
+ expect(result.length).toEqual(2);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should return empty list because all order is correct', async() => {
+ const shelving = 'NCC';
+ const parking = 'A-01-1';
+ const itemFk = 1000000;
+
+ const tx = await models.Sector.beginTransaction({});
+ const myOptions = {transaction: tx};
+
+ try {
+ const config = await models.ProductionConfig.findOne();
+ await config.updateAttributes({
+ itemOrderReviewHours: 24,
+ });
+
+ const result = await models.ItemShelving.getItemsByReviewOrder(shelving, parking, itemFk, myOptions);
+
+ expect(result.length).toEqual(0);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/item/back/model-config.json b/modules/item/back/model-config.json
index dcd973524..c386a8eaa 100644
--- a/modules/item/back/model-config.json
+++ b/modules/item/back/model-config.json
@@ -56,9 +56,6 @@
"ItemShelving": {
"dataSource": "vn"
},
- "ItemShelvingLog": {
- "dataSource": "vn"
- },
"ItemShelvingSale": {
"dataSource": "vn"
},
diff --git a/modules/item/back/models/item-shelving-log.json b/modules/item/back/models/item-shelving-log.json
deleted file mode 100644
index f976008f1..000000000
--- a/modules/item/back/models/item-shelving-log.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- "name": "ItemShelvingLog",
- "base": "VnModel",
- "mixins": {
- "Loggable": true
- },
- "options": {
- "mysql": {
- "table": "itemShelvingLog"
- }
- },
- "properties": {
- "id": {
- "type": "number",
- "id": true,
- "description": "Identifier"
- },
- "created": {
- "type": "date"
- },
- "shelvingFk": {
- "type": "string"
- },
- "itemFk": {
- "type": "number"
- },
- "visible": {
- "type": "number"
- },
- "accion": {
- "type": "string"
- }
- },
- "relations": {
- "item": {
- "type": "belongsTo",
- "model": "Item",
- "foreignKey": "itemFk"
- },
- "worker": {
- "type": "belongsTo",
- "model": "Worker",
- "foreignKey": "workerFk"
- },
- "shelving": {
- "type": "belongsTo",
- "model": "Shelving",
- "foreignKey": "shelvingFk",
- "primaryKey": "code"
- }
- }
-}
\ No newline at end of file
diff --git a/modules/item/back/models/item-shelving.js b/modules/item/back/models/item-shelving.js
index be72dac37..34e18f23f 100644
--- a/modules/item/back/models/item-shelving.js
+++ b/modules/item/back/models/item-shelving.js
@@ -5,4 +5,5 @@ module.exports = Self => {
require('../methods/item-shelving/getAlternative')(Self);
require('../methods/item-shelving/updateFromSale')(Self);
require('../methods/item-shelving/getListItemNewer')(Self);
+ require('../methods/item-shelving/getItemsByReviewOrder')(Self);
};
diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js
index a0c1fd427..a681ebc83 100644
--- a/modules/monitor/back/methods/sales-monitor/salesFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js
@@ -348,7 +348,6 @@ module.exports = Self => {
'CHECKED',
'PACKING',
'PACKED',
- 'INVOICED',
'ON_DELIVERY',
'PREPARED',
'WAITING_FOR_PICKUP',
@@ -356,10 +355,7 @@ module.exports = Self => {
'PRINTED_BACK',
'LAST_CALL',
'PREVIOUS_PREPARATION',
- 'ASSISTED_PREPARATION',
- 'BOARD',
'PRINTED STOWAWAY',
- 'OK STOWAWAY',
'HALF_PACKED',
'COOLER_PREPARATION'
]}};
diff --git a/modules/route/back/methods/agency-term/filter.js b/modules/route/back/methods/agency-term/filter.js
index 9d1268958..d52d93e95 100644
--- a/modules/route/back/methods/agency-term/filter.js
+++ b/modules/route/back/methods/agency-term/filter.js
@@ -66,9 +66,9 @@ module.exports = Self => {
case 'agencyFk':
return {'agencyFk': value};
case 'from':
- return {'created': {gte: value}};
+ return {'dated': {gte: value}};
case 'to':
- return {'created': {lte: value}};
+ return {'dated': {lte: value}};
}
});
@@ -81,7 +81,7 @@ module.exports = Self => {
`SELECT *
FROM (
SELECT r.id routeFk,
- r.created,
+ r.dated,
r.agencyModeFk,
am.name agencyModeName,
am.agencyFk,
@@ -103,7 +103,7 @@ module.exports = Self => {
LEFT JOIN vn.ticket t ON t.routeFk = r.id
LEFT JOIN vn.supplierAgencyTerm sat ON sat.agencyFk = a.id
LEFT JOIN vn.supplier s ON s.id = sat.supplierFk
- WHERE r.created > DATE_ADD(?, INTERVAL -2 MONTH) AND sat.supplierFk IS NOT NULL
+ WHERE r.dated > DATE_ADD(?, INTERVAL -2 MONTH) AND sat.supplierFk IS NOT NULL
GROUP BY r.id
) a`
, [date]);
diff --git a/modules/route/back/methods/route/clone.js b/modules/route/back/methods/route/clone.js
index d56118e08..c5c4d846a 100644
--- a/modules/route/back/methods/route/clone.js
+++ b/modules/route/back/methods/route/clone.js
@@ -10,10 +10,10 @@ module.exports = Self => {
description: 'The routes ids to clone'
},
{
- arg: 'created',
+ arg: 'dated',
type: 'date',
required: true,
- description: 'The created date for all routes'
+ description: 'The date for all routes'
}
],
returns: {
@@ -26,7 +26,7 @@ module.exports = Self => {
}
});
- Self.clone = async(ids, created) => {
+ Self.clone = async(ids, dated) => {
const tx = await Self.beginTransaction({});
try {
const options = {transaction: tx};
@@ -39,7 +39,7 @@ module.exports = Self => {
throw new Error(`The amount of routes found don't match`);
const routes = originalRoutes.map(route => {
- route.created = created;
+ route.dated = dated;
return route;
});
diff --git a/modules/route/back/methods/route/filter.js b/modules/route/back/methods/route/filter.js
index 925927cc8..70bf7ba67 100644
--- a/modules/route/back/methods/route/filter.js
+++ b/modules/route/back/methods/route/filter.js
@@ -93,9 +93,9 @@ module.exports = Self => {
case 'search':
return {'id': value};
case 'from':
- return {'created': {gte: value}};
+ return {'dated': {gte: value}};
case 'to':
- return {'created': {lte: value}};
+ return {'dated': {lte: value}};
case 'description':
return {'description': {like: `%${value}%`}};
case 'isOk':
@@ -119,7 +119,7 @@ module.exports = Self => {
SELECT
r.id,
r.workerFk,
- r.created,
+ r.dated,
r.vehicleFk,
r.agencyModeFk,
r.time,
diff --git a/modules/route/back/methods/route/getByWorker.js b/modules/route/back/methods/route/getByWorker.js
index 5d1881c20..92086bba0 100644
--- a/modules/route/back/methods/route/getByWorker.js
+++ b/modules/route/back/methods/route/getByWorker.js
@@ -46,14 +46,14 @@ module.exports = Self => {
and: [
{
or: [
- {'created': currentDate},
- {'created': nextDay}
+ {'dated': currentDate},
+ {'dated': nextDay}
]
}
]
},
order: [
- 'created ASC',
+ 'dated ASC',
'time ASC',
'agencyName ASC'
]
diff --git a/modules/route/back/methods/route/getSuggestedTickets.js b/modules/route/back/methods/route/getSuggestedTickets.js
index e1b90d359..daaff2bc8 100644
--- a/modules/route/back/methods/route/getSuggestedTickets.js
+++ b/modules/route/back/methods/route/getSuggestedTickets.js
@@ -43,10 +43,10 @@ module.exports = Self => {
for (let zoneAgencyMode of zoneAgencyModes)
zoneIds.push(zoneAgencyMode.zoneFk);
- const minDate = new Date(route.created);
+ const minDate = new Date(route.dated);
minDate.setHours(0, 0, 0, 0);
- const maxDate = new Date(route.created);
+ const maxDate = new Date(route.dated);
maxDate.setHours(23, 59, 59, 59);
let tickets = await Self.app.models.Ticket.find({
diff --git a/modules/route/back/methods/route/insertTicket.js b/modules/route/back/methods/route/insertTicket.js
index 4ac8bad1a..41c910116 100644
--- a/modules/route/back/methods/route/insertTicket.js
+++ b/modules/route/back/methods/route/insertTicket.js
@@ -42,10 +42,10 @@ module.exports = Self => {
try {
const route = await models.Route.findById(routeId, null, myOptions);
- const minDate = new Date(route.created);
+ const minDate = new Date(route.dated);
minDate.setHours(0, 0, 0, 0);
- const maxDate = new Date(route.created);
+ const maxDate = new Date(route.dated);
maxDate.setHours(23, 59, 59, 59);
const ticket = await models.Ticket.findOne({
where: {
diff --git a/modules/route/back/models/route.json b/modules/route/back/models/route.json
index f8be9023c..8f4eab761 100644
--- a/modules/route/back/models/route.json
+++ b/modules/route/back/models/route.json
@@ -15,7 +15,7 @@
"id": true,
"description": "Identifier"
},
- "created": {
+ "dated": {
"type": "date"
},
"time": {
diff --git a/modules/route/front/descriptor/index.html b/modules/route/front/descriptor/index.html
index 4e7e99f1a..0079168a6 100644
--- a/modules/route/front/descriptor/index.html
+++ b/modules/route/front/descriptor/index.html
@@ -32,7 +32,7 @@
+ value="{{$ctrl.route.dated | date: 'dd/MM/yyyy'}}">
+ value="{{$ctrl.summary.route.dated | date: 'dd/MM/yyyy'}}">
diff --git a/modules/supplier/back/methods/supplier/getWithPackaging.js b/modules/supplier/back/methods/supplier/getWithPackaging.js
index 07e563412..41b080964 100644
--- a/modules/supplier/back/methods/supplier/getWithPackaging.js
+++ b/modules/supplier/back/methods/supplier/getWithPackaging.js
@@ -15,7 +15,7 @@ module.exports = Self => {
Self.getWithPackaging = async options => {
const models = Self.app.models;
const myOptions = {};
- const oneYearAgo = new Date();
+ const oneYearAgo = Date.vnNew();
oneYearAgo.setFullYear(oneYearAgo.getFullYear() - 1);
if (typeof options == 'object')
diff --git a/modules/supplier/back/methods/supplier/specs/getWithPackaging.spec.js b/modules/supplier/back/methods/supplier/specs/getWithPackaging.spec.js
index bd30d7437..b6a780a10 100644
--- a/modules/supplier/back/methods/supplier/specs/getWithPackaging.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/getWithPackaging.spec.js
@@ -1,26 +1,12 @@
const {models} = require('vn-loopback/server/server');
describe('Supplier getWithPackaging()', () => {
+ beforeAll.mockLoopBackContext();
it('should return a list of suppliers with an entry of type packaging', async() => {
- const typeFk = 'packaging';
-
const tx = await models.Supplier.beginTransaction({});
const myOptions = {transaction: tx};
try {
- const entry = await models.Entry.findOne(
- {
- where: {
- id: 1
- },
- myOptions
- });
-
- await entry.updateAttributes({
- typeFk: typeFk,
- created: new Date()
- });
-
const result = await models.Supplier.getWithPackaging(myOptions);
expect(result.length).toEqual(1);
diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index d3e53c702..c61223470 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -265,7 +265,8 @@ module.exports = Self => {
FROM sale s2
JOIN item i2 ON i2.id = s2.itemFk
WHERE s2.ticketFk = t.id
- ) AS packing
+ ) AS packing,
+ c.credit
FROM ticket t
LEFT JOIN invoiceOut io ON t.refFk = io.ref
LEFT JOIN zone z ON z.id = t.zoneFk
diff --git a/modules/travel/back/methods/travel/filter.js b/modules/travel/back/methods/travel/filter.js
index 349553eac..b96873925 100644
--- a/modules/travel/back/methods/travel/filter.js
+++ b/modules/travel/back/methods/travel/filter.js
@@ -154,8 +154,8 @@ module.exports = Self => {
t.landingHour,
t.cargoSupplierFk,
t.totalEntries,
- t.daysInForward,
t.isRaid,
+ t.daysInForward,
am.name agencyModeName,
win.name warehouseInName,
wout.name warehouseOutName,
diff --git a/modules/worker/back/methods/worker-dms/filter.js b/modules/worker/back/methods/worker-dms/filter.js
index 597084e60..240a905d2 100644
--- a/modules/worker/back/methods/worker-dms/filter.js
+++ b/modules/worker/back/methods/worker-dms/filter.js
@@ -86,30 +86,30 @@ module.exports = Self => {
'Tipo Documento': 'description',
'Stored on': 'created',
'Document ID': 'id',
- 'URL': 'download',
+ 'URL': 'url',
'Stored by': 'name',
'Estado': 'state'
};
workerDocuware =
- await models.Docuware.getById('hr', worker.lastName + ' ' + worker.firstName, docuwareParse) ?? [];
- const url = (await Self.app.models.Url.getUrl('docuware')) + 'WebClient';
+ await models.Docuware.getById('hr', worker?.lastName + ' ' + worker?.firstName, docuwareParse) ?? [];
+
for (document of workerDocuware) {
- const docuwareId = document.id;
+ const {id: documentId, dmsFk} = document;
const defaultData = {
- id: docuwareId,
+ id: documentId,
workerFk: id,
- dmsFk: docuwareId,
+ dmsFk: dmsFk,
dms: {
- id: docuwareId,
- file: docuwareId + '.pdf',
+ id: documentId,
+ file: dmsFk + '.pdf',
isDocuware: true,
hasFile: false,
- reference: worker.fi,
- dmsFk: docuwareId,
- url,
+ reference: worker?.fi,
+ dmsFk: dmsFk,
+ url: document.url,
+ download: `WorkerDms/${document.dmsFk}/docuwareDownload`,
description: document.description + ' - ' + document.state,
- download: document.download,
created: document.created,
dmsType: {name: 'Docuware'},
worker: {id: null, user: {name: document.name}},
diff --git a/modules/worker/back/methods/worker-time-control-mail/checkInbox.js b/modules/worker/back/methods/worker-time-control-mail/checkInbox.js
index 4d9f98cc3..688cbb634 100644
--- a/modules/worker/back/methods/worker-time-control-mail/checkInbox.js
+++ b/modules/worker/back/methods/worker-time-control-mail/checkInbox.js
@@ -16,7 +16,7 @@ module.exports = Self => {
});
Self.checkInbox = async() => {
- let imapConfig = await Self.app.models.WorkerTimeControlParams.findOne();
+ let imapConfig = await Self.app.models.WorkerTimeControlConfig.findOne();
let imap = new Imap({
user: imapConfig.mailUser,
password: imapConfig.mailPass,
diff --git a/modules/worker/back/methods/worker/createAbsence.js b/modules/worker/back/methods/worker/createAbsence.js
index 495997f29..e46ce9577 100644
--- a/modules/worker/back/methods/worker/createAbsence.js
+++ b/modules/worker/back/methods/worker/createAbsence.js
@@ -58,19 +58,24 @@ module.exports = Self => {
if (!isSubordinate || (isSubordinate && userId == id && !isTeamBoss))
throw new UserError(`You don't have enough privileges`);
- const canCreateAbsenceInPast = await models.ACL.checkAccessAcl(ctx, 'Worker', 'canCreateAbsenceInPast', 'WRITE');
- const labour = await models.WorkerLabour.findById(args.businessFk, {
- include: {relation: 'department'}
- }, myOptions);
+ const canCreateAbsenceInPast =
+ await models.ACL.checkAccessAcl(ctx, 'Worker', 'canCreateAbsenceInPast', 'WRITE');
+ const now = Date.vnNew();
+ const newDate = new Date(args.dated).getTime();
+
+ if ((now.getTime() > newDate) && !canCreateAbsenceInPast)
+ throw new UserError(`Holidays to past days not available`);
+
+ const labour = await models.WorkerLabour.findById(args.businessFk,
+ {fields: ['started', 'ended', 'businessFk']}, myOptions);
if (args.dated < labour.started || (labour.ended != null && args.dated > labour.ended))
throw new UserError(`The contract was not active during the selected date`);
- query = `SELECT *
- FROM vn.workerTimeControl
- WHERE userFk = ? AND timed BETWEEN DATE(?) AND CONCAT(DATE(?), ' 23:59:59')
- LIMIT 1;`;
- const [hasHoursRecorded] = await Self.rawSql(query, [id, args.dated, args.dated]);
+ const [hasHoursRecorded] = await Self.rawSql(`SELECT *
+ FROM vn.workerTimeControl
+ WHERE userFk = ? AND timed BETWEEN DATE(?) AND CONCAT(DATE(?), ' 23:59:59')
+ LIMIT 1;`, [id, args.dated, args.dated]);
const absenceType = await models.AbsenceType.findById(args.absenceTypeId, null, myOptions);
@@ -82,13 +87,13 @@ module.exports = Self => {
throw new UserError(`The worker has hours recorded that day`);
const date = Date.vnNew();
- const now = Date.vnNew();
date.setHours(0, 0, 0, 0);
const [result] = await Self.rawSql(
`SELECT COUNT(*) halfHolidayCounter
FROM vn.calendar c
JOIN vn.business b ON b.id = c.businessFk
- WHERE c.dayOffTypeFk = 6
+ JOIN vn.absenceType at ON at.id = c.dayOffTypeFk
+ WHERE at.code = 'halfHoliday'
AND b.workerFk = ?
AND c.dated BETWEEN util.firstDayOfYear(?)
AND LAST_DAY(DATE_ADD(?, INTERVAL 12 - MONTH(?) MONTH))`, [id, date, now, now]);
@@ -114,36 +119,29 @@ module.exports = Self => {
if ((holiday && isFestive) && (workCenter.workcenterFk === holiday.workCenterFk))
throw new UserError(`Cannot add holidays on this day`);
- const newDate = new Date(args.dated).getTime();
- const nowDate = now.getTime();
- if ((nowDate > newDate) && !canCreateAbsenceInPast)
- throw new UserError(`Holidays to past days not available`);
-
const absence = await models.Calendar.create({
businessFk: labour.businessFk,
dayOffTypeFk: args.absenceTypeId,
dated: args.dated
}, myOptions);
- const department = labour.department();
- if (department && department.notificationEmail) {
- const absenceType = await models.AbsenceType.findById(args.absenceTypeId, null, myOptions);
- const account = await models.VnUser.findById(userId, null, myOptions);
- const subordinated = await models.VnUser.findById(id, null, myOptions);
- const url = await Self.app.models.Url.getUrl();
- const body = $t('Created absence', {
- author: account.nickname,
- employee: subordinated.nickname,
- absenceType: absenceType.name,
- dated: formatDate(args.dated),
- workerUrl: `${url}worker/${id}/calendar`
- });
- await models.Mail.create({
- subject: $t('Absence change notification on the labour calendar'),
- body: body,
- receiver: department.notificationEmail
- }, myOptions);
- }
+ const account = await models.VnUser.findById(userId, null, myOptions);
+ const subordinated = await models.VnUser.findById(id, null, myOptions);
+ const worker = await models.Worker.findById(subordinated.id, null, myOptions);
+ const departmentBoss = await models.VnUser.findById(worker.bossFk, null, myOptions);
+ const url = await Self.app.models.Url.getUrl();
+ const body = $t('Created absence', {
+ author: account.nickname,
+ employee: subordinated.nickname,
+ absenceType: absenceType.name,
+ dated: formatDate(args.dated),
+ workerUrl: `${url}worker/${id}/calendar`
+ });
+ await models.Mail.create({
+ subject: $t('Absence change notification on the labour calendar'),
+ body: body,
+ receiver: departmentBoss.email
+ }, myOptions);
if (tx) await tx.commit();
diff --git a/modules/worker/back/model-config.json b/modules/worker/back/model-config.json
index 7bfc667ac..10e55d956 100644
--- a/modules/worker/back/model-config.json
+++ b/modules/worker/back/model-config.json
@@ -113,9 +113,6 @@
"WorkerTimeControlConfig": {
"dataSource": "vn"
},
- "WorkerTimeControlParams": {
- "dataSource": "vn"
- },
"WorkerTimeControlMail": {
"dataSource": "vn"
},
@@ -125,6 +122,15 @@
"Locker": {
"dataSource": "vn"
},
+ "WorkerIrpf": {
+ "dataSource": "vn"
+ },
+ "DisabilityGrade": {
+ "dataSource": "vn"
+ },
+ "WorkerRelative": {
+ "dataSource": "vn"
+ },
"MedicalReview": {
"dataSource": "vn"
},
diff --git a/modules/worker/back/models/disability-grade.json b/modules/worker/back/models/disability-grade.json
new file mode 100644
index 000000000..506138225
--- /dev/null
+++ b/modules/worker/back/models/disability-grade.json
@@ -0,0 +1,18 @@
+{
+ "name": "DisabilityGrade",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "disabilityGrade"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number"
+ },
+ "description": {
+ "type": "string"
+ }
+ }
+}
diff --git a/modules/worker/back/models/worker-irpf.json b/modules/worker/back/models/worker-irpf.json
new file mode 100644
index 000000000..65f72a1fd
--- /dev/null
+++ b/modules/worker/back/models/worker-irpf.json
@@ -0,0 +1,55 @@
+{
+ "name": "WorkerIrpf",
+ "description": "Model 145 IRPF",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "workerIrpf"
+ }
+ },
+ "properties": {
+ "workerFk": {
+ "type": "number",
+ "id": 1,
+ "description": "Identifier"
+ },
+ "spouseNif": {
+ "type": "string"
+ },
+ "geographicMobilityDate": {
+ "type": "date"
+ },
+ "disabilityGradeFk": {
+ "type" : "number"
+ },
+ "isDependend": {
+ "type" : "number"
+ },
+ "familySituation": {
+ "type" : "number"
+ },
+ "spousePension": {
+ "type" : "number"
+ },
+ "childPension": {
+ "type" : "number"
+ },
+ "hasHousingPaymentBefore": {
+ "type" : "number"
+ },
+ "hasHousingPaymentAfter": {
+ "type" : "number"
+ },
+ "updated": {
+ "type" : "date"
+ }
+
+ },
+ "relations": {
+ "disabilityGrade": {
+ "type": "belongsTo",
+ "model": "disabilityGrade",
+ "foreignKey": "disabilityGradeFk"
+ }
+ }
+}
diff --git a/modules/worker/back/models/worker-relatives.json b/modules/worker/back/models/worker-relatives.json
new file mode 100644
index 000000000..532a9446c
--- /dev/null
+++ b/modules/worker/back/models/worker-relatives.json
@@ -0,0 +1,53 @@
+{
+ "name": "WorkerRelative",
+ "description": "Model 145 IRPF",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "workerRelatives"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "workerFk": {
+ "type": "number"
+ },
+ "isDescendant": {
+ "type": "number"
+ },
+ "disabilityGradeFk": {
+ "type" : "number"
+ },
+ "birthed": {
+ "type" : "number"
+ },
+ "adoptionYear": {
+ "type" : "number"
+ },
+ "isDependend": {
+ "type" : "boolean"
+ },
+ "isJointCustody": {
+ "type" : "boolean"
+ },
+ "updated": {
+ "type" : "date"
+ }
+ },
+ "relations": {
+ "disabilityGrade": {
+ "type": "belongsTo",
+ "model": "disabilityGrade",
+ "foreignKey": "disabilityGradeFk"
+ },
+ "worker": {
+ "type": "belongsTo",
+ "model": "VnUser",
+ "foreignKey": "workerFK"
+ }
+ }
+}
diff --git a/modules/worker/back/models/worker-time-control-config.json b/modules/worker/back/models/worker-time-control-config.json
index b96e2ae3b..53f1a14ea 100644
--- a/modules/worker/back/models/worker-time-control-config.json
+++ b/modules/worker/back/models/worker-time-control-config.json
@@ -11,6 +11,15 @@
"id": true,
"type": "number"
},
+ "mailPass": {
+ "type": "string"
+ },
+ "mailHost": {
+ "type": "string"
+ },
+ "mailUser": {
+ "type": "string"
+ },
"breakTime": {
"type": "number"
},
@@ -23,5 +32,13 @@
"teleworkingStartBreakTime": {
"type": "number"
}
- }
+ },
+ "acls": [
+ {
+ "accessType": "READ",
+ "principalType": "ROLE",
+ "principalId": "$everyone",
+ "permission": "ALLOW"
+ }
+ ]
}
diff --git a/modules/worker/back/models/worker-time-control-params.json b/modules/worker/back/models/worker-time-control-params.json
deleted file mode 100644
index 14cabbfb0..000000000
--- a/modules/worker/back/models/worker-time-control-params.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "name": "WorkerTimeControlParams",
- "description": "imap config",
- "base": "VnModel",
- "options": {
- "mysql": {
- "table": "workerTimeControlParams"
- }
- },
- "properties": {
- "mailHost": {
- "type": "string"
- },
- "mailUser": {
- "type": "string"
- },
- "mailPass": {
- "type": "string"
- },
- "mailSuccessFolder": {
- "type": "string"
- },
- "mailErrorFolder": {
- "type": "string"
- }
- },
- "acls": [
- {
- "accessType": "READ",
- "principalType": "ROLE",
- "principalId": "$everyone",
- "permission": "ALLOW"
- }
- ]
-}
diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json
index 5c3b95fe6..705851963 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -132,6 +132,16 @@
"type": "hasMany",
"model": "WorkerTimeControlMail",
"foreignKey": "workerFk"
+ },
+ "irpf": {
+ "type": "hasMany",
+ "model": "WorkerIrpf",
+ "foreignKey": "workerFk"
+ },
+ "workerRelative": {
+ "type": "hasMany",
+ "model": "WorkerRelative",
+ "foreignKey": "workerFK"
}
},
"acls": [
@@ -317,4 +327,4 @@
]
}
}
-}
\ No newline at end of file
+}
diff --git a/myt.config.yml b/myt.config.yml
index 25f94f1bd..209686fd4 100755
--- a/myt.config.yml
+++ b/myt.config.yml
@@ -258,7 +258,6 @@ localFixtures:
- itemFamily
- itemLog
- itemShelving
- - itemShelvingLog
- itemShelvingSale
- itemTag
- itemTaxCountry
@@ -385,7 +384,6 @@ localFixtures:
- workerTimeControl
- workerTimeControlConfig
- workerTimeControlMail
- - workerTimeControlParams
- zone
- zoneAgencyMode
- zoneClosure
diff --git a/package.json b/package.json
index d36360498..ef1dd8f89 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "salix-back",
- "version": "24.48.0",
+ "version": "24.50.0",
"author": "Verdnatura Levante SL",
"description": "Salix backend",
"license": "GPL-3.0",
diff --git a/print/templates/reports/driver-route/driver-route.html b/print/templates/reports/driver-route/driver-route.html
index 109afd2f5..e3a206656 100644
--- a/print/templates/reports/driver-route/driver-route.html
+++ b/print/templates/reports/driver-route/driver-route.html
@@ -16,7 +16,7 @@
| {{$t('date')}} |
- {{formatDate(route.created, '%d-%m-%Y')}} |
+ {{formatDate(route.dated, '%d-%m-%Y')}} |
{{$t('vehicle')}} |
{{route.vehicleTradeMark}} {{route.vehicleModel}} |
diff --git a/print/templates/reports/driver-route/sql/routes.sql b/print/templates/reports/driver-route/sql/routes.sql
index 9d2dd5c13..334f2337d 100644
--- a/print/templates/reports/driver-route/sql/routes.sql
+++ b/print/templates/reports/driver-route/sql/routes.sql
@@ -1,6 +1,6 @@
SELECT r.id,
r.m3,
- r.created,
+ r.dated,
r.time,
u.nickName userNickName,
v.tradeMark vehicleTradeMark,
diff --git a/print/templates/reports/expedition-pallet-label/sql/labelData.sql b/print/templates/reports/expedition-pallet-label/sql/labelData.sql
index 49a4031ae..5ddf8eb6e 100644
--- a/print/templates/reports/expedition-pallet-label/sql/labelData.sql
+++ b/print/templates/reports/expedition-pallet-label/sql/labelData.sql
@@ -4,7 +4,7 @@ SELECT ep.id palletFk,
r.description `zone`,
COUNT(es.id) labels,
t.warehouseFk warehouseFk,
- dayname(r.created) `dayName`,
+ dayname(r.dated) `dayName`,
rs.id <=> rm.roadmapStopFk isMatch
FROM vn.roadmapStop rs
JOIN vn.expeditionPallet ep ON ep.truckFk = rs.id