Skip to content

Commit

Permalink
Merge pull request #536 from NandiniAV/cbrelease-4.8.15
Browse files Browse the repository at this point in the history 
Cbrelease 4.8.15
  • Loading branch information
@vishnubansaltarento
vishnubansaltarento authored Jun 19, 2024
2 parents c72fd9e + 2351c23 commit 8ff1197
Show file tree
Hide file tree
Showing 8 changed files with 136 additions and 142 deletions.
65 changes: 43 additions & 22 deletions project/ws/app/src/lib/routes/home/components/filter/filter.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</div>
</div>
<div class="filter-content-container">
<div class="filter-content flex flex-1">
<div class="filter-content flex flex-1" *ngIf="groupList && groupList.length > 0">
<mat-accordion>
<mat-expansion-panel disableRipple [expanded]="true">
<mat-expansion-panel-header>
Expand All @@ -24,17 +24,21 @@
(ngModelChange)="searchGroup($event)" label="" placeholder="Enter group"
type="Standard">
</div>
<div class="flex flex-1 flex-row category-item" *ngFor="let group of filteredGroupList">
<mat-checkbox #checkboxes disableRipple class="example-margin"
[checked]="group?.selected"
(change)="manageSelectedGroup($event, group)">{{group?.name |
titlecase}}</mat-checkbox>
<div *ngIf="filteredGroupList && filteredGroupList.length > 0">
<div class="flex flex-1 flex-row category-item" *ngFor="let group of filteredGroupList">
<mat-checkbox #checkboxes disableRipple class="example-margin"
[checked]="group?.selected"
(change)="manageSelectedGroup($event, group)">{{group?.name |
titlecase}}</mat-checkbox>
</div>
</div>
<div *ngIf="filteredGroupList && filteredGroupList.length === 0" class="margin-top-xs">No
groups found</div>
</div>
</mat-expansion-panel>
</mat-accordion>
</div>
<div class="filter-content flex flex-1">
<div class="filter-content flex flex-1" *ngIf="designationList && designationList.length > 0">
<mat-accordion>
<mat-expansion-panel disableRipple [expanded]="true">
<mat-expansion-panel-header>
Expand All @@ -50,17 +54,24 @@
(ngModelChange)="searchDesignation($event)" label="" placeholder="Enter designation"
type="Standard">
</div>
<div class="flex flex-1 flex-row category-item" *ngFor="let des of filteredDesignationList">
<mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="des?.selected"
(change)="manageSelectedDesignation($event, des)">{{des?.name |
titlecase}}</mat-checkbox>
<div *ngIf="filteredDesignationList && filteredDesignationList.length > 0">
<div class="flex flex-1 flex-row category-item"
*ngFor="let des of filteredDesignationList">
<mat-checkbox #checkboxes disableRipple class="example-margin"
[checked]="des?.selected" (change)="manageSelectedDesignation($event, des)"
*ngIf="des?.name !== ''">{{des?.name |
titlecase}}</mat-checkbox>
</div>
</div>
<div *ngIf="filteredDesignationList && filteredDesignationList.length === 0"
class="margin-top-xs">No designation
found</div>
</div>
</mat-expansion-panel>
</mat-accordion>
</div>
<!-- roles -->
<div class="filter-content flex flex-1">
<div class="filter-content flex flex-1" *ngIf="rolesList && rolesList.length > 0">
<mat-accordion>
<mat-expansion-panel disableRipple [expanded]="true">
<mat-expansion-panel-header>
Expand All @@ -76,18 +87,23 @@
(ngModelChange)="searchRoles($event)" label="" placeholder="Enter roles"
type="Standard">
</div>
<div class="flex flex-1 flex-row category-item" *ngFor="let role of filteredRolesList">
<mat-checkbox #checkboxes disableRipple class="example-margin"
[checked]="role?.selected" (change)="manageSelectedRoles($event, role)">{{role?.name
|
titlecase}}</mat-checkbox>
<div *ngIf="filteredRolesList && filteredRolesList.length > 0">
<div class="flex flex-1 flex-row category-item" *ngFor="let role of filteredRolesList">
<mat-checkbox #checkboxes disableRipple class="example-margin"
[checked]="role?.selected"
(change)="manageSelectedRoles($event, role)">{{role?.name
|
titlecase}}</mat-checkbox>
</div>
</div>
<div *ngIf="filteredRolesList && filteredRolesList.length === 0" class="margin-top-xs">No
roles found</div>
</div>
</mat-expansion-panel>
</mat-accordion>
</div>
<!-- tage -->
<div class="filter-content flex flex-1">
<div class="filter-content flex flex-1" *ngIf="tagsList && tagsList.length > 0">
<mat-accordion>
<mat-expansion-panel disableRipple [expanded]="true">
<mat-expansion-panel-header>
Expand All @@ -103,11 +119,16 @@
(ngModelChange)="searchTags($event)" label="" placeholder="Enter tags"
type="Standard">
</div>
<div class="flex flex-1 flex-row category-item" *ngFor="let tag of filteredTagsList">
<mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="tag?.selected"
(change)="manageSelectedTags($event, tag)">{{tag?.name |
titlecase}}</mat-checkbox>
<div *ngIf="filteredTagsList && filteredTagsList.length > 0">
<div class="flex flex-1 flex-row category-item" *ngFor="let tag of filteredTagsList">
<mat-checkbox #checkboxes disableRipple class="example-margin"
[checked]="tag?.selected" (change)="manageSelectedTags($event, tag)">{{tag?.name
|
titlecase}}</mat-checkbox>
</div>
</div>
<div *ngIf="filteredTagsList && filteredTagsList.length === 0" class="margin-top-xs">No tags
found</div>
</div>
</mat-expansion-panel>
</mat-accordion>
Expand Down
4 changes: 2 additions & 2 deletions project/ws/app/src/lib/routes/home/components/filter/filter.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
}

.filter-content {
padding: 18px 0px;
margin: 0px 25px;
padding: 6px 0;
margin: 0 25px 12px 25px;
}

.filter-content-container {
Expand Down
Loading

0 comments on commit 8ff1197

Please sign in to comment.