Commits

Ronnie Birkelund Trøjborg authored e34ccc8b9dd Merge 
Pull request #44: Added scroll into view on activities view + timeout

Merge in WEC/egraviditet from feature/rbt/DGAF-1067-autoscroll to develop

* commit '1b802d1ac8d4d325adfdf17f7b7f8fbc981bcc8a':
  Fixed a couple super flaky tests
  keep alive and force logout functional
  Added scroll into view on activities view
No tags
56cc67aff91
master

src/app/activities/activities.component.html

Modified
24 24 <div class="activities-timeline"></div>
25 25 <div class="activities-container">
26 26 <app-activity-card [appHighlightOnNavigation]="activity.id" *ngFor="let activity of pastActivities$ | async" [activity]="activity"></app-activity-card>
27 27 </div>
28 28 </div>
29 29 </fieldset>
30 30 <fieldset class="fieldset--last">
31 31 <legend align="center" #divider>Kommende aftaler</legend>
32 32 <div class="timeline-container">
33 33 <div class="activities-timeline"></div>
34 - <div class="activities-container">
34 + <div class="activities-container" #upcomingActivities>
35 35 <app-activity-card [appHighlightOnNavigation]="activity.id" *ngFor="let activity of futureActivities$ | async" [activity]="activity"></app-activity-card>
36 36 </div>
37 37 </div>
38 38 </fieldset>
39 39 <app-activity-modal #activityModal></app-activity-modal>
40 40 <app-edit-plan-modal #editPlanModal></app-edit-plan-modal>
41 41 <app-note-modal #noteModal></app-note-modal>
42 42 <app-measurements-modal [isOpen]="measurementsModalEvent.isOpen"
43 43 (modalClosed)="measurementsModalEvent.isOpen = false; measurementsModalEvent.activity = undefined"
44 44 [observationType]="measurementsModalEvent.observationType"

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut