Sn/3.6.0

src/app/app-provider-admin/provider-admin/activities/call-disposition-type-master/call-disposition-type-master.component.html

@@ -66,6 +66,7 @@ <h4 class="pull-left">Create Call Disposition Type/Sub Type</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filtereddata"
           class="table table-striped table-hover"
         >
@@ -361,6 +362,7 @@ <h4 class="pull-left">Create Call Disposition Type/Sub Type</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="temporarySubtypeArray"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/category-subcategory-provisioning/category-subcategory-provisioning.component.html

@@ -120,6 +120,7 @@ <h4 class="pull-left">Category and Sub Category Master</h4>
         <table
           *ngIf="showCategoryTable"
           mat-table
+          matSort
           [dataSource]="filtereddata"
           class="table table-striped table-hover"
         >
@@ -216,6 +217,7 @@ <h4 class="pull-left">Category and Sub Category Master</h4>
         <table
           *ngIf="!showCategoryTable"
           mat-table
+          matSort
           [dataSource]="filteredsubCat"
           class="table table-striped table-hover"
         >
@@ -562,6 +564,7 @@ <h4 class="pull-left">Create Category and Sub Category</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="this.serviceList"
           class="table table-striped table-hover"
         >
@@ -621,6 +624,7 @@ <h4 class="pull-left">Create Category and Sub Category</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="this.serviceSubCatList"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/device-id-master/device-id-master.component.html

@@ -74,6 +74,7 @@ <h4 class="pull-left">Edit Device ID</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filteredsearchResultArray"
           class="table table-striped table-hover"
         >
@@ -226,6 +227,7 @@ <h4 class="pull-left">Edit Device ID</h4>
       <div class="table-responsive" *ngIf="bufferArray.data.length > 0">
         <table
           mat-table
+          matSort
           [dataSource]="bufferArray"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/drug-group/drug-group.component.html

@@ -23,6 +23,7 @@ <h4 class="pull-left">Drug Group Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredavailableDrugGroups"
         >
@@ -215,6 +216,7 @@ <h4 *ngIf="editable">Edit Drug Group</h4>
         <div class="table-responsive">
           <table
             mat-table
+            matSort
             [dataSource]="drugGroupList"
             class="table table-striped table-hover"
           >

src/app/app-provider-admin/provider-admin/activities/drug-list/drug-list.component.html

@@ -23,6 +23,7 @@ <h4 class="pull-left">Drug Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="fileteredavailableDrugs"
         >
@@ -230,6 +231,7 @@ <h4 *ngIf="editable">Edit Drug</h4>
         <div class="table-responsive">
           <table
             mat-table
+            matSort
             [dataSource]="drugList"
             class="table table-striped table-hover"
           >

src/app/app-provider-admin/provider-admin/activities/drug-mapping/drug-mapping.component.html

@@ -64,6 +64,7 @@ <h4 *ngIf="!editable && !showMappings">Drug Group-Drug Mapping</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredavailableDrugMappings"
         >
@@ -232,6 +233,7 @@ <h4 *ngIf="!editable && !showMappings">Drug Group-Drug Mapping</h4>
         <div class="table-responsive">
           <table
             mat-table
+            matSort
             [dataSource]="drugMapping"
             class="table table-striped table-hover"
           >

src/app/app-provider-admin/provider-admin/activities/drug-strength/drug-strength.component.html

@@ -21,6 +21,7 @@ <h4>Drug Strength Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredDrugStrength"
         >
@@ -214,6 +215,7 @@ <h4 *ngIf="editMode && !tableMode">Edit Drug Strength</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="drugStrengthList"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/feedback-complaint-nature-master/feedback-complaint-nature-master.component.html

@@ -85,6 +85,7 @@ <h4 class="m-b-30">Feedback/Complaint Nature Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="this.filterednatureTypes"
           class="table table-striped table-hover"
         >
@@ -314,6 +315,7 @@ <h4 class="width100">Add Feedback/Complaint Nature</h4>
         <div class="table-responsive">
           <table
             mat-table
+            matSort
             [dataSource]="this.objs"
             class="table table-striped table-hover"
           >

src/app/app-provider-admin/provider-admin/activities/feedback-type-master/feedback-type-master.component.html

@@ -67,6 +67,7 @@ <h4 class="pull-left">Feedback/Complaint Type Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filteredfeedbackTypes"
           class="table table-striped table-hover"
         >
@@ -298,6 +299,7 @@ <h4 class="width100">Add Feedback/Complaint Type</h4>
           <div class="table-responsive">
             <table
               mat-table
+              matSort
               [dataSource]="objs"
               class="table table-striped table-hover"
             >

src/app/app-provider-admin/provider-admin/activities/fetosense-test-master/fetosense-test-master.component.html

@@ -81,6 +81,7 @@ <h4 class="pull-left">Edit Test</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filteredFetosenseTests"
           class="table table-striped table-hover"
         >
@@ -249,6 +250,7 @@ <h4 class="pull-left">Edit Test</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="addedFetosenseTests"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/hospital-master/hospital-master.component.html

@@ -99,6 +99,7 @@ <h4 class="pull-left">Create Institution</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filteredsearchResultArray"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/institute-type-master/institute-type-master.component.html

@@ -69,6 +69,7 @@ <h4 class="pull-left">Create Institute Type</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="this.filteredsearchResultArray"
           class="table table-striped table-hover"
         >
@@ -225,6 +226,7 @@ <h4 class="pull-left">Create Institute Type</h4>
       <div class="table-responsive" *ngIf="bufferArray.data.length > 0">
         <table
           mat-table
+          matSort
           [dataSource]="this.bufferArray.data"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/language-mapping/language-mapping.component.html

@@ -26,6 +26,7 @@ <h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredLanguageMappedList"
         >
@@ -310,6 +311,7 @@ <h4 *ngIf="editMode">
                 <div class="table-responsive">
                   <table
                     mat-table
+                    matSort
                     [dataSource]="bufferArray"
                     class="table table-striped table-hover"
                   >

src/app/app-provider-admin/provider-admin/activities/nature-of-complaint-category-mapping/nature-of-complaint-category-mapping.component.html

@@ -113,6 +113,7 @@ <h4 *ngIf="editable && !showListOfCategorymapping">
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filteredMappings"
           class="table table-striped table-hover"
         >
@@ -238,6 +239,7 @@ <h4 *ngIf="editable && !showListOfCategorymapping">
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="complaintCategoryMappingList"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/parking-place-sub-district-mapping/parking-place-sub-district-mapping.component.html

@@ -117,6 +117,7 @@ <h4 *ngIf="editable && !showListOfMapping">
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredMappedParkingPlaceDistricts"
         >
@@ -299,6 +300,7 @@ <h4 *ngIf="editable && !showListOfMapping">
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="mappingList"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/role-master/provider-admin-role-master.component.html

@@ -100,6 +100,7 @@ <h4 class="pull-left">Edit Role</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="dataSource"
           class="table table-striped table-hover"
         >
@@ -317,6 +318,7 @@ <h4 class="pull-left">Edit Role</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="addRole"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/role-master/provider-admin-role-master.component.ts

@@ -141,6 +141,15 @@ export class RoleMasterComponent implements OnInit, AfterViewInit {
     this.dataSource.sort = this.sort;
   }
 
+  private setDataSourceAttributes() {
+    if (this.paginatorFirst) {
+      this.dataSource.paginator = this.paginatorFirst;
+    }
+    if (this.sort) {
+      this.dataSource.sort = this.sort;
+    }
+  }
+
   getServiceLines() {
     this.ProviderAdminRoleService.getServiceLinesNew(this.userID).subscribe(
       (response: any) => {
@@ -172,8 +181,7 @@ export class RoleMasterComponent implements OnInit, AfterViewInit {
     this.states = response.data;
     this.searchresultarray = [];
     this.dataSource.data = [];
-    this.dataSource.paginator = this.paginatorFirst;
-    this.dataSource.sort = this.sort;
+    this.setDataSourceAttributes();
 
     if (value.isNational) {
       this.nationalFlag = value.isNational;
@@ -207,8 +215,7 @@ export class RoleMasterComponent implements OnInit, AfterViewInit {
         this.dataSource.data.forEach((item: any, index: number) => {
           item.sno = index + 1;
         });
-        this.dataSource.paginator = this.paginatorFirst;
-        this.dataSource.sort = this.sort;
+        this.setDataSourceAttributes();
         if (this.service.serviceID !== 7) {
           for (let i = 0; i < this.searchresultarray.length; i++) {
             this.filterScreens.push(this.searchresultarray[i].screenName);
@@ -638,10 +645,9 @@ export class RoleMasterComponent implements OnInit, AfterViewInit {
     this.services = [];
     this.searchresultarray = [];
     this.dataSource.data = [];
-    this.dataSource.paginator = this.paginatorFirst;
-    this.dataSource.sort = this.sort;
     this.filterScreens = [];
     this.showAddButtonFlag = false;
+    this.setDataSourceAttributes()
   }
 
   // UPDATE MORE FEATURES TO ROLE
@@ -697,12 +703,10 @@ export class RoleMasterComponent implements OnInit, AfterViewInit {
   filterComponentList(searchTerm?: string) {
     if (!searchTerm) {
       this.dataSource.data = this.searchresultarray;
-      this.dataSource.paginator = this.paginatorFirst;
-      this.dataSource.sort = this.sort;
+      this.setDataSourceAttributes();
     } else {
       this.dataSource.data = [];
-      this.dataSource.paginator = this.paginatorFirst;
-      this.dataSource.sort = this.sort;
+      this.setDataSourceAttributes();
       this.searchresultarray.forEach((item: any) => {
         for (const key in item) {
           if (key === 'roleName' || key === 'screenName') {

src/app/app-provider-admin/provider-admin/activities/severity-type/severity-type.component.html

@@ -59,6 +59,7 @@ <h4 *ngIf="!firstPage" class="pull-left">Add Severity Type</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filtereddata"
           class="table table-striped table-hover"
         >
@@ -224,6 +225,7 @@ <h4 *ngIf="!firstPage" class="pull-left">Add Severity Type</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="severityArray"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/specialist-mapping/specialist-mapping.component.html

@@ -84,6 +84,7 @@ <h4 *ngIf="creationMode && !tableMode">Create Mapping</h4>
             <div class="table-responsive">
               <table
                 mat-table
+                matSort
                 [dataSource]="filteredspecializationList"
                 class="table table-striped table-hover"
               >

src/app/app-provider-admin/provider-admin/activities/van-master/van-master.component.html

@@ -112,6 +112,7 @@ <h4>Van Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredavailableVans"
         >
@@ -446,6 +447,7 @@ <h4 *ngIf="editable">Edit Van Details</h4>
       <div *ngIf="vanList.data.length > 0" class="m-t-10 table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="vanList"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/zone-district-mapping/zone-district-mapping.component.html

@@ -74,6 +74,7 @@ <h4 *ngIf="editable && !showListOfZonemapping">
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredavailableZoneDistrictMappings"
         >
@@ -266,6 +267,7 @@ <h4 *ngIf="editable && !showListOfZonemapping">
           <div class="table-responsive">
             <table
               mat-table
+              matSort
               [dataSource]="zoneDistrictMappingList"
               class="table table-striped table-hover"
             >

src/app/app-provider-admin/provider-admin/activities/zone-list/zone.component.html

@@ -79,6 +79,7 @@ <h4 *ngIf="editable && !showListOfZones">Edit Zone</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredavailableZones"
         >
@@ -260,6 +261,7 @@ <h4 *ngIf="editable && !showListOfZones">Edit Zone</h4>
         <div class="table-responsive">
           <table
             mat-table
+            matSort
             [dataSource]="zoneList"
             class="table table-striped table-hover"
           >