Skip to content

Change layout for status card; fix progress bar #1237

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
Apr 14, 2025
Merged

Change layout for status card; fix progress bar #1237

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
48 changes: 22 additions & 26 deletions ...i/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,34 +20,30 @@
[class.progress-card-pilot]="data.device.test_pack === TestingType.Pilot"
aria-live="assertive"
role="alert">
<div class="progress-card-header">
<div class="progress-card-info progress-card-info-tests">
<p class="progress-card-info-title">Tests executed</p>
<div class="progress-card-info progress-card-info-tests">
<p class="progress-card-info-title">Tests executed</p>
<p class="progress-card-info-text">
<span>{{ getTestsResult(data) }}</span>
</p>
</div>

<div class="progress-card-info progress-card-info-status">
<div>
<p class="progress-card-info-title">{{ getTestStatusText(data) }}</p>
<p class="progress-card-info-text">
<span>{{ getTestsResult(data) }}</span>
<span>{{ getTestStatus(data) }}</span>
</p>
</div>

<div class="progress-card-info progress-card-info-status">
<div>
<p class="progress-card-info-title">{{ getTestStatusText(data) }}</p>
<p class="progress-card-info-text">
<span>{{ getTestStatus(data) }}</span>
</p>
</div>
<div
*ngIf="
data.finished &&
(data.status === StatusOfTestrun.Proceed ||
data.status === StatusOfTestrun.DoNotProceed)
">
<p class="progress-card-info-title">
Preliminary Pilot Recommendation
</p>
<p class="progress-card-info-text">
<span>{{ data.status }}</span>
</p>
</div>
<div
*ngIf="
data.finished &&
(data.status === StatusOfTestrun.Proceed ||
data.status === StatusOfTestrun.DoNotProceed)
">
<p class="progress-card-info-title">Preliminary Pilot Recommendation</p>
<p class="progress-card-info-text">
<span>{{ data.status }}</span>
</p>
</div>
</div>
<div
Expand Down Expand Up @@ -143,7 +139,7 @@
<ng-template #WithProgressBar let-data="data">
<div class="progress-card-status progress-card-status-bar">
<mat-progress-bar
class="progress-bar"
class="progress-bar progress-value-{{ getProgressValue(data) }}"
mode="determinate"
[value]="getProgressValue(data)"
[attr.aria-label]="data.status + ' ' + getProgressValue(data) + '%'">
Expand Down
24 changes: 16 additions & 8 deletions ...i/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,19 @@

.progress-card {
display: grid;
grid-template-areas:
'tests status'
'bar bar';
width: fit-content;
box-sizing: border-box;
gap: 16px;
padding: 16px 0;
justify-items: center;
grid-template-columns: min-content 1fr;

p {
margin: 0;
}

.progress-card-header {
display: flex;
justify-content: flex-start;
flex-wrap: nowrap;
column-gap: 16px;
}

.progress-bar {
padding-bottom: 28px;
width: 100%;
Expand Down Expand Up @@ -124,21 +120,25 @@
}

.progress-card-info-tests {
grid-area: tests;
@include progress-card-info(
colors.$surface-variant,
colors.$on-surface-variant,
colors.$on-surface
);
justify-self: end;
}

.progress-card-info-status {
grid-area: status;
@include progress-card-info(
colors.$primary,
colors.$primary-container,
colors.$on-primary
);
flex-direction: row;
gap: 32px;
justify-self: stretch;

&-pilot {
gap: 6px;
Expand All @@ -154,6 +154,7 @@

.progress-card-status {
overflow: hidden;
grid-area: bar;
white-space: normal;
&-bar {
width: 100%;
Expand All @@ -175,3 +176,10 @@
margin-left: 32px;
}
}

@for $i from 1 through 100 {
.progress-value-#{$i} ::ng-deep .mdc-linear-progress__primary-bar {
transform: scaleX(1) !important;
width: #{$i * 1%};
}
}