diff --git a/huxley/settings/conference.py b/huxley/settings/conference.py index cba398b3..768a7d8a 100644 --- a/huxley/settings/conference.py +++ b/huxley/settings/conference.py @@ -1,3 +1,3 @@ # Copyright (c) 2011-2022 Berkeley Model United Nations. All rights reserved. # Use of this source code is governed by a BSD License (see LICENSE). -SESSION = 70 +SESSION = 69 diff --git a/huxley/www/js/components/DelegateProfileView.js b/huxley/www/js/components/DelegateProfileView.js index 4b7f9236..321ec280 100644 --- a/huxley/www/js/components/DelegateProfileView.js +++ b/huxley/www/js/components/DelegateProfileView.js @@ -20,7 +20,8 @@ require("css/Table.less"); const DelegateProfileViewText = require("text/DelegateProfileViewText.md"); const DelegateChecklistPositionPaperText = require("text/checklists/DelegateChecklistPositionPaperText.md"); -const DelegateChecklistWaiverText = require("text/checklists/DelegateChecklistWaiverText.md"); +const DelegateChecklistWaiverTextWhenAvailable = require("text/checklists/DelegateChecklistWaiverTextWhenAvailable.md"); +const DelegateChecklistWaiverTextBeforeAvailable = require("text/checklists/DelegateChecklistWaiverTextBeforeAvailable.md"); const DelegateProfileNoZoomViewText = require("text/DelegateProfileNoZoomViewText.md"); // const DelegateProfileZoomViewText = require("text/DelegateProfileZoomViewText.md"); @@ -80,6 +81,20 @@ class DelegateProfileView extends React.Component { waiverCheck = "\u2610"; } + const d = new Date(); + let currentMonth = d.getMonth() + 1; + let currentDate = d.getDate(); + let waiverAvailability = global.conference.waiver_avail_date.split("/"); + let availabilityMonth = waiverAvailability[0] + let availabilityDate = waiverAvailability[1] + + if (currentMonth >= availabilityMonth && currentDate >= availabilityDate) { + var DelegateChecklistWaiverText = DelegateChecklistWaiverTextWhenAvailable + } + else { + var DelegateChecklistWaiverText = DelegateChecklistWaiverTextBeforeAvailable + } + var checklist = (