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 = ( diff --git a/huxley/www/js/text/checklists/DelegateChecklistWaiverTextBeforeAvailable.md b/huxley/www/js/text/checklists/DelegateChecklistWaiverTextBeforeAvailable.md new file mode 100644 index 00000000..d0ec1444 --- /dev/null +++ b/huxley/www/js/text/checklists/DelegateChecklistWaiverTextBeforeAvailable.md @@ -0,0 +1,5 @@ +All delegates are required to turn in a medical and media release waiver prior to attending conference. Waiver completion is due on **{{ waiverDeadline }}**. The waiver is not yet available, but will be available here on **{{ waiverAvail }}**. + +IMPORTANT: Any waiver submissions prior to **{{ waiverAvail }}** will be considered invalid, and you will need to submit another waiver on or after **{{ waiverAvail }}**. + +This checklist item is updated manually by BMUN's Under-Secretary-General of External Relations, {{ conferenceExternal }}, every non-holiday Wednesday and Sunday night on a rolling basis. If you have submitted a waiver electronically and this item has not been checked, please contact info@bmun.org. \ No newline at end of file diff --git a/huxley/www/js/text/checklists/DelegateChecklistWaiverText.md b/huxley/www/js/text/checklists/DelegateChecklistWaiverTextWhenAvailable.md similarity index 100% rename from huxley/www/js/text/checklists/DelegateChecklistWaiverText.md rename to huxley/www/js/text/checklists/DelegateChecklistWaiverTextWhenAvailable.md diff --git a/package.json b/package.json index c8e4c1ee..9693e0f4 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "less": "^4.1.0", "less-loader": "^7.2.1", "markdown-loader": "^6.0.0", - "mini-css-extract-plugin": "^1.3.3", + "mini-css-extract-plugin": "^1.6.2", "path-browserify": "^1.0.1", "prettier": "^2.2.1", "stream-browserify": "^3.0.0",