From e40af3a92b0dbb9e636df6a0ac50f05a87725c3b Mon Sep 17 00:00:00 2001
From: 4gray <serega05@gmail.com>
Date: Fri, 5 Feb 2021 23:24:21 +0100
Subject: [PATCH] refactor: active epg program is date dased now

---
 .../epg-list/epg-list.component.html          | 10 +++++++-
 .../components/epg-list/epg-list.component.ts | 25 +++++++++++++------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/app/player/components/epg-list/epg-list.component.html b/src/app/player/components/epg-list/epg-list.component.html
index 1c9c2201d..444eaa278 100644
--- a/src/app/player/components/epg-list/epg-list.component.html
+++ b/src/app/player/components/epg-list/epg-list.component.html
@@ -62,7 +62,15 @@
                 "
             >
                 <div matLine>
-                    <span class="time">{{ item.start }} - {{ item.stop }}</span>
+                    <span class="time"
+                        >{{
+                            item.start | momentDate: 'YYYYMMDDHHmm ZZ':'HH:mm'
+                        }}
+                        -
+                        {{
+                            item.stop | momentDate: 'YYYYMMDDHHmm ZZ':'HH:mm'
+                        }}</span
+                    >
                     <span
                         *ngIf="timeNow >= item.start && timeNow <= item.stop"
                         class="live-badge"
diff --git a/src/app/player/components/epg-list/epg-list.component.ts b/src/app/player/components/epg-list/epg-list.component.ts
index 23b82df4e..49deb4e7a 100644
--- a/src/app/player/components/epg-list/epg-list.component.ts
+++ b/src/app/player/components/epg-list/epg-list.component.ts
@@ -11,6 +11,9 @@ export interface EpgData {
     items: EpgProgram[];
 }
 
+const DATE_FORMAT = 'YYYYMMDD';
+const DATE_TIME_FORMAT = 'YYYYMMDDHHmm ZZ';
+
 @Component({
     selector: 'app-epg-list',
     templateUrl: './epg-list.component.html',
@@ -37,10 +40,12 @@ export class EpgListComponent {
     /** Current time as formatted string */
     timeNow: string;
 
+    /** Selected date */
     selectedDate: string;
 
     /**
      * Creates an instance of EpgListComponent
+     * @param channelStore
      * @param electronService
      * @param ngZone
      */
@@ -64,8 +69,8 @@ export class EpgListComponent {
     handleEpgData(programs: { payload: EpgData }): void {
         if (programs.payload?.items?.length > 0) {
             this.programs = programs;
-            this.timeNow = moment(Date.now()).format('HH:mm');
-            this.dateToday = moment(Date.now()).format('YYYYMMDD');
+            this.timeNow = moment(Date.now()).format(DATE_TIME_FORMAT);
+            this.dateToday = moment(Date.now()).format(DATE_FORMAT);
             this.channel = programs.payload?.channel;
             this.items = this.selectPrograms(programs);
 
@@ -85,8 +90,12 @@ export class EpgListComponent {
             .filter((item) => item.start.includes(this.dateToday.toString()))
             .map((program) => ({
                 ...program,
-                start: moment(program.start, 'YYYYMMDDHHmm ZZ').format('HH:mm'),
-                stop: moment(program.stop, 'YYYYMMDDHHmm ZZ').format('HH:mm'),
+                start: moment(program.start, DATE_TIME_FORMAT).format(
+                    DATE_TIME_FORMAT
+                ),
+                stop: moment(program.stop, DATE_TIME_FORMAT).format(
+                    DATE_TIME_FORMAT
+                ),
             }))
             .sort((a, b) => {
                 return a.start.localeCompare(b.start);
@@ -100,13 +109,13 @@ export class EpgListComponent {
     changeDate(direction: 'next' | 'prev'): void {
         let dateToSwitch;
         if (direction === 'next') {
-            dateToSwitch = moment(this.dateToday, 'YYYYMMDD')
+            dateToSwitch = moment(this.dateToday, DATE_FORMAT)
                 .add(1, 'days')
-                .format('YYYYMMDD');
+                .format(DATE_FORMAT);
         } else if (direction === 'prev') {
-            dateToSwitch = moment(this.dateToday, 'YYYYMMDD')
+            dateToSwitch = moment(this.dateToday, DATE_FORMAT)
                 .subtract(1, 'days')
-                .format('YYYYMMDD');
+                .format(DATE_FORMAT);
         }
         this.dateToday = dateToSwitch;
         this.items = this.selectPrograms(this.programs);