Skip to content

Dev -> Prod Changes #552

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

Jump to bottom
Open
BrianRamsay wants to merge 191 commits into
base: production
Choose a base branch
from
Open

Dev -> Prod Changes #552

BrianRamsay wants to merge 191 commits into from

Conversation

@BrianRamsay
Copy link
Contributor

@BrianRamsay BrianRamsay commented Nov 18, 2025

No description provided.

Meatchema and others added 30 commits July 1, 2025 18:46
@Meatchema
Started moving files
3d5a7ac
@Meatchema
We have put the getuser function and the flashmessage into one file i…
925b1a7 
…n logic. we also did that for check adjustment and SaveStatus.
@BesherKitaz
Fixed some files and reorganized some. There is a circular import iss…
d47a205 
…ue though.
@Meatchema
New file studentsFromTracy added to try to get rid of circular import…
09e1286 
…. It now says it cant import createUser.
@BesherKitaz
Fix circular import issue and created departmentPositions file.
61178e1
@BesherKitaz
Moved allPending logic functions to allPending in logic.
318ddfe
@BesherKitaz
Moved most logic functions form routes folders to logic. Resolved all…
76b1fc1 
… necessary imports.
@Meatchema
Delete a lot of weird OneNote files and an empty downlaod file
64c226e
@jjijon7000
removed all 'approved reluctantly' instances in the code
2cae239
@jjijon7000
fixed sql file
e2993bc
@BesherKitaz
Moved some functions based on the most recent feedback on PR
7507a6e
@BesherKitaz
Pulling down remote branch
653655d
@BesherKitaz
Solving merge
4e9239b
@BesherKitaz
Changed as request in the PR
49169ed
@BesherKitaz
merging
b5786e8
@BrianRamsay
createOverloadForm didn't have the whole function moved
01f3155
@BrianRamsay
Fix imports for tests
3f1528d
@BrianRamsay
Fix tests broken by new demo data
b988262
@BrianRamsay
Resolve merge conflicts from recent dev changes, tests passing again
9e86db0
@BrianRamsay
Refactor the approval modal data function a little because it hurt
ce3b397
@BrianRamsay
Logout actually works! Required shibboleth2.xml change also
5d2fca2
@BrianRamsay
Fix missing import
be9d9b9
@BrianRamsay
Add Form type to the downloads
7444792
@BrianRamsay
Resolve merge conflicts
4eb3506
@BrianRamsay
Add a button to resubmit a form to Banner
87211c2
@BrianRamsay
changed variable name to be more accurate
f5086f5
@BrianRamsay
Merge branch 'development' of github.com:BCStudentSoftwareDevTeam/lsf…
4d9bfb2 
… into organizingtest
@BrianRamsay
Resolve conflict with backup
1f6f7ee
@BrianRamsay
Make contact person on release form nullable
aaaf460
@BrianRamsay
Add missing table to prod backup
bf406ec
ojmakinde and others added 30 commits November 12, 2025 18:55
@ojmakinde
Fixed the bug with field presets not showing up for current supervise…
1af7043 
…es and pending forms.
@ojmakinde
Removed debug statements
273696a
@JohnCox2211
Merge branch 'dynamic-search-supervisor-portal' of https://github.com…
a37c214 
…/BCStudentSoftwareDevTeam/lsf into dynamic-search-supervisor-portal
@MImran2002
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
3c3c2f0 
…Team/lsf into laborReleaseFormAdmin
@MImran2002
Committing
2ab9972
@MImran2002
Merge
0f67cd8
@MImran2002
integrated form expiration script and labor admin notify
8fd5c6f
@RueHaile
reason for release and dtae fix, doesn't work yet- in progress
55d8ae7
@RueHaile
Merge branch 'laborReleaseFormAdmin' of https://github.com/BCStudentS…
4e465a2 
…oftwareDevTeam/lsf into laborReleaseFormAdmin
@ojmakinde
Removed the notion of 'currentTerm' (which we don't use) and correctl…
d398e41 
…y implemented the 'All Active Terms' as term option for select presets
@ojmakinde
Fixed the 'all active terms' query error from incorrect use of datetime
8ba87d2
@BrianRamsay
Merge pull request #529 from BCStudentSoftwareDevTeam/dynamic-search-…
a74aca5 
…supervisor-portal

Dynamic search and load time optimization
@MImran2002
the username and reasons have now showed correctly in the labor relea…
145aefc 
…se form
@MImran2002
Merge branch 'laborReleaseFormAdmin' of https://github.com/BCStudentS…
9942cea 
…oftwareDevTeam/lsf into laborReleaseFormAdmin
@MImran2002
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
e3bf9b2 
…Team/lsf into laborReleaseFormAdmin
@RueHaile
Adding template change
b5860e4
@RueHaile
getting rid of debug prints
84a0003
@Meatchema
Merge branch 'development' into add-approve-button-in-labor-history-form
50d1ac5
@BrianRamsay
Change button text
5d6ba08
@BrianRamsay
Removed duplicated Email Labor button
fc323c4
@BrianRamsay
Merge pull request #538 from BCStudentSoftwareDevTeam/add-approve-but…
f4f33b8 
…ton-in-labor-history-form

Add 'Approve' button in labor history form labor modal
@BrianRamsay
Merge branch 'development' into laborReleaseFormAdmin
8d82bb5
@BrianRamsay
Better name for emailhandler method
37904bc
@BrianRamsay
Eliminate unneeded variable with bad name
f972467
@BrianRamsay
Fix bad variable name
a3bda4c
@BrianRamsay
Add basic output to script
ebf6825
@BrianRamsay
Re-add PR template
ff2bd20
@BrianRamsay
Merge pull request #546 from BCStudentSoftwareDevTeam/laborReleaseFor…
4986885 
…mAdmin

Labor release form admin
@JohnCox2211
changed datetime syntax, removed unused line
91afb75
@MImran2002
Merge pull request #558 from BCStudentSoftwareDevTeam/laborhistory-qu…
ab581c4 
…ickfix

Labor History datetime Quick Fix is merged, a student variable is deleted that is not called at all. Datetime.date.today is updated to datetime.today() is fixed. The modals are working back.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.