github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-20 13:23:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed up the episode request modal a bit

Browse source
This commit is contained in:
Jamie Rees 2019-03-12 13:10:06 +00:00
commit 619e22827f
7 changed files with 191 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ombi.Helpers/GlobalMutex.cs
View file

@ -9,7 +9,7 @@ namespace Ombi.Helpers
{ {
const string mutexId = "Global\\OMBI"; const string mutexId = "Global\\OMBI";
using (var mutex = new Mutex(false, mutexId, out __)) using (var mutex = new Mutex(false, mutexId, out var __))
{ {
var hasHandle = false; var hasHandle = false;
try try

7
src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
View file

@ -150,11 +150,4 @@
</div> </div>
</section> </section>
</div> </div>

2
src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.ts
View file

@ -51,7 +51,7 @@ export class TvDetailsComponent {
} }
public async request() { public async request() {
this.dialog.open(EpisodeRequestComponent, { width: "700px", data: this.tv }) this.dialog.open(EpisodeRequestComponent, { width: "800px", data: this.tv })
} }
public openDialog() { public openDialog() {

122
src/Ombi/ClientApp/src/app/shared/episode-request/episode-request.component.html
View file

@ -1,73 +1,83 @@
<div class="spinner-container"> <div class="spinner-container">
<mat-spinner *ngIf="loading" [color]="'accent'"></mat-spinner> <mat-spinner *ngIf="loading" [color]="'accent'"></mat-spinner>
</div> </div>
<div *ngIf="!loading" mat-dialog-content class="background"> <div *ngIf="!loading" mat-dialog-content class="background">
<div class="row">
<div class="col-12" *ngFor="let season of series.seasonRequests"> <div class="row">
<mat-expansion-panel> <div class="col-12 action-buttons-right">
<mat-expansion-panel-header> <button (click)="requestAllSeasons()" color="primary" mat-raised-button class="btn-spacing"
<mat-panel-title> matTooltip="{{'MediaDetails.EpisodeSelector.AllSeasonsTooltip' | translate}}">{{'Search.TvShows.AllSeasons' | translate }}</button>
<mat-checkbox *ngIf="!season.seasonAvailable" (click)="$event.stopPropagation();" (change)="seasonChanged($event, season)"> Season {{season.seasonNumber}}</mat-checkbox>
<span *ngIf="season.seasonAvailable">Season {{season.seasonNumber}}</span>
</mat-panel-title>
<mat-panel-description>
Description
</mat-panel-description>
</mat-expansion-panel-header>
<div class="row" *ngFor="let ep of season.episodes"> <button (click)="requestFirstSeason()" color="accent" mat-raised-button class="btn-spacing"
<div class="col-1"> matTooltip="{{'MediaDetails.EpisodeSelector.FirstSeasonTooltip' | translate}}">{{ 'Search.TvShows.FirstSeason' | translate }}</button>
<div *ngIf="!ep.available && !ep.requested && !ep.approved"> <button (click)="requestLatestSeason()" color="warn" mat-raised-button class="btn-spacing"
<mat-checkbox *ngIf="!ep.selected" [ngModel]="ep.selected" (click)="addRequest(ep)"></mat-checkbox> matTooltip="{{'MediaDetails.EpisodeSelector.LatestSeasonTooltip' | translate}}">{{ 'Search.TvShows.LatestSeason' | translate }}</button>
<mat-checkbox *ngIf="ep.selected" [ngModel]="ep.selected" (click)="removeRequest(ep)"></mat-checkbox> </div>
</div> </div>
</div>
<div class="col-1">
{{ep.episodeNumber}}
</div>
<div class="col-3">
{{ep.title}}
</div>
<div class="col-2" *ngIf="ep.airDateDisplay != 'Unknown'">
{{ep.airDate | amLocal | amDateFormat: 'L' }}
</div>
<div class="col-2" *ngIf="ep.airDateDisplay == 'Unknown'">
{{ep.airDateDisplay }}
</div>
<div class="col-3">
<ng-template [ngIf]="ep.available"><span class="label label-success"
id="availableLabel">Available</span></ng-template>
<ng-template [ngIf]="ep.approved && !ep.available "><span class="label label-info"
id="processingRequestLabel">Processing Request</span></ng-template>
<ng-template [ngIf]="ep.selected"><span class="label label-info"
id="selectedLabel">Selected</span></ng-template>
<ng-template [ngIf]="ep.requested && !ep.approved && !ep.available && !ep.selected"><span
class="label label-warning" id="pendingApprovalLabel">Pending Approval</span>
</ng-template>
<ng-template [ngIf]="!ep.requested && !ep.available && !ep.approved && !ep.selected"><span
class="label label-danger" id="notRequetsedLabel">Not Requested</span></ng-template>
</div>
</div>
</mat-expansion-panel>
<div class="row">
<div class="col-12" *ngFor="let season of series.seasonRequests">
<mat-expansion-panel>
<mat-expansion-panel-header>
<mat-panel-title>
<mat-checkbox *ngIf="!season.seasonAvailable" (click)="$event.stopPropagation();" (change)="seasonChanged($event, season)">
Season {{season.seasonNumber}}</mat-checkbox>
<span *ngIf="season.seasonAvailable">Season {{season.seasonNumber}}</span>
</mat-panel-title>
<mat-panel-description>
Description
</mat-panel-description>
</mat-expansion-panel-header>
<div class="row" *ngFor="let ep of season.episodes">
<div class="col-1">
<div *ngIf="!ep.available && !ep.requested && !ep.approved">
<mat-checkbox *ngIf="!ep.selected" [ngModel]="ep.selected" (click)="addRequest(ep)"></mat-checkbox>
<mat-checkbox *ngIf="ep.selected" [ngModel]="ep.selected" (click)="removeRequest(ep)"></mat-checkbox>
</div>
</div>
<div class="col-1">
{{ep.episodeNumber}}
</div>
<div class="col-3">
{{ep.title}}
</div>
<div class="col-2" *ngIf="ep.airDateDisplay != 'Unknown'">
{{ep.airDate | amLocal | amDateFormat: 'L' }}
</div>
<div class="col-2" *ngIf="ep.airDateDisplay == 'Unknown'">
{{ep.airDateDisplay }}
</div>
<div class="col-3">
<ng-template [ngIf]="ep.available"><span class="label label-success" id="availableLabel">Available</span></ng-template>
<ng-template [ngIf]="ep.approved && !ep.available "><span class="label label-info" id="processingRequestLabel">Processing
Request</span></ng-template>
<ng-template [ngIf]="ep.selected"><span class="label label-info" id="selectedLabel">Selected</span></ng-template>
<ng-template [ngIf]="ep.requested && !ep.approved && !ep.available && !ep.selected"><span class="label label-warning"
id="pendingApprovalLabel">Pending Approval</span>
</ng-template>
<ng-template [ngIf]="!ep.requested && !ep.available && !ep.approved && !ep.selected"><span class="label label-danger"
id="notRequetsedLabel">Not Requested</span></ng-template>
</div>
</div> </div>
</mat-expansion-panel>
</div> </div>
</div>
</div> </div>
<div mat-dialog-actions> <div mat-dialog-actions>
<div class="action-buttons-right"> <div class="action-buttons-right">
<div class="col-md-12">
<button (click)="submitRequests()" mat-raised-button class="btn-spacing btn-orange">{{ <button (click)="submitRequests()" mat-raised-button class="btn-spacing btn-orange">{{
'Common.Request' | translate }}</button> 'Common.Request' | translate }}</button>
</div> </div>
</div>
</div> </div>

30
src/Ombi/ClientApp/src/app/shared/episode-request/episode-request.component.ts
View file

@ -29,8 +29,8 @@ export class EpisodeRequestComponent implements OnInit {
return ep.selected; return ep.selected;
}); });
}); });
debugger;
if (!selected) { if (!selected && !this.series.requestAll && !this.series.firstSeason && !this.series.latestSeason) {
this.notificationService.send("You need to select some episodes!", "OK"); this.notificationService.send("You need to select some episodes!", "OK");
return; return;
} }
@ -41,15 +41,14 @@ export class EpisodeRequestComponent implements OnInit {
viewModel.seasons = []; viewModel.seasons = [];
this.series.seasonRequests.forEach((season) => { this.series.seasonRequests.forEach((season) => {
const seasonsViewModel = <ISeasonsViewModel>{ seasonNumber: season.seasonNumber, episodes: [] }; const seasonsViewModel = <ISeasonsViewModel>{ seasonNumber: season.seasonNumber, episodes: [] };
season.episodes.forEach(ep => { if (!this.series.latestSeason && !this.series.requestAll && !this.series.firstSeason) {
if (!this.series.latestSeason || !this.series.requestAll || !this.series.firstSeason) { season.episodes.forEach(ep => {
if (ep.selected) { if (ep.selected) {
ep.requested = true; ep.requested = true;
seasonsViewModel.episodes.push({ episodeNumber: ep.episodeNumber }); seasonsViewModel.episodes.push({ episodeNumber: ep.episodeNumber });
} }
} });
}); }
viewModel.seasons.push(seasonsViewModel); viewModel.seasons.push(seasonsViewModel);
}); });
@ -81,11 +80,26 @@ export class EpisodeRequestComponent implements OnInit {
public seasonChanged(checkbox: MatCheckboxChange, season: INewSeasonRequests) { public seasonChanged(checkbox: MatCheckboxChange, season: INewSeasonRequests) {
season.episodes.forEach((ep) => { season.episodes.forEach((ep) => {
if (checkbox.checked) { if (checkbox.checked && (!ep.available && !ep.requested && !ep.approved)) {
this.addRequest(ep) this.addRequest(ep)
} else { } else {
this.removeRequest(ep); this.removeRequest(ep);
} }
}); });
} }
public async requestAllSeasons() {
this.series.requestAll = true;
await this.submitRequests();
}
public async requestFirstSeason() {
this.series.firstSeason = true;
await this.submitRequests();
}
public async requestLatestSeason() {
this.series.latestSeason = true;
await this.submitRequests();
}
} }

1
src/Ombi/ClientApp/src/app/shared/shared.module.ts
View file

@ -43,6 +43,7 @@ import { EpisodeRequestComponent } from "./episode-request/episode-request.compo
TranslateModule, TranslateModule,
MatExpansionModule, MatExpansionModule,
MatDialogModule, MatDialogModule,
MatTooltipModule,
], ],
entryComponents: [ entryComponents: [
EpisodeRequestComponent EpisodeRequestComponent

198
src/Ombi/wwwroot/translations/en.json
View file

@ -17,14 +17,14 @@
"NotAvailable": "Not Available", "NotAvailable": "Not Available",
"ProcessingRequest": "Processing Request", "ProcessingRequest": "Processing Request",
"PendingApproval": "Pending Approval", "PendingApproval": "Pending Approval",
"RequestDenied":"Request Denied", "RequestDenied": "Request Denied",
"NotRequested": "Not Requested", "NotRequested": "Not Requested",
"Requested": "Requested", "Requested": "Requested",
"Request": "Request", "Request": "Request",
"Denied":"Denied", "Denied": "Denied",
"Approve":"Approve", "Approve": "Approve",
"PartlyAvailable": "Partly Available", "PartlyAvailable": "Partly Available",
"ViewDetails": "View Details", "ViewDetails": "View Details",
"Errors": { "Errors": {
"Validation": "Please check your entered values" "Validation": "Please check your entered values"
} }
@ -38,49 +38,45 @@
"OnlineParagraph": "The media server is currently online", "OnlineParagraph": "The media server is currently online",
"PartiallyOnlineHeading": "Partially Online", "PartiallyOnlineHeading": "Partially Online",
"PartiallyOnlineParagraph": "The media server is partially online.", "PartiallyOnlineParagraph": "The media server is partially online.",
"MultipleServersUnavailable": "MultipleServersUnavailable": "There are {{serversUnavailable}} servers offline out of {{totalServers}}.",
"There are {{serversUnavailable}} servers offline out of {{totalServers}}.", "SingleServerUnavailable": "There is {{serversUnavailable}} server offline out of {{totalServers}}.",
"SingleServerUnavailable":
"There is {{serversUnavailable}} server offline out of {{totalServers}}.",
"OfflineHeading": "Currently Offline", "OfflineHeading": "Currently Offline",
"OfflineParagraph": "The media server is currently offline.", "OfflineParagraph": "The media server is currently offline.",
"CheckPageForUpdates": "Check this page for continuous site updates." "CheckPageForUpdates": "Check this page for continuous site updates."
}, },
"NavigationBar": { "NavigationBar": {
"Discover":"Discover", "Discover": "Discover",
"Search": "Search", "Search": "Search",
"Requests": "Requests", "Requests": "Requests",
"UserManagement": "User Management", "UserManagement": "User Management",
"Issues":"Issues", "Issues": "Issues",
"Vote":"Vote", "Vote": "Vote",
"Donate": "Donate!", "Donate": "Donate!",
"DonateLibraryMaintainer": "Donate to Library Maintainer", "DonateLibraryMaintainer": "Donate to Library Maintainer",
"DonateTooltip": "DonateTooltip": "This is how I convince my wife to let me spend my spare time developing Ombi ;)",
"This is how I convince my wife to let me spend my spare time developing Ombi ;)",
"UpdateAvailableTooltip": "Update Available!", "UpdateAvailableTooltip": "Update Available!",
"Settings": "Settings", "Settings": "Settings",
"Welcome": "Welcome {{username}}", "Welcome": "Welcome {{username}}",
"UpdateDetails": "Update Details", "UpdateDetails": "Update Details",
"Logout": "Logout", "Logout": "Logout",
"OpenMobileApp":"Open Mobile App", "OpenMobileApp": "Open Mobile App",
"RecentlyAdded":"Recently Added" "RecentlyAdded": "Recently Added"
}, },
"Search": { "Search": {
"Title": "Search", "Title": "Search",
"Paragraph": "Paragraph": "Want to watch something that is not currently available? No problem, just search for it below and request it!",
"Want to watch something that is not currently available? No problem, just search for it below and request it!",
"MoviesTab": "Movies", "MoviesTab": "Movies",
"TvTab": "TV Shows", "TvTab": "TV Shows",
"MusicTab":"Music", "MusicTab": "Music",
"Suggestions": "Suggestions", "Suggestions": "Suggestions",
"NoResults": "Sorry, we didn't find any results!", "NoResults": "Sorry, we didn't find any results!",
"DigitalDate": "Digital Release: {{date}}", "DigitalDate": "Digital Release: {{date}}",
"TheatricalRelease":"Theatrical Release: {{date}}", "TheatricalRelease": "Theatrical Release: {{date}}",
"ViewOnPlex": "View On Plex", "ViewOnPlex": "View On Plex",
"ViewOnEmby": "View On Emby", "ViewOnEmby": "View On Emby",
"RequestAdded": "Request for {{title}} has been added successfully", "RequestAdded": "Request for {{title}} has been added successfully",
"Similar":"Similar", "Similar": "Similar",
"Refine":"Refine", "Refine": "Refine",
"Movies": { "Movies": {
"PopularMovies": "Popular Movies", "PopularMovies": "Popular Movies",
"UpcomingMovies": "Upcoming Movies", "UpcomingMovies": "Upcoming Movies",
@ -90,28 +86,27 @@
"Trailer": "Trailer" "Trailer": "Trailer"
}, },
"TvShows": { "TvShows": {
"Popular":"Popular", "Popular": "Popular",
"Trending":"Trending", "Trending": "Trending",
"MostWatched":"Most Watched", "MostWatched": "Most Watched",
"MostAnticipated":"Most Anticipated", "MostAnticipated": "Most Anticipated",
"Results":"Results", "Results": "Results",
"AirDate":"Air Date:", "AirDate": "Air Date:",
"AllSeasons":"All Seasons", "AllSeasons": "All Seasons",
"FirstSeason":"First Season", "FirstSeason": "First Season",
"LatestSeason":"Latest Season", "LatestSeason": "Latest Season",
"Select":"Select ...", "Select": "Select ...",
"SubmitRequest":"Submit Request", "SubmitRequest": "Submit Request",
"Season":"Season: {{seasonNumber}}", "Season": "Season: {{seasonNumber}}",
"SelectAllInSeason":"Select All in Season {{seasonNumber}}" "SelectAllInSeason": "Select All in Season {{seasonNumber}}"
} }
}, },
"Requests": { "Requests": {
"Title": "Requests", "Title": "Requests",
"Paragraph": "Paragraph": "Below you can see yours and all other requests, as well as their download and approval status.",
"Below you can see yours and all other requests, as well as their download and approval status.",
"MoviesTab": "Movies", "MoviesTab": "Movies",
"TvTab": "TV Shows", "TvTab": "TV Shows",
"MusicTab":"Music", "MusicTab": "Music",
"RequestedBy": "Requested By:", "RequestedBy": "Requested By:",
"Status": "Status:", "Status": "Status:",
"RequestStatus": "Request status:", "RequestStatus": "Request status:",
@ -123,27 +118,27 @@
"RequestDate": "Request Date:", "RequestDate": "Request Date:",
"QualityOverride": "Quality Override:", "QualityOverride": "Quality Override:",
"RootFolderOverride": "Root Folder Override:", "RootFolderOverride": "Root Folder Override:",
"ChangeRootFolder":"Root Folder", "ChangeRootFolder": "Root Folder",
"ChangeQualityProfile":"Quality Profile", "ChangeQualityProfile": "Quality Profile",
"MarkUnavailable":"Mark Unavailable", "MarkUnavailable": "Mark Unavailable",
"MarkAvailable":"Mark Available", "MarkAvailable": "Mark Available",
"Remove":"Remove", "Remove": "Remove",
"Deny":"Deny", "Deny": "Deny",
"DenyReason":"Deny Reason", "DenyReason": "Deny Reason",
"Season":"Season:", "Season": "Season:",
"GridTitle":"Title", "GridTitle": "Title",
"AirDate":"AirDate", "AirDate": "AirDate",
"GridStatus":"Status", "GridStatus": "Status",
"ReportIssue":"Report Issue", "ReportIssue": "Report Issue",
"Filter":"Filter", "Filter": "Filter",
"Sort":"Sort", "Sort": "Sort",
"SeasonNumberHeading":"Season: {seasonNumber}", "SeasonNumberHeading": "Season: {seasonNumber}",
"SortTitleAsc":"Title ▲", "SortTitleAsc": "Title ▲",
"SortTitleDesc":"Title ▼", "SortTitleDesc": "Title ▼",
"SortRequestDateAsc": "Request Date ▲", "SortRequestDateAsc": "Request Date ▲",
"SortRequestDateDesc": "Request Date ▼", "SortRequestDateDesc": "Request Date ▼",
"SortStatusAsc":"Status ▲", "SortStatusAsc": "Status ▲",
"SortStatusDesc":"Status ▼", "SortStatusDesc": "Status ▼",
"Remaining": { "Remaining": {
"Quota": "{{remaining}}/{{total}} requests remaining", "Quota": "{{remaining}}/{{total}} requests remaining",
"NextDays": "Another request will be added in {{time}} days", "NextDays": "Another request will be added in {{time}} days",
@ -152,30 +147,30 @@
"NextMinute": "Another request will be added in {{time}} minute" "NextMinute": "Another request will be added in {{time}} minute"
} }
}, },
"Issues":{ "Issues": {
"Title":"Issues", "Title": "Issues",
"PendingTitle":"Pending Issues", "PendingTitle": "Pending Issues",
"InProgressTitle":"In Progress Issues", "InProgressTitle": "In Progress Issues",
"ResolvedTitle":"Resolved Issues", "ResolvedTitle": "Resolved Issues",
"ColumnTitle":"Title", "ColumnTitle": "Title",
"Category":"Category", "Category": "Category",
"Status": "Status", "Status": "Status",
"Details": "Details", "Details": "Details",
"Description":"Description", "Description": "Description",
"NoComments":"No Comments!", "NoComments": "No Comments!",
"MarkInProgress":"Mark In Progress", "MarkInProgress": "Mark In Progress",
"MarkResolved":"Mark Resolved", "MarkResolved": "Mark Resolved",
"SendMessageButton":"Send", "SendMessageButton": "Send",
"Subject":"Subject", "Subject": "Subject",
"Comments":"Comments", "Comments": "Comments",
"WriteMessagePlaceholder":"Write your message here...", "WriteMessagePlaceholder": "Write your message here...",
"ReportedBy":"Reported By" "ReportedBy": "Reported By"
}, },
"Filter":{ "Filter": {
"ClearFilter":"Clear Filter", "ClearFilter": "Clear Filter",
"FilterHeaderAvailability":"Availability", "FilterHeaderAvailability": "Availability",
"FilterHeaderRequestStatus":"Status", "FilterHeaderRequestStatus": "Status",
"Approved":"Approved", "Approved": "Approved",
"PendingApproval": "Pending Approval" "PendingApproval": "Pending Approval"
}, },
"UserManagment": { "UserManagment": {
@ -192,30 +187,35 @@
}, },
"MediaDetails": { "MediaDetails": {
"Denied": "Denied", "Denied": "Denied",
"RecommendationsTitle":"Recommendations", "RecommendationsTitle": "Recommendations",
"SimilarTitle":"Similar", "SimilarTitle": "Similar",
"VideosTitle":"Videos", "VideosTitle": "Videos",
"Casts": { "Casts": {
"CastTitle":"Cast", "CastTitle": "Cast",
"Character":"Character", "Character": "Character",
"Actor":"Actor" "Actor": "Actor"
}, },
"Discovery": { "EpisodeSelector":{
"PopularTab":"Popular", "AllSeasonsTooltip":"This will request every season for this show",
"TrendingTab":"Trending", "FirstSeasonTooltip":"This will only request the First Season for this show",
"UpcomingTab":"Upcoming", "LatestSeasonTooltip":"This will only request the Latest Season for this show"
"CardDetails":{ }
"Availability":"Availability", },
"Studio":"Studio", "Discovery": {
"Network":"Network", "PopularTab": "Popular",
"UnknownNetwork":"Unknown", "TrendingTab": "Trending",
"RequestStatus":"Request Status", "UpcomingTab": "Upcoming",
"Director":"Director", "CardDetails": {
"InCinemas":"In Cinemas", "Availability": "Availability",
"FirstAired":"First Aired", "Studio": "Studio",
"Writer":"Writer", "Network": "Network",
"ExecProducer":"Exec Producer" "UnknownNetwork": "Unknown",
} "RequestStatus": "Request Status",
"Director": "Director",
"InCinemas": "In Cinemas",
"FirstAired": "First Aired",
"Writer": "Writer",
"ExecProducer": "Exec Producer"
} }
} }
} }