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

187216522 international schools #295

Merged
merged 69 commits into from
May 10, 2024

Conversation

ArushC
Copy link
Contributor

@ArushC ArushC commented Mar 14, 2024

Pivotal Tracker Link

What this PR does:

This is a duplicate of cs169#42. For ease's sake, do NOT review this PR until first reviewing #294 and #293. Due to an unfortunate merge conflict and a glitch with Github's web interface, we had no choice but to merge the entire main branch into the international schools branch. The main branch includes the features whose corresponding PRs were listed above.

"This PR adds the country field to the school model. Whenever a new school is created, the option to select a country is available. Moreover, the country data is introduced in tables, teacher and school information panels and in the backend. The UI logic either renders a textfield if the country selected when creating a school is not the US or a dropdown of US states if the selected country is the US."

This pull request fixes|implements (pick one...) ______.

Include screenshots, videos, etc.

Who authored this PR?

@razztech - overall implementation, testing, code refactoring and UI logic
@perryzjc - pair-programming help for debugging teacher requests table
@ArushC - bug fixes, additional test cases, PR fixes

How should this PR be tested?

  • Is there a deploy we can view?
  • What do the specs/features test?
  • Are there edge cases to watch out for?

Are there any complications to deploying this?

Checklist:

  • Has this been deployed to a staging environment or reviewed by a customer?
  • Tag someone for code review (either a coach / team member)
  • I have renamed the branch to match PivotTracker's suggested one (necessary for BlueJay) (e.g. michael/12345-add-new-feature Any branch name will do as long as the story ID is there. You can use git checkout -b [new-branch-name])

Copy link

codecov bot commented Mar 14, 2024

Codecov Report

Attention: Patch coverage is 58.13953% with 18 lines in your changes are missing coverage. Please review.

Project coverage is 69.67%. Comparing base (5638aeb) to head (c027698).

❗ Current head c027698 differs from pull request most recent head 163e2a9. Consider uploading reports for the commit 163e2a9 to get more accurate results

Files Patch % Lines
app/models/school.rb 53.33% 7 Missing ⚠️
app/controllers/schools_controller.rb 42.85% 4 Missing ⚠️
app/controllers/teachers_controller.rb 55.55% 4 Missing ⚠️
app/controllers/email_templates_controller.rb 0.00% 2 Missing ⚠️
app/controllers/pages_controller.rb 50.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##             main     #295       +/-   ##
===========================================
- Coverage   86.29%   69.67%   -16.62%     
===========================================
  Files          20       21        +1     
  Lines         693      709       +16     
===========================================
- Hits          598      494      -104     
- Misses         95      215      +120     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ArushC ArushC force-pushed the 187216522-international-schools branch from 9914438 to 4cf6fbc Compare April 12, 2024 21:48
@ArushC
Copy link
Contributor Author

ArushC commented Apr 13, 2024

@cycomachead I made all the changes that you requested except removing the countries thing from the table because that resulted in a really weird bug which caused some Cucumber tests related to the admin feature to unexpectedly fail. I could look into it more, but my 10 min glance says it would probably be a 2-3 point story to figure out what's going on there.

Otherwise, I think this PR is in good shape. Feel free to take a look at the stuff that I changed and merge this.

@ArushC ArushC mentioned this pull request Apr 15, 2024
3 tasks
@cycomachead cycomachead self-requested a review April 22, 2024 18:56
Copy link
Member

@cycomachead cycomachead left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I had some comments open for a while, but there are few things to fix.

app/models/school.rb Outdated Show resolved Hide resolved
app/views/schools/show.html.erb Outdated Show resolved Hide resolved
app/views/teachers/_teacher.erb Outdated Show resolved Hide resolved
app/views/teachers/_teacher_info.html.erb Outdated Show resolved Hide resolved
app/models/school.rb Outdated Show resolved Hide resolved
app/views/schools/_form.html.erb Outdated Show resolved Hide resolved
app/views/schools/show.html.erb Outdated Show resolved Hide resolved
app/views/teachers/_table_headers.erb Outdated Show resolved Hide resolved
app/views/teachers/_teacher.erb Outdated Show resolved Hide resolved
app/views/teachers/_teacher_info.html.erb Outdated Show resolved Hide resolved
@cycomachead
Copy link
Member

Future Followup:

  • tests for location info
  • simplify location and name location methods

app/models/school.rb Outdated Show resolved Hide resolved
@cycomachead cycomachead merged commit 5b2c3fe into beautyjoy:main May 10, 2024
1 of 3 checks passed
@cycomachead cycomachead deleted the 187216522-international-schools branch May 10, 2024 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants