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

#2086 - Enhance regulatory body dropdown #2088

Merged
merged 2 commits into from
Jul 7, 2023
Merged

#2086 - Enhance regulatory body dropdown #2088

merged 2 commits into from
Jul 7, 2023

Conversation

dheepak-aot
Copy link
Collaborator

@dheepak-aot dheepak-aot commented Jul 6, 2023 •
edited
Loading

New dropdown item Senate, Academic Council, Education Council, and/or Program Council and Board of Governors

  • Add a new dropdown item called "Senate, Academic Council, Education Council, and/or Program Council and Board of Governors". Add the dropdown item to institution profile and program both.
  • Define the option code as senateOrEducationCouncil.
  • In case of other regulatory body is selected, the text input to enter other regulatory body has been moved under the regulatory body dropdown.

Create/Edit Program

image

Other
image

Institution Profile (Edit from ministry)

image

image

image

Institution Setup (Ignore the label)

image

image

@dheepak-aot dheepak-aot self-assigned this Jul 6, 2023
@dheepak-aot dheepak-aot added the Form.io Form IO definitions changed. label Jul 6, 2023
sh16011993
sh16011993 approved these changes Jul 6, 2023
View reviewed changes
Copy link
Collaborator

@sh16011993 sh16011993 left a comment

Choose a reason for hiding this comment

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

LGTM @dheepak-aot 👍

andrewsignori-aot
andrewsignori-aot reviewed Jul 6, 2023
View reviewed changes
sources/packages/forms/src/form-definitions/institutionprofile.json Outdated
"tableView": true,
"inputType": "text",
"inputMask": "",
"label": "Other institution regulating body",
Copy link
Collaborator

@andrewsignori-aot andrewsignori-aot Jul 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

The last PR raised the question (answered by @hellolynn-tbtb) about using Regulating vs Regulatory and apparently the expected way would be Regulatory as per the wiki below (the wiki was also created by @hellolynn-tbtb).
@JasonCTang does it make sense? Should we adjust the programs?
Please keep in mind that my suggestion would be to change only the labels on the UI.

image
Source: https://github.com/bcgov/SIMS/wiki/Acronyms-&-Terminology#word--spelling-usage

andrewsignori-aot
andrewsignori-aot reviewed Jul 6, 2023
View reviewed changes
sources/packages/forms/src/form-definitions/institutionprofilecreation.json Outdated
],
"type": "columns",
"hideLabel": true,
"label": "Institution regulating body",
Copy link
Collaborator

@andrewsignori-aot andrewsignori-aot Jul 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Same from https://github.com/bcgov/SIMS/pull/2088/files#r1254984989

andrewsignori-aot
andrewsignori-aot reviewed Jul 6, 2023
View reviewed changes
sources/packages/forms/src/form-definitions/institutionprofilecreation.json Outdated
"tableView": true,
"inputType": "text",
"inputMask": "",
"label": "Other regulating body",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same from https://github.com/bcgov/SIMS/pull/2088/files#r1254984989

andrewsignori-aot
andrewsignori-aot reviewed Jul 6, 2023
View reviewed changes
sources/packages/forms/src/form-definitions/institutionprofile.json Outdated
@@ -562,216 +562,186 @@
"defaultValue": null
},
{
"label": "Institution regulating body",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same from https://github.com/bcgov/SIMS/pull/2088/files#r1254984989

ann-aot
ann-aot reviewed Jul 6, 2023
View reviewed changes
Copy link
Contributor

@ann-aot ann-aot left a comment

Choose a reason for hiding this comment

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

pls take a look at the devs' comments

guru-aot
guru-aot approved these changes Jul 6, 2023
View reviewed changes
Copy link
Collaborator

@guru-aot guru-aot left a comment

Choose a reason for hiding this comment

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

LGTM, nice work

@dheepak-aot
Copy link
Collaborator Author

pls take a look at the devs' comments

Just letting know @ann-aot that comment is not part of the PR. But I strongly agree with the idea of making this label change now rather than doing a hotfix/update on production later.

@ann-aot
Copy link
Contributor

ann-aot commented Jul 7, 2023 •
edited
Loading

pls take a look at the devs' comments

Just letting know @ann-aot that comment is not part of the PR. But I strongly agree with the idea of making this label change now rather than doing a hotfix/update on production later.

I am sorry, I didn't get it. So, the plan is not to do the changes in this PR? @dheepak-aot

@dheepak-aot
Copy link
Collaborator Author

pls take a look at the devs' comments

Just letting know @ann-aot that comment is not part of the PR. But I strongly agree with the idea of making this label change now rather than doing a hotfix/update on production later.

I am sorry, I didn't get it. So, the plan is not to do the changes in this PR? @dheepak-aot

It is the opposite. To do the change as discussed.

@github-actions
Copy link

github-actions bot commented Jul 7, 2023

Backend Unit Tests Coverage Report

Totals Coverage
Statements: 17.89% ( 2127 / 11892 )
Methods: 8.31% ( 126 / 1516 )
Lines: 20.68% ( 1863 / 9009 )
Branches: 10.1% ( 138 / 1367 )

@github-actions
Copy link

github-actions bot commented Jul 7, 2023

E2E Workflow Workers Coverage Report

Totals Coverage
Statements: 49.81% ( 267 / 536 )
Methods: 41.56% ( 32 / 77 )
Lines: 55.33% ( 218 / 394 )
Branches: 26.15% ( 17 / 65 )

@github-actions
Copy link

github-actions bot commented Jul 7, 2023

E2E Queue Consumers Coverage Report

Totals Coverage
Statements: 71% ( 399 / 562 )
Methods: 61.97% ( 44 / 71 )
Lines: 72.97% ( 351 / 481 )
Branches: 40% ( 4 / 10 )

@github-actions
Copy link

github-actions bot commented Jul 7, 2023

E2E SIMS API Coverage Report

Totals Coverage
Statements: 50.18% ( 3543 / 7061 )
Methods: 45.63% ( 418 / 916 )
Lines: 55.38% ( 2915 / 5264 )
Branches: 23.84% ( 210 / 881 )

andrewsignori-aot
andrewsignori-aot reviewed Jul 7, 2023
View reviewed changes
sources/packages/web/src/views/aest/institution/Profile.vue
@@ -56,12 +56,12 @@
:propertyValue="institutionProfileDetail.institutionTypeName"
/>
<title-value
propertyTitle="Regulating body"
propertyTitle="Regulatory body"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks for changing these ones also.

andrewsignori-aot
andrewsignori-aot approved these changes Jul 7, 2023
View reviewed changes
Copy link
Collaborator

@andrewsignori-aot andrewsignori-aot left a comment

Choose a reason for hiding this comment

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

Thanks for doing the additional changes, looks good 👍

ann-aot
ann-aot approved these changes Jul 7, 2023
View reviewed changes
Copy link
Contributor

@ann-aot ann-aot left a comment

Choose a reason for hiding this comment

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

Thanks for including the label change in the PR. Good work @dheepak-aot 👍

@sonarqubecloud
Copy link

sonarqubecloud bot commented Jul 7, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@dheepak-aot dheepak-aot merged commit 0b2b319 into main Jul 7, 2023
@dheepak-aot dheepak-aot temporarily deployed to DEV July 7, 2023 18:40 — with GitHub Actions Inactive
@dheepak-aot dheepak-aot temporarily deployed to DEV July 7, 2023 18:41 — with GitHub Actions Inactive
@dheepak-aot dheepak-aot temporarily deployed to DEV July 7, 2023 18:41 — with GitHub Actions Inactive
@dheepak-aot dheepak-aot temporarily deployed to DEV July 7, 2023 18:41 — with GitHub Actions Inactive
@dheepak-aot dheepak-aot temporarily deployed to DEV July 7, 2023 18:41 — with GitHub Actions Inactive
@dheepak-aot dheepak-aot temporarily deployed to DEV July 7, 2023 18:43 — with GitHub Actions Inactive
@dheepak-aot dheepak-aot temporarily deployed to DEV July 7, 2023 18:43 — with GitHub Actions Inactive
@dheepak-aot dheepak-aot deleted the enhancement/#2086-add-new-regulatory-body branch July 18, 2023 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sh16011993 sh16011993 sh16011993 approved these changes

@andrewsignori-aot andrewsignori-aot andrewsignori-aot approved these changes

@guru-aot guru-aot guru-aot approved these changes

@ann-aot ann-aot ann-aot approved these changes

@JasonCTang JasonCTang Awaiting requested review from JasonCTang

Assignees

@dheepak-aot dheepak-aot

Labels
Form.io Form IO definitions changed.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dheepak-aot @ann-aot @sh16011993 @andrewsignori-aot @guru-aot