Skip to content

Commit

Permalink
updated activity code from 12 to 89
Browse files Browse the repository at this point in the history
  • Loading branch information
RLCorp committed Sep 17, 2024
1 parent c10c1e5 commit 2527cf2
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@dvsa/mes-mot-schema": "1.0.2",
"@dvsa/mes-microservice-common": "^1.1.9",
"@dvsa/mes-search-schema": "1.3.0",
"@dvsa/mes-test-schema": "3.43.0",
"@dvsa/mes-test-schema": "3.43.1",
"@ionic-enterprise/auth": "3.9.5",
"@ionic/angular": "~7.5.7",
"@ionic/core": "~7.5.7",
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/models/activity-codes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ export enum ActivityCodes {
FAIL_PUBLIC_SAFETY = '4',
FAIL_CANDIDATE_STOPS_TEST = '5',
MECHANICAL_FAILURE = '11',
MOT_INVALID = '12',
DOCUMENTS_NOT_PRODUCED = '20',
VEHICLE_NOT_SUITABLE = '21',
NO_L_PLATES = '22',
Expand Down Expand Up @@ -46,6 +45,7 @@ export enum ActivityCodes {
INCORRECT_LENSE_WORN = '82',
SITE_ACCESS_MANAGER_NOT_AVAILABLE = '83',
NO_BODY_CAM_AVAILABLE = '88',
MOT_INVALID = '89',
}

export enum DelegatedExaminerActivityCodes {
Expand Down
6 changes: 5 additions & 1 deletion src/components/common/activity-code/activity-code.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { ActivityCodeModalEvent } from '@components/common/activity-code/acitivi
import { ModalActivityCodeListComponent } from '@components/common/modal-activity-code-list/modal-activity-code-list';
import { ModalController } from '@ionic/angular';
import { ActivityCodeModel } from '@shared/constants/activity-code/activity-code.constants';
import { ActivityCodes } from '@shared/models/activity-codes';

@Component({
selector: 'activity-code',
Expand Down Expand Up @@ -62,7 +63,10 @@ export class ActivityCodeComponent implements OnChanges {
if (this.activityCodeModel) {
activityCode = Number.parseInt(this.activityCodeModel.activityCode, 10);
}
return this.disabled || (this.activityCodeModel && (activityCode < 4 || activityCode == 12));
return (
this.disabled ||
(this.activityCodeModel && (activityCode < 4 || activityCode == Number.parseInt(ActivityCodes.MOT_INVALID)))
);
}

openActivityCodeListModal = async (): Promise<void> => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { ActivityCodeModalEvent } from '@components/common/activity-code/acitivi
import { ActivityCode } from '@dvsa/mes-test-schema/categories/common';
import { ModalController } from '@ionic/angular';
import { ActivityCodeModel } from '@shared/constants/activity-code/activity-code.constants';
import { ActivityCodes } from '@shared/models/activity-codes';
import { get } from 'lodash-es';

@Component({
Expand All @@ -22,7 +23,8 @@ export class ModalActivityCodeListComponent {
};

isOptionDisabled = (activityCode: ActivityCode): boolean =>
Number.parseInt(activityCode, 10) < 4 || Number.parseInt(activityCode, 10) == 12;
Number.parseInt(activityCode, 10) < 4 ||
Number.parseInt(activityCode, 10) == Number.parseInt(ActivityCodes.MOT_INVALID);

selectActivityCode = async (activityCodeModel: ActivityCodeModel): Promise<void> => {
if (this.isOptionDisabled(activityCodeModel.activityCode)) {
Expand Down

0 comments on commit 2527cf2

Please sign in to comment.