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

187227068 languages feature #304

Closed
wants to merge 72 commits into from
Closed

187227068 languages feature #304

wants to merge 72 commits into from

Conversation

ArushC
Copy link
Contributor

@ArushC ArushC commented Apr 8, 2024 •
edited
Loading

Pivotal Tracker Link

What this PR does:

This pull request is a duplicate of cs169#47. Do NOT review this PR until first merging in #295

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

Include screenshots, videos, etc.

Who authored this PR?

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])

razztech and others added 30 commits March 7, 2024 19:41
@razztech
Added frontend + db logic for country field in international schools
f2ee4d2
@razztech
Added some new frontend logic
1000250
@razztech
Made changes to UI logic and updated tests
277e4de
@razztech
Update tests to use country dropdown
43b0a3d
@perryzjc
Merge pull request #39 from cs169/187129573-change-teacher-status
bfe7a19 
187129573 change teacher status
@razztech
All tests are passing
f3cd0cd
@razztech
Finished table country display
dc852f3
@razztech
Added filtering with a different column
fa48319
@razztech
Fixed rubocop
fadef9a
@razztech
Added state textfield test for international schools
1320a4e
@razztech
Merge branch 'main' into 187216522-international-schools
2fe9505
@razztech
Fixed merge issues for cucumber tests
b2c8e47
@razztech
Added international school test, moved custom web step to form_steps.rb:
c9df771
@razztech
Fixed rubocop
5d8654b
@razztech
Added country validation
6660f2e
@razztech
Added new test for country
39123b8
@razztech
Changed UI based on Michael's feedback
d27c514
@razztech
Made UI changes requested by Michael 2
29de296
@razztech
Changed from VanillaJS to jQuerry suggested by Arush
2c0363d
@ArushC
Merge pull request #38 from cs169/187186207/iter1-golden-repo-fixes
5135d22 
187186207/iter1 golden repo fixes
@perryzjc
Further change from VanillaJS to jQuerry suggested by Arush
677bb6e
@perryzjc
Add cucumber test for unexpected user behavior
772f2df
@ArushC
fix glitch
05d989e
@ArushC
resolve merge conflict
a2ea667
@ArushC
ok actually fixed merge conflict now
fa1155b
@ArushC
no choice, have to resolve conflict manually
a155d65
@ArushC
Merge branch 'main' into 187216522-international-schools
da5f122
@ArushC
Merge pull request #42 from cs169/187216522-international-schools
71b92b6 
Country field added for international schools
@ArushC
added languages dropdown without selectize
4af15e7
@ArushC
added selectize thingie
db87716
ArushC and others added 25 commits April 4, 2024 17:06
@ArushC
add equivalent of presence validation
3484fb1
@cycomachead
Merge branch 'beautyjoy:main' into 187216522-international-schools
8b96209
@cycomachead
Merge branch 'main' into 187216522-international-schools
2ded341
@razztech
Removed empty lines
ef2d3c4
@ArushC
Update email_template.feature
ff543d6 
Fix cucumber test -- note that error messages have been standardized in the application to have the common format "An error occured: ..."
@ArushC
Update schools_controller.rb
2e1c1d1 
remove debugger
@ArushC
fix cucumber tests
d58eda9
@ArushC
change new --> edit redirect for update school failure
838c4c0
@ArushC
actually fixed it now
b1fe2d5
@ArushC
it turns out I don't know how to spell the word 'occured'
66eb04c
@ArushC
fixed another myterious cucumber test bug
6e46e5c
@ArushC
remove country from teachers table
f9388fc
@ArushC
removed one unnecessary deletion
8ca3872
@ArushC
update location method to display country
05df57c
@ArushC
update selectize options
38b2ce1
@ArushC
revert placeholder
8f831eb
@ArushC
update location method to display country
fb9e877
@ArushC
update selectize options
4cf6fbc
@ArushC
Merge branch '187216522-international-schools' of github.com:cs169/BJ…
92e5647 
…C-Teacher-Tracker-App into 187216522-international-schools
@ArushC
add back teachers to table to prevent cucumber bugs
eeea4ca
@ArushC
make search_list change
fa97d32
@ArushC
added unique school params and DRY out code
c027698
@ArushC
converted valid states list using country gem
f41d0b9
@ArushC
fixed rubocop
1f682da
@ArushC
Merge branch '187216522-international-schools' into 187227068-languag…
29b2e68 
…es-feature
@ArushC ArushC mentioned this pull request Apr 15, 2024
Closed
3 tasks
fp456
fp456 reviewed Apr 15, 2024
View reviewed changes
Copy link

@fp456 fp456 left a comment

Choose a reason for hiding this comment

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

LGTM

@ArushC ArushC mentioned this pull request Apr 22, 2024
Closed
3 tasks
@cycomachead cycomachead closed this May 8, 2024
@cycomachead cycomachead deleted the 187227068-languages-feature branch May 8, 2024 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fp456 fp456 fp456 left review comments

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

Successfully merging this pull request may close these issues.
5 participants
@ArushC @fp456 @cycomachead @razztech @perryzjc