Simplified by removing channel info from program

As the information is not accurate
LarsBergqvist · Nov 29, 2023 · caca367 · caca367
1 parent e6e0a11
commit caca367
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 65 deletions.
diff --git a/src/app/components/programs/program-favorites.component.html b/src/app/components/programs/program-favorites.component.html
@@ -7,11 +7,6 @@
                 <th class="min-title-column" pSortableColumn="name">{{'ProgramNameTitle' | translate | uppercase }}<p-sortIcon field="name">
                     </p-sortIcon>
                 </th>
-                <th pSortableColumn="channel.name">{{'ChannelNameTitle' | translate | uppercase }}<p-sortIcon
-                        field="channel.name">
-                    </p-sortIcon>
-                </th>
-
                 <th>{{'Description' | translate | uppercase}}</th>
             </tr>
         </ng-template>
@@ -21,9 +16,6 @@
                     <div class="p-grid" style="width:100%">
                         <span (click)="onProgramDetails(program)" class="clickable p-col-8">
                             <img class="image-thumb" src={{program.programimage}} />
-                            <span *ngIf="program?.channel" class="prg-chan">
-                                {{program.channel.name}}
-                            </span>
                             <span class="prg-title">
                                 {{program.name}}
                             </span>
@@ -35,11 +27,6 @@
                         </span>
                     </div>
                 </td>
-                <td class="prg-chan-td">
-                    <div *ngIf="program?.channel">
-                        {{program.channel.name}}
-                    </div>
-                </td>
                 <td class="description-td" style="border:none">
                     {{program.description}}
                 </td>

diff --git a/src/app/components/programs/programs-list.component.html b/src/app/components/programs/programs-list.component.html
@@ -11,14 +11,7 @@
     [globalFilterFields]="['name','channel.name','description']" styleClass="sr-table">
     <ng-template pTemplate="header">
         <tr>
-            <th class="min-title-column" pSortableColumn="name">{{'ProgramNameTitle' | translate | uppercase }}<p-sortIcon field="name">
-                </p-sortIcon>
-            </th>
-            <th pSortableColumn="channel.name">{{'ChannelNameTitle' | translate | uppercase }}<p-sortIcon
-                    field="channel.name">
-                </p-sortIcon>
-            </th>
-
+            <th class="min-title-column">{{'ProgramNameTitle' | translate | uppercase }}</th>
             <th>{{'Description' | translate | uppercase}}</th>
         </tr>
     </ng-template>
@@ -28,9 +21,6 @@
                 <div class="p-grid" style="width:100%">
                     <span (click)="onProgramDetails(program)" class="clickable p-col-8">
                         <img src={{program.programimage}} class="image-thumb" />
-                        <span *ngIf="program?.channel" class="prg-chan">
-                            {{program.channel.name}}
-                        </span>
                         <span class="prg-title">
                             {{program.name}}
                         </span>
@@ -42,11 +32,6 @@
                     </span>
                 </div>
             </td>
-            <td class="prg-chan-td">
-                <div *ngIf="program?.channel">
-                    {{program.channel.name}}
-                </div>
-            </td>
             <td class="description-td" style="border:none">
                 {{program.description}}
             </td>

diff --git a/src/app/components/programs/programs-list.component.scss b/src/app/components/programs/programs-list.component.scss
@@ -1,16 +1 @@
-.description-td {
-  overflow: hidden;
-  white-space: wrap;
-  text-overflow: ellipsis;
-}
 
-.prg-title {
-  font-weight: bold;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.fav-checkbox {
-  vertical-align: middle;
-}
diff --git a/src/app/models/program.ts b/src/app/models/program.ts
@@ -1,12 +1,9 @@
-import { Channel } from './channel';
-
 export interface Program {
   name: string;
   id: number;
   description: string;
   programimage: string;
   programimagetemplate: string;
-  channel: Channel;
   fav: boolean;
   programcategory: {
     id: number;

diff --git a/src/app/services/programs.service.ts b/src/app/services/programs.service.ts
@@ -25,10 +25,6 @@ export class ProgramsService extends SRBaseService {
       name: p.name,
       id: p.id,
       fav: false,
-      channel: {
-        id: p?.channel.id,
-        name: p?.channel.name === '[No channel]' ? '' : p?.channel.name
-      },
       programimage: p.programimagetemplate + SRApiService.DefaultImagePreset,
       description: p.description,
       programcategory: p.programcategory
@@ -48,10 +44,6 @@ export class ProgramsService extends SRBaseService {
       name: p.name,
       id: p.id,
       fav: this.srApiService.hasFavMarker(p.id),
-      channel: {
-        id: p?.channel.id,
-        name: p?.channel.name
-      },
       programimage: p.programimagetemplate + SRApiService.DefaultImagePreset,
       description: p.description,
       programcategory: p.programcategory

diff --git a/src/styles.scss b/src/styles.scss
@@ -32,9 +32,6 @@
   max-width: 300px;
 }
 
-.prg-chan {
-  display: none;
-}
 .fav-chk {
   max-width: 100px;
   margin-right: 10px;
@@ -67,12 +64,6 @@
   .channel-type {
     display: none !important;
   }
-  .prg-chan {
-    display: initial;
-  }
-  .prg-chan-td {
-    display: none !important;
-  }
   .desc-col {
     border: none !important;
   }
@@ -170,4 +161,17 @@
   border-right-width: 8px;
   border-style: solid;
   border-color: var(--surface-50);
-}
+}
+
+.description-td {
+  overflow: hidden;
+  white-space: wrap;
+  text-overflow: ellipsis;
+}
+
+.prg-title {
+  font-weight: bold;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}