Merge pull request #534 from rahulramakrishnan3/release-3.0.0

bug fix 1601
ELEVATE-Project · Jul 26, 2024 · 7a0c0a3 · 7a0c0a3
2 parents da1d037 + 35acd3a
commit 7a0c0a3
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts
@@ -36,7 +36,6 @@ export class HomeSearchPage implements OnInit {
   filteredDatas = []
   page = 1;
   setPaginatorToFirstpage:any = false;
-  limit = 5;
   totalCount: any;
   noDataMessage: any;
   createdSessions: any;
@@ -120,7 +119,7 @@ export class HomeSearchPage implements OnInit {
   }
 
   async fetchSessionList() {
-    var obj={page: this.page, limit: this.limit, type: this.type, searchText : this.searchText, selectedChip : this.criteriaChip?.name, filterData : this.urlQueryData}
+    var obj={page: this.page, limit: this.pageSize, type: this.type, searchText : this.searchText, selectedChip : this.criteriaChip?.name, filterData : this.urlQueryData}
     var response = await this.sessionService.getSessionsList(obj);
     this.results = response.result.data;
     this.totalCount = response.result.count;
@@ -156,7 +155,7 @@ export class HomeSearchPage implements OnInit {
 
         case 'startAction':
           this.sessionService.startSession(event.data.id).then(async () => {
-            var obj = { page: this.page, limit: this.limit, searchText: "" };
+            var obj = { page: this.page, limit: this.pageSize, searchText: "" };
             if(this.profileService.isMentor){
               this.createdSessions = await this.sessionService.getAllSessionsAPI(obj);
             }

diff --git a/src/app/shared/components/filter-popup/filter-popup.component.html b/src/app/shared/components/filter-popup/filter-popup.component.html
@@ -5,7 +5,7 @@
   </div>
 </ion-header>
 <ion-content  class="d-flex flex-justify-center">
-  <app-filter-tree *ngIf="filterData" [filterData]="filterData" [enableFilterHeader]="true" (filtersChanged)="filtersChanged($event)"></app-filter-tree>
+  <app-filter-tree *ngIf="filterData" [filterData]="filterData" [enableFilterLabel]="false" [enableFilterHeader]="true" (filtersChanged)="filtersChanged($event)"></app-filter-tree>
 </ion-content>
 <ion-footer class=" d-flex flex-justify-center footer ion-padding-start wrapper-class" (click)="onClickApply()">
     <ion-label class="header">{{"APPLY"|translate}}</ion-label>

diff --git a/src/app/shared/components/filter-tree/filter-tree.component.html b/src/app/shared/components/filter-tree/filter-tree.component.html
@@ -1,6 +1,7 @@
 <ion-header *ngIf="enableFilterHeader && filterData">
   <div class="ion-padding-start wrapper-class">
-    <ion-label class="underline" (click)="clearAll()">{{"CLEAR_ALL"|translate}}</ion-label>
+    <ion-label *ngIf="enableFilterLabel" class="header">{{"FILTER"|translate}}</ion-label>
+    <ion-label [ngClass]="{'filter-underline': enableFilterLabel, 'underline': !enableFilterLabel}" (click)="clearAll()">{{"CLEAR_ALL"|translate}}</ion-label>
   </div>
 </ion-header>
 <ng-container *ngIf="filterData">

diff --git a/src/app/shared/components/filter-tree/filter-tree.component.scss b/src/app/shared/components/filter-tree/filter-tree.component.scss
@@ -18,4 +18,11 @@
 }
 ion-checkbox {
     --border-color: var(--ion-color-primary)
+}
+.header{
+    padding-right: 65%;
+}
+.filter-underline{
+    cursor: pointer;
+    text-decoration: underline;
 }
diff --git a/src/app/shared/components/filter-tree/filter-tree.component.ts b/src/app/shared/components/filter-tree/filter-tree.component.ts
@@ -7,7 +7,8 @@ import * as _ from 'lodash';
   styleUrls: ['./filter-tree.component.scss'],
 })
 export class FilterTreeComponent implements OnInit {
-  @Input() enableFilterHeader:any
+  @Input() enableFilterHeader:any;
+  @Input() enableFilterLabel: any;
   @Input() filterData: any;
   @Output() filtersChanged = new EventEmitter<any>();
 

diff --git a/src/app/shared/components/search-popover/search-popover.component.html b/src/app/shared/components/search-popover/search-popover.component.html
@@ -13,7 +13,7 @@
   <ion-row>
     <ion-col class="col-width-25" *ngIf="data.showFilter && tableData">
       <div class="scrollable-filter">
-        <app-filter-tree [enableFilterHeader]="true" *ngIf="filterData" [filterData]="filterData"
+        <app-filter-tree [enableFilterHeader]="true" [enableFilterLabel]="true" *ngIf="filterData" [filterData]="filterData"
         (filtersChanged)="filtersChanged($event)"></app-filter-tree>
       </div>
     </ion-col>