From e770d321eb2b319f2e93215e2d04c98e18ab47a4 Mon Sep 17 00:00:00 2001 From: Kenton Royal Date: Sun, 26 Aug 2018 21:02:23 +0100 Subject: [PATCH] Fix lint errors --- .../app/interfaces/IRemainingRequests.ts | 2 +- .../app/requests/movierequests.component.ts | 2 +- .../requests/remainingrequests.component.ts | 39 ++++++++++--------- .../ClientApp/app/search/search.module.ts | 2 +- .../ClientApp/app/services/request.service.ts | 5 ++- 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/Ombi/ClientApp/app/interfaces/IRemainingRequests.ts b/src/Ombi/ClientApp/app/interfaces/IRemainingRequests.ts index ce1b37427..a6ff1a66c 100644 --- a/src/Ombi/ClientApp/app/interfaces/IRemainingRequests.ts +++ b/src/Ombi/ClientApp/app/interfaces/IRemainingRequests.ts @@ -3,4 +3,4 @@ export interface IRemainingRequests { limit: number; remaining: number; nextRequest: Date; -} \ No newline at end of file +} diff --git a/src/Ombi/ClientApp/app/requests/movierequests.component.ts b/src/Ombi/ClientApp/app/requests/movierequests.component.ts index 9495f0790..651637308 100644 --- a/src/Ombi/ClientApp/app/requests/movierequests.component.ts +++ b/src/Ombi/ClientApp/app/requests/movierequests.component.ts @@ -6,8 +6,8 @@ import { debounceTime, distinctUntilChanged } from "rxjs/operators"; import { AuthService } from "../auth/auth.service"; import { FilterType, IFilter, IIssueCategory, IMovieRequests, IPagenator, IRadarrProfile, IRadarrRootFolder, OrderType } from "../interfaces"; -import { NotificationService, RadarrService, RequestService } from "../services"; import { IRemainingRequests } from "../interfaces/IRemainingRequests"; +import { NotificationService, RadarrService, RequestService } from "../services"; @Component({ selector: "movie-requests", diff --git a/src/Ombi/ClientApp/app/requests/remainingrequests.component.ts b/src/Ombi/ClientApp/app/requests/remainingrequests.component.ts index 9e64b0013..4f4439c13 100644 --- a/src/Ombi/ClientApp/app/requests/remainingrequests.component.ts +++ b/src/Ombi/ClientApp/app/requests/remainingrequests.component.ts @@ -1,6 +1,7 @@ -import { Component, OnInit, Input } from "@angular/core"; +import { IRemainingRequests } from "../interfaces/IRemainingRequests"; import { RequestService } from "../services"; -import { IRemainingRequests } from "../interfaces/IRemainingRequests"; + +import { Component, Input, OnInit } from "@angular/core"; @Component({ selector: "remaining-requests", @@ -14,29 +15,29 @@ export class RemainingRequestsComponent implements OnInit { public hoursUntil: number; public minutesUntil: number; - constructor(private requestService: RequestService) - { + constructor(private requestService: RequestService) { } - ngOnInit(): void { - var self = this; + public ngOnInit() { + const self = this; + this.update(); this.requestService.onRequested().subscribe(m => { this.update(); }); - setInterval(function(){ + setInterval(() => { self.calculateTime(); - }, 10000) + }, 10000); - setInterval(function(){ - self.update() - }, 60000) + setInterval(() => { + self.update(); + }, 60000); } - update(): void { - var callback = (remaining => { + public update(): void { + const callback = (remaining => { this.remaining = remaining; this.calculateTime(); }); @@ -48,21 +49,21 @@ export class RemainingRequestsComponent implements OnInit { } } - calculateTime(): void { + private calculateTime(): void { this.daysUntil = Math.ceil(this.daysUntilNextRequest()); this.hoursUntil = Math.ceil(this.hoursUntilNextRequest()); - this.minutesUntil = Math.ceil(this.minutesUntilNextRequest()) + this.minutesUntil = Math.ceil(this.minutesUntilNextRequest()); } - daysUntilNextRequest(): number { + private daysUntilNextRequest(): number { return (new Date(this.remaining.nextRequest).getTime() - new Date().getTime()) / 1000 / 60 / 60 / 24; } - hoursUntilNextRequest(): number { + private hoursUntilNextRequest(): number { return (new Date(this.remaining.nextRequest).getTime() - new Date().getTime()) / 1000 / 60 / 60; } - minutesUntilNextRequest(): number { + private minutesUntilNextRequest(): number { return (new Date(this.remaining.nextRequest).getTime() - new Date().getTime()) / 1000 / 60; } -} \ No newline at end of file +} diff --git a/src/Ombi/ClientApp/app/search/search.module.ts b/src/Ombi/ClientApp/app/search/search.module.ts index c2a309819..75c2de5d9 100644 --- a/src/Ombi/ClientApp/app/search/search.module.ts +++ b/src/Ombi/ClientApp/app/search/search.module.ts @@ -18,8 +18,8 @@ import { SearchService } from "../services"; import { AuthGuard } from "../auth/auth.guard"; -import { SharedModule } from "../shared/shared.module"; import { RemainingRequestsComponent } from "../requests/remainingrequests.component"; +import { SharedModule } from "../shared/shared.module"; const routes: Routes = [ { path: "", component: SearchComponent, canActivate: [AuthGuard] }, diff --git a/src/Ombi/ClientApp/app/services/request.service.ts b/src/Ombi/ClientApp/app/services/request.service.ts index 7940c43d6..a7fbc76bf 100644 --- a/src/Ombi/ClientApp/app/services/request.service.ts +++ b/src/Ombi/ClientApp/app/services/request.service.ts @@ -8,6 +8,7 @@ import { TreeNode } from "primeng/primeng"; import { FilterType, IChildRequests, IFilter, IMovieRequestModel, IMovieRequests, IMovieUpdateModel, IRequestEngineResult, IRequestsViewModel, ITvRequests, ITvUpdateModel, OrderType } from "../interfaces"; import { ITvRequestViewModel } from "../interfaces"; import { ServiceHelpers } from "./service.helpers"; + import { IRemainingRequests } from "../interfaces/IRemainingRequests"; @Injectable() @@ -30,7 +31,7 @@ export class RequestService extends ServiceHelpers { } public requestMovie(movie: IMovieRequestModel): Observable { - var observer = Observable.create(observer => { + const observer = Observable.create(observer => { this.http.post(`${this.url}Movie/`, JSON.stringify(movie), {headers: this.headers}).subscribe(m => { observer.next(m); this.requestEvents.next(m); @@ -49,7 +50,7 @@ export class RequestService extends ServiceHelpers { } public requestTv(tv: ITvRequestViewModel): Observable { - var observer = Observable.create(observer => { + const observer = Observable.create(observer => { return this.http.post(`${this.url}TV/`, JSON.stringify(tv), { headers: this.headers }).subscribe(m => { observer.next(m); this.requestEvents.next(m);