diff --git a/src/app/forms/models/testTypeId.enum.ts b/src/app/forms/models/testTypeId.enum.ts index 54c074738a..8e70294bf5 100644 --- a/src/app/forms/models/testTypeId.enum.ts +++ b/src/app/forms/models/testTypeId.enum.ts @@ -13,14 +13,26 @@ export const TEST_TYPES_GROUP2: string[] = ['15', '16', '23', '19', '22']; // 38 through 36 - tests for PSV - Notifiable alteration check, voluntary brake test, voluntary multi check, voluntary speed limiter check // voluntary smoke test, voluntary headlamp aim test, vitesse 100 replacement, vitesse 100 application, voluntary tempo 100 // 86 through 90 - tests for HGV - voluntary multi-check, voluntary speed limiter check, voluntary smoke and headlamp aim test -// NOTE: the 47, and 48 from group 8 are excluded and use there own template to enable issuing documents centrally -export const TEST_TYPES_GROUP3_4_8: string[] = ['38', '30', '33', '34', '32', '31', '100', '121', '36', '86', '88', '89', '90', '87', '85']; - -// 47 - free notifiable alteration (HGV/TRL), 48 - paid notifiable alteration (HGV/TRL) -export const TEST_TYPES_GROUP8_NOTIFABLE = ['47', '48']; - // 87 through 85 - tests for HGV and TRL - voluntary shaker plate check, Free/Paid notifiable alteration, voluntary break test -export const TEST_TYPES_GROUP8_VOLUNTARY = ['85', '87']; +export const TEST_TYPES_GROUP3_4_8: string[] = [ + '38', + '30', + '33', + '34', + '32', + '31', + '100', + '121', + '36', + '86', + '88', + '89', + '90', + '87', + '47', + '48', + '85', +]; // 56 and 49 - tests for HGV and TRL - Paid TIR retest, TIR test // 57 - test for TRL - Free TIR retest @@ -198,7 +210,6 @@ export const TEST_TYPES = { testTypesGroup2: TEST_TYPES_GROUP2, testTypesGroup3And4And8: TEST_TYPES_GROUP3_4_8, testTypesGroup7: TEST_TYPES_GROUP7, - testTypesGroup8Notifiable: TEST_TYPES_GROUP8_NOTIFABLE, testTypesGroup9And10: TEST_TYPES_GROUP9_10, testTypesGroup6And11: TEST_TYPES_GROUP6_11, testTypesGroup12And14: TEST_TYPES_GROUP12_14, diff --git a/src/app/forms/templates/test-records/create-master.template.ts b/src/app/forms/templates/test-records/create-master.template.ts index a450d13c0d..5ae59ff5d3 100644 --- a/src/app/forms/templates/test-records/create-master.template.ts +++ b/src/app/forms/templates/test-records/create-master.template.ts @@ -28,7 +28,6 @@ import { ContingencyTestSectionGroup3And4And8 } from './section-templates/test/c import { ContingencyTestSectionGroup5And13 } from './section-templates/test/contingency/contingency-test-section-group5And13.template'; import { ContingencyTestSectionGroup6And11 } from './section-templates/test/contingency/contingency-test-section-group6And11.template'; import { ContingencyTestSectionGroup7 } from './section-templates/test/contingency/contingency-test-section-group7.template'; -import { ContingencyTestSectionGroup8Notifiable } from './section-templates/test/contingency/contingency-test-section-group8Notifiable.template'; import { ContingencyTestSectionGroup9And10 } from './section-templates/test/contingency/contingency-test-section-group9And10.template'; import { ContingencyTestSectionSpecialistGroup1 } from './section-templates/test/contingency/contingency-test-section-specialist-group1.template'; import { ContingencyTestSectionSpecialistGroup2 } from './section-templates/test/contingency/contingency-test-section-specialist-group2.template'; @@ -101,17 +100,6 @@ export const contingencyTestTemplates: Record