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.

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

Dev to Prod 12/11 #1365

Open
wants to merge 386 commits into
base: production
Choose a base branch
from
Open
Changes from 8 commits
Commits
Show all changes
386 commits
Select commit Hold shift + click to select a range
651a9c5
Merge branch 'development' of github.com:BCStudentSoftwareDevTeam/cel…
bledsoef Oct 3, 2024
3b62689
Merge branch 'BCI1' of github.com:BCStudentSoftwareDevTeam/celts into…
bledsoef Oct 3, 2024
7c52974
James, changed instances of isRecurring to isRepeating, and it works.…
ojmakinde Oct 3, 2024
01f0b78
Anna, replaced all 'recurring' with 'repeating', nothing broke in Man…
vungc Oct 3, 2024
986f9d3
Anna, changed more instances of 'recurring' to 'repeating' on view ne…
vungc Oct 3, 2024
3d41f61
Anna, undo works for all event types. There is an issue with renaming…
vungc Oct 3, 2024
0e89c88
Anna, reorganized and deleted commented code
vungc Oct 3, 2024
db7e121
Anna, failed to fix delete function. Added a note on the issue
vungc Oct 3, 2024
616aa8c
Bonner Cohort checkbox fixed + merge conflict
doucoureb Oct 4, 2024
0842823
pr modifications
doucoureb Oct 9, 2024
29c825f
Merge branch 'development' into serviceTEntry658
bledsoef Oct 11, 2024
1f9a4e4
added a new column to user profile
bledsoef Oct 14, 2024
716a677
Anna, started replacing recurring with repeating and got rid of isMul…
vungc Oct 14, 2024
a03abc4
Anna, working on tests
vungc Oct 15, 2024
54afc6b
Fixed duplicate catching for creating events
ojmakinde Oct 15, 2024
78a464d
Fixed test
ojmakinde Oct 15, 2024
b51d7bf
Removed recurringId and multipleOfferingId from DB
ojmakinde Oct 15, 2024
b1e0a7d
Merge branch 'development' into serviceTEntry658
bledsoef Oct 17, 2024
d4078be
Ready for PR
Oct 18, 2024
ad755ca
Wrote DB Script
ojmakinde Oct 20, 2024
d0e1dfa
???
ojmakinde Oct 21, 2024
750a8df
Anna, deleted the headings for edit and transcript and made the check…
vungc Oct 21, 2024
d67199f
Anna, changed edit into pencil icon and moved it next to eligibility …
vungc Oct 22, 2024
ca94830
Anna, checkbox in ban modal is checked by default. Still need to make…
vungc Oct 22, 2024
3e6b824
Completed base script
ojmakinde Oct 23, 2024
7b88661
Merge branch 'development' of github.com:BCStudentSoftwareDevTeam/cel…
ojmakinde Oct 23, 2024
9e07fca
Correctly merged 'Past Start Date' into current logic
ojmakinde Oct 23, 2024
3cb7d96
Removed comments
ojmakinde Oct 23, 2024
2a658a2
Changing name fields of multiple offerings in html + js
ojmakinde Oct 23, 2024
ba89502
Trivial HTML + JS name changes
ojmakinde Oct 24, 2024
20c4865
Merge branch 'development' of github.com:BCStudentSoftwareDevTeam/cel…
ojmakinde Oct 24, 2024
a6e3aee
Updated SQL script
ojmakinde Oct 24, 2024
8469369
Merge branch 'development' into refactorProgramMgmt
bledsoef Oct 25, 2024
494e21f
Merge branch 'development' of github.com:BCStudentSoftwareDevTeam/cel…
ojmakinde Oct 29, 2024
d0a825b
invitation cohort attempt
doucoureb Oct 29, 2024
6ef35d2
pr test
doucoureb Oct 31, 2024
c1051fd
Fixed final saving errors and finalized development merge
ojmakinde Oct 31, 2024
b951929
fixed crappy merge conflicts that were preventing the database from r…
bledsoef Oct 31, 2024
06c6d26
Merge branch 'development' of github.com:BCStudentSoftwareDevTeam/cel…
bledsoef Oct 31, 2024
1428cf2
Fixed failing tests.
ojmakinde Nov 1, 2024
23adc8c
Trivial spacing change
ojmakinde Nov 1, 2024
2cee41f
fixed the text blur and size of program settings modal
WackyWeaver Nov 1, 2024
9b4f88a
added all program photos with id
WackyWeaver Nov 1, 2024
0ef65d2
fixed unit landingPage unit test
WackyWeaver Nov 1, 2024
b2cc118
removed coverImage field and fixed unit tests
WackyWeaver Nov 1, 2024
f42411e
pr test
doucoureb Nov 4, 2024
6530720
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
vungc Nov 5, 2024
a082dd1
Address slight UI changes
ojmakinde Nov 5, 2024
7ecbb6c
Address slight UI changes
ojmakinde Nov 5, 2024
9df1778
Merge branch 'Repeating-Events-Implementation-Clean-Slate' of https:/…
vungc Nov 5, 2024
84d6cc0
Anna, added required stars and spacing in repeating events modal
vungc Nov 5, 2024
ecde1f6
Fixed UI bug
ojmakinde Nov 5, 2024
0e722f3
test_image addedq
WackyWeaver Nov 5, 2024
6fec1f8
test_image added
WackyWeaver Nov 5, 2024
07a4b84
UI oversight fix
ojmakinde Nov 6, 2024
32ea25b
created a sql script and updated file handler logic
bledsoef Nov 6, 2024
ad19716
fixed sql script
bledsoef Nov 6, 2024
88deb54
updated image directory and got landing page properly displaying
bledsoef Nov 6, 2024
f0fde03
Anna, removeFromTranscript status can now be saved into the table as …
vungc Nov 6, 2024
351ef38
Fixed date validation for multiple offering + Added validation for st…
ojmakinde Nov 7, 2024
41c076f
moved the images to a new location
bledsoef Nov 7, 2024
e748af3
changed upload image verbage
bledsoef Nov 7, 2024
b0e8f7c
replaces selected image in program modal
WackyWeaver Nov 7, 2024
b7e9ebe
worked on file handler for program attachments
bledsoef Nov 7, 2024
0532b1f
removed some suspect code
bledsoef Nov 7, 2024
c9c2b50
Added conditional readonly to name field to improve UI
ojmakinde Nov 7, 2024
1cd75cd
pr test 1
doucoureb Nov 8, 2024
231a773
Merge branch 'BCI1' of github.com:BCStudentSoftwareDevTeam/celts into…
bledsoef Nov 8, 2024
619c0dd
Fixed toggle error with blurring the name field
ojmakinde Nov 8, 2024
bc63549
working on test case
WackyWeaver Nov 8, 2024
29a569a
Merge branch 'refactorProgramMgmt' of github.com:BCStudentSoftwareDev…
WackyWeaver Nov 8, 2024
e629b15
Anna, added the extra parameter removeFromTranscript(default as True)…
vungc Nov 11, 2024
bec01f7
removed print statement in testing suite
WackyWeaver Nov 11, 2024
0946087
added program photos to test data
WackyWeaver Nov 11, 2024
d24650d
fixed typo
WackyWeaver Nov 11, 2024
8c6e1d1
Merge branch 'development' into BCI1
bledsoef Nov 11, 2024
047de58
Anna, query is working opposite of what I intend. work in progress
vungc Nov 11, 2024
63c0521
created new testing ssuite
bledsoef Nov 12, 2024
dddf311
modified test data to handle inserting program files
bledsoef Nov 12, 2024
eab7d05
refactored update program tests
bledsoef Nov 12, 2024
9e3015d
finishing touches on unit tests
WackyWeaver Nov 12, 2024
b42ce9a
Merge branch 'BCI1' of github.com:BCStudentSoftwareDevTeam/celts into…
bledsoef Nov 12, 2024
2646217
Merge branch 'BCI1' of github.com:BCStudentSoftwareDevTeam/celts into…
bledsoef Nov 12, 2024
a88b114
test pr 2
doucoureb Nov 12, 2024
d64297f
Merge branch 'BCI1' of github.com:BCStudentSoftwareDevTeam/celts into…
doucoureb Nov 12, 2024
494ea81
Anna, totalhours function is modified
vungc Nov 12, 2024
2e56deb
Anna, added another column to move checkbox outside modal
vungc Nov 12, 2024
d62dcf9
merged the doc ready functionality
WackyWeaver Nov 14, 2024
3a8e9bf
Anna, checkbox removed from modal in html and checkbox outside now ha…
vungc Nov 14, 2024
75678ae
fixed merge conflicts
bledsoef Nov 14, 2024
e157b91
removed file testing
bledsoef Nov 14, 2024
d619cb4
clear file contents on modal open
bledsoef Nov 14, 2024
a15e14c
Anna, renamed checkbox ID and logic to update removeFromTranscript st…
vungc Nov 14, 2024
cc0c0aa
Anna, console.log line
vungc Nov 14, 2024
431da20
updating non chrome datepicker to use flatpickr
bledsoef Nov 14, 2024
d8d0da5
finalized flatpickr setup and made it dynamic so it gets added on eac…
bledsoef Nov 15, 2024
ea32a18
ignored unwanted toast msg
WackyWeaver Nov 15, 2024
4421028
Anna, disabled checkbox on default. Still need to make it save the st…
vungc Nov 18, 2024
f3c35b7
checkboxes are staying checked/unchecked on page reload and database …
vungc Nov 19, 2024
4300e05
removed the removeFromTranscript parameter in the banUser function in…
vungc Nov 19, 2024
d0a9163
Cleaning up comments and unused functions
vungc Nov 19, 2024
7b1cc84
fixed datepickr
bledsoef Nov 19, 2024
d06a9eb
Addressed PR comments
ojmakinde Nov 19, 2024
1e44479
Removed reduntant preprocess tests.
ojmakinde Nov 19, 2024
5164aa2
Anna, texts can disaply next to checkbox being displayed.Need to modi…
vungc Nov 20, 2024
1dee3c7
fixed time picker, sad :( it was just a typo
bledsoef Nov 20, 2024
3d3147e
Anna, text displays on the right side of chexkbox
vungc Nov 20, 2024
cced728
fixed multiple offering time pickers
bledsoef Nov 20, 2024
e67dce0
fixed multiple offering time pickers once more
bledsoef Nov 20, 2024
0c30606
removed unneeded title tags
bledsoef Nov 20, 2024
cc1beab
fixed multiple offering time pickers once more
bledsoef Nov 20, 2024
504eda5
Anna, modified text and deleted console.log
vungc Nov 20, 2024
2d973b2
Anna, shortened text and added fade out
vungc Nov 20, 2024
35f2b50
Anna, aligned items in the table
vungc Nov 20, 2024
0e95f2d
Anna, aligned the checkboxes
vungc Nov 21, 2024
ffea1a4
created a formatting function from 12 hour to 24 hour time
bledsoef Nov 21, 2024
85e308d
Anna, message no longer shifts to the left
vungc Nov 21, 2024
2b66011
Anna, changed 'added' color to blue to fit color scheme on the page
vungc Nov 21, 2024
3fde76f
resolved PR comments
bledsoef Nov 21, 2024
3a426c8
made sure we werent taking into consideration deleted events
bledsoef Nov 22, 2024
c357886
removed logging statements
bledsoef Nov 22, 2024
cc12edb
PR test 3: I haven't moved the function inviteCohortsToEvent to the e…
doucoureb Nov 22, 2024
aa3e174
made the necessary changes towards the unix timestamp of isDateInPast
WackyWeaver Nov 22, 2024
eaae371
Merge pull request #1359 from BCStudentSoftwareDevTeam/1350_recurring…
bledsoef Nov 22, 2024
ad18b6e
just about removed all occurences of endDate
bledsoef Nov 23, 2024
45f72d3
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
ojmakinde Dec 2, 2024
bab92c5
removed console logs from function
WackyWeaver Dec 2, 2024
9554154
made all of the requested changes from last review
WackyWeaver Dec 2, 2024
5154c96
Merge branch 'development' into fixSameDayEvent
WackyWeaver Dec 2, 2024
6717262
Merge branch 'development' into serviceTEntry658
vungc Dec 2, 2024
6554990
Merge branch 'development' into refactorProgramMgmt
WackyWeaver Dec 2, 2024
90449ed
Merge pull request #1281 from BCStudentSoftwareDevTeam/refactorProgra…
WackyWeaver Dec 2, 2024
1cada54
Merge branch 'development' into fixSameDayEvent
WackyWeaver Dec 3, 2024
5c25a96
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
ojmakinde Dec 3, 2024
ad28701
fixed the spacing
ojmakinde Dec 3, 2024
7fba1ab
Merge pull request #1363 from BCStudentSoftwareDevTeam/fix-delete-modal
BrianRamsay Dec 3, 2024
73e7255
Merge branch 'development' of github.com:BCStudentSoftwareDevTeam/cel…
bledsoef Dec 3, 2024
350f1aa
Merge branch 'BCI1' of github.com:BCStudentSoftwareDevTeam/celts into…
bledsoef Dec 3, 2024
401682c
Merge branch 'development' of github.com:BCStudentSoftwareDevTeam/cel…
bledsoef Dec 3, 2024
6afd33d
Merge branch 'development' of github.com:BCStudentSoftwareDevTeam/cel…
bledsoef Dec 3, 2024
3674921
Merge pull request #1356 from BCStudentSoftwareDevTeam/1267-timepicke…
bledsoef Dec 3, 2024
3214d9d
Merge branch 'development' into fixSameDayEvent
bledsoef Dec 3, 2024
eda40bb
Merge pull request #1360 from BCStudentSoftwareDevTeam/fixSameDayEvent
bledsoef Dec 3, 2024
035547f
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
vungc Dec 4, 2024
ec1fd3c
finished removing instances of end date
bledsoef Dec 5, 2024
8a2617a
Merge branch 'development' into 1348_remove_end_date
bledsoef Dec 5, 2024
c6af958
used css to move the pencil button up, still need to finishthe js for…
vungc Dec 5, 2024
3dafa2f
split the trranscriptsRemoved query into two parts, used css to modif…
vungc Dec 6, 2024
05f7477
Merge pull request #1176 from BCStudentSoftwareDevTeam/serviceTEntry658
BrianRamsay Dec 11, 2024
8fd4e37
Fix Bonner note
BrianRamsay Dec 11, 2024
e179c8f
Change variables from snake_case to camelCasee
stevensonmichel Dec 26, 2024
a6a4f7d
Fixed checkbox for event cohort
stevensonmichel Dec 26, 2024
c022d6a
Merge branch 'development' into BCI1
stevensonmichel Dec 26, 2024
c28fd89
removed unnecessary codes and moved functions to logic
stevensonmichel Dec 27, 2024
a6e42dc
Finished test for inviteCohorts and updateCohorts to events functions
stevensonmichel Dec 30, 2024
f167c78
Removed the form tags and changed a post method to GET
hoerstl Jan 14, 2025
fbb44c7
Merge pull request #1382 from BCStudentSoftwareDevTeam/1381-Fix-Odd-S…
BrianRamsay Jan 14, 2025
977eb2b
I added an empty table message. Somehow lost the ability to remove in…
hoerstl Jan 14, 2025
8dc76bb
Merge branch 'development' of github.com:BCStudentSoftwareDevTeam/cel…
BrianRamsay Jan 14, 2025
0f55362
resolved many of the comments from print statements and removing cohorts
WackyWeaver Jan 14, 2025
7f96eff
Merge branch 'development' into 1348_remove_end_date
bledsoef Jan 15, 2025
146849a
got rid of an error appearing in the console
bledsoef Jan 15, 2025
82cc7b0
Clarified the form validation and added autofocus improvements to the…
hoerstl Jan 16, 2025
d12b7e4
created an undo button for bg check and we change the bg delete funct…
MImran2002 Jan 16, 2025
06a5236
Make background check undoing functional and fix issue with JSON seri…
stevensonmichel Jan 17, 2025
5c91574
changed the toast UI with flex display in base.html and add mx-2 clas…
MImran2002 Jan 17, 2025
6c3312a
Wrote tests for addBonnerCohortToRsvpLog logic
stevensonmichel Jan 20, 2025
d1081b0
have edited parts of the base.html of the front-end so that the toas…
MImran2002 Jan 22, 2025
23eea14
have edited parts of the base.html of the front-end so that the toas…
MImran2002 Jan 22, 2025
c1e197b
Fixed variables
stevensonmichel Jan 23, 2025
9a701aa
Merged conflicts, better add button
BrianRamsay Jan 24, 2025
17f3551
adjusting button behavior
BrianRamsay Jan 24, 2025
cb11d36
I like the delete animation better this way
BrianRamsay Jan 24, 2025
ec84dc8
I like the delete animation better this way
BrianRamsay Jan 24, 2025
257f312
add occurence click only works on the button now
BrianRamsay Jan 24, 2025
3a1a66a
Merge branch 'development' of github.com:BCStudentSoftwareDevTeam/cel…
bledsoef Jan 24, 2025
b72ddcb
made refresh less clunky
bledsoef Jan 24, 2025
cf3ba40
Changed flash messages of undo processes for event and background check.
stevensonmichel Jan 24, 2025
ff1446e
Fixed duplicate rsvp logs when adding cohort in bonner scholar event
stevensonmichel Jan 24, 2025
20fefad
Merge branch 'development' into BCI1
stevensonmichel Jan 24, 2025
43d421a
Merge branch 'development' into 1367-Empty-Table-Message
bledsoef Jan 27, 2025
17fd1fa
removed unnecessary HTML tag
bledsoef Jan 27, 2025
e0b1e6e
remove 3.7 from CI
bledsoef Jan 28, 2025
7e2e949
Merge pull request #1386 from BCStudentSoftwareDevTeam/CIFix
BrianRamsay Jan 29, 2025
a12e1c9
Merge branch 'development' into 1348_remove_end_date
BrianRamsay Jan 29, 2025
1753636
Allow events in a series to be in the past
BrianRamsay Jan 29, 2025
51b65ac
Remove 'Events saved!' flash message before saving
BrianRamsay Jan 29, 2025
a445f44
Remove timezone adjustment that broke date display
BrianRamsay Jan 29, 2025
b9365a0
Fix re-appearing delete series event
BrianRamsay Jan 29, 2025
8e83cf7
Both types of series are reflected in event view
BrianRamsay Jan 29, 2025
2b9f68a
repeating event generation working in firefox
BrianRamsay Jan 29, 2025
4b0c16f
flatpickr working for repeating series
BrianRamsay Jan 29, 2025
8adb439
Merge branch 'development' into Repeating-Events-Implementation-Clean…
BrianRamsay Jan 29, 2025
217248d
Merge pull request #1349 from BCStudentSoftwareDevTeam/Repeating-Even…
BrianRamsay Jan 29, 2025
feaf4e3
branch created
MImran2002 Jan 29, 2025
2489496
dhid
stevensonmichel Jan 29, 2025
dadab13
Resolve merge conflicts
BrianRamsay Jan 29, 2025
1d58de8
Merge pull request #1362 from BCStudentSoftwareDevTeam/1348_remove_en…
BrianRamsay Jan 29, 2025
03e9efe
Sorted terms using termOrder
stevensonmichel Jan 29, 2025
0dcc467
Merge branch 'development' into bgcheck_undo_button
bledsoef Jan 29, 2025
ec97f84
dhid
stevensonmichel Jan 30, 2025
2a32abe
Changed test data to make terms not successive in database
stevensonmichel Jan 30, 2025
a310410
Merge pull request #1383 from BCStudentSoftwareDevTeam/1367-Empty-Tab…
BrianRamsay Jan 30, 2025
1858e82
Merge branch 'development' into bgcheck_undo_button
BrianRamsay Jan 30, 2025
3273d00
Merge pull request #1384 from BCStudentSoftwareDevTeam/bgcheck_undo_b…
BrianRamsay Jan 30, 2025
671b1c0
Merge with development resolve conflicts
BrianRamsay Jan 30, 2025
ae4c180
Remove EndDates that made it in somehow
BrianRamsay Jan 30, 2025
a5ec5d3
Fixed failing tests
BrianRamsay Jan 30, 2025
408e281
Merge pull request #1297 from BCStudentSoftwareDevTeam/BCI1
BrianRamsay Jan 30, 2025
f9d3d4a
Input fields are no longer displaying none
Kafui123 Jan 30, 2025
b9b5cff
Removed none from display fields of the programManagement pop-up
Kafui123 Jan 30, 2025
80810de
focused search on page load
bledsoef Jan 31, 2025
bd108f5
Merge pull request #1392 from BCStudentSoftwareDevTeam/1369_StudentSe…
BrianRamsay Jan 31, 2025
6d92034
Base commit. Attempting to run CI with 3.12 in a PR
ojmakinde Feb 3, 2025
4fa6887
Upgraded pyodbc version
ojmakinde Feb 3, 2025
5c7c03f
Upgraded greenlet version
ojmakinde Feb 3, 2025
91e51ae
Changed input fields from displaying none to being empty
Kafui123 Feb 3, 2025
1dbe287
we have changed back the id we changed previously and work on the tes…
MImran2002 Feb 3, 2025
15c999c
Merge branch 'development' into programManagement
bledsoef Feb 3, 2025
d61100c
adjusted tests and base data to be sequential - Finn Schafer Bledsoe
bledsoef Feb 3, 2025
3eeb115
Merge branch 'development' into events_list_term
bledsoef Feb 3, 2025
c2cf989
Changed spacing
Kafui123 Feb 3, 2025
d8c034a
Changed spacing
Kafui123 Feb 3, 2025
8b831db
test newer versions of actions
BrianRamsay Feb 5, 2025
792a3e5
Merge pull request #1396 from BCStudentSoftwareDevTeam/programManagement
BrianRamsay Feb 5, 2025
bbc5ee2
I have found the isservice in event table, and added a isservice as …
MImran2002 Feb 5, 2025
c8d9a7f
updated some of the breaking dependancies
WackyWeaver Feb 6, 2025
24bb7b3
next attempt
WackyWeaver Feb 6, 2025
3e23497
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
WackyWeaver Feb 6, 2025
0657496
Simplify process of getting service-based events
stevensonmichel Feb 6, 2025
94b0f6d
I refactored the existing test suite to both check events which have …
MImran2002 Feb 6, 2025
41a7755
I refactored the existing test suite to check the total functions for…
MImran2002 Feb 6, 2025
9c5dac9
Merge branch 'development' into CCE_minor_engagement
stevensonmichel Feb 7, 2025
92e9347
Merge pull request #1394 from BCStudentSoftwareDevTeam/1380-CI-Fix
BrianRamsay Feb 7, 2025
4cecd3d
made broadstrokes changes that replicate common functionality for eng…
WackyWeaver Feb 7, 2025
9ccc47f
fixed weird consolidation bug with sustained community engagements
bledsoef Feb 7, 2025
88850de
working on the test suite
MImran2002 Feb 9, 2025
37f1eb1
Added trivial QoL changes
ojmakinde Feb 10, 2025
9a24414
started added test data
WackyWeaver Feb 10, 2025
59a6f6c
have worked on the test_getCommunityEngagementByTerm
MImran2002 Feb 10, 2025
a570283
have worked on the test for the bug that finn fixed
MImran2002 Feb 10, 2025
3eea757
tweaked some stuff
bledsoef Feb 12, 2025
bf9b00e
Merge branch 'development' into CCE_minor_engagement
bledsoef Feb 12, 2025
95f7b08
Merge pull request #1404 from BCStudentSoftwareDevTeam/CCE_minor_enga…
bledsoef Feb 12, 2025
c8b0875
Merge branch 'development' into events_list_term
bledsoef Feb 12, 2025
57afccb
Merge pull request #1387 from BCStudentSoftwareDevTeam/events_list_term
bledsoef Feb 12, 2025
eb36b2b
Wrote test for getEngagementEvent function
ojmakinde Feb 13, 2025
dc3a98b
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
ojmakinde Feb 13, 2025
10cbc53
Updated test names to use camelCase
ojmakinde Feb 13, 2025
ffd90d3
Merge pull request #1407 from BCStudentSoftwareDevTeam/1373-Event-Tabs
bledsoef Feb 13, 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
1 change: 0 additions & 1 deletion app/controllers/admin/routes.py
Original file line number Diff line number Diff line change
@@ -224,7 +224,6 @@ def renewEvent(eventId):
'timeEnd': formData['timeEnd'],
'location': formData['location'],
'startDate': f'{formData["startDate"][-4:]}-{formData["startDate"][0:-5]}',
'endDate': f'{formData["endDate"][-4:]}-{formData["endDate"][0:-5]}',
'isRepeating': bool(priorEvent['isRepeating']),
'seriesId': priorEvent['seriesId'],
})
2 changes: 0 additions & 2 deletions app/logic/emailHandler.py
Original file line number Diff line number Diff line change
@@ -258,7 +258,6 @@ def retrievePlaceholderList(eventId):
["Recipient Name", "{recipient_name}"],
["Event Name", event.name],
["Start Date", (event.startDate).strftime('%m/%d/%Y')],
["End Date", (event.endDate).strftime('%m/%d/%Y')],
["Start Time", (event.timeStart).strftime('%I:%M')],
["End Time", (event.timeEnd).strftime('%I:%M')],
["Location", event.location],
@@ -274,7 +273,6 @@ def replaceStaticPlaceholders(eventId, email_body):
new_body = email_body.format(event_name=event.name,
location=event.location,
start_date=(event.startDate).strftime('%m/%d/%Y'),
end_date=(event.endDate).strftime('%m/%d/%Y'),
start_time=(event.timeStart).strftime('%I:%M'),
end_time=(event.timeEnd).strftime('%I:%M'),
event_link="{event_link}",
28 changes: 25 additions & 3 deletions app/logic/events.py
Original file line number Diff line number Diff line change
@@ -199,7 +199,6 @@ def saveEventToDb(newEventData, renewedEvent = False):
"isService": newEventData['isService'],
"startDate": newEventData['startDate'],
"rsvpLimit": newEventData['rsvpLimit'],
"endDate": newEventData['startDate'],
"contactEmail": newEventData['contactEmail'],
"contactName": newEventData['contactName']
}
@@ -246,7 +245,7 @@ def getUpcomingStudentLedCount(term, currentTime):
.join(Event, on=(Program.id == Event.program_id))
.where(Program.isStudentLed,
Event.term == term, Event.deletionDate == None,
(Event.endDate > currentTime) | ((Event.endDate == currentTime) & (Event.timeEnd >= currentTime)),
(Event.startDate > currentTime) | ((Event.startDate == currentTime) & (Event.timeEnd >= currentTime)),
Event.isCanceled == False)
.group_by(Program.id))

@@ -477,6 +476,29 @@ def preprocessEventData(eventData):
eventData[eventDate] = parser.parse(eventData[eventDate])
elif not isinstance(eventData[eventDate], date): # The date is not a date object
eventData[eventDate] = ''

# Process multipleOfferingData
if 'multipleOfferingData' not in eventData:
eventData['multipleOfferingData'] = json.dumps([])
elif type(eventData['multipleOfferingData']) is str:
try:
multipleOfferingData = json.loads(eventData['multipleOfferingData'])
eventData['multipleOfferingData'] = multipleOfferingData
if type(multipleOfferingData) != list:
eventData['multipleOfferingData'] = json.dumps([])
except json.decoder.JSONDecodeError as e:
eventData['multipleOfferingData'] = json.dumps([])
if type(eventData['multipleOfferingData']) is list:
# validate the list data. Make sure there is 'eventName', 'startDate', 'timeStart', 'timeEnd', and 'isDuplicate' data
multipleOfferingData = eventData['multipleOfferingData']
for offeringDatum in multipleOfferingData:
for attribute in ['eventName', 'startDate', 'timeStart', 'timeEnd']:
if type(offeringDatum.get(attribute)) != str:
offeringDatum[attribute] = ''
if type(offeringDatum.get('isDuplicate')) != bool:
offeringDatum['isDuplicate'] = False

eventData['multipleOfferingData'] = json.dumps(eventData['multipleOfferingData'])

# Process seriesData
if 'seriesData' not in eventData:
@@ -564,7 +586,7 @@ def getCountdownToEvent(event, *, currentDatetime=None):
currentMorning = currentDatetime.replace(hour=0, minute=0)

eventStart = datetime.combine(event.startDate, event.timeStart)
eventEnd = datetime.combine(event.endDate, event.timeEnd)
eventEnd = datetime.combine(event.startDate, event.timeEnd)

if eventEnd < currentDatetime:
return "Already passed"
5 changes: 2 additions & 3 deletions app/models/event.py
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@ class Event(baseModel):
isAllVolunteerTraining = BooleanField(default=False)
rsvpLimit = IntegerField(null=True)
startDate = DateField()
endDate = DateField(null=True)
seriesId = IntegerField(null=True)
isRepeating = BooleanField(default=False)
contactEmail = CharField(null=True)
@@ -47,8 +46,8 @@ def isPastStart(self):

@property
def isPastEnd(self):
return datetime.now() >= datetime.combine(self.endDate, self.timeEnd)
return datetime.now() >= datetime.combine(self.startDate, self.timeEnd)

@property
def isFirstRepeatingEvent(self):
firstRepeatingEvent = Event.select().where(Event.seriesId==self.seriesId).order_by(Event.id).get()
55 changes: 18 additions & 37 deletions app/static/js/createEvents.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,5 @@
import searchUser from './searchUser.js'
let pendingmultipleEvents = []
// updates max and min dates of the datepickers as the other datepicker changes
// No need for / for Firefox compatiblity
function updateDate(obj) {
var selectedDate = $(obj).datepicker("getDate");
var newMonth = selectedDate.getMonth();
var newYear = selectedDate.getFullYear();
var newDay = selectedDate.getDate();

if (obj.className.includes("startDatePicker")) {
$("#endDatePicker-" + $(obj).data("page-location")).datepicker("option", "minDate", new Date(newYear, newMonth, newDay));
} else if (obj.className.includes("endDatePicker")) {
$("#startDatePicker-" + $(obj).data("page-location")).datepicker("option", "maxDate", new Date(newYear, newMonth, newDay));
}

if (obj.className.includes("endDatePicker")) {
$("#startDatePicker-"+$(obj).data("page-location")).datepicker({maxDate: new Date(newYear, newMonth, newDay)});
$("#startDatePicker-"+$(obj).data("page-location")).datepicker("option", "maxDate", new Date(newYear, newMonth, newDay));
}
}

// turns a string with a time with HH:mm format to %I:%M %p format
// used to display 12 hour format but still use 24 hour format in the backend
@@ -172,10 +153,6 @@ $('#saveSeries').on('click', function() {
let endTimeInputs = $('#multipleOfferingSlots .multipleOfferingEndTime');
let isRepeatingStatus = $("#checkIsRepeating").is(":checked");
let dataTable = isRepeatingStatus ? "#generatedEventsList" : "#multipleOfferingSlots";
if ($(dataTable).children().length < 1){
displayNotification("Please create events.")
return;
}
let isEmpty = false;
let hasValidTimes = true;
let hasDuplicateListings = false;
@@ -223,6 +200,10 @@ $('#saveSeries').on('click', function() {
}
}

if ($(dataTable).children().length < 1){
displayNotification("Please create events.")
}

// Check if there are duplicate event offerings
let eventListings = {};
for(let i = 0; i < eventOfferings.length; i++){
@@ -382,30 +363,38 @@ function formatDate(originalDate) {
* Run when the webpage is ready for javascript
*/
$(document).ready(function() {
var isEditPage = (window.location.pathname == '/event/' + $('#newEventID').val() + '/edit')

//makes sure bonners toggle will stay on between event pages
if (window.location.pathname == '/event/' + $('#newEventID').val() + '/edit') {
if (isEditPage) {
if ($("#checkBonners")) {
$("#checkBonners").prop('checked', true);
}
}

// don't use a minimum if we are editing an existing event
var minDate = new Date()
if (isEditPage) {
minDate = null;
}

// Initialize datepicker with proper options
$.datepicker.setDefaults({
dateFormat: 'yy/mm/dd', // Ensures compatibility across browsers
minDate: new Date()
minDate: minDate
});

$(".datePicker").datepicker({
dateFormat: 'mm/dd/yy',
minDate: new Date()
minDate: minDate
});

$(".datePicker").each(function() {
var dateStr = $(this).val();
$(".datePicker").each(function(idx, el) {
var dateStr = $(el).val();
if (dateStr) {
var dateObj = new Date(dateStr);
if (!isNaN(dateObj.getTime())) {
$(this).datepicker("setDate", dateObj);
$(el).datepicker("setDate", dateObj);
}
}
});
@@ -628,14 +617,6 @@ $(document).ready(function() {
$(this).closest("tr").remove();
});

$(".endDatePicker").change(function () {
updateDate(this);
});

$(".startDatePicker").change(function(){
updateDate(this)
});

$("#inputCharacters").keyup(function () {
setCharacterLimit(this, "#remainingCharacters");
});
10 changes: 5 additions & 5 deletions app/templates/events/createEvent.html
Original file line number Diff line number Diff line change
@@ -445,7 +445,7 @@ <h5 class="modal-title">This is an event with multiple time offerings.</h5>
<div class="row col-md-12 my-3">

<div class="form-group mb-3">
<label class="required form-label me-2 mb-0" for="repeatingEventsName"><strong>Event Name</strong></label>
<label class="required form-label me-2 mb-0" for="repeatingEventsNamePicker"><strong>Event Name</strong></label>
<div class='input-group date'>
<input autocomplete="off" type='text'
class="form-control repeatingEventsField"
@@ -477,7 +477,7 @@ <h5 class="modal-title">This is an event with multiple time offerings.</h5>

<!-- Repeating Event Start Time -->
<div class="form-group col-md-3">
<label class="form-label me-2 mb-0" for="startTime-repeatingEventsDiv"><strong>Start Time</strong></label>
<label class="form-label me-2 mb-0" for="repeatingEventsStartTime"><strong>Start Time</strong></label>
<div class="input-group flatpickr">
{% if eventData.repeatingEventsStartTime %}
{% set startTime = eventData.repeatingEventsStartTime %}
@@ -493,7 +493,7 @@ <h5 class="modal-title">This is an event with multiple time offerings.</h5>
</div>
<!-- Repeating Event End Time -->
<div class='form-group col-md-3'>
<label class="form-label me-2 mb-0" for="endTime-repeatingEventsDiv"><strong>End Time</strong></label>
<label class="form-label me-2 mb-0" for="repeatingEventsEndTime"><strong>End Time</strong></label>
<div class="input-group flatpickr">
{% if eventData.repeatingEventsEndTime %}
{% set endTime = eventData.repeatingEventsEndTime %}
@@ -533,7 +533,7 @@ <h3 class="mt-1 d-flex justify-content-center"> Generated Events: </h3>

<!--series date datepicker-->
<div class="form-group col-md-5">
<label class="form-label me-2 required" for="multipleOfferingDatePicker"><strong>Event
<label class="form-label me-2 required" for="multipleOfferingDatePicker-{{pageLocation}}"><strong>Event
Date</strong></label>
<div class='input-group date multipleOfferingDate' id="multipleOfferingDate-{{pageLocation}}"
data-page-location="{{pageLocation}}">
@@ -565,7 +565,7 @@ <h3 class="mt-1 d-flex justify-content-center"> Generated Events: </h3>
</div>
<!--series Start Time-->
<div class='form-group col-md-3'>
<label class="form-label me-2" for="endTime-{{pageLocation}}"><strong>End Time</strong></label>
<label class="form-label me-2" for="multipleOfferingEndTime-{{pageLocation}}"><strong>End Time</strong></label>
<div class="input-group flatpickr" id="flatpickr2">
{% if eventData.timeEnd %}
{% set endTime = eventData.timeEnd %}
4 changes: 2 additions & 2 deletions app/templates/events/eventNav.html
Original file line number Diff line number Diff line change
@@ -21,9 +21,9 @@
{% set isInProg = not event.isPastEnd and event.isPastStart %}
{% set display = "" if eventPast or event.isCanceled or isInProg else "d-none"%}
{% set alertClass = ("alert-success" if isInProg else ( "alert-danger" if eventPast else "alert-warning")) %}
{% set event_year = event.endDate.strftime("%Y") | int %}
{% set event_year = event.startDate.strftime("%Y") | int %}
{% set currentYear = g.currentDateTime.year | int %}
{% set formatted_date = event.endDate.strftime("%B %d %Y") if currentYear > event_year else event.endDate.strftime("%B %d") %}
{% set formatted_date = event.startDate.strftime("%B %d %Y") if currentYear > event_year else event.startDate.strftime("%B %d") %}

<div class = "{{alertClass}} {{display}} mb-2 pb-2 pt-2" role="alert">
{% if eventPast and event.isCanceled %}
1 change: 0 additions & 1 deletion database/prod-backup.sql
Original file line number Diff line number Diff line change
@@ -583,7 +583,6 @@ CREATE TABLE `event` (
`isService` tinyint(1) NOT NULL,
`isAllVolunteerTraining` tinyint(1) NOT NULL,
`startDate` date NOT NULL,
`endDate` date DEFAULT NULL,
`recurringId` int DEFAULT NULL,
`contactEmail` varchar(255) DEFAULT NULL,
`contactName` varchar(255) DEFAULT NULL,
Loading