Skip to content

Commit 606135e

Browse files
author
Hans-Martin Schuller
committed
filter by kurs_anmfrist and check for bookable status
1 parent 735d77d commit 606135e

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

server/service/CoursesService.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,13 @@ exports.coursesLastminuteGET = function() {
230230
Courses
231231
.forge()
232232
.query(function(qb) {
233-
qb.whereBetween('KURS_BEGINN', [moment().format('YYYY-MM-DD'), moment().add(6, 'weeks').format('YYYY-MM-DD')]);
233+
qb.whereBetween('KURS_ANMFRIST', [moment().format('YYYY-MM-DD'), moment().add(6, 'weeks').format('YYYY-MM-DD')]);
234234
})
235235
.fetchAll({withRelated: ["applications"]})
236236
.then((courses) => {
237237
resolve(courses
238238
.filter(item => item.related('applications').toJSON().length < item.attributes.KURS_TEIL_MAX)
239+
.filter(item => item.attributes.KURS_KURSSTAT_ID === 3)
239240
.map(item => item.attributes)
240241
)
241242
})

server/utils/sampleData.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ exports.coursesForLastMinute = () => [
165165
eingegeben_am_datum: "2018-01-01",
166166
eingegeben_am_zeit: "00:00:00",
167167
datenhistory: "Daten History",
168-
kurs_beginn: moment().add(5, 'weeks').format("YYYY-MM-DD"),
168+
kurs_beginn: moment().add(7, 'weeks').format("YYYY-MM-DD"),
169+
kurs_anmfrist: moment().add(5, 'weeks').format("YYYY-MM-DD"),
169170
kurs_beginn_uhrzeit: "20:15:00",
170171
kurs_teil_min: 1,
171172
kurs_teil_max: 2
@@ -189,8 +190,10 @@ exports.coursesForLastMinute = () => [
189190
eingegeben_am_datum: "2018-01-01",
190191
eingegeben_am_zeit: "00:00:00",
191192
datenhistory: "Daten History",
192-
kurs_beginn: moment().add(5, 'weeks').format("YYYY-MM-DD"),
193+
kurs_beginn: moment().add(7, 'weeks').format("YYYY-MM-DD"),
194+
kurs_anmfrist: moment().add(5, 'weeks').format("YYYY-MM-DD"),
193195
kurs_beginn_uhrzeit: "20:15:00",
196+
kurs_kursstat_id: 3,
194197
kurs_teil_min: 6,
195198
kurs_teil_max: 10,
196199
}

0 commit comments

Comments
 (0)