Skip to content

Fix device testing type #737

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

Merged
sofyakurilova merged 1 commit into from
Sep 2, 2024
Merged

Fix device testing type #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/ui/src/app/model/device.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ export interface QuestionnaireFormat extends QuestionFormat {
}

export enum TestingType {
Pilot = 'Pilot assessment',
Qualification = 'Device qualification',
Pilot = 'Pilot Assessment',
Qualification = 'Device Qualification',
}
6 changes: 3 additions & 3 deletions .../devices/components/device-qualification-from/device-qualification-from.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ describe('DeviceQualificationFromComponent', () => {
manufacturer: 'test',
model: '',
mac_addr: '',
test_pack: 'Device qualification',
test_pack: 'Device Qualification',
type: '',
technology: '',
test_modules: {
Expand Down Expand Up @@ -586,7 +586,7 @@ describe('DeviceQualificationFromComponent', () => {
manufacturer: 'manufacturer',
model: 'model',
mac_addr: '07:07:07:07:07:07',
test_pack: 'Device qualification',
test_pack: 'Device Qualification',
type: '',
technology: '',
test_modules: {
Expand Down Expand Up @@ -643,7 +643,7 @@ describe('DeviceQualificationFromComponent', () => {
manufacturer: 'manufacturer',
model: 'model',
mac_addr: '07:07:07:07:07:07',
test_pack: 'Device qualification',
test_pack: 'Device Qualification',
type: '',
technology: '',
test_modules: {
Expand Down
6 changes: 5 additions & 1 deletion ...pages/devices/components/device-qualification-from/device-qualification-from.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,11 @@ export class DeviceQualificationFromComponent
this.manufacturer.setValue(device.manufacturer);
this.mac_addr.setValue(device.mac_addr);

if (device.test_pack) {
if (
device.test_pack &&
(device.test_pack === TestingType.Qualification ||
device.test_pack === TestingType.Pilot)
) {
this.test_pack.setValue(device.test_pack);
} else {
this.test_pack.setValue(TestingType.Qualification);
Expand Down