Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update event times for scanning and on landing page #39

Merged
merged 6 commits into from
Nov 3, 2023
Merged

Update event times for scanning and on landing page #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1813daf
Update event times for scanning and on landing page
Mustaballer Nov 3, 2023
ae6b360
update lunch1 time
Mustaballer Nov 3, 2023
dcfd5eb
Update landing.html
thomaslin2020 Nov 3, 2023
03e2c3e
Update __init__.py
thomaslin2020 Nov 3, 2023
e27722b
increase intervals for qr code scanning events
Mustaballer Nov 3, 2023
9872075
Merge branch 'update-event-times' of github.com:ieeeuoft/newhacks-sit…
Mustaballer Nov 3, 2023
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
4 changes: 2 additions & 2 deletions hackathon_site/event/jinja2/event/landing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ <h4 class="white-text" style="text-align:center; flex-grow:1;">
</p>
</div>
<div class="scheduleRow">
<p class="lightText scheduleTime">12PM</p>
<p class="lightText scheduleTime">12:30PM</p>
<p class="white-text" style="text-align:center; flex-grow:1;">
Lunch
</p>
Expand Down Expand Up @@ -162,7 +162,7 @@ <h4 class="white-text" style="text-align:center; flex-grow:1;">
<p class="white-text" style="text-align:center; flex-grow:1;"><strong>Hacking Ends!</strong></p>
</div>
<div class="scheduleRow">
<p class="lightText scheduleTime">11AM</p>
<p class="lightText scheduleTime">11:45PM</p>
<p class="white-text" style="text-align:center; flex-grow:1;">Lunch</p>
</div>
<div class="scheduleRow">
Expand Down
10 changes: 5 additions & 5 deletions hackathon_site/hackathon_site/settings/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,27 +332,27 @@
{
"name": "sign_in",
"description": "Hackathon Sign In",
"time": datetime(2023, 2, 18, 9, 50, 0, tzinfo=TZ_INFO), # Oct 10th @ 11am
"time": datetime(2023, 11, 4, 9, 0, 0, tzinfo=TZ_INFO), # Nov 4th @ 9am
},
{
"name": "lunch1",
"description": "Lunch Day 1",
"time": datetime(2023, 2, 18, 14, 0, 0, tzinfo=TZ_INFO), # Oct 10th @ 2pm
"time": datetime(2023, 11, 4, 12, 30, 0, tzinfo=TZ_INFO), # Nov 4th @ 12:30pm
},
{
"name": "dinner1",
"description": "Dinner Day 1",
"time": datetime(2023, 2, 18, 19, 0, 0, tzinfo=TZ_INFO), # Oct 10th @ 6pm
"time": datetime(2023, 11, 4, 18, 0, 0, tzinfo=TZ_INFO), # Nov 4th @ 6pm
},
{
"name": "breakfast2",
"description": "Breakfast Day 2",
"time": datetime(2023, 2, 19, 9, 0, 0, tzinfo=TZ_INFO), # Oct 11th @ 9am
"time": datetime(2023, 11, 5, 8, 0, 0, tzinfo=TZ_INFO), # Nov 5th @ 8am
},
{
"name": "lunch2",
"description": "Lunch Day 2",
"time": datetime(2023, 2, 19, 13, 0, 0, tzinfo=TZ_INFO), # Oct 11th @ 12pm
"time": datetime(2023, 11, 5, 11, 45, 0, tzinfo=TZ_INFO), # Nov 5th @ 11:45pm
},
]

Expand Down
2 changes: 1 addition & 1 deletion hackathon_site/hackathon_site/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def get_curr_sign_in_time(use_description=False, return_exception=False):
# assumes interval won't overlap between different months or years
def get_sign_in_interval(time):
start_interval = time - relativedelta(hours=1)
end_interval = time + relativedelta(hours=1)
end_interval = time + relativedelta(hours=2)

if start_interval.day == end_interval.day:
return f"{start_interval.strftime('%H:%M')} - {end_interval.strftime('%H:%M')}, {start_interval.strftime('%b %d')}"
Expand Down