Merge pull request #109 from KB-iGOT/cbrelease-4.8.19

Cbrelease 4.8.19
KB-iGOT · Nov 29, 2024 · 8bcc775 · 8bcc775
2 parents 7037e2c + 08806b9
commit 8bcc775
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/project/ws/app/src/lib/routes/home/routes/events/create-event/create-event.component.html b/project/ws/app/src/lib/routes/home/routes/events/create-event/create-event.component.html
@@ -232,7 +232,7 @@
                                         Date
                                     </label>
                                     <ng-container
-                                        *ngIf="createEventForm.get('eventType')?.value === 'Karmayogi Saptah'">
+                                        *ngIf="allowedCurrentDates?.includes(createEventForm.get('eventType')?.value)">
                                         <mat-form-field color="accent" appearance="outline">
                                             <input matInput [matDatepicker]="eventDate" formControlName="eventDate"
                                                 [min]="currentDate" [max]="maxDate" [(ngModel)]="todayDate"
@@ -255,7 +255,7 @@
                                         </mat-form-field>
                                     </ng-container>
                                     <ng-container
-                                        *ngIf="!(createEventForm.get('eventType')?.value === 'Karmayogi Saptah')">
+                                        *ngIf="!allowedCurrentDates?.includes(createEventForm.get('eventType')?.value)">
                                         <mat-form-field color="accent" appearance="outline">
                                             <input matInput [matDatepicker]="eventDate" formControlName="eventDate"
                                                 [max]="maxDate" [(ngModel)]="todayDate"
@@ -448,6 +448,11 @@
             </div>
         </div>
     </div>
+    <div class="page_title_flex ">
+        <span class="required"></span>
+        <span class="flex font-bold mr-2    ">Note:</span>
+        <span class="flex bold">Event will be visible after 30 minutes in the learner portal.</span>
+    </div>
 
     <div class="page_title_flex">
         <span class="spacer"></span>

diff --git a/project/ws/app/src/lib/routes/home/routes/events/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/home/routes/events/create-event/create-event.component.ts
@@ -49,6 +49,7 @@ export class CreateEventComponent implements OnInit {
   participantsArr: any = []
   // presentersArr: any = []
   displayedColumns: string[] = ['fullname', 'email', 'type']
+  allowedCurrentDates: any = ['Karmayogi Talks', 'Karmayogi Saptah']
   @Input() tableData!: ITableData | undefined
   @Input() data?: []
   @Input() isUpload?: boolean
@@ -139,7 +140,7 @@ export class CreateEventComponent implements OnInit {
     private router: Router, private configSvc: ConfigurationsService, private changeDetectorRefs: ChangeDetectorRef,
     // tslint:disable-next-line:align
     private activeRoute: ActivatedRoute, private events: EventService, private profileUtilSvc: ProfileV2UtillService,
-              private pipePublic: PipePublicURL
+    private pipePublic: PipePublicURL
   ) {
 
     if (this.configSvc.userProfile) {
@@ -602,7 +603,7 @@ export class CreateEventComponent implements OnInit {
     this.dialogRef.afterClosed().subscribe(() => {
       setTimeout(() => {
         this.router.navigate([`/app/home/events`])
-      },         700)
+      }, 700)
     })
   }
 

diff --git a/project/ws/app/src/lib/routes/home/routes/sectors/sectors-constats.model.ts b/project/ws/app/src/lib/routes/home/routes/sectors/sectors-constats.model.ts
@@ -1,5 +1,5 @@
 export const sectorConstants = {
-  nameRegex: /^[a-zA-Z0-9.\-_$/:[\]' '!]+$/,
+  nameRegex: /^[a-zA-Z0-9.,\-_$/:[\]' '!]+$/,
   fileSize: 1024,
   fileCount: 1,
   width: 24,