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

feat(grower): show assigned organization in overview #178

Merged

Conversation

Mloweedgar
Copy link
Contributor

@Mloweedgar Mloweedgar commented Oct 25, 2021

Description

UI enhancements have been done in growers list making it possible to distinguish Growers own organization from organisation assigned to a Grower.

Please check if the PR fulfills these requirements

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce?

  • Enhancement

Issue

What is the current behavior?

After the organisation was assigned the Grower(s), cards/panels in Growers list still show the content written initially into the organization field(Growers own organisation)

see #136

What is the new behavior?

new behavior has the following improvements

  1. When Grower has not yet been assigned organisation, growers own organisation is displayed in grey color. see image below

grower_own_organisation

  1. When Grower has been assigned an organization then organisation assigned is displayed with organization Id in brackets. see image below

assigned_organisation

3.When grower does not have organisation and has not been assigned an organisation then no organisation is displayed. see image below

no_org

Breaking change

Does this PR introduce a breaking change?

  • No

@Mloweedgar Mloweedgar marked this pull request as ready for review October 25, 2021 18:15
@nmcharlton nmcharlton linked an issue Oct 25, 2021 that may be closed by this pull request
Copy link
Collaborator

@nmcharlton nmcharlton left a comment

Choose a reason for hiding this comment

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

Just a couple of cosmetic changes

src/components/Growers.js Outdated Show resolved Hide resolved
src/components/Growers.js Outdated Show resolved Hide resolved
own org made paler grey and in italics, a space has been added between assigned org name and id
@Mloweedgar Mloweedgar requested a review from nmcharlton October 25, 2021 19:00
@nmcharlton nmcharlton merged commit 76c061a into Greenstand:master Oct 25, 2021
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.

Need to show assigned org in overview
2 participants