From 86778cb59aa10bea245a2ac063b61f6325677ce3 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 18 Feb 2025 12:32:22 +0530
Subject: [PATCH 1/3] adding loaders

---
 .../create-event/create-event.component.ts    | 40 ++++++++-----
 .../event-basic-details.component.html        |  2 +-
 .../event-basic-details.component.ts          | 59 ++++++++++---------
 .../event-materials.component.ts              |  9 ++-
 .../events-list/events-list.component.ts      |  2 +
 .../basic-info/basic-info.component.ts        | 11 +++-
 .../events-2/events-2-routing.module.ts       | 12 ++++
 7 files changed, 87 insertions(+), 48 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/components/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/home/routes/events-2/components/create-event/create-event.component.ts
index 1ec76326..0819f063 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/components/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/components/create-event/create-event.component.ts
@@ -9,6 +9,7 @@ import { MatStepper } from '@angular/material/stepper'
 import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'
 import { HttpErrorResponse } from '@angular/common/http'
 import { DatePipe } from '@angular/common'
+import { LoaderService } from '../../../../../../../../../../../src/app/services/loader.service'
 
 @Component({
   selector: 'ws-app-create-event',
@@ -39,7 +40,8 @@ export class CreateEventComponent implements OnInit, AfterViewInit {
     private formBuilder: FormBuilder,
     private router: Router,
     private matSnackBar: MatSnackBar,
-    private datePipe: DatePipe
+    private datePipe: DatePipe,
+    private loaderService: LoaderService,
   ) { }
 
   //#region (onInit)
@@ -57,9 +59,8 @@ export class CreateEventComponent implements OnInit, AfterViewInit {
       startDate: new FormControl('', [Validators.required]),
       startTime: new FormControl('', [Validators.required]),
       endTime: new FormControl('', [Validators.required]),
-      resourceUrl: new FormControl('', [Validators.required]),
-      uploadUrl: new FormControl(''),
-      resourceUploadType: new FormControl('url'),
+      registrationLink: new FormControl('', [Validators.required]),
+      recordedLinks: new FormControl(''),
       appIcon: new FormControl('', [Validators.required]),
     })
   }
@@ -82,12 +83,12 @@ export class CreateEventComponent implements OnInit, AfterViewInit {
   patchEventDetails() {
     this.eventId = _.get(this.eventDetails, 'identifier')
     const startDate = _.get(this.eventDetails, 'startDate', '')
-    const resourceUploadType = _.get(this.eventDetails, 'resourceUploadType', '')
-    if (resourceUploadType === 'upload') {
-      this.eventDetailsForm.controls.resourceUrl.clearAsyncValidators()
-      this.eventDetailsForm.controls.uploadUrl.setValidators([Validators.required])
-      this.eventDetailsForm.controls.uploadUrl.updateValueAndValidity()
-      this.eventDetailsForm.controls.resourceUrl.updateValueAndValidity()
+    const recordedLinks = _.get(this.eventDetails, 'recordedLinks', [])
+    if (recordedLinks.length > 0) {
+      this.eventDetailsForm.controls.registrationLink.clearValidators()
+      this.eventDetailsForm.controls.recordedLinks.setValidators([Validators.required])
+      this.eventDetailsForm.controls.recordedLinks.updateValueAndValidity()
+      this.eventDetailsForm.controls.registrationLink.updateValueAndValidity()
     }
     const eventBaseDetails = {
       eventName: _.get(this.eventDetails, 'name', ''),
@@ -95,11 +96,11 @@ export class CreateEventComponent implements OnInit, AfterViewInit {
       eventCategory: _.get(this.eventDetails, 'resourceType', ''),
       streamType: _.get(this.eventDetails, 'streamType', ''),//new key to add
       startDate: startDate ? new Date(startDate) : startDate,
+      endDate: startDate ? new Date(startDate) : startDate,
       startTime: _.get(this.eventDetails, 'startTime', ''),
       endTime: _.get(this.eventDetails, 'endTime', ''),
-      resourceUrl: resourceUploadType === 'url' ? _.get(this.eventDetails, 'registrationLink', '') : '',
-      uploadUrl: resourceUploadType === 'upload' ? _.get(this.eventDetails, 'registrationLink', '') : '',
-      resourceUploadType: resourceUploadType,
+      registrationLink: _.get(this.eventDetails, 'registrationLink', ''),
+      recordedLinks: _.get(this.eventDetails, 'recordedLinks', []),
       appIcon: _.get(this.eventDetails, 'appIcon', '')
     }
     this.eventDetailsForm.setValue(eventBaseDetails)
@@ -211,15 +212,22 @@ export class CreateEventComponent implements OnInit, AfterViewInit {
         event: this.getFormBodyOfEvent(status)
       }
     }
+    this.loaderService.changeLoaderState(true)
     this.eventSvc.updateEvent(formBody, this.eventId).subscribe({
       next: res => {
         if (res) {
           const successMessage = status === 'Draft' ? 'Event details saved successfully' : 'Event details sent for approval successfully'
           this.openSnackBar(successMessage)
-          this.navigateBack()
+          setTimeout(() => {
+            this.navigateBack()
+            this.loaderService.changeLoaderState(false)
+          }, 1000)
+        } else {
+          this.loaderService.changeLoaderState(false)
         }
       },
       error: (error: HttpErrorResponse) => {
+        this.loaderService.changeLoaderState(false)
         const errorMessage = _.get(error, 'error.message', 'Something went wrong while updating event, please try again')
         this.openSnackBar(errorMessage)
       }
@@ -244,8 +252,8 @@ export class CreateEventComponent implements OnInit, AfterViewInit {
     eventDetails['startDate'] = eventBaseDetails.startDate ? this.datePipe.transform(eventBaseDetails.startDate, 'yyyy-MM-dd') : ''
     eventDetails['startTime'] = startTime
     eventDetails['endTime'] = endTime
-    eventDetails['registrationLink'] = eventBaseDetails.resourceUploadType === 'url' ? eventBaseDetails.resourceUrl : eventBaseDetails.uploadUrl
-    eventDetails['resourceUploadType'] = eventBaseDetails.resourceUploadType
+    eventDetails['registrationLink'] = eventBaseDetails.registrationLink
+    eventDetails['recordedLinks'] = eventBaseDetails.recordedLinks
     eventDetails['appIcon'] = eventBaseDetails.appIcon
 
     if (status === 'SentToPublish') {
diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/components/event-basic-details/event-basic-details.component.html b/project/ws/app/src/lib/routes/home/routes/events-2/components/event-basic-details/event-basic-details.component.html
index 45c8343d..410464f4 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/components/event-basic-details/event-basic-details.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/components/event-basic-details/event-basic-details.component.html
@@ -86,7 +86,7 @@
       or upload from URL
     </div>
     <mat-form-field appearance="outline" class="">
-      <input matInput placeholder="Enter url" formControlName="resourceUrl">
+      <input matInput placeholder="Enter url" formControlName="registrationLink">
     </mat-form-field>
   </div>
 
diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/components/event-basic-details/event-basic-details.component.ts b/project/ws/app/src/lib/routes/home/routes/events-2/components/event-basic-details/event-basic-details.component.ts
index 0f95fb59..e4456aec 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/components/event-basic-details/event-basic-details.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/components/event-basic-details/event-basic-details.component.ts
@@ -8,6 +8,7 @@ import { map, mergeMap } from 'rxjs/operators'
 import { environment } from '../../../../../../../../../../../src/environments/environment'
 import { HttpErrorResponse } from '@angular/common/http'
 import moment from 'moment'
+import { LoaderService } from '../../../../../../../../../../../src/app/services/loader.service'
 
 @Component({
   selector: 'ws-app-event-basic-details',
@@ -32,7 +33,8 @@ export class EventBasicDetailsComponent implements OnInit, OnChanges {
 
   constructor(
     private matSnackBar: MatLegacySnackBar,
-    private eventSvc: EventsService
+    private eventSvc: EventsService,
+    private loaderService: LoaderService
   ) { }
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -72,16 +74,14 @@ export class EventBasicDetailsComponent implements OnInit, OnChanges {
         this.generatMinTimeToEnd(time)
       })
     }
-    if (this.eventDetails.controls.resourceUrl) {
-      this.eventDetails.controls.resourceUrl.valueChanges.subscribe((url) => {
+    if (this.eventDetails.controls.registrationLink) {
+      this.eventDetails.controls.registrationLink.valueChanges.subscribe((url) => {
         if (url && url !== '') {
-          this.eventDetails.controls.uploadUrl.patchValue('')
-          this.eventDetails.controls.uploadUrl.clearValidators()
-          this.eventDetails.controls.resourceUrl.setValidators([Validators.required])
-          this.eventDetails.controls.resourceUploadType.patchValue('url')
-          this.eventDetails.controls.uploadUrl.updateValueAndValidity()
-          this.eventDetails.controls.resourceUrl.updateValueAndValidity()
-          this.eventDetails.controls.resourceUploadType.updateValueAndValidity()
+          this.eventDetails.controls.recordedLinks.patchValue([])
+          this.eventDetails.controls.recordedLinks.clearValidators()
+          this.eventDetails.controls.registrationLink.setValidators([Validators.required])
+          this.eventDetails.controls.recordedLinks.updateValueAndValidity()
+          this.eventDetails.controls.registrationLink.updateValueAndValidity()
         }
       })
     }
@@ -128,9 +128,9 @@ export class EventBasicDetailsComponent implements OnInit, OnChanges {
 
   get uploadedVideoName(): string {
     let name = ''
-    const uploadedVideoUrl = _.get(this.eventDetails, 'value.uploadUrl', '')
-    if (uploadedVideoUrl) {
-      const urlSplit = uploadedVideoUrl.split('_')
+    const uploadedVideoUrl = _.get(this.eventDetails, 'value.recordedLinks', [])
+    if (uploadedVideoUrl.length > 0) {
+      const urlSplit = uploadedVideoUrl[0].split('_')
       if (urlSplit.length > 0) {
         name = urlSplit[urlSplit.length - 1]
       }
@@ -142,11 +142,11 @@ export class EventBasicDetailsComponent implements OnInit, OnChanges {
     if (item === 'appIcon' && this.eventDetails.controls.appIcon) {
       this.eventDetails.controls.appIcon.patchValue('')
       this.eventDetails.controls.appIcon.updateValueAndValidity()
-    } else if (item === 'uploadedVideo' && this.eventDetails.controls.uploadUrl) {
-      this.eventDetails.controls.uploadUrl.patchValue('')
-      this.eventDetails.controls.uploadUrl.updateValueAndValidity()
-      this.eventDetails.controls.resourceUrl.setValidators([Validators.required])
-      this.eventDetails.controls.resourceUrl.updateValueAndValidity()
+    } else if (item === 'uploadedVideo' && this.eventDetails.controls.recordedLinks) {
+      this.eventDetails.controls.recordedLinks.patchValue([])
+      this.eventDetails.controls.recordedLinks.updateValueAndValidity()
+      this.eventDetails.controls.registrationLink.setValidators([Validators.required])
+      this.eventDetails.controls.registrationLink.updateValueAndValidity()
     }
   }
 
@@ -156,8 +156,8 @@ export class EventBasicDetailsComponent implements OnInit, OnChanges {
       return
     }
     const mimeType = files[0].type
-    if (!mimeType.startsWith('video/')) {
-      this.openSnackBar('Only video files are supported')
+    if (!mimeType.startsWith('image/')) {
+      this.openSnackBar('Only images are supported')
       return
     }
     const reader = new FileReader()
@@ -194,6 +194,7 @@ export class EventBasicDetailsComponent implements OnInit, OnChanges {
           },
         },
       }
+      this.loaderService.changeLoaderState(true)
       this.eventSvc.createContent(request).pipe(mergeMap((res: any) => {
         const contentID = _.get(res, 'result.identifier')
         const formData: FormData = new FormData()
@@ -207,6 +208,7 @@ export class EventBasicDetailsComponent implements OnInit, OnChanges {
         }
       })).subscribe({
         next: res => {
+          this.loaderService.changeLoaderState(false)
           if (res) {
             const createdUrl = res
             const urlToReplace = 'https://storage.googleapis.com/igot'//https://portal.dev.karmayogibharat.net
@@ -221,20 +223,19 @@ export class EventBasicDetailsComponent implements OnInit, OnChanges {
                 this.eventDetails.controls.appIcon.updateValueAndValidity()
               }
             } else {
-              if (this.eventDetails.controls.uploadUrl) {
-                this.eventDetails.controls.uploadUrl.patchValue(appIcon)
-                this.eventDetails.controls.uploadUrl.setValidators([Validators.required])
-                this.eventDetails.controls.resourceUrl.patchValue('')
-                this.eventDetails.controls.resourceUrl.clearValidators()
-                this.eventDetails.controls.resourceUploadType.patchValue('upload')
-                this.eventDetails.controls.uploadUrl.updateValueAndValidity()
-                this.eventDetails.controls.resourceUrl.updateValueAndValidity()
-                this.eventDetails.controls.resourceUploadType.updateValueAndValidity()
+              if (this.eventDetails.controls.recordedLinks) {
+                this.eventDetails.controls.recordedLinks.patchValue([appIcon])
+                this.eventDetails.controls.recordedLinks.setValidators([Validators.required])
+                this.eventDetails.controls.registrationLink.patchValue('')
+                this.eventDetails.controls.registrationLink.clearValidators()
+                this.eventDetails.controls.recordedLinks.updateValueAndValidity()
+                this.eventDetails.controls.registrationLink.updateValueAndValidity()
               }
             }
           }
         },
         error: (error: HttpErrorResponse) => {
+          this.loaderService.changeLoaderState(false)
           const errorMessage = _.get(error, 'error.message', 'Something went wrong please try again')
           this.openSnackBar(errorMessage)
         }
diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/components/event-materials/event-materials.component.ts b/project/ws/app/src/lib/routes/home/routes/events-2/components/event-materials/event-materials.component.ts
index 619f57c4..327a7d45 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/components/event-materials/event-materials.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/components/event-materials/event-materials.component.ts
@@ -7,6 +7,7 @@ import * as _ from 'lodash'
 import { ActivatedRoute } from '@angular/router'
 import { environment } from '../../../../../../../../../../../src/environments/environment'
 import { HttpErrorResponse } from '@angular/common/http'
+import { LoaderService } from '../../../../../../../../../../../src/app/services/loader.service'
 
 
 @Component({
@@ -28,7 +29,8 @@ export class EventMaterialsComponent implements OnInit {
   constructor(
     private matSnackBar: MatSnackBar,
     private eventSvc: EventsService,
-    private activeRoute: ActivatedRoute
+    private activeRoute: ActivatedRoute,
+    private loaderService: LoaderService
   ) { }
 
   ngOnInit(): void {
@@ -54,7 +56,9 @@ export class EventMaterialsComponent implements OnInit {
     //   return
     // }
     reader.readAsDataURL(files[0])
+    this.loaderService.changeLoaderState(true)
     reader.onload = _event => {
+      this.loaderService.changeLoaderState(false)
       this.fileURL = reader.result
       this.saveFile()
     }
@@ -83,6 +87,7 @@ export class EventMaterialsComponent implements OnInit {
           },
         },
       }
+      this.loaderService.changeLoaderState(true)
       this.eventSvc.createContent(request).pipe(mergeMap((res: any) => {
         const contentID = _.get(res, 'result.identifier')
         const formData: FormData = new FormData()
@@ -96,6 +101,7 @@ export class EventMaterialsComponent implements OnInit {
         }
       })).subscribe({
         next: res => {
+          this.loaderService.changeLoaderState(false)
           if (res) {
             const createdUrl = res
             const urlToReplace = 'https://storage.googleapis.com/igot'
@@ -108,6 +114,7 @@ export class EventMaterialsComponent implements OnInit {
           }
         },
         error: (error: HttpErrorResponse) => {
+          this.loaderService.changeLoaderState(false)
           const errorMessage = _.get(error, 'error.message', 'Something went wrong please try again')
           this.openSnackBar(errorMessage)
         }
diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/components/events-list/events-list.component.ts b/project/ws/app/src/lib/routes/home/routes/events-2/components/events-list/events-list.component.ts
index f157d48b..872ed7e5 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/components/events-list/events-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/components/events-list/events-list.component.ts
@@ -225,6 +225,8 @@ export class EventsListComponent implements OnInit, OnDestroy {
         filters: {
           status: ['Live'],
           contentType: 'Event',
+          createdFor: _.get(this.userProfile, 'rootOrgId', '')
+
         },
         sort_by: {
           lastUpdatedOn: 'desc',
diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/dialogs/basic-info/basic-info.component.ts b/project/ws/app/src/lib/routes/home/routes/events-2/dialogs/basic-info/basic-info.component.ts
index da74d737..6cc6c136 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/dialogs/basic-info/basic-info.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/dialogs/basic-info/basic-info.component.ts
@@ -8,6 +8,7 @@ import { EventsService } from '../../services/events.service'
 import { map, mergeMap } from 'rxjs/operators'
 import { HttpErrorResponse } from '@angular/common/http'
 import { environment } from '../../../../../../../../../../../src/environments/environment'
+import { LoaderService } from '../../../../../../../../../../../src/app/services/loader.service'
 
 @Component({
   selector: 'ws-app-basic-info',
@@ -27,7 +28,8 @@ export class BasicInfoComponent implements OnInit {
     @Inject(MAT_DIALOG_DATA) data: any,
     private formBuilder: FormBuilder,
     private matSnackBar: MatSnackBar,
-    private eventSvc: EventsService
+    private eventSvc: EventsService,
+    private loaderService: LoaderService
   ) {
     this.userProfile = data.userProfile
     this.userEmail = data.userEmail
@@ -100,6 +102,7 @@ export class BasicInfoComponent implements OnInit {
           },
         },
       }
+      this.loaderService.changeLoaderState(true)
       this.eventSvc.createContent(request).pipe(mergeMap((res: any) => {
         const contentID = _.get(res, 'result.identifier')
         const formData: FormData = new FormData()
@@ -113,6 +116,7 @@ export class BasicInfoComponent implements OnInit {
         }
       })).subscribe({
         next: res => {
+          this.loaderService.changeLoaderState(false)
           if (res) {
             const createdUrl = res
             const urlToReplace = 'https://storage.googleapis.com/igot'//https://portal.dev.karmayogibharat.net
@@ -122,11 +126,13 @@ export class BasicInfoComponent implements OnInit {
               appIcon = `${environment.domainName}/assets/public/${urlSplice.slice(1).join('/')}`
             }
             this.createEvent(appIcon)
+          } else {
           }
         },
         error: (error: HttpErrorResponse) => {
           const errorMessage = _.get(error, 'error.message', 'Something went wrong please try again')
           this.openSnackBar(errorMessage)
+          this.loaderService.changeLoaderState(false)
         }
       })
     }
@@ -172,14 +178,17 @@ export class BasicInfoComponent implements OnInit {
           }
         }
       }
+      this.loaderService.changeLoaderState(true)
       this.eventSvc.createEvent(requestBody).subscribe({
         next: res => {
+          this.loaderService.changeLoaderState(false)
           if (res) {
             this.openSnackBar('Event created successfully')
             this.dialogRef.close(_.get(res, 'result.identifier', ''))
           }
         },
         error: (error: HttpErrorResponse) => {
+          this.loaderService.changeLoaderState(false)
           const errorMessage = _.get(error, 'error.message', 'Something went wrong while creating event, please try again')
           this.openSnackBar(errorMessage)
         }
diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/events-2-routing.module.ts b/project/ws/app/src/lib/routes/home/routes/events-2/events-2-routing.module.ts
index 11b39311..a291fe00 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/events-2-routing.module.ts
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/events-2-routing.module.ts
@@ -44,6 +44,9 @@ const routes: Routes = [
           pageId: 'app/home/events/draft',
           module: 'events-2',
         },
+        resolve: {
+          configService: ConfigResolveService,
+        },
       },
       {
         path: 'pending-approval',
@@ -63,6 +66,9 @@ const routes: Routes = [
           pageId: 'app/home/events/past',
           module: 'events-2',
         },
+        resolve: {
+          configService: ConfigResolveService,
+        },
       },
       {
         path: 'canceled',
@@ -71,6 +77,9 @@ const routes: Routes = [
           pageId: 'app/home/events/canceled',
           module: 'events-2',
         },
+        resolve: {
+          configService: ConfigResolveService,
+        },
       },
       {
         path: 'rejected',
@@ -79,6 +88,9 @@ const routes: Routes = [
           pageId: 'app/home/events/rejected',
           module: 'events-2',
         },
+        resolve: {
+          configService: ConfigResolveService,
+        },
       },
     ],
   }, {

From 826fd7626dbf5e6132ede5f9ee8ffa4ef67c78b6 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 18 Feb 2025 13:09:40 +0530
Subject: [PATCH 2/3] fixing end time disable issues

---
 .../event-basic-details.component.ts              | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/components/event-basic-details/event-basic-details.component.ts b/project/ws/app/src/lib/routes/home/routes/events-2/components/event-basic-details/event-basic-details.component.ts
index e4456aec..37e7c531 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/components/event-basic-details/event-basic-details.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/components/event-basic-details/event-basic-details.component.ts
@@ -25,8 +25,8 @@ export class EventBasicDetailsComponent implements OnInit, OnChanges {
   evntCategorysList = ['Webinar', 'Karmayogi Talks', 'Karmayogi Saptah']
   todayDate = new Date()
 
-  maxTimeToStart = '11:30 pm'
-  minTimeToEnd = '12:30 am'
+  maxTimeToStart = '11:45 pm'
+  minTimeToEnd = '12:15 am'
   timeGap = 15
 
   //#endregion
@@ -41,7 +41,12 @@ export class EventBasicDetailsComponent implements OnInit, OnChanges {
     if (changes.eventDetails) {
       const startTime = _.get(this.eventDetails, 'value.startTime')
       if (startTime) {
-        this.eventDetails.controls.startTime.patchValue(this.convertTo12HourFormat(startTime))
+        const convertedStartTime = this.convertTo12HourFormat(startTime)
+        this.eventDetails.controls.startTime.patchValue(convertedStartTime)
+        setTimeout(() => {
+          const resetEndTime = false
+          this.generatMinTimeToEnd(convertedStartTime, resetEndTime)
+        }, 100)
       }
 
       const endTime = _.get(this.eventDetails, 'value.endTime')
@@ -88,7 +93,7 @@ export class EventBasicDetailsComponent implements OnInit, OnChanges {
   }
 
 
-  generatMinTimeToEnd(time: string) {
+  generatMinTimeToEnd(time: string, resetEndTime = true) {
     let [timePart, period] = time.split(' ')
     let [hours, minutes] = timePart.split(':').map(Number)
     minutes += this.timeGap
@@ -109,7 +114,7 @@ export class EventBasicDetailsComponent implements OnInit, OnChanges {
     }
     const formattedTime = `${hours}:${minutes < 10 ? '0' + minutes : minutes} ${period}`
     this.minTimeToEnd = formattedTime
-    if (this.eventDetails.controls.startTime) {
+    if (this.eventDetails.controls.startTime && resetEndTime) {
       this.eventDetails.controls.endTime.patchValue('')
     }
   }

From 1ba8cf512cb5f65b7585e01f0c599d33c8c8743e Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 18 Feb 2025 15:41:37 +0530
Subject: [PATCH 3/3] fixing video issue and view mode issues and sorting

---
 .../create-event/create-event.component.html  |   2 +-
 .../create-event/create-event.component.ts    |   2 +-
 .../event-competencies.component.html         |  12 +-
 .../events-table/events-table.component.html  | 131 +++++++++---------
 .../events-table/events-table.component.ts    |   9 +-
 .../youtube-player.component.html             |   9 +-
 .../home/routes/events-2/events-2.module.ts   |   4 +-
 7 files changed, 91 insertions(+), 78 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/components/create-event/create-event.component.html b/project/ws/app/src/lib/routes/home/routes/events-2/components/create-event/create-event.component.html
index 9a90d607..a4699e88 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/components/create-event/create-event.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/components/create-event/create-event.component.html
@@ -18,7 +18,7 @@
       <ng-container *ngIf="!showPreview && currentStepperIndex === 3">
         <button mat-raised-button class="flex items-center publish-btn" (click)="preview()">Preview</button>
       </ng-container>
-      <ng-container *ngIf="this.currentStepperIndex === 3 || this.currentStepperIndex === 4">
+      <ng-container *ngIf="currentStepperIndex >= 3 && openMode === 'edit'">
         <button mat-raised-button class="flex items-center publish-btn" (click)="publish()">Send to Publisher</button>
       </ng-container>
     </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/components/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/home/routes/events-2/components/create-event/create-event.component.ts
index 0819f063..b3ec5da1 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/components/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/components/create-event/create-event.component.ts
@@ -96,7 +96,6 @@ export class CreateEventComponent implements OnInit, AfterViewInit {
       eventCategory: _.get(this.eventDetails, 'resourceType', ''),
       streamType: _.get(this.eventDetails, 'streamType', ''),//new key to add
       startDate: startDate ? new Date(startDate) : startDate,
-      endDate: startDate ? new Date(startDate) : startDate,
       startTime: _.get(this.eventDetails, 'startTime', ''),
       endTime: _.get(this.eventDetails, 'endTime', ''),
       registrationLink: _.get(this.eventDetails, 'registrationLink', ''),
@@ -250,6 +249,7 @@ export class CreateEventComponent implements OnInit, AfterViewInit {
     eventDetails['resourceType'] = eventBaseDetails.eventCategory
     eventDetails['streamType'] = eventBaseDetails.streamType
     eventDetails['startDate'] = eventBaseDetails.startDate ? this.datePipe.transform(eventBaseDetails.startDate, 'yyyy-MM-dd') : ''
+    eventDetails['endDate'] = eventBaseDetails.startDate ? this.datePipe.transform(eventBaseDetails.startDate, 'yyyy-MM-dd') : ''
     eventDetails['startTime'] = startTime
     eventDetails['endTime'] = endTime
     eventDetails['registrationLink'] = eventBaseDetails.registrationLink
diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/components/event-competencies/event-competencies.component.html b/project/ws/app/src/lib/routes/home/routes/events-2/components/event-competencies/event-competencies.component.html
index 61c6813a..a062dd15 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/components/event-competencies/event-competencies.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/components/event-competencies/event-competencies.component.html
@@ -1,7 +1,9 @@
 <div class="competency-details flex-grow">
   <div class="mt-4 flex justify-between">
     <div class="title">Add Competency</div>
-    <div class="add-theme" (click)="showAddCompetencyDialog()">Add Competency</div>
+    <ng-container *ngIf="openMode === 'edit'">
+      <button mat-button class="add-theme" (click)="showAddCompetencyDialog()">Add Competency</button>
+    </ng-container>
   </div>
   <div class="add-theme-sec mt-4" *ngIf="competencies?.length">
     <div class="" *ngFor="let competency of competencies, let index=c">
@@ -16,9 +18,11 @@
               <div>{{competency.competencyAreaName}}</div>
             </div>
           </div>
-          <div>
-            <mat-icon class="cursor-pointer" (click)="removeNode(competency)">delete</mat-icon>
-          </div>
+          <ng-container *ngIf="openMode === 'edit'">
+            <div>
+              <mat-icon class="cursor-pointer" (click)="removeNode(competency)">delete</mat-icon>
+            </div>
+          </ng-container>
         </div>
         <ng-container *ngIf="competency?.themes?.length">
           <div class="themes-card" *ngFor="let theme of competency.themes, let i=index">
diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/components/events-table/events-table.component.html b/project/ws/app/src/lib/routes/home/routes/events-2/components/events-table/events-table.component.html
index 3eb46002..84fe850b 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/components/events-table/events-table.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/components/events-table/events-table.component.html
@@ -13,81 +13,82 @@
 
   <div class="example-table-container">
     <ng-container *ngIf="!showLoader; else tableLoader">
-      <mat-table #table matSort [dataSource]="dataSource" class="example-table table1 responsiveTable"
-        *ngIf="dataSource.filteredData.length > 0">
+      <ng-container *ngIf="dataSource.filteredData.length > 0">
+        <mat-table #table matSort [dataSource]="dataSource" class="example-table table1 responsiveTable">
 
-        <ng-container matColumnDef="{{col.key}}" *ngFor="let col of tableColumns">
-          <ng-container [ngSwitch]="col.cellType">
-            <ng-container *ngSwitchCase="'text'">
-              <mat-header-cell *matHeaderCellDef mat-sort-header class="table-header-text"> {{col.displayName}}
-              </mat-header-cell>
-              <mat-cell *matCellDef="let element" class="py-2 flex flex-row gap-2">
-                <ng-container *ngIf="col.imageKey">
-                  <img class="imageCell py-2" [src]="element[col.imageKey]" alt="logo">
-                </ng-container>
-                <span [ngClass]="col.cellClass" class="cources-table-cell">
-                  {{element[col.key]}}
-                </span>
-              </mat-cell>
-            </ng-container>
+          <ng-container matColumnDef="{{col.key}}" *ngFor="let col of tableColumns">
+            <ng-container [ngSwitch]="col.cellType">
+              <ng-container *ngSwitchCase="'text'">
+                <mat-header-cell *matHeaderCellDef mat-sort-header class="table-header-text"> {{col.displayName}}
+                </mat-header-cell>
+                <mat-cell *matCellDef="let element" class="py-2 flex flex-row gap-2">
+                  <ng-container *ngIf="col.imageKey">
+                    <img class="imageCell py-2" [src]="element[col.imageKey]" alt="logo">
+                  </ng-container>
+                  <span [ngClass]="col.cellClass" class="cources-table-cell">
+                    {{element[col.key]}}
+                  </span>
+                </mat-cell>
+              </ng-container>
 
-            <ng-container *ngSwitchCase="'date'">
-              <mat-header-cell *matHeaderCellDef mat-sort-header class="table-header-text table-date-header">
-                {{col.displayName}}
-              </mat-header-cell>
-              <mat-cell *matCellDef="let element" class="table-date-column">
-                <span [ngClass]="col.cellClass" class="cources-table-cell">
-                  {{element[col.key]}}
-                </span>
-              </mat-cell>
-            </ng-container>
+              <ng-container *ngSwitchCase="'date'">
+                <mat-header-cell *matHeaderCellDef class="table-header-text table-date-header">
+                  {{col.displayName}}
+                </mat-header-cell>
+                <mat-cell *matCellDef="let element" class="table-date-column">
+                  <span [ngClass]="col.cellClass" class="cources-table-cell">
+                    {{element[col.key]}}
+                  </span>
+                </mat-cell>
+              </ng-container>
 
-            <ng-container *ngSwitchCase="'number'">
-              <mat-header-cell *matHeaderCellDef mat-sort-header class="table-header-text table-number-cell">
-                {{col.displayName}}
-              </mat-header-cell>
-              <mat-cell *matCellDef="let element" class="table-number-cell">
-                <span [ngClass]="col.cellClass" class="cources-table-cell">
-                  {{element[col.key]}}
-                </span>
-              </mat-cell>
-            </ng-container>
+              <ng-container *ngSwitchCase="'number'">
+                <mat-header-cell *matHeaderCellDef mat-sort-header class="table-header-text table-number-cell">
+                  {{col.displayName}}
+                </mat-header-cell>
+                <mat-cell *matCellDef="let element" class="table-number-cell">
+                  <span [ngClass]="col.cellClass" class="cources-table-cell">
+                    {{element[col.key]}}
+                  </span>
+                </mat-cell>
+              </ng-container>
 
-            <ng-container *ngSwitchCase="'menu'">
-              <mat-header-cell *matHeaderCellDef class="table-header-text flex justify-center table-menu-header">
-                {{col.displayName}}
-              </mat-header-cell>
-              <mat-cell *matCellDef="let element" class="justify-center table-menu-column">
+              <ng-container *ngSwitchCase="'menu'">
+                <mat-header-cell *matHeaderCellDef class="table-header-text flex justify-center table-menu-header">
+                  {{col.displayName}}
+                </mat-header-cell>
+                <mat-cell *matCellDef="let element" class="justify-center table-menu-column">
 
-                <mat-icon mat-icon-button i18n-aria-label aria-label="action items" [matMenuTriggerFor]="cardMenu"
-                  class="horizontalMenu"> more_horiz
-                </mat-icon>
-                <mat-menu #cardMenu="matMenu">
-                  <ng-template matMenuContent>
-                    <ng-container *ngFor="let item of menuItems">
-                      <div mat-menu-item [ngClass]="{'disableMenu': element['disableMenu']}"
-                        [disabled]="element['disableMenu'] === true" (click)="buttonClick(item.action, element)">
-                        <button class="flex item-btn items-center" mat-icon-button i18n-aria-label
-                          aria-label="Analytics">
-                          <mat-icon *ngIf="item.icon" class="menu-item-icon">{{item.icon}}</mat-icon>
-                          {{item.btnText}}
-                        </button>
-                      </div>
-                    </ng-container>
-                  </ng-template>
-                </mat-menu>
-              </mat-cell>
-            </ng-container>
+                  <mat-icon mat-icon-button i18n-aria-label aria-label="action items" [matMenuTriggerFor]="cardMenu"
+                    class="horizontalMenu"> more_horiz
+                  </mat-icon>
+                  <mat-menu #cardMenu="matMenu">
+                    <ng-template matMenuContent>
+                      <ng-container *ngFor="let item of menuItems">
+                        <div mat-menu-item [ngClass]="{'disableMenu': element['disableMenu']}"
+                          [disabled]="element['disableMenu'] === true" (click)="buttonClick(item.action, element)">
+                          <button class="flex item-btn items-center" mat-icon-button i18n-aria-label
+                            aria-label="Analytics">
+                            <mat-icon *ngIf="item.icon" class="menu-item-icon">{{item.icon}}</mat-icon>
+                            {{item.btnText}}
+                          </button>
+                        </div>
+                      </ng-container>
+                    </ng-template>
+                  </mat-menu>
+                </mat-cell>
+              </ng-container>
 
+            </ng-container>
           </ng-container>
-        </ng-container>
 
-        <mat-header-row *matHeaderRowDef="columnsList"></mat-header-row>
+          <mat-header-row *matHeaderRowDef="columnsList"></mat-header-row>
 
-        <mat-row *matRowDef="let row; columns: columnsList">
-        </mat-row>
+          <mat-row *matRowDef="let row; columns: columnsList">
+          </mat-row>
 
-      </mat-table>
+        </mat-table>
+      </ng-container>
       <div class="no-cbp-data" *ngIf="dataSource.filteredData.length === 0 && searchControl.value">
         <div class="mat-subheading-1 margin-remove">No results found</div>
         <div>Try adjusting your search to find what you are looking for.</div>
diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/components/events-table/events-table.component.ts b/project/ws/app/src/lib/routes/home/routes/events-2/components/events-table/events-table.component.ts
index 42c49b7a..95c07bc3 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/components/events-table/events-table.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/components/events-table/events-table.component.ts
@@ -1,10 +1,11 @@
-import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core'
 import { FormControl } from '@angular/forms'
 import { PageEvent } from '@angular/material/paginator'
 import { MatTableDataSource } from '@angular/material/table'
 import _ from 'lodash'
 import { debounceTime } from 'rxjs/operators'
 import { events } from '../../models/events.model'
+import { MatSort } from '@angular/material/sort'
 
 @Component({
   selector: 'ws-app-events-table',
@@ -12,6 +13,7 @@ import { events } from '../../models/events.model'
   styleUrls: ['./events-table.component.scss']
 })
 export class EventsTableComponent implements OnInit, OnChanges {
+  @ViewChild(MatSort, { static: false }) sort!: MatSort
   @Input() tableData!: events.tableData
   @Input() data?: []
   @Input() paginationDetails: events.pagination = {
@@ -58,8 +60,11 @@ export class EventsTableComponent implements OnInit, OnChanges {
     if (changes.tableData) {
       this.getFinalColumns()
     }
-    if (changes.data) {
+    if (changes.data && this.dataSource) {
       this.dataSource.data = this.data
+      setTimeout(() => {
+        this.dataSource.sort = this.sort
+      }, 10)
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/dialogs/youtube-player/youtube-player.component.html b/project/ws/app/src/lib/routes/home/routes/events-2/dialogs/youtube-player/youtube-player.component.html
index 0dcbd3ab..8f52a84c 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/dialogs/youtube-player/youtube-player.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/dialogs/youtube-player/youtube-player.component.html
@@ -2,13 +2,14 @@
   <div class="title font-bold">{{eventData?.name}}</div>
   <mat-icon class="pointer" (click)="closeDialog()">close</mat-icon>
 </div>
-{{videoLink | json}}
 <div *ngIf="!youtubeURL" class="pb-4">
   <video width="100%" height="500px" disablePictureInPicture="true" controls controlsList="nodownload"
     [autoplay]="true">
     <source [src]="videoLink.changingThisBreaksApplicationSecurity" type="video/mp4">
   </video>
 </div>
-<div [hidden]='!youtubeURL' id='youtubeTag' class="pb-4">
-  <iframe class="uploadedVideo" width="100%" [src]="iframeSrc"></iframe>
-</div>
\ No newline at end of file
+<ng-container *ngIf="youtubeURL">
+  <div id='youtubeTag' class="pb-4">
+    <iframe class="uploadedVideo" width="100%" [src]="iframeSrc"></iframe>
+  </div>
+</ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/events-2/events-2.module.ts b/project/ws/app/src/lib/routes/home/routes/events-2/events-2.module.ts
index 1af38633..6a85dca8 100644
--- a/project/ws/app/src/lib/routes/home/routes/events-2/events-2.module.ts
+++ b/project/ws/app/src/lib/routes/home/routes/events-2/events-2.module.ts
@@ -45,6 +45,7 @@ import { NgxMaterialTimepickerModule } from 'ngx-material-timepicker'
 import { RejectionReasonComponent } from './dialogs/rejection-reason/rejection-reason.component'
 import { CarouselModule } from 'ngx-owl-carousel-o'
 import { DragDropModule } from '@angular/cdk/drag-drop'
+import { MatSortModule } from '@angular/material/sort'
 
 
 @NgModule({
@@ -94,7 +95,8 @@ import { DragDropModule } from '@angular/cdk/drag-drop'
     WidgetResolverModule,
     NgxMaterialTimepickerModule,
     CarouselModule,
-    DragDropModule
+    DragDropModule,
+    MatSortModule
   ],
   providers: [
     DatePipe,