-
Preliminary Pilot Recommendation
-
- {{ data.status }}
-
+
+
+
+
diff --git a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.scss b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.scss
index f54554db8..69b4d5ac1 100644
--- a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.scss
+++ b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.scss
@@ -65,6 +65,26 @@
.progress-bar {
padding-bottom: 28px;
+ width: 460px;
+ border-radius: 45%;
+ }
+
+ @include mat.progress-bar-overrides(
+ (
+ active-indicator-color: colors.$primary,
+ track-color: colors.$secondary-container,
+ active-indicator-height: 12px,
+ track-height: 12px,
+ )
+ );
+
+ &.canceled {
+ @include mat.progress-bar-overrides(
+ (
+ active-indicator-color: colors.$on-surface,
+ track-color: colors.$surface-variant,
+ )
+ );
}
&.progress .progress-card-info-status {
@@ -72,15 +92,15 @@
}
&.completed-success .progress-card-info-status {
- background-color: #188038; /* TODO update with variable*/
+ background-color: colors.$on-tertiary-container;
}
&.completed-failed .progress-card-info-status {
- background-color: colors.$red-800;
+ background-color: colors.$on-error-container;
}
&.canceled .progress-card-info-status {
- background-color: colors.$secondary;
+ background-color: colors.$on-surface;
}
}
@@ -103,7 +123,6 @@
colors.$on-primary
);
justify-self: start;
- width: 343px;
&-pilot {
gap: 6px;
@@ -115,6 +134,7 @@
grid-area: 2/1/2/3;
max-width: max-content;
white-space: normal;
+ justify-self: center;
}
.progress-card-result-loading {
diff --git a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts
index 81467b207..1c3c125c7 100644
--- a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts
+++ b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts
@@ -26,6 +26,7 @@ import {
MOCK_PROGRESS_DATA_COMPLIANT,
MOCK_PROGRESS_DATA_IN_PROGRESS,
MOCK_PROGRESS_DATA_MONITORING,
+ MOCK_PROGRESS_DATA_PROCEED,
MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE,
MOCK_PROGRESS_DATA_WITH_ERROR,
} from '../../../../mocks/testrun.mock';
@@ -170,29 +171,55 @@ describe('ProgressStatusCardComponent', () => {
});
});
+ describe('#getTestStatusText should return status text as', () => {
+ it('"Status" if not finished', () => {
+ const expectedText = 'Status';
+
+ const result = component.getTestStatusText(
+ MOCK_PROGRESS_DATA_MONITORING
+ );
+
+ expect(result).toEqual(expectedText);
+ });
+
+ it('"Result" if finished and not Pilot statuses', () => {
+ const expectedText = 'Result';
+
+ const result = component.getTestStatusText(
+ MOCK_PROGRESS_DATA_COMPLIANT
+ );
+
+ expect(result).toEqual(expectedText);
+ });
+
+ it('"Preliminary Pilot Recommendation" if finished and Pilot statuses', () => {
+ const expectedText = 'Preliminary Pilot Recommendation';
+
+ const result = component.getTestStatusText(MOCK_PROGRESS_DATA_PROCEED);
+
+ expect(result).toEqual(expectedText);
+ });
+ });
+
describe('#getTestStatus', () => {
- it('should return test status "Complete" if testrun is finished', () => {
- const expectedResult = 'Complete';
+ it('should return test result if testrun has status "Complete"', () => {
+ const expectedResult = MOCK_PROGRESS_DATA_COMPLIANT.result as string;
const result = component.getTestStatus(MOCK_PROGRESS_DATA_COMPLIANT);
expect(result).toEqual(expectedResult);
});
- it('should return test status "Incomplete" if status "Cancelled"', () => {
- const expectedResult = 'Incomplete';
-
+ it('should return test status "Cancelled" if status "Cancelled"', () => {
const result = component.getTestStatus(MOCK_PROGRESS_DATA_CANCELLED);
- expect(result).toEqual(expectedResult);
+ expect(result).toEqual(StatusOfTestrun.Cancelled);
});
it('should return test status "In Progress" if status "In Progress"', () => {
- const expectedResult = 'In Progress';
-
const result = component.getTestStatus(MOCK_PROGRESS_DATA_IN_PROGRESS);
- expect(result).toEqual(expectedResult);
+ expect(result).toEqual(StatusOfTestrun.InProgress);
});
it('should return test status "Monitoring" if finished with status "Monitoring"', () => {
@@ -272,28 +299,19 @@ describe('ProgressStatusCardComponent', () => {
expect(progressCardEl?.classList).toContain('canceled');
});
- it('should not have progress bar element', () => {
+ it('should have progress bar element', () => {
const progressBarEl = compiled.querySelector('.progress-bar');
- expect(progressBarEl).toBeNull();
- });
-
- it('should have progress card result', () => {
- const progressCardResultEl = compiled.querySelector(
- '.progress-card-result-text span'
- );
-
- expect(progressCardResultEl).not.toBeNull();
- expect(progressCardResultEl?.textContent).toEqual('Cancelled');
+ expect(progressBarEl).not.toBeNull();
});
- it('should have progress card status text as "Incomplete"', () => {
+ it('should have progress card status text as "Cancelled"', () => {
const progressCardStatusText = compiled.querySelector(
'.progress-card-info-status .progress-card-info-text > span'
);
expect(progressCardStatusText).not.toBeNull();
- expect(progressCardStatusText?.textContent).toEqual('Incomplete');
+ expect(progressCardStatusText?.textContent).toEqual('Cancelled');
});
});
diff --git a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts
index cafeb6e16..77ea36823 100644
--- a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts
+++ b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts
@@ -110,22 +110,22 @@ export class TestrunStatusCardComponent {
return '-/-';
}
- public getTestStatus(data: TestrunStatus): string {
- if (data.status === StatusOfTestrun.Cancelled) {
- return 'Incomplete';
- } else if (data.finished && !this.isProgressStatus(data.status)) {
- return 'Complete';
+ public getTestStatusText(data: TestrunStatus): string {
+ if (!data.finished) {
+ return 'Status';
+ } else if (
+ data.finished &&
+ (data.status === StatusOfTestrun.Proceed ||
+ data.status === StatusOfTestrun.DoNotProceed)
+ ) {
+ return 'Preliminary Pilot Recommendation';
} else {
- return data.status;
+ return 'Result';
}
}
- public getTestResult(data: TestrunStatus): string {
- if (
- data.status === StatusOfTestrun.Complete ||
- data.status === StatusOfTestrun.Proceed ||
- data.status === StatusOfTestrun.DoNotProceed
- ) {
+ public getTestStatus(data: TestrunStatus): string {
+ if (data.status === StatusOfTestrun.Complete) {
return data.result!;
}
return data.status;
diff --git a/modules/ui/src/app/pages/testrun/testrun.component.html b/modules/ui/src/app/pages/testrun/testrun.component.html
index 196d308ff..f38eebbb1 100644
--- a/modules/ui/src/app/pages/testrun/testrun.component.html
+++ b/modules/ui/src/app/pages/testrun/testrun.component.html
@@ -47,10 +47,6 @@