Skip to content

Commit 58f0ac9

Browse files
dominikglandorfflorianschmidt1994
authored andcommitted
#289: check if new sponsorings are allowed for event
1 parent f450357 commit 58f0ac9

File tree

5 files changed

+160
-149
lines changed

5 files changed

+160
-149
lines changed

src/client/js/sponsoring.js

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -111,23 +111,6 @@ $(document).ready(() => {
111111

112112
});
113113

114-
$('#bo-add-challenge-model-btn').click((e) => {
115-
alert('Eintragen von Sponsoren ist nach dem Event nicht mehr möglich');
116-
e.stopImmediatePropagation();
117-
});
118-
119-
120-
$('#bo-add-sponsoring-model-btn').click((e) => {
121-
alert('Eintragen von Challenges ist nach dem Event nicht mehr möglich');
122-
e.stopImmediatePropagation();
123-
});
124-
125-
$('#bo-add-offline-sponsoring-model-btn').click((e) => {
126-
alert('Eintragen von Sponsoren ist nach dem Event nicht mehr möglich');
127-
e.stopImmediatePropagation();
128-
});
129-
130-
131114
$('#editSponsoringModal').submit(function (e) {
132115
e.preventDefault();
133116
if (sanityCheck('editSponsoringModal')) {

src/common/resources/translations/translations.de.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,8 @@ module.exports = {
368368
"STATUS_WITHDRAWN": "Zurückgezogen",
369369
"LABEL_EMAIL": "Emailadresse des Sponsors (optional)",
370370
"ESTIMATED_DONATE_PROMISE": "Geschätztes Spendenversprechen",
371-
"SELECT_TEAM": "Team auswählen"
371+
"SELECT_TEAM": "Team auswählen",
372+
'NO_NEW_SPONSORINGS': 'Momentan können keine Sponsorings eingetragen werden.'
372373
},
373374
"CLOSED": {
374375
"HEADLINE": "Anmeldung geschlossen",

src/common/resources/translations/translations.en.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,8 @@ module.exports = {
368368
"STATUS_WITHDRAWN": "Withdrawn",
369369
"LABEL_EMAIL": "Email address of sponsor (optional)",
370370
"ESTIMATED_DONATE_PROMISE": "Estimated donate promise",
371-
"SELECT_TEAM": "Select team"
371+
"SELECT_TEAM": "Select team",
372+
"NO_NEW_SPONSORINGS": "At the moment it is not possible to add a sponsoring."
372373
},
373374
"CLOSED": {
374375
"HEADLINE": "Registration closed",

src/server/controller/SponsoringController.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,23 +54,24 @@ sponsoring.showSponsorings = function*(req, res) {
5454
let outSponsoring = [];
5555
let outChallenges = [];
5656
let confirmedDonations = [];
57-
//INCOMING
57+
let teams = [];
5858

59+
//INCOMING
5960
if (req.user.status.is.team) {
6061
incSponsoring = yield sponsoring.getByTeam(req);
6162
incChallenges = yield sponsoring.challenge.getByTeam(req);
6263
confirmedDonations = yield sponsoring.invoice.getByTeam(req);
64+
req.user.me.participant.event = yield api.event.get(req.user.me.participant.eventId);
6365
}
6466

6567
//OUTGOING
6668
if (req.user.status.is.sponsor) {
6769
outSponsoring = yield sponsoring.getBySponsor(req);
6870
outChallenges = yield sponsoring.challenge.getBySponsor(req);
71+
teams = yield sponsoring.getAllTeamsSummary(req);
72+
teams = teams.filter(team => team.eventAllowNewSponsoring);
6973
}
7074

71-
72-
const teams = yield sponsoring.getAllTeamsSummary(req);
73-
7475
res.render('dynamic/sponsoring/sponsoring', {
7576
error: req.flash('error'),
7677
layout: 'master',

0 commit comments

Comments
 (0)