diff --git a/src/Ombi/ClientApp/app/issues/issuestable.component.html b/src/Ombi/ClientApp/app/issues/issuestable.component.html index f1b686c19..f98d6eb0e 100644 --- a/src/Ombi/ClientApp/app/issues/issuestable.component.html +++ b/src/Ombi/ClientApp/app/issues/issuestable.component.html @@ -13,15 +13,15 @@ - + - + - + - + diff --git a/src/Ombi/ClientApp/app/requests/movierequests.component.html b/src/Ombi/ClientApp/app/requests/movierequests.component.html index a4af16767..a4bdf0aed 100644 --- a/src/Ombi/ClientApp/app/requests/movierequests.component.html +++ b/src/Ombi/ClientApp/app/requests/movierequests.component.html @@ -4,9 +4,49 @@ - + {{ 'Requests.Filter' | translate }} + + + + + @@ -19,7 +59,7 @@
-
+
diff --git a/src/Ombi/ClientApp/app/requests/movierequests.component.ts b/src/Ombi/ClientApp/app/requests/movierequests.component.ts index 72c229f1c..fc695c898 100644 --- a/src/Ombi/ClientApp/app/requests/movierequests.component.ts +++ b/src/Ombi/ClientApp/app/requests/movierequests.component.ts @@ -36,7 +36,8 @@ export class MovieRequestsComponent implements OnInit { public filter: IFilter; public filterType = FilterType; - public sortDisplay: boolean; + public order: string = "requestedDate"; + public reverse = false; private currentlyLoaded: number; private amountToLoad: number; @@ -174,6 +175,14 @@ export class MovieRequestsComponent implements OnInit { }); } + public setOrder(value: string) { + if (this.order === value) { + this.reverse = !this.reverse; + } + + this.order = value; + } + private loadRequests(amountToLoad: number, currentlyLoaded: number) { this.requestService.getMovieRequests(amountToLoad, currentlyLoaded + 1) .subscribe(x => { diff --git a/src/Ombi/ClientApp/app/requests/requests.module.ts b/src/Ombi/ClientApp/app/requests/requests.module.ts index 6bbb3ca01..7bddee71c 100644 --- a/src/Ombi/ClientApp/app/requests/requests.module.ts +++ b/src/Ombi/ClientApp/app/requests/requests.module.ts @@ -2,6 +2,7 @@ import { RouterModule, Routes } from "@angular/router"; import { NgbModule } from "@ng-bootstrap/ng-bootstrap"; +import { OrderModule } from "ngx-order-pipe"; import { InfiniteScrollModule } from "ngx-infinite-scroll"; @@ -34,6 +35,7 @@ const routes: Routes = [ TreeTableModule, SharedModule, SidebarModule, + OrderModule, ], declarations: [ RequestComponent, diff --git a/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.html b/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.html index ed9dbde86..ae33598f1 100644 --- a/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.html +++ b/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.html @@ -16,44 +16,45 @@ - + Username - + - + Alias - + - + Email - - + + + Roles - + Last Logged In - + - + User Type - + diff --git a/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.ts b/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.ts index 09b86a31e..3620e0f20 100644 --- a/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.ts +++ b/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.ts @@ -13,7 +13,7 @@ export class UserManagementComponent implements OnInit { public emailSettings: IEmailNotificationSettings; public customizationSettings: ICustomizationSettings; - public order: string = "u.userName"; + public order: string = "userName"; public reverse = false; public showBulkEdit = false; diff --git a/src/Ombi/package-lock.json b/src/Ombi/package-lock.json index 71c8c5489..de4e14487 100644 --- a/src/Ombi/package-lock.json +++ b/src/Ombi/package-lock.json @@ -4972,9 +4972,9 @@ "integrity": "sha512-7lASze8zHSDdAAFO3VNop1TY60rs8A7sm8DzQfU33VNcJI27F6mtxwjILIH339s7m6HVC08AS7I64HBjBMw/QQ==" }, "ngx-order-pipe": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ngx-order-pipe/-/ngx-order-pipe-1.1.1.tgz", - "integrity": "sha512-hIfdUONbKG14/S5zEyGjr1ukAd2XdUUnUsvA80ct3pyoBCh5aQ7XhBz7N9jCsVzMGTGUPK6R59KYkEPB3n5hbQ==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ngx-order-pipe/-/ngx-order-pipe-2.0.1.tgz", + "integrity": "sha512-t0IUqoNs3705yZQeohmhUQvpiRTj5RX7AhFXkx3PMfq7G6h7GNNrR3x27XbXEsjKgBo5hPgfEfW5OljRYa1VVw==" }, "ngx-window-token": { "version": "0.0.4", diff --git a/src/Ombi/package.json b/src/Ombi/package.json index 1427ceb4b..4e4fe485f 100644 --- a/src/Ombi/package.json +++ b/src/Ombi/package.json @@ -55,7 +55,7 @@ "ng2-cookies": "^1.0.12", "ngx-clipboard": "8.1.1", "ngx-infinite-scroll": "^0.6.1", - "ngx-order-pipe": "^1.1.1", + "ngx-order-pipe": "^2.0.1", "node-sass": "^4.7.2", "npm": "^5.6.0", "pace-progress": "^1.0.2", diff --git a/src/Ombi/wwwroot/translations/en.json b/src/Ombi/wwwroot/translations/en.json index e4c944dd0..c2d8cedc0 100644 --- a/src/Ombi/wwwroot/translations/en.json +++ b/src/Ombi/wwwroot/translations/en.json @@ -117,6 +117,7 @@ "RequestStatus": "Request status:", "Denied": " Denied:", "TheatricalRelease": "Theatrical Release: {{date}}", + "TheatricalReleaseSort": "Theatrical Release", "DigitalRelease": "Digital Release: {{date}}", "RequestDate": "Request Date:", "QualityOverride": "Quality Override:", @@ -134,7 +135,11 @@ "ReportIssue":"Report Issue", "Filter":"Filter", "Sort":"Sort", - "SeasonNumberHeading":"Season: {seasonNumber}" + "SeasonNumberHeading":"Season: {seasonNumber}", + "SortTitle":"Title", + "SortRequestDate": "Request Date", + "SortRequestedBy":"Requested By", + "SortStatus":"Status" }, "Issues":{ "Title":"Issues",