Skip to content

Commit 89a918f

Browse files
update for sync with 19
2 parents 37dee4d + bfaf616 commit 89a918f

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

project/ws/app/src/lib/routes/home/routes/directory/directory.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
</div>
5353
<ng-container>
5454
<ws-widget-directory-table [selectedDepartment]='currentDepartment' [tableData]='tabledata' [data]='data'
55-
[needCreate]="isAllowed(allowedCreateRoles)" (eOnRowClick)="onRoleClick($event)"
56-
(actionsClick)="actionClick($event)" (searchByEnterKey)="onEnterkySearch($event)"
57-
(pageChangeEvent)="onPageChange($event)">
55+
[needCreate]="currentFilter === 'mdo' || currentFilter === 'state' ? false : true"
56+
(eOnRowClick)="onRoleClick($event)" (actionsClick)="actionClick($event)"
57+
(searchByEnterKey)="onEnterkySearch($event)">
5858
</ws-widget-directory-table>
5959
</ng-container>
6060
</mat-card-content>

project/ws/app/src/lib/routes/home/routes/events/create-event/create-event.component.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@
101101
<mat-form-field appearance="outline" class="margin-top-xs">
102102
<input id="eventTitle" matInput #eventTitle formControlName="eventTitle"
103103
placeholder="Type here" aria-label="Event Title input" class="form-input"
104-
(keypress)="omit_special_char($event)" maxlength="250" />
104+
(paste)="omit_special_char($event)" (keypress)="omit_special_char($event)"
105+
maxlength="250" />
105106
<mat-error [hidden]="false"
106107
aria-label="Event title Error|Explains event title is required "
107108
*ngIf="createEventForm?.controls['eventTitle']?.touched && createEventForm?.controls['eventTitle'].errors?.required">
@@ -231,7 +232,7 @@
231232
Date
232233
</label>
233234
<ng-container
234-
*ngIf="createEventForm.get('eventType')?.value === 'Karmayogi Saptah'">
235+
*ngIf="allowedCurrentDates?.includes(createEventForm.get('eventType')?.value)">
235236
<mat-form-field color="accent" appearance="outline">
236237
<input matInput [matDatepicker]="eventDate" formControlName="eventDate"
237238
[min]="currentDate" [max]="maxDate" [(ngModel)]="todayDate"
@@ -254,7 +255,7 @@
254255
</mat-form-field>
255256
</ng-container>
256257
<ng-container
257-
*ngIf="!(createEventForm.get('eventType')?.value === 'Karmayogi Saptah')">
258+
*ngIf="!allowedCurrentDates?.includes(createEventForm.get('eventType')?.value)">
258259
<mat-form-field color="accent" appearance="outline">
259260
<input matInput [matDatepicker]="eventDate" formControlName="eventDate"
260261
[max]="maxDate" [(ngModel)]="todayDate"
@@ -447,6 +448,11 @@
447448
</div>
448449
</div>
449450
</div>
451+
<div class="page_title_flex ">
452+
<span class="required"></span>
453+
<span class="flex font-bold mr-2 ">Note:</span>
454+
<span class="flex bold">Event will be visible after 30 minutes in the learner portal.</span>
455+
</div>
450456

451457
<div class="page_title_flex">
452458
<span class="spacer"></span>

project/ws/app/src/lib/routes/home/routes/events/create-event/create-event.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ export class CreateEventComponent implements OnInit {
4949
participantsArr: any = []
5050
// presentersArr: any = []
5151
displayedColumns: string[] = ['fullname', 'email', 'type']
52+
allowedCurrentDates: any = ['Karmayogi Talks', 'Karmayogi Saptah']
5253
@Input() tableData!: ITableData | undefined
5354
@Input() data?: []
5455
@Input() isUpload?: boolean

project/ws/app/src/lib/routes/home/routes/sectors/sectors-constats.model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export const sectorConstants = {
2-
nameRegex: /^[a-zA-Z0-9.\-_$/:[\]' '!]+$/,
2+
nameRegex: /^[a-zA-Z0-9.,\-_$/:[\]' '!]+$/,
33
fileSize: 1024,
44
fileCount: 1,
55
width: 24,

project/ws/app/src/lib/routes/home/validators/prevent-html-and-js.validator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms'
44
export function preventHtmlAndJs(): ValidatorFn {
55
return (control: AbstractControl): ValidationErrors | null => {
66
const value = control.value
7-
if (value && value.match(/<[^>]*>|(function[^\s]+)|(javascript:[^\s]+)/i)) {
7+
if (value && value.match(/<[^>]*>|(function\s*\([^)]*\))|(javascript:[^\s]+)/i)) {
88
return { noHtml: true }
99
}
1010
return null

0 commit comments

Comments
 (0)