Skip to content
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

Jump to bottom

show no job running after print again (no touch) #1861

Merged
merged 1 commit into from
May 25, 2021
Merged

show no job running after print again (no touch) #1861

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
55 changes: 39 additions & 16 deletions src/app/job-status/job-status.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
<div class="job-info" *ngIf="jobStatus.file && isPrinting()">
<div class="job-info__progress" *ngIf="!showPreviewWhilePrinting">
<round-progress [current]="jobStatus.progress" [max]="100" [stroke]="25" [rounded]="true" [responsive]="true"
[color]="'#4bae50'"></round-progress>
<round-progress
[current]="jobStatus.progress"
[max]="100"
[stroke]="25"
[rounded]="true"
[responsive]="true"
[color]="'#4bae50'"
></round-progress>
<div class="job-info__progress-percentage">{{ jobStatus.progress }}<span style="font-size: 40%">%</span></div>
</div>

Expand All @@ -14,8 +20,14 @@
</div>

<div *ngIf="useCircularProgressBar()" style="height: 23.5vw" id="progress-preview-circle">
<round-progress [current]="jobStatus.progress" [max]="100" [stroke]="25" [rounded]="true" [responsive]="true"
[color]="'#4bae50'"></round-progress>
<round-progress
[current]="jobStatus.progress"
[max]="100"
[stroke]="25"
[rounded]="true"
[responsive]="true"
[color]="'#4bae50'"
></round-progress>

<div class="job-info__progress-percentage job-info__progress-preview-image-container">
<img class="job-info__progress-preview-image" [src]="thumbnail" />
Expand All @@ -30,9 +42,7 @@
<br />
<span class="job-info__filament" *ngIf="hasProperty(jobStatus, 'filamentAmount')">
{{ jobStatus.filamentAmount }}
<ng-container i18n="@@job-filament-g">
g Filament
</ng-container>
<ng-container i18n="@@job-filament-g"> g Filament </ng-container>
</span>
<br />

Expand All @@ -55,14 +65,25 @@
<span class="job-info__filename">{{ jobStatus.file }}</span>
<br />

<span (click)="preheat()" matRipple [matRippleUnbounded]="true" [matRippleCentered]="true"
class="job-info__actions-item-heat" *ngIf="isPreheatEnabled()">
<span
(click)="preheat()"
matRipple
[matRippleUnbounded]="true"
[matRippleCentered]="true"
class="job-info__actions-item-heat"
*ngIf="isPreheatEnabled()"
>
<img src="assets/heat.svg" class="job-info__actions-item-heat-icon" />
</span>
<br />

<span (click)="startJob()" matRipple [matRippleUnbounded]="true" [matRippleCentered]="true"
class="job-info__actions-item-print">
<span
(click)="startJob()"
matRipple
[matRippleUnbounded]="true"
[matRippleCentered]="true"
class="job-info__actions-item-print"
>
<img src="assets/print.svg" class="job-info__actions-item-print-icon" />
</span>
<br />
Expand All @@ -89,12 +110,14 @@
</div>
</div>

<div class="job-info__no-job loading-dots" *ngIf="(!jobStatus.file && isFileLoaded()) || (!jobStatus && isPrinting())"
i18n="@@loading-info">
<div
class="job-info__no-job loading-dots"
*ngIf="(!jobStatus.file && isFileLoaded()) || (!jobStatus && isPrinting())"
i18n="@@loading-info"
>
loading info
</div>

<div class="job-info__no-job" *ngIf="!jobStatus.file && !isFileLoaded() && !isPrinting()" i18n="@@no-job">no job running
...</div>
<div class="job-info__no-job" *ngIf="!isFileLoaded() && !isPrinting()" i18n="@@no-job">no job running ...</div>

<span id="jobTogglePreview" (click)="togglePreview()"></span>
<span id="jobTogglePreview" (click)="togglePreview()"></span>