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

#166185743 Allow managers deactivate trainers from a gym #25

Merged
merged 1 commit into from
Jun 21, 2019
Merged

#166185743 Allow managers deactivate trainers from a gym #25

merged 1 commit into from
Jun 21, 2019

Conversation

Rhytah
Copy link
Contributor

@Rhytah Rhytah commented Jun 17, 2019 •
edited
Loading

What does this PR do?

  • Allow managers to delete or deactivate trainers from a gym.

Description of Task to be completed?

  • Have the username in gym member list as a link to the user's details

How should this be manually tested?

  • Login in as an admin.
  • Go to gyms
  • Add a gym
  • Add members to the gym and assign them roles, be sure to add gym manager and trainer roles
  • Take note of the auto-generated passwords for the members
  • Log in as a gym manager, and select a trainer
  • You should be redirected to the member's overview. Select actions on the details tab and deactivate the trainer. You can delete a trainer from a gym from here as well.

Any background context you want to provide?

Currently, a manager cannot delete or deactivate trainers from a gym.

They should be able to do this

What are the relevant pivotal tracker stories?

#166185743

####Screenshots
Logged in as a gym manager for gym playground
Screenshot 2019-06-19 at 12 09 41

Deactivate trainer Jenny
Screenshot 2019-06-17 at 16 43 52

Gym member overview showing the status of trainers and roles
Screenshot 2019-06-19 at 12 11 40

Delete a trainer
Screenshot 2019-06-19 at 12 13 11

Trainer successfully deleted
Screenshot 2019-06-19 at 12 13 48

@Emmanuel-Dominic Emmanuel-Dominic temporarily deployed to wger-kronos-pr-25 June 17, 2019 12:26 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from 0917ef8 to a482401 Compare June 17, 2019 13:20
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 17, 2019 13:21 Inactive
@Rhytah Rhytah added the wip label Jun 17, 2019
@Rhytah Rhytah changed the title [#166185743] Allow managers deactivate trainers from a gym #166185743 Allow managers deactivate trainers from a gym Jun 17, 2019
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from a482401 to 71a6317 Compare June 17, 2019 15:16
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 17, 2019 15:16 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from 71a6317 to 9e099fc Compare June 17, 2019 17:27
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 17, 2019 17:27 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from 9e099fc to 55de7ae Compare June 17, 2019 17:49
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 17, 2019 17:49 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from 55de7ae to dc81560 Compare June 18, 2019 09:49
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 18, 2019 09:49 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from dc81560 to defbe2f Compare June 18, 2019 09:54
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 18, 2019 09:54 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from defbe2f to 0fd07f9 Compare June 18, 2019 09:58
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 18, 2019 09:58 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from 0fd07f9 to d6acdef Compare June 18, 2019 10:51
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 18, 2019 10:51 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from d6acdef to fb59b4a Compare June 18, 2019 11:27
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 18, 2019 11:27 Inactive
@Rhytah Rhytah added Done Finished tast and removed wip labels Jun 18, 2019
@Rhytah Rhytah added the Review Required Requires teammates review label Jun 18, 2019
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from fb59b4a to dcc909e Compare June 19, 2019 08:43
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 19, 2019 08:44 Inactive
reifred
reifred approved these changes Jun 19, 2019
View reviewed changes
Copy link
Contributor

@reifred reifred left a comment

Choose a reason for hiding this comment

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

Thanks, @Rhytah for the work done. The feature is working as described.

.travis.yml Outdated Show resolved Hide resolved
@Emmanuel-Dominic Emmanuel-Dominic self-requested a review June 19, 2019 13:04
Emmanuel-Dominic
Emmanuel-Dominic suggested changes Jun 19, 2019
View reviewed changes
Copy link
Contributor

@Emmanuel-Dominic Emmanuel-Dominic left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Great work @Rhytah, thanks for the work

@AGMETEOR
Copy link
Contributor

@Rhytah in your PR description under What does this PR do? there's some more information missing about what was implemented by this code.

@Rhytah
Copy link
Contributor Author

Rhytah commented Jun 20, 2019

@Rhytah in your PR description under What does this PR do? there's some more information missing about what was implemented by this code.

@AGMETEOR do you mean the added status of a user in the table or the migrations? Or should I include everything?

@AGMETEOR
Copy link
Contributor

@Rhytah the story also says "delete" trainers.

@AGMETEOR
Copy link
Contributor

@Rhytah I am going to request that you separate out the task onUpdate travis.yml to fix gulp errors in Travis Build. into a different PR whose merge we're going to prioritize.

@Rhytah
Copy link
Contributor Author

Rhytah commented Jun 20, 2019

@Rhytah the story also says "delete" trainers.

@AGMETEOR I have added this.

@Rhytah
Copy link
Contributor Author

Rhytah commented Jun 20, 2019

@Rhytah I am going to request that you separate out the task onUpdate travis.yml to fix gulp errors in Travis Build. into a different PR whose merge we're going to prioritize.

@AGMETEOR on it.

@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from 9099b08 to 1b777cc Compare June 20, 2019 11:14
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 20, 2019 11:15 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from 1b777cc to c10879e Compare June 20, 2019 11:17
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 20, 2019 11:17 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from c10879e to c8bdc28 Compare June 20, 2019 14:23
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 20, 2019 14:23 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from c8bdc28 to 0428105 Compare June 20, 2019 18:13
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 20, 2019 18:13 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from 0428105 to 08bd85e Compare June 20, 2019 18:20
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 20, 2019 18:20 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from 08bd85e to d8aa847 Compare June 20, 2019 19:17
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 20, 2019 19:17 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from d8aa847 to b0f7664 Compare June 21, 2019 07:25
@Rhytah Rhytah temporarily deployed to wger-kronos-pr-25 June 21, 2019 07:25 Inactive
@Rhytah Rhytah force-pushed the ft-deactivate-trainers-from-a-gym-166185743 branch from b0f7664 to 2cde6ec Compare June 21, 2019 07:56
@AGMETEOR AGMETEOR merged commit 909552a into develop Jun 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@reifred reifred reifred approved these changes

@Manorlds-Eaglespark Manorlds-Eaglespark Manorlds-Eaglespark approved these changes

@Emmanuel-Dominic Emmanuel-Dominic Emmanuel-Dominic approved these changes

@AGMETEOR AGMETEOR Awaiting requested review from AGMETEOR

Assignees
No one assigned
Labels
Done Finished tast Review Required Requires teammates review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Rhytah @AGMETEOR @reifred @Manorlds-Eaglespark @Emmanuel-Dominic