-
Notifications
You must be signed in to change notification settings - Fork 8
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
Teacher merge feature #307
Closed
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
187129573 change teacher status
187186207/iter1 golden repo fixes
Country field added for international schools
187384622/new email model - PR4 - Now add multi-personal-email feature
Professional Development Feature
razztech
force-pushed
the
teacher-merge-feature
branch
3 times, most recently
from
April 19, 2024 23:23
70e98f5
to
7fb905a
Compare
ArushC
force-pushed
the
teacher-merge-feature
branch
from
April 22, 2024 17:24
ad38df9
to
7fb905a
Compare
3 tasks
3 tasks
razztech
force-pushed
the
teacher-merge-feature
branch
2 times, most recently
from
April 25, 2024 22:07
332ee31
to
ca6c172
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does:
Implements a feature which allows the admin to merge teachers together. I merged the branches of the other pull requests into this one, so do NOT review this pull request until first merging in #295 and #304.
This pull request ALSO includes the email template changes made by @perryzjc and @realmichaeltao . I resolved merge conflicts that came up between our two features. To avoid merge conflicts, @cycomachead it would be best if you reviewed this branch for both the features at once. Here is a summary of the features that are included on this branch:
The teacher merge feature, see description below.
The new email model feature, all relevant PR descriptions are linked here: 187384622/new email model - PR1 - Add new EmailAddress Model without Schema Change on Original Models #308, 187384622/new email model - PR2 - Add Email Address Data Migration Script #309, 187384622/new email model - PR3 - Add schema migration to drop old email columns and Adjust Relevant Dependencies #310, and 187384622/new email model - PR4 - Now add multi-personal-email feature #311
This pull request fixes|implements (pick one...) ______.
TEACHER MERGE FEATURE DESCRIPTION BELOW
Include screenshots, videos, etc.
Who authored this PR?
@ArushC wrote the tests, implemented the frontend design for the merge page and the frontend/backend for the merge button + modal popup on the teacher show page, and setup routes
@razztech worked on backend for the merge function logic, delivered feedback/guidance on frontend design, modified routes for improved clarity.
How should this PR be tested?
Look at the Cucumber tests to see that everything works.
Yes: latest deployment at https://sp24-01-bjc-teachers-d0e972207d82.herokuapp.com/.
They show that stuff works...
No
Are there any complications to deploying this?
Nope
Checklist:
michael/12345-add-new-feature
Any branch name will do as long as the story ID is there. You can usegit checkout -b [new-branch-name]
)