Fix calendar height

pull/10554/head
Benjamin Bädorf 3 years ago
parent ef28d4f086
commit 2b9e636417
No known key found for this signature in database
GPG Key ID: 069CA2D117AB5CCF
  1. 3
      frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts
  2. 26
      frontend/src/app/features/calendar/te-calendar/te-calendar.template.html

@ -122,7 +122,8 @@ export class TimeEntryCalendarComponent {
initialView: 'timeGridWeek', initialView: 'timeGridWeek',
firstDay: this.configuration.startOfWeek(), firstDay: this.configuration.startOfWeek(),
hiddenDays: [], hiddenDays: [],
contentHeight: 605, // This is a magic number that is derived by trial and error
contentHeight: 550,
slotEventOverlap: false, slotEventOverlap: false,
slotLabelInterval: `${this.labelIntervalHours}:00:00`, slotLabelInterval: `${this.labelIntervalHours}:00:00`,
slotLabelFormat: (info:any) => ((this.maxHour - info.date.hour) / this.scaleRatio).toString(), slotLabelFormat: (info:any) => ((this.maxHour - info.date.hour) / this.scaleRatio).toString(),

@ -1,19 +1,25 @@
<!-- position: relative added in order for the loading indicator to be positioned correctly --> <!-- position: relative added in order for the loading indicator to be positioned correctly -->
<div class="te-calendar--container loading-indicator--location" <div
class="te-calendar--container loading-indicator--location"
[attr.data-indicator-name]="'table'" [attr.data-indicator-name]="'table'"
style="position: relative"> style="position: relative"
>
<button *ngIf="memoizedCreateAllowed" <button
*ngIf="memoizedCreateAllowed"
class="button te-calendar--create-button" class="button te-calendar--create-button"
[attr.aria-label]="text.logTime" [attr.aria-label]="text.logTime"
(click)="addEventToday()"> (click)="addEventToday()"
>
<op-icon icon-classes="button--icon icon-log_time"></op-icon> <op-icon icon-classes="button--icon icon-log_time"></op-icon>
<span class="button--text" <span
class="button--text"
[textContent]="text.logTime" [textContent]="text.logTime"
aria-hidden="true"></span> aria-hidden="true"
></span>
</button> </button>
<full-calendar #ucCalendar <full-calendar
[options]="calendarOptions"> #ucCalendar
</full-calendar> [options]="calendarOptions"
></full-calendar>
</div> </div>

Loading…
Cancel
Save