Fixing last breaking changes

This commit is contained in:
Zoe Roux 2021-07-23 20:22:34 +02:00
parent 87783a5bfd
commit c037270d33
4 changed files with 29 additions and 17 deletions

View File

@ -2,7 +2,7 @@ import { HTTP_INTERCEPTORS, HttpClientModule } from "@angular/common/http";
import { APP_INITIALIZER, NgModule } from "@angular/core"; import { APP_INITIALIZER, NgModule } from "@angular/core";
import { MatButtonModule } from "@angular/material/button"; import { MatButtonModule } from "@angular/material/button";
import { MatCardModule } from "@angular/material/card"; import { MatCardModule } from "@angular/material/card";
import { MatRippleModule } from "@angular/material/core"; import { MatNativeDateModule, MatRippleModule } from "@angular/material/core";
import { MatIconModule } from "@angular/material/icon"; import { MatIconModule } from "@angular/material/icon";
import { MatMenuModule } from "@angular/material/menu"; import { MatMenuModule } from "@angular/material/menu";
import { MatProgressBarModule } from "@angular/material/progress-bar"; import { MatProgressBarModule } from "@angular/material/progress-bar";
@ -49,6 +49,7 @@ import { MatBadgeModule } from "@angular/material/badge";
import { StartupService } from "./services/startup.service"; import { StartupService } from "./services/startup.service";
import { LongPressDirective } from "./misc/long-press.directive"; import { LongPressDirective } from "./misc/long-press.directive";
import { DatetimeInterceptorService } from "./services/datetime-interceptor.service"; import { DatetimeInterceptorService } from "./services/datetime-interceptor.service";
import { MatDatepickerModule } from "@angular/material/datepicker";
@NgModule({ @NgModule({
@ -103,7 +104,9 @@ import { DatetimeInterceptorService } from "./services/datetime-interceptor.serv
MatExpansionModule, MatExpansionModule,
InfiniteScrollModule, InfiniteScrollModule,
MatBadgeModule, MatBadgeModule,
HammerModule HammerModule,
MatDatepickerModule,
MatNativeDateModule
], ],
bootstrap: [AppComponent], bootstrap: [AppComponent],
exports: [ exports: [

View File

@ -30,13 +30,15 @@
</mat-form-field> </mat-form-field>
<mat-form-field class="w-25 pr-3"> <mat-form-field class="w-25 pr-3">
<mat-label>Start Year</mat-label> <mat-label>Air period</mat-label>
<input matInput [(ngModel)]="this.show.startYear" name="startYear" type="number" [max]="this.show.endYear"/> <mat-date-range-input [rangePicker]="picker">
</mat-form-field> <input matStartDate placeholder="Start date" name="startAir" [(ngModel)]="this.show.startAir">
<mat-form-field class="w-25 pr-3"> <input matEndDate placeholder="End date" name="endAir" [(ngModel)]="this.show.endAir">
<mat-label>End Year</mat-label> </mat-date-range-input>
<input matInput [(ngModel)]="this.show.endYear" name="endYear" type="number" [min]="this.show.startYear"/> <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
<mat-date-range-picker #picker></mat-date-range-picker>
</mat-form-field> </mat-form-field>
<mat-form-field class="w-50"> <mat-form-field class="w-50">
<mat-label>Status</mat-label> <mat-label>Status</mat-label>
<mat-select> <mat-select>

View File

@ -10,8 +10,7 @@
<div class="main col"> <div class="main col">
<div class="info"> <div class="info">
<h1 class="title">{{this.show.title}}</h1> <h1 class="title">{{this.show.title}}</h1>
<h2 class="date" *ngIf="show.endYear && show.startYear != show.endYear; else elseBlock">{{show.startYear}} - {{show.endYear}}</h2> <h2 class="date" *ngIf="getDate(show)">{{getDate(show)}}</h2>
<ng-template #elseBlock><h2 class="date">{{show.startYear}}</h2></ng-template>
</div> </div>
<div class="buttons"> <div class="buttons">
<button mat-mini-fab matTooltipPosition="above" matTooltip="Play" class="mr-3" (click)="playClicked()"> <button mat-mini-fab matTooltipPosition="above" matTooltip="Play" class="mr-3" (click)="playClicked()">

View File

@ -3,7 +3,7 @@ import { MatSnackBar } from "@angular/material/snack-bar";
import { DomSanitizer, SafeStyle, Title } from "@angular/platform-browser"; import { DomSanitizer, SafeStyle, Title } from "@angular/platform-browser";
import { ActivatedRoute, Router } from "@angular/router"; import { ActivatedRoute, Router } from "@angular/router";
import { Episode } from "../../models/resources/episode"; import { Episode } from "../../models/resources/episode";
import { Show } from "../../models/resources/show"; import { Show, ShowRole } from "../../models/resources/show";
import { MatDialog } from "@angular/material/dialog"; import { MatDialog } from "@angular/material/dialog";
import { TrailerDialogComponent } from "../trailer-dialog/trailer-dialog.component"; import { TrailerDialogComponent } from "../trailer-dialog/trailer-dialog.component";
import { MetadataEditComponent } from "../metadata-edit/metadata-edit.component"; import { MetadataEditComponent } from "../metadata-edit/metadata-edit.component";
@ -12,6 +12,9 @@ import { EpisodeService, PeopleService, SeasonService } from "../../services/api
import { Page } from "../../models/page"; import { Page } from "../../models/page";
import { People } from "../../models/resources/people"; import { People } from "../../models/resources/people";
import { HttpClient } from "@angular/common/http"; import { HttpClient } from "@angular/common/http";
import { LibraryItem } from "../../models/resources/library-item";
import { Collection } from "../../models/resources/collection";
import { ItemsUtils } from "../../misc/items-utils";
@Component({ @Component({
selector: "app-show-details", selector: "app-show-details",
@ -173,4 +176,9 @@ export class ShowDetailsComponent implements AfterViewInit, OnDestroy
}); });
}); });
} }
getDate(item: LibraryItem | Show | ShowRole | Collection): string
{
return ItemsUtils.getDate(item);
}
} }