Skip to content

Added a Location field for every single event listing #1546

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

Open
wants to merge 50 commits into
base: development
Choose a base branch
from
Open

Added a Location field for every single event listing #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
91a87eb
Added the field for location in HTML only
BesherKitaz Jun 24, 2025
79aa76d
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
BesherKitaz Jun 24, 2025
cfcf2d3
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
BesherKitaz Jun 25, 2025
766a9b2
Fixed the location field in the create event form to disappear when t…
Jonimz Jun 25, 2025
490a580
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
Jonimz Jun 25, 2025
eb96c79
Now it is mandatory to enter a name before toggling the multi offerin…
BesherKitaz Jun 26, 2025
c9894f5
Resolving conflict
BesherKitaz Jun 26, 2025
96a49bc
Added location field for weekly event offerings modal.
BesherKitaz Jun 26, 2025
d051849
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
BesherKitaz Jun 26, 2025
4c5559b
Location field moved to the modal for weekly events
BesherKitaz Jun 28, 2025
8610ab6
Added the eventLocation
PuskarC Jun 30, 2025
15fddfc
fixed the location error
Jonimz Jul 1, 2025
e01f7d7
added event location
Jonimz Jul 1, 2025
837e16c
Merge branch 'development' into locationFieldChange
Karina-Agliullova Jul 2, 2025
bbe4ee8
Fixed the issue for Location in the Modal
PuskarC Jul 2, 2025
185960a
Fixed the Event Location
PuskarC Jul 2, 2025
101a9df
We fixed the location field in multiple offering so that it shows up…
Jonimz Jul 3, 2025
986c38b
Removed some non-essential code, used .hide() and .show() instead of …
PuskarC Jul 3, 2025
3abb92a
Fixed the table issue
PuskarC Jul 8, 2025
0966a6a
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
Jonimz Jul 8, 2025
c755d4e
Merge branch 'locationFieldChange' of https://github.com/BCStudentSof…
Jonimz Jul 8, 2025
21be475
Removed the flash messages from the main event page based on Karina's…
Jonimz Jul 8, 2025
2ccb1f1
Replace flash messages with input focus on validation failure
Jonimz Jul 8, 2025
2a759bc
Using a combination of hide/show and addClass/removeClass
PuskarC Jul 9, 2025
2491d9f
Assigning a variable in front of eventSessionNum
PuskarC Jul 9, 2025
e072911
Removed the student users ability to create event
PuskarC Jul 9, 2025
a6ac5cf
Add missing semicolons and clean up indentation and formatting
PuskarC Jul 9, 2025
5d7f8fe
prefill event name and location from main input
PuskarC Jul 9, 2025
7c5e4fb
Merge branch 'development' into locationFieldChange
Karina-Agliullova Jul 10, 2025
52dbcfc
removed the debug output
Jonimz Jul 17, 2025
540bd02
Removed another debug out put
Jonimz Jul 17, 2025
f4b03d4
add input handling for name, location, and dates
Jonimz Jul 17, 2025
fb03c6c
set 7-second timer for repeating event updates
Jonimz Jul 18, 2025
fccccb8
Change passing location as a list to a string
Jonimz Jul 18, 2025
a23aa23
set the timer to 7 secs instead of 3
Jonimz Jul 18, 2025
8d3aa8d
fixed merge conflict
Jonimz Jul 20, 2025
fd21a5f
fixed merge conflict
Jonimz Jul 20, 2025
2f6e925
changed the timer to 3000 milliseconds
Jonimz Jul 20, 2025
620728b
fixed Assertion Issue in the test
Jonimz Jul 21, 2025
73d0d2c
fixed indentation
Jonimz Jul 21, 2025
f418eb0
fixed else statement
Jonimz Jul 21, 2025
799f1fb
Merge branch 'development' into locationFieldChange
Karina-Agliullova Jul 22, 2025
a4021c7
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
MImran2002 Oct 8, 2025
cb6d5c3
merging into main
MImran2002 Oct 8, 2025
8bf8069
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
MImran2002 Oct 9, 2025
d01f436
Merge branch 'locationFieldChange' of https://github.com/BCStudentSof…
MImran2002 Oct 9, 2025
f6fd5b1
Merge branch 'locationFieldChange' of https://github.com/BCStudentSof…
MImran2002 Oct 9, 2025
71de251
Merge branch 'locationFieldChange' of https://github.com/BCStudentSof…
MImran2002 Oct 9, 2025
9e51a9d
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
MImran2002 Oct 9, 2025
d1faf52
Merge branch 'locationFieldChange' of https://github.com/BCStudentSof…
MImran2002 Oct 9, 2025
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
7 changes: 5 additions & 2 deletions app/logic/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,9 @@ def attemptSaveMultipleOfferings(eventData, attachmentFiles = None):
'startDate': event['eventDate'],
'timeStart': event['startTime'],
'timeEnd': event['endTime'],
'location': eventData['location'],
'seriesId': seriesId,
'isRepeating': bool(isRepeating)
'isRepeating': bool(isRepeating),
})
# Try to save each offering
savedEvents, validationErrorMessage = attemptSaveEvent(eventInfo, attachmentFiles)
Expand Down Expand Up @@ -456,7 +457,9 @@ def getRepeatingEventsData(eventData):

return [ {'name': f"{eventData['name']} Week {counter+1}",
'date': eventData['startDate'] + timedelta(days=7*counter),
"week": counter+1}
"week": counter+1,
'location': eventData['location']
}
for counter in range(0, ((eventData['endDate']-eventData['startDate']).days//7)+1)]

def preprocessEventData(eventData):
Expand Down
Loading
Loading