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

Jump to bottom

Merging code from both Sophia and Faeren's branches into the Develop Branch #350

Merged
merged 21 commits into from
Apr 27, 2024
Merged

Merging code from both Sophia and Faeren's branches into the Develop Branch #350

merged 21 commits into from
Apr 27, 2024

Conversation

NycoCC1993
Copy link
Collaborator

We have satisfied ourselves with the efficacy of our code when it is all running together, therefore we wish to add it to the Develop branch.

NycoCC1993 and others added 21 commits February 11, 2024 18:53
@NycoCC1993
Add files via upload
b21e378
@NycoCC1993
Removing lint errors
5057b81
@NycoCC1993
Removing extraneous alteration messages
fd05036
@SophiaSun18
Unused capacity-related sections removed
e4e6228
@SophiaSun18
Term -> Academic Period
ab2efa5
@SophiaSun18
Department -> Parse the first piece of CourseSection
b329e50
@SophiaSun18
Prefix, Number, Section, Course Title -> Parse everything from Course…
514183e 
… Section, but didn't comment out previous cf functions
@SophiaSun18
Faculty Hours, Student Hours -> Semester Hours
8272656
@SophiaSun18
BuildingAndRoom -> Location 1 & 2, Using the same cf function but onl…
7f51ba2 
…y creating meeting sections for 1
@SophiaSun18
Meeting Day, Meeting Time -> Meeting Patterns
7d7cd72
@SophiaSun18
Split part of original courseSectionCallback() into courseCallback()
bc2efe3 
to fix the error of "cannot read properties of undefined"
@SophiaSun18
SemesterStartDate, SemesterEndDate -> StartDate, EndDate
ade7977 
original StartDate (column name: TermStart) commented out: same value as SemesterStartDate, all combined into the StartDate column of new format
Semester Length = EndDate - StartDate
@SophiaSun18
Fixed readFullCSV.spec.ts to pass pnpm test using updated example…
0652709 
… schedule
@SophiaSun18
Fixed minor meetingTime issue to accomodate the most recent schedule
a81da0f
@SophiaSun18
Update meetingPatternCallback() and timeCallback() to process section…
1ecd2c2 
…s with multiple meeting times
@SophiaSun18
Update output format
452f775
@SophiaSun18
Update testing script
3ba0a47
@SophiaSun18
Update deploy.yml for production deployment
9d31bdc
@NycoCC1993
Adding changes
0297921
@NycoCC1993
Fix jest-dom version needs extend-expect
506783f
@NycoCC1993
Merge pull request #349 from senior-knights/feature/update-scheduling…
6f61efc 
…-format

Feature/update scheduling format
@netlify Netlify
Copy link

netlify bot commented Apr 10, 2024 •
edited
Loading

✅ Deploy Preview for sharp-babbage-a45ee2 ready!

Name Link
🔨 Latest commit 6f61efc
🔍 Latest deploy log https://app.netlify.com/sites/sharp-babbage-a45ee2/deploys/6616e7970bf7eb00082868e6
😎 Deploy Preview https://deploy-preview-350--sharp-babbage-a45ee2.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@SophiaSun18 SophiaSun18 requested review from rpruim and kvlinden April 10, 2024 20:08
@kvlinden
Copy link
Collaborator

LGTM

@NycoCC1993 NycoCC1993 merged commit b5b2654 into develop Apr 27, 2024
7 checks passed
@NycoCC1993 NycoCC1993 deleted the update/develop branch April 27, 2024 17:08
@kvlinden
Copy link
Collaborator

@NycoCC1993 @SophiaSun18
I'm trying to run the current development service (https://sharp-babbage-a45ee2.netlify.app/#/) and am having trouble loading a schedule. Can either of you give check the import and send me a file that works?

keith

@NycoCC1993
Copy link
Collaborator Author

@NycoCC1993 @SophiaSun18 I'm trying to run the current development service (https://sharp-babbage-a45ee2.netlify.app/#/) and am having trouble loading a schedule. Can either of you give check the import and send me a file that works?

keith

@kvlinden @SophiaSun18

Both when running on the Sharp Babbage and running the "develop" code locally, this file worked correctly. Would you be willing, professor, to also share a copy of the file you used that did not work please?

Thanks for your time and patience.

Course_Section_Enrollment_Report-CS-DS-2023.csv

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kvlinden kvlinden kvlinden approved these changes

@rpruim rpruim Awaiting requested review from rpruim

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@NycoCC1993 @kvlinden @SophiaSun18