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

Add first and last buttons #1304

Merged
merged 5 commits into from
Jul 4, 2022
Merged

Add first and last buttons #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a925784
Add first and last buttons
Schottkyc137 May 31, 2022
12ba167
tweak layout for long names
sleidig Jun 30, 2022
b5969fc
Merge branch 'master' into 1303-skip-to-end
sleidig Jun 30, 2022
01aaeab
clarify comment
sleidig Jun 30, 2022
30e3608
Merge branch 'master' into 1303-skip-to-end
TheSlimvReal Jul 4, 2022
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
29 changes: 20 additions & 9 deletions src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,27 @@
mode="determinate"
[value]="(currentIndex / children.length) * 100"
></mat-progress-bar>
<div class="progress-label" [style.visibility]="currentIndex < children.length ? 'visible' : 'hidden'">
{{ currentIndex+1 }} / {{ children.length }}

<div fxLayout="row" class="progress-nav">
<button mat-icon-button (click)="goToFirst()" [disabled]="isFirst" class="button-skip" fxFlex="40px">
<fa-icon icon="angle-double-left"></fa-icon>
</button>
<button mat-icon-button (click)="goToPrevious()" [disabled]="isFirst" class="button-skip" fxFlex="40px">
<fa-icon icon="angle-left"></fa-icon>
</button>
<div class="progress-label" [style.visibility]="currentIndex < children.length ? 'visible' : 'hidden'" fxFlex="grow">
{{ currentIndex+1 }} / {{ children.length }}
</div>
<button mat-icon-button (click)="goToNext()" [disabled]="isFinished" class="button-skip" fxFlex="40px">
<fa-icon icon="angle-right"></fa-icon>
</button>
<button mat-icon-button (click)="goToLast()" [disabled]="isFinished" class="button-skip" fxFlex="40px">
<fa-icon icon="angle-double-right"></fa-icon>
</button>
</div>
</div>
<div class="navbar-wrapper margin-bottom-small">
<button mat-icon-button class="button-aligned-left" (click)="goToPrevious()" [disabled]="isFirst">
<fa-icon icon="chevron-left"></fa-icon>
</button>

<div class="child-block-container">
<app-child-block
class="child-block"
*ngIf="!isFinished"
Expand All @@ -22,10 +35,8 @@
[tooltipDisabled]="true">
</app-child-block>
<div class="placeholder" *ngIf="isFinished"></div>
<button class="button-aligned-right" mat-icon-button (click)="goToNext()" [disabled]="isFinished">
<fa-icon icon="chevron-right"></fa-icon>
</button>
</div>

<div *ngIf="!isFinished && currentAttendance" class="tab-wrapper">
<app-roll-call-tab
(swiperight)="goToPrevious()"
Expand Down
31 changes: 17 additions & 14 deletions src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../../../../styles";

.group-select-option {
width: 100%;
cursor: pointer;
Expand Down Expand Up @@ -37,18 +39,29 @@
}

.progress-label {
align-self: flex-end;
display: flex;
place-content: center;
}

.attendance-progress-bar {
display: flex;
flex-direction: column;
margin-top: $standard-margin-small;
margin-bottom: $standard-margin-small;
}

.progress-nav {
margin-top: -4px;
}

.child-block {
flex-grow: 1;
display: flex;
place-content: center;
place-content: flex-start;
}

.child-block-container {
margin: $standard-margin-small;
}

.finished-screen-button {
Expand Down Expand Up @@ -88,18 +101,8 @@
// with the content
// `text-align: left` would work as well, but not with the ripples

.button-aligned-left {
// Position the button relative to it's parent
position: relative;
// This is the amount the button has to be shifted to be left-aligned
left: -15px;
}

.button-aligned-right {
// Position the button relative to it's parent
position: relative;
// This is the amount the button has to be shifted to be right-aligned
right: -15px;
.button-skip {
margin-top: -10px;
}

.full-width {
Expand Down
9 changes: 9 additions & 0 deletions src/app/child-dev-project/attendance/add-day-attendance/roll-call/roll-call.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,15 @@ export class RollCallComponent implements OnChanges {
}
}

goToFirst() {
this.goToParticipantWithIndex(0);
}

goToLast() {
// jump directly to completed state, i.e. beyond last participant index
this.goToParticipantWithIndex(this.children.length);
}

get isFirst(): boolean {
return this.currentIndex === 0;
}
Expand Down