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

#1790 - Enable Applications Tab for Public Institution User #1903

Merged
merged 12 commits into from
Apr 28, 2023
Merged

#1790 - Enable Applications Tab for Public Institution User #1903

merged 12 commits into from
Apr 28, 2023

Conversation

ann-aot
Copy link
Contributor

@ann-aot ann-aot commented Apr 24, 2023 •
edited
Loading

Screenshots:

  1. Student has submitted an application to the below institution
    image
  2. Below are the applications that belong to this student
    image

@ann-aot ann-aot self-assigned this Apr 24, 2023
@ann-aot ann-aot added User Experience task that relates to UI UX Institution Institution Features Web Portal SIMS-Api SIMS-Api E2E/Unit tests labels Apr 24, 2023
@ann-aot ann-aot marked this pull request as ready for review April 26, 2023 00:13
andrewsignori-aot
andrewsignori-aot reviewed Apr 26, 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.

Nice work, please take a look at the comments.

dheepak-aot
dheepak-aot reviewed Apr 26, 2023
View reviewed changes
sources/packages/web/src/views/aest/student/Applications.vue
@@ -21,7 +21,7 @@ export default defineComponent({
required: true,
},
},
setup(props: any) {
setup(props) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

👍

dheepak-aot
dheepak-aot reviewed Apr 26, 2023
View reviewed changes
...student/_tests_/e2e/student.institutions.controller.getStudentApplicationSummary.e2e-spec.ts Outdated
});

it("Should get an empty array as application summary when student has a submitted application in a different location.", async () => {
// Arrange
Copy link
Collaborator

Choose a reason for hiding this comment

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

https://github.com/bcgov/SIMS/pull/1903/files#r1178370671

Test scenario can be removed.

@dheepak-aot
Copy link
Collaborator

Nice work with applications tab @ann-aot 👍. Please have look at the comments.

andrewsignori-aot
andrewsignori-aot reviewed Apr 27, 2023
View reviewed changes
...student/_tests_/e2e/student.institutions.controller.getStudentApplicationSummary.e2e-spec.ts Outdated

it(
`Should get all the two student application details in ${FieldSortOrder.DESC} order of application number ` +
"as summary when student has two submitted/Inprogress application for the institution (application with location id saved) " +
Copy link
Collaborator

Choose a reason for hiding this comment

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

Just a suggestion, I would not mind omitting the explanation about "(application with location id saved)", that said I do support the long text description 😉

andrewsignori-aot
andrewsignori-aot reviewed Apr 27, 2023
View reviewed changes
sources/packages/web/src/components/common/students/StudentApplications.vue Outdated
@@ -157,6 +155,21 @@ export default defineComponent({
type: Number,
required: false,
},
enableViewApplicationBtn: {
Copy link
Collaborator

Choose a reason for hiding this comment

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

For properties in general I would avoid adding the component type and use an abbreviation like btn or similar.
IMO these three properties could be named as.

  • enableViewApplication
  • allowManageApplication
  • displayApplicationName

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added btn only because of the last property, the last property is the view application action in the name.
image.

displayApplicationName is confusing. do you guys have a better name, I can update it

guru-aot
guru-aot approved these changes Apr 27, 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 @ann-aot

sources/packages/backend/apps/api/src/services/application/application.service.ts
@@ -608,6 +611,17 @@ export class ApplicationService extends RecordDataModelService<Application> {
.andWhere("application.applicationStatus != :overwrittenStatus", {
Copy link
Collaborator

Choose a reason for hiding this comment

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

I know this is not part of your PR, but can we change the leftJoin on the currentAssessment and offering to innerJoin?

Copy link
Collaborator

Choose a reason for hiding this comment

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

As the services is used across client types, the left join actually make sense

Copy link
Collaborator

Choose a reason for hiding this comment

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

To be clear, the method is supposed to return all applications, even draft ones, unless I am missing something. It is not about bing used across different clients it is about what it needs to return.

sources/packages/web/src/views/student/StudentApplicationSummary.vue
@@ -24,7 +25,7 @@
import { ref, defineComponent } from "vue";
import StartApplication from "@/views/student/financial-aid-application/Applications.vue";
import { ApplicationStatus } from "@/types";
import StudentApplications from "@/components/aest/StudentApplications.vue";
import StudentApplications from "@/components/common/students/StudentApplications.vue";
Copy link
Collaborator

Choose a reason for hiding this comment

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

👍

andrewsignori-aot
andrewsignori-aot reviewed Apr 27, 2023
View reviewed changes
sources/packages/backend/apps/api/src/utilities/datatable-config.ts
*/
export const DEFAULT_PAGE_LIMIT = 10;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nice cleanup 😉

andrewsignori-aot
andrewsignori-aot reviewed Apr 27, 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.

Just minor comments.

@dheepak-aot
Copy link
Collaborator

Thanks for making the changes. Added some clarifications and one more comment.

@github-actions
Copy link

E2E SIMS API Coverage Report

Totals Coverage
Statements: 39.38% ( 2664 / 6764 )
Methods: 32.05% ( 282 / 880 )
Lines: 44.71% ( 2254 / 5041 )
Branches: 15.18% ( 128 / 843 )

andrepestana-aot
andrepestana-aot reviewed Apr 28, 2023
View reviewed changes
...student/_tests_/e2e/student.institutions.controller.getStudentApplicationSummary.e2e-spec.ts Outdated
app = nestApplication;
appDataSource = dataSource;
// College F.
const { institution } = await getAuthRelatedEntities(
Copy link
Collaborator

Choose a reason for hiding this comment

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

Minor: if you do:

    const { institution: collegeF } = await getAuthRelatedEntities(
      appDataSource,
      InstitutionTokenTypes.CollegeFUser,
    );

then you won't need line 41.

andrepestana-aot
andrepestana-aot approved these changes Apr 28, 2023
View reviewed changes
Copy link
Collaborator

@andrepestana-aot andrepestana-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!

andrewsignori-aot
andrewsignori-aot approved these changes Apr 28, 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 changes, looks good 👍

dheepak-aot
dheepak-aot approved these changes Apr 28, 2023
View reviewed changes
Copy link
Collaborator

@dheepak-aot dheepak-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 making the changes @ann-aot 👍LGTM.

@sonarqubecloud
Copy link

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 1 Code Smell

No Coverage information No Coverage information
0.0% 0.0% Duplication

@github-actions
Copy link

Backend Unit Tests Coverage Report

Totals Coverage
Statements: 18.01% ( 1992 / 11061 )
Methods: 8.1% ( 116 / 1432 )
Lines: 20.81% ( 1749 / 8404 )
Branches: 10.37% ( 127 / 1225 )

@github-actions
Copy link

E2E Workflow Workers Coverage Report

Totals Coverage
Statements: 32.41% ( 176 / 543 )
Methods: 21.25% ( 17 / 80 )
Lines: 39.25% ( 157 / 400 )
Branches: 3.17% ( 2 / 63 )

@github-actions
Copy link

E2E Queue Consumers Coverage Report

Totals Coverage
Statements: 66.67% ( 362 / 543 )
Methods: 55.07% ( 38 / 69 )
Lines: 68.97% ( 320 / 464 )
Branches: 40% ( 4 / 10 )

@ann-aot ann-aot merged commit 698738a into main Apr 28, 2023
@ann-aot ann-aot temporarily deployed to DEV April 28, 2023 20:59 — with GitHub Actions Inactive
@ann-aot ann-aot temporarily deployed to DEV April 28, 2023 20:59 — with GitHub Actions Inactive
@ann-aot ann-aot temporarily deployed to DEV April 28, 2023 21:09 — with GitHub Actions Inactive
@ann-aot ann-aot deleted the feature/sims-1790 branch April 28, 2023 21:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dheepak-aot dheepak-aot dheepak-aot approved these changes

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

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

@andrepestana-aot andrepestana-aot andrepestana-aot approved these changes

@sh16011993 sh16011993 Awaiting requested review from sh16011993

@JasonCTang JasonCTang Awaiting requested review from JasonCTang

@hellolynn-tbtb hellolynn-tbtb Awaiting requested review from hellolynn-tbtb

Assignees

@ann-aot ann-aot

Labels
E2E/Unit tests Institution Institution Features SIMS-Api SIMS-Api User Experience task that relates to UI UX
Projects
None yet
Milestone
No milestone
Development

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