Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion huxley/settings/conference.py
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's remove this from commit, since I assume locally you had to use 69. Our prod is on 70 right now

17 changes: 16 additions & 1 deletion huxley/www/js/components/DelegateProfileView.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down Expand Up @@ -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 = (
<table>
<thead>
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a specific reason this version upgrade was needed? If it doesn't affect functionality and passes the unit tests, it should be fine though.

"path-browserify": "^1.0.1",
"prettier": "^2.2.1",
"stream-browserify": "^3.0.0",
Expand Down