Skip to content

Commit 219ec6d

Browse files
peggy-quartechpeggy-quartech
committed
Merge branch 'release/1.1.2'
2 parents 366ea56 + f4007b0 commit 219ec6d

File tree

17 files changed

+57276
-53910
lines changed

17 files changed

+57276
-53910
lines changed

‎src/Spd.Manager.Screening/ApplicationContract.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,8 @@ public enum ApplicationPortalStatisticsCode
296296
CancelledByApplicant,
297297
CancelledByOrganization,
298298
ClearedLastSevenDays,
299-
NotClearedLastSevenDays
299+
NotClearedLastSevenDays,
300+
Completed
300301
}
301302

302303
public enum ApplicationOriginTypeCode

‎src/Spd.Presentation.Screening/ClientApp/src/app/api/models/anonymous-org-registration-create-request.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export interface AnonymousOrgRegistrationCreateRequest {
3131
mailingPostalCode?: string | null;
3232
mailingProvince?: string | null;
3333
operatingBudgetFlag?: FundsFromBcGovtExceedsThresholdCode;
34+
organizationLegalName?: string | null;
3435
organizationName?: string | null;
3536
payerPreference?: PayerPreferenceTypeCode;
3637
portalUserIdentityTypeCode?: IdentityProviderTypeCode;

‎src/Spd.Presentation.Screening/ClientApp/src/app/api/models/application-statistics-response.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ export interface ApplicationStatisticsResponse {
1818
'CancelledByOrganization'?: number;
1919
'ClearedLastSevenDays'?: number;
2020
'NotClearedLastSevenDays'?: number;
21+
'Completed'?: number;
2122
}) | null;
2223
}

‎src/Spd.Presentation.Screening/ClientApp/src/app/api/models/org-registration-create-request.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export interface OrgRegistrationCreateRequest {
3131
mailingPostalCode?: string | null;
3232
mailingProvince?: string | null;
3333
operatingBudgetFlag?: FundsFromBcGovtExceedsThresholdCode;
34+
organizationLegalName?: string | null;
3435
organizationName?: string | null;
3536
payerPreference?: PayerPreferenceTypeCode;
3637
portalUserIdentityTypeCode?: IdentityProviderTypeCode;

‎src/Spd.Presentation.Screening/ClientApp/src/app/core/code-types/application-portal-statistics-type.model.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ export enum ApplicationPortalStatisticsTypeCode {
1616
CancelledByOrganization = 'CancelledByOrganization',
1717
ClearedLastSevenDays = 'ClearedLastSevenDays',
1818
NotClearedLastSevenDays = 'NotClearedLastSevenDays',
19+
Completed = 'Completed',
1920
}

‎src/Spd.Presentation.Screening/ClientApp/src/app/core/code-types/code-desc-types.models.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export {
2+
ApplicationPortalStatisticsTypes,
23
ApplicationPortalStatusTypes,
34
CaseSubStatuses,
45
ContactAuthorizationTypes,

‎src/Spd.Presentation.Screening/ClientApp/src/app/core/code-types/model-desc.models.ts‎

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
PayerPreferenceTypeCode,
99
ServiceTypeCode,
1010
} from 'src/app/api/models';
11-
import { ScreeningTypeCode } from './code-types.models';
11+
import { ApplicationPortalStatisticsTypeCode, ScreeningTypeCode } from './code-types.models';
1212
import { CountryTypeCode } from './country-type.model';
1313

1414
export interface SelectOptions<k = string | number | boolean> {
@@ -113,69 +113,95 @@ export const ContactAuthorizationTypes: SelectOptions[] = [
113113

114114
export const ApplicationPortalStatusTypes: SelectOptions[] = [
115115
{ desc: 'Draft', code: ApplicationPortalStatusCode.Draft },
116+
{ desc: 'Verify Identity', code: ApplicationPortalStatusCode.VerifyIdentity },
117+
{ desc: 'In Progress', code: ApplicationPortalStatusCode.InProgress },
118+
{ desc: 'Payment Pending', code: ApplicationPortalStatusCode.AwaitingPayment },
119+
{ desc: 'Awaiting Third Party', code: ApplicationPortalStatusCode.AwaitingThirdParty },
120+
{ desc: 'Awaiting Applicant', code: ApplicationPortalStatusCode.AwaitingApplicant },
121+
{ desc: 'Under Assessment', code: ApplicationPortalStatusCode.UnderAssessment },
122+
{ desc: 'Incomplete', code: ApplicationPortalStatusCode.Incomplete },
123+
{ desc: 'Completed', code: ApplicationPortalStatusCode.Completed },
124+
{ desc: 'Completed - Cleared', code: ApplicationPortalStatusCode.CompletedCleared },
125+
{ desc: 'Completed - Risk Found', code: ApplicationPortalStatusCode.RiskFound },
126+
{ desc: 'Closed - No Response', code: ApplicationPortalStatusCode.ClosedNoResponse },
127+
{ desc: 'Closed - No Consent', code: ApplicationPortalStatusCode.ClosedNoConsent },
128+
{ desc: 'Cancelled by Organization', code: ApplicationPortalStatusCode.CancelledByOrganization },
129+
{ desc: 'Cancelled by Applicant', code: ApplicationPortalStatusCode.CancelledByApplicant },
130+
{ desc: 'Refund Requested', code: ApplicationPortalStatusCode.RefundRequested },
131+
];
132+
133+
export const ApplicationPortalStatisticsTypes: SelectOptions[] = [
134+
{ desc: 'Draft', code: ApplicationPortalStatisticsTypeCode.Draft },
116135
{
117136
desc: 'Verify Identity',
118-
code: ApplicationPortalStatusCode.VerifyIdentity,
137+
code: ApplicationPortalStatisticsTypeCode.VerifyIdentity,
119138
extra: `The applicant has submitted their CRC application, and the organization must confirm they have checked the applicant's government-issued photo ID`,
120139
},
121140
{
122141
desc: 'In Progress',
123-
code: ApplicationPortalStatusCode.InProgress,
142+
code: ApplicationPortalStatisticsTypeCode.InProgress,
124143
extra: 'The application is currently undergoing the screening process',
125144
},
126145
{
127146
desc: 'Payment Pending',
128-
code: ApplicationPortalStatusCode.AwaitingPayment,
147+
code: ApplicationPortalStatisticsTypeCode.AwaitingPayment,
129148
extra: 'The organization or the applicant must pay the application fee',
130149
},
131150
{
132151
desc: 'Awaiting Third Party',
133-
code: ApplicationPortalStatusCode.AwaitingThirdParty,
152+
code: ApplicationPortalStatisticsTypeCode.AwaitingThirdParty,
134153
extra: 'Waiting for information from an external party',
135154
},
136155
{
137156
desc: 'Awaiting Applicant',
138-
code: ApplicationPortalStatusCode.AwaitingApplicant,
157+
code: ApplicationPortalStatisticsTypeCode.AwaitingApplicant,
139158
extra: 'Waiting for the applicant to provide additional information',
140159
},
141160
{
142161
desc: 'Under Assessment',
143-
code: ApplicationPortalStatusCode.UnderAssessment,
162+
code: ApplicationPortalStatisticsTypeCode.UnderAssessment,
144163
extra: 'The application is in risk assessment',
145164
},
146-
{ desc: 'Incomplete', code: ApplicationPortalStatusCode.Incomplete, extra: 'Incomplete application received' },
147-
{ desc: 'Completed', code: ApplicationPortalStatusCode.Completed },
165+
{
166+
desc: 'Incomplete',
167+
code: ApplicationPortalStatisticsTypeCode.Incomplete,
168+
extra: 'Incomplete application received',
169+
},
170+
{
171+
desc: 'Completed',
172+
code: ApplicationPortalStatisticsTypeCode.Completed,
173+
extra: 'Criminal record check completed',
174+
},
148175
{
149176
desc: 'Completed - Cleared',
150-
code: ApplicationPortalStatusCode.CompletedCleared,
177+
code: ApplicationPortalStatisticsTypeCode.CompletedCleared,
151178
extra: 'Criminal record check completed - no risk',
152179
},
153180
{
154181
desc: 'Completed - Risk Found',
155-
code: ApplicationPortalStatusCode.RiskFound,
182+
code: ApplicationPortalStatisticsTypeCode.RiskFound,
156183
extra: 'The applicant is not cleared due to risk found',
157184
},
158185
{
159186
desc: 'Closed - No Response',
160-
code: ApplicationPortalStatusCode.ClosedNoResponse,
187+
code: ApplicationPortalStatisticsTypeCode.ClosedNoResponse,
161188
extra: 'No response from applicant',
162189
},
163190
{
164191
desc: 'Closed - No Consent',
165-
code: ApplicationPortalStatusCode.ClosedNoConsent,
192+
code: ApplicationPortalStatisticsTypeCode.ClosedNoConsent,
166193
extra: 'The applicant did not consent to the CRC',
167194
},
168195
{
169196
desc: 'Cancelled by Organization',
170-
code: ApplicationPortalStatusCode.CancelledByOrganization,
197+
code: ApplicationPortalStatisticsTypeCode.CancelledByOrganization,
171198
extra: 'Organization cancelled the application',
172199
},
173200
{
174201
desc: 'Cancelled by Applicant',
175-
code: ApplicationPortalStatusCode.CancelledByApplicant,
202+
code: ApplicationPortalStatisticsTypeCode.CancelledByApplicant,
176203
extra: 'The applicant cancelled their application',
177204
},
178-
{ desc: 'Refund Requested', code: ApplicationPortalStatusCode.RefundRequested },
179205
];
180206

181207
export const CountryTypes: SelectOptions[] = [

‎src/Spd.Presentation.Screening/ClientApp/src/app/core/services/util.service.ts‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ import * as moment from 'moment';
77
import { ApplicationPortalStatusCode, PaginationResponse, ScreeningTypeCode } from 'src/app/api/models';
88
import * as CodeDescTypes from 'src/app/core/code-types/code-desc-types.models';
99
import { CaptchaResponse, CaptchaResponseType } from 'src/app/shared/components/captcha-v2.component';
10-
import { ApplicationPortalStatusTypes, ScreeningTypes, SelectOptions } from '../code-types/model-desc.models';
10+
import {
11+
ApplicationPortalStatisticsTypes,
12+
ApplicationPortalStatusTypes,
13+
ScreeningTypes,
14+
SelectOptions,
15+
} from '../code-types/model-desc.models';
1116
import { SPD_CONSTANTS } from '../constants/constants';
1217

1318
@Injectable({ providedIn: 'root' })
@@ -182,8 +187,12 @@ export class UtilService {
182187
return (ApplicationPortalStatusTypes.find((item: SelectOptions) => item.code == code)?.desc as string) ?? '';
183188
}
184189

185-
getApplicationPortalStatusHint(code: string): string {
186-
return (ApplicationPortalStatusTypes.find((item: SelectOptions) => item.code == code)?.extra as string) ?? '';
190+
getApplicationPortalStatisticsDesc(code: string): string {
191+
return (ApplicationPortalStatisticsTypes.find((item: SelectOptions) => item.code == code)?.desc as string) ?? '';
192+
}
193+
194+
getApplicationPortalStatisticsHint(code: string): string {
195+
return (ApplicationPortalStatisticsTypes.find((item: SelectOptions) => item.code == code)?.extra as string) ?? '';
187196
}
188197

189198
getDateString(date: Date): string {

‎src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/screening-status-filter-common.component.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ export class ScreeningStatusFilterCommonComponent extends BaseFilterComponent im
115115
} else {
116116
this.applicationPortalStatusCodes = statuses.filter(
117117
(item: SelectOptions) =>
118+
item.code != ApplicationPortalStatusCode.AwaitingThirdParty &&
119+
item.code != ApplicationPortalStatusCode.UnderAssessment &&
118120
item.code != ApplicationPortalStatusCode.CompletedCleared &&
119121
item.code != ApplicationPortalStatusCode.RiskFound
120122
);

‎src/Spd.Presentation.Screening/ClientApp/src/app/shared/components/screening-statuses-common.component.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,7 @@ export class ScreeningStatusesCommonComponent implements OnInit {
382382
this.defaultStatuses = [
383383
ApplicationPortalStatusCode.AwaitingApplicant,
384384
ApplicationPortalStatusCode.AwaitingPayment,
385-
ApplicationPortalStatusCode.AwaitingThirdParty,
386385
ApplicationPortalStatusCode.InProgress,
387-
ApplicationPortalStatusCode.UnderAssessment,
388386
ApplicationPortalStatusCode.VerifyIdentity,
389387
];
390388

0 commit comments

Comments
 (0)