Skip to content

Commit 52469f3

Browse files
committed
feate: sort WP inside RB by startDate for comfort
1 parent 09d3636 commit 52469f3

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

src/services/ResourceBookingService.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,13 @@ async function searchResourceBookings (currentUser, criteria, options = { return
613613
})
614614
})
615615

616+
// sort Work Periods inside Resource Bookings by startDate just for comfort output
617+
_.each(resourceBookings, r => {
618+
if (_.isArray(r.workPeriods)) {
619+
r.workPeriods = _.sortBy(r.workPeriods, ['startDate'])
620+
}
621+
})
622+
616623
return {
617624
total: body.hits.total.value,
618625
page,
@@ -676,6 +683,12 @@ async function searchResourceBookings (currentUser, criteria, options = { return
676683
queryCriteria.order = [[{ model: WorkPeriod, as: 'workPeriods' }, _.split(criteria.sortBy, '.')[1], `${criteria.sortOrder} NULLS LAST`]]
677684
}
678685
const result = await ResourceBooking.findAll(queryCriteria)
686+
// sort Work Periods inside Resource Bookings by startDate just for comfort output
687+
_.each(result, r => {
688+
if (_.isArray(r.workPeriods)) {
689+
r.workPeriods = _.sortBy(r.workPeriods, ['startDate'])
690+
}
691+
})
679692
let countQuery
680693
countQuery = _.omit(queryCriteria, ['limit', 'offset', 'attributes', 'order'])
681694
if (queryOpt.withWorkPeriods && !queryCriteria.include[0].required) {

0 commit comments

Comments
 (0)