bleh

Ombi/Ombi.Core/Engine/TvRequestEngine.cs

@@ -4,6 +4,7 @@ using System.Globalization;
 using System.Linq;
 using System.Security.Principal;
 using System.Threading.Tasks;
+using AutoMapper;
 using Hangfire;
 using Ombi.Api.TvMaze;
 using Ombi.Core.Models.Requests;
@@ -17,13 +18,15 @@ namespace Ombi.Core.Engine
 {
     public class TvRequestEngine : BaseMediaEngine, ITvRequestEngine
     {
-        public TvRequestEngine(ITvMazeApi tvApi, IRequestServiceMain requestService, IPrincipal user, INotificationService notificationService) : base(user, requestService)
+        public TvRequestEngine(ITvMazeApi tvApi, IRequestServiceMain requestService, IPrincipal user, INotificationService notificationService, IMapper map) : base(user, requestService)
         {
             TvApi = tvApi;
             NotificationService = notificationService;
+            Mapper = map;
         }
         private INotificationService NotificationService { get; }
         private ITvMazeApi TvApi { get; }
+        private IMapper Mapper { get; }
 
         public async Task<RequestEngineResult> RequestTvShow(SearchTvShowViewModel tv)
         {
@@ -166,6 +169,16 @@ namespace Ombi.Core.Engine
                 newRequest.SeasonRequests = episodeDifference;
             }
 
+            if (!existingRequest.HasChildRequests)
+            {
+                // So this is the first child request, we will want to convert the original request to a child
+                var originalRequest = Mapper.Map<TvRequestModel>(existingRequest);
+                existingRequest.ChildRequests.Add(originalRequest);
+                existingRequest.RequestedUsers.Clear();
+                existingRequest.Approved = false;
+                existingRequest.Available = false;
+            }
+
             existingRequest.ChildRequests.Add(newRequest);
 
             TvRequestService.UpdateRequest(existingRequest);

Ombi/Ombi/wwwroot/app/app.component.html

@@ -1,4 +1,4 @@
-<p-growl [value]="notificationService.messages"  [life]="1000"></p-growl>
+<p-growl [value]="notificationService.messages" ></p-growl>
 
 <nav *ngIf="showNav" class="navbar navbar-default navbar-fixed-top">
     <div class="container-fluid">

Ombi/Ombi/wwwroot/app/interfaces/ISearchTvResult.ts

@@ -2,7 +2,7 @@
 
 export interface ISearchTvResult {
     id: number,
-    title: string,
+    title: string, // used in the request
     aliases: string[],
     banner: string,
     seriesId: number,

Ombi/Ombi/wwwroot/app/requests/tvrequests.component.html

@@ -3,9 +3,9 @@
         <input type="text" class="form-control form-control-custom" placeholder="Search" (keyup)="search($event)">
     </div>
 </div>
-<br/>
+<br />
 
-    <div infinite-scroll
+<div infinite-scroll
      [infiniteScrollDistance]="1"
      [infiniteScrollThrottle]="100"
      (scrolled)="loadMore()">
@@ -32,7 +32,7 @@
                     <span>Status: </span>
                     <span class="label label-success">{{request.status}}</span>
                 </div>
-
+                <div *ngIf="!request.hasChildRequests">
                     <div>
                         <span>Request status: </span>
                         <span *ngIf="request.available" class="label label-success">Available</span>
@@ -49,7 +49,7 @@
 
 
                     <div>Release Date: {{request.releaseDate | date}}</div>
-                    <br/>
+                    <br />
 
                     <!--{{#if_eq type "tv"}}
                     {{#if episodes}}
@@ -75,16 +75,19 @@
                         {{/if_eq}}
                     </div>-->
 
-                    
+                </div>
                 <!--Child Requests-->
                 <div *ngIf="request.hasChildRequests">
+                    
                     <button type="button" class="btn btn-sm btn-info-outline" data-toggle="collapse" [attr.data-target]="'#' + request.id +'childRequests'">Children</button>
                     <div id="{{request.id}}childRequests" class="collapse">
 
                         <div *ngFor="let child of request.childRequests">
                             <hr/>
-                                <div *ngIf="request.requestedUsers">Requested By: <span *ngFor="let user of request.requestedUsers">{{user}} </span></div>
+                            <div *ngIf="request.requestedUsers">Requested By: <span *ngFor="let user of request.requestedUsers">{{user}} </span>
-                                <div>Seasons Requested: <span *ngFor="let s of request.seasonNumbersRequested">{{s}} </span> </div>
+                            </div>
+                            <div>Seasons Requested: <span *ngFor="let s of request.seasonNumbersRequested">{{s}} </span>
+                            </div>
                             <div>
                                 <span>Request status: </span>
                                 <span *ngIf="request.available" class="label label-success">Available</span>
@@ -146,8 +149,8 @@
 
                         <div *ngIf="!request.denied">
                             <form>
-                                    <input name="requestId" type="text" value="{{request.requestId}}" hidden="hidden"/>
+                                <input name="requestId" type="text" value="{{request.requestId}}" hidden="hidden" />
-                                    <input name="reason" type="text" hidden="hidden"/>
+                                <input name="reason" type="text" hidden="hidden" />
                                 <div class="btn-group btn-split">
                                     <button type="button" (click)="deny(request)" class="btn btn-sm btn-danger-outline deny"><i class="fa fa-times"></i> Deny</button>
                                     <button type="button" class="btn btn-danger-outline dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -173,7 +176,7 @@
 
 
 
-</div>
+                </div>
 
 
                 <input name="requestId" type="text" value="{{request.requestId}}" hidden="hidden" />
@@ -199,4 +202,4 @@
 
 
     </div>
-    </div>
+</div>

Ombi/Ombi/wwwroot/app/search/seriesinformation.component.ts

@@ -53,7 +53,7 @@ export class SeriesInformationComponent implements OnInit, OnDestroy {
                 this.result = x as IRequestEngineResult;
                 if (this.result.requestAdded) {
                     this.notificationService.success("Request Added",
-                        `Request for ${this.series.seriesName} has been added successfully`);
+                        `Request for ${this.series.title} has been added successfully`);
                 } else {
                     this.notificationService.warning("Request Added", this.result.message);
                 }

Ombi/Ombi/wwwroot/app/search/tvsearch.component.html

@@ -44,7 +44,7 @@
                     <div>
 
                         <a href="http://www.imdb.com/title/{{result.imdbId}}/" target="_blank">
-                            <h4>{{result.seriesName}} ({{result.firstAired}})</h4>
+                            <h4>{{result.title}} ({{result.firstAired}})</h4>
 
                         </a>
 

Ombi/Ombi/wwwroot/app/search/tvsearch.component.ts

@@ -13,10 +13,12 @@ import { NotificationService } from '../services/notification.service';
 import { ISearchTvResult } from '../interfaces/ISearchTvResult';
 import { IRequestEngineResult } from '../interfaces/IRequestEngineResult';
 
+import  template  from './tvsearch.component.html';
+
 @Component({
     selector: 'tv-search',
     moduleId: module.id,
-    templateUrl: './tvsearch.component.html',
+    template: template,
 })
 export class TvSearchComponent implements OnInit, OnDestroy {