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

Merge branch 'dev' into 7343-modifyDriverRouteEmail
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Ivan Mas 2025-01-08 12:16:01 +00:00
parent 0940a31288 f1b45a3903
commit 14b88b1ad6
4 changed files with 19 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
back/methods/collection/getTickets.js
View File

@ -40,6 +40,7 @@ module.exports = Self => {
const sales = await Self.rawSql(`
SELECT s.ticketFk,
NULL ticketOrder,
sgd.saleGroupFk,
s.id saleFk,
s.itemFk,
@ -83,6 +84,7 @@ module.exports = Self => {
GROUP BY s.id, ish.id, p.code, p2.code
UNION ALL
SELECT s.ticketFk,
DENSE_RANK() OVER (ORDER BY ss.id),
sgd.saleGroupFk,
s.id saleFk,
s.itemFk,

29
modules/worker/back/methods/worker-time-control/sendMail.js
View File

@ -41,22 +41,10 @@ module.exports = Self => {
const stmts = [];
let stmt;
if (!args.week || !args.year) {
const from = Date.vnNew();
const to = Date.vnNew();
const {date: started, week, year} = Self.getMondayWeekYear(args.week, args.year);
args.week = week;
args.year = year;
const time = await models.Time.findOne({
where: {
dated: {between: [from.setDate(from.getDate() - 10), to.setDate(to.getDate() - 4)]}
},
order: 'week ASC'
}, myOptions);
args.week = time.week;
args.year = time.year;
}
const started = getStartDateOfWeekNumber(args.week, args.year);
started.setHours(0, 0, 0, 0);
const ended = new Date(started);
@ -388,17 +376,6 @@ module.exports = Self => {
return true;
};
function getStartDateOfWeekNumber(week, year) {
const simple = new Date(year, 0, 1 + (week - 1) * 7);
const dow = simple.getDay();
const weekStart = simple;
if (dow <= 4)
weekStart.setDate(simple.getDate() - simple.getDay() + 1);
else
weekStart.setDate(simple.getDate() + 8 - simple.getDay());
return weekStart;
}
function getTime(timeString) {
const [hours, minutes, seconds] = timeString.split(':');
return [parseInt(hours), parseInt(minutes), parseInt(seconds)];

23
modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js
View File

@ -55,8 +55,8 @@ module.exports = Self => {
}
}, myOptions);
const dated = getMondayDateFromYearWeek(args.year, args.week);
const timestamp = dated.getTime() / 1000;
const {date} = Self.getMondayWeekYear(args.week, args.year);
const timestamp = date.getTime() / 1000;
const url = `${salix.url}worker/${args.workerId}/time-control?timestamp=${timestamp}`;
ctx.args.url = url;
@ -64,23 +64,4 @@ module.exports = Self => {
await models.WorkerTimeControl.updateMailState(ctx, ctx.args.workerId, myOptions);
return Self.sendTemplate(ctx, 'weekly-hour-record');
};
function getMondayDateFromYearWeek(yearNumber, weekNumber) {
const yearStart = new Date(yearNumber, 0, 1);
const firstMonday = new Date(yearStart.getTime() + ((7 - yearStart.getDay() + 1) % 7) * 86400000);
const firstMondayWeekNumber = getWeekNumber(firstMonday);
if (firstMondayWeekNumber > 1)
firstMonday.setDate(firstMonday.getDate() + 7);
firstMonday.setDate(firstMonday.getDate() + (weekNumber - 1) * 7);
return firstMonday;
}
function getWeekNumber(date) {
const firstDayOfYear = new Date(date.getFullYear(), 0, 1);
const daysPassed = (date - firstDayOfYear) / 86400000;
return Math.ceil((daysPassed + firstDayOfYear.getDay() + 1) / 7);
}
};

12
modules/worker/back/models/worker-time-control.js
View File

@ -1,4 +1,5 @@
const UserError = require('vn-loopback/util/user-error');
const moment = require('moment');
module.exports = Self => {
require('../methods/worker-time-control/filter')(Self);
@ -19,4 +20,15 @@ module.exports = Self => {
return new UserError(`The introduced hour already exists`);
return err;
});
Self.getMondayWeekYear = (week, year) => {
if (!week || !year) {
const today = Date.vnNew();
today.setDate(today.getDate() - 7);
week = moment(today).isoWeek();
year = moment(today).isoWeekYear();
}
const date = moment(year, 'YYYY').week(week).startOf('isoweek').toDate();
return {date, year, week};
};
};