From 9daa64572ae1fbda8cbf5bd23c11de7e188c748e Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Sat, 13 Oct 2018 18:40:39 +0530
Subject: [PATCH] merge changes: kms

---
 .../manage-pd/list-pd/list-pd.component.html  |  14 +-
 .../manage-pd/list-pd/list-pd.component.ts    |   6 +
 .../company-details.module.spec.ts            |  13 --
 .../company-details/company-details.module.ts |  10 -
 .../company-details.routing.ts                |  12 --
 .../branch-list/branch-list.component.html    |   8 +-
 .../branch-list/branch-list.component.ts      |  46 ++++-
 .../city/city-list/city-list.component.html   |   6 +-
 .../city/city-list/city-list.component.ts     |  44 ++++-
 .../comments-on-locality-list.component.html  |   4 +-
 .../comments-on-locality-list.component.ts    |  42 +++-
 .../component/company/company.component.html  |  81 ++++++++
 .../component/company/company.component.scss  |   0
 .../company/company.component.spec.ts         |  25 +++
 .../component/company/company.component.ts    | 180 ++++++++++++++++++
 .../customer-behaviour-list.component.html    |   4 +-
 .../customer-behaviour-list.component.ts      |  45 ++++-
 .../customer-segment-list.component.html      |   4 +-
 .../customer-segment-list.component.ts        |  45 ++++-
 .../designation-list.component.html           |   4 +-
 .../designation-list.component.ts             |  45 ++++-
 .../frequency-list.component.html             |   4 +-
 .../frequency-list.component.ts               |  43 ++++-
 ...ndustry_classification-list.component.html |   6 +-
 .../industry_classification-list.component.ts |  41 +++-
 .../lender-hierarchy-list.component.html      |   4 +-
 .../lender-hierarchy-list.component.ts        |  42 +++-
 .../members-occupation-list.component.html    |   4 +-
 .../members-occupation-list.component.ts      |  42 +++-
 .../pd-allocation-type-list.component.html    |   2 +-
 .../pd-allocation-type-list.component.ts      |   6 +-
 .../pd-location-approach-list.component.html  |   4 +-
 .../pd-location-approach-list.component.ts    |  41 +++-
 .../pd-type-list/pd-type-list.component.html  |   4 +-
 .../pd-type-list/pd-type-list.component.ts    |  41 +++-
 .../product-list/product-list.component.html  |   4 +-
 .../product-list/product-list.component.ts    |  42 +++-
 .../question-category-list.component.html     |   4 +-
 .../question-category-list.component.ts       |  43 ++++-
 .../regions-list/regions-list.component.html  |   4 +-
 .../regions-list/regions-list.component.ts    |  41 +++-
 .../relation-ship-list.component.html         |   4 +-
 .../relation-ship-list.component.ts           |  41 +++-
 .../states-list/states-list.component.html    |   4 +-
 .../states-list/states-list.component.ts      |  42 +++-
 .../sub-product-list.component.html           |   4 +-
 .../sub-product-list.component.ts             |  42 +++-
 .../title-list/title-list.component.html      |   4 +-
 .../title/title-list/title-list.component.ts  |  42 +++-
 .../activity-list.component.html              |   4 +-
 .../activity-list/activity-list.component.ts  |  42 +++-
 .../uom/uom-list/uom-list.component.html      |   4 +-
 .../uom/uom-list/uom-list.component.ts        |  43 ++++-
 .../settings/masters/masters.component.html   |  12 +-
 .../app/settings/masters/masters.component.ts |  16 +-
 .../app/settings/masters/masters.module.ts    |   2 +
 .../pd-team-edit/pd-team-edit.component.html  |   4 +-
 .../pd-team-edit/pd-team-edit.component.ts    |  16 +-
 .../pd-team-list/pd-team-list.component.html  |   6 +-
 .../pd-team-list/pd-team-list.component.ts    |  29 ++-
 .../pd-team-manage.component.html             |  89 +++++----
 .../pd-team-manage.component.scss             |   1 +
 .../pd-team-manage.component.ts               |   2 +-
 .../service/masters/masters.service.ts        |   2 +-
 .../service/masters/pd-team.service.ts        |   2 +-
 ng6-seed/src/index.html                       |   6 +
 66 files changed, 1315 insertions(+), 208 deletions(-)
 delete mode 100644 ng6-seed/src/app/settings/company-details/company-details.module.spec.ts
 delete mode 100644 ng6-seed/src/app/settings/company-details/company-details.module.ts
 delete mode 100755 ng6-seed/src/app/settings/company-details/company-details.routing.ts
 create mode 100644 ng6-seed/src/app/settings/masters/component/company/company.component.html
 create mode 100644 ng6-seed/src/app/settings/masters/component/company/company.component.scss
 create mode 100644 ng6-seed/src/app/settings/masters/component/company/company.component.spec.ts
 create mode 100644 ng6-seed/src/app/settings/masters/component/company/company.component.ts

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html
index b3922d059..fa3855b93 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html
@@ -1,6 +1,14 @@
-<div align="right" *ngIf="viewPdList">
-    <button mat-stroked-button color="primary" (click)="viewMapPdDetails()" class="mr-1 mb-1"><mat-icon>map</mat-icon>Map List</button> 
-    <button mat-stroked-button color="primary" (click)="addPdDetails()" class="mr-1 mb-1"><mat-icon>add</mat-icon>Add PD</button>
+<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
+  <div *ngIf="!noRecordFound" class="ml-xs mr-xs" style="width: 80%;">
+      <mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
+        <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
+      </mat-form-field>
+  </div>
+  <div *ngIf="noRecordFound" class="nocontent ml-xs mr-xs" style="width: 80%;">No records found</div>  
+  <div class="ml-xs mr-xs"  style="width: 20%;text-align:right" *ngIf="viewPdList">
+    <button mat-fab  color="primary" (click)="viewMapPdDetails()" class="mr-1 mb-1" matTooltip="Map List" matTooltipPosition="above"><mat-icon>map</mat-icon></button> 
+    <button mat-fab color="primary" (click)="addPdDetails()" class="mr-1 mb-1" matTooltip="Add PD" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
+</div>
 </div>
 <mat-card *ngIf="viewPdList">
   <mat-tab-group>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts
index 791e98d32..3de4e7979 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts
@@ -83,6 +83,12 @@ export class ListPdComponent implements OnInit, OnDestroy {
     this.viewPdList = !this.viewPdList;
     this.router.navigate([ '../pdlist/viewpd',pdid], { relativeTo: this.route });
 
+  }
+   //Global filter 
+   applyFilter(filterValue: string) {
+    filterValue = filterValue.trim(); // Remove whitespace
+    filterValue = filterValue.toLowerCase(); // Datasource defaults to lowercase matches
+    this.dataSource.filter = filterValue;
   }
   ngOnDestroy(): void {
     this.viewPdList=false;
diff --git a/ng6-seed/src/app/settings/company-details/company-details.module.spec.ts b/ng6-seed/src/app/settings/company-details/company-details.module.spec.ts
deleted file mode 100644
index db014c808..000000000
--- a/ng6-seed/src/app/settings/company-details/company-details.module.spec.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { CompanyDetailsModule } from './company-details.module';
-
-describe('CompanyDetailsModule', () => {
-  let companyDetailsModule: CompanyDetailsModule;
-
-  beforeEach(() => {
-    companyDetailsModule = new CompanyDetailsModule();
-  });
-
-  it('should create an instance', () => {
-    expect(companyDetailsModule).toBeTruthy();
-  });
-});
diff --git a/ng6-seed/src/app/settings/company-details/company-details.module.ts b/ng6-seed/src/app/settings/company-details/company-details.module.ts
deleted file mode 100644
index 1c7bfd8aa..000000000
--- a/ng6-seed/src/app/settings/company-details/company-details.module.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-@NgModule({
-  imports: [
-    CommonModule
-  ],
-  declarations: []
-})
-export class CompanyDetailsModule { }
diff --git a/ng6-seed/src/app/settings/company-details/company-details.routing.ts b/ng6-seed/src/app/settings/company-details/company-details.routing.ts
deleted file mode 100755
index acac68aca..000000000
--- a/ng6-seed/src/app/settings/company-details/company-details.routing.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Routes } from '@angular/router';
-//import { MastersComponent } from './masters.component';
-
-
-export const CompanyDetailsRoutes: Routes = [
-{
-  
-    //path: '',
-    //component: PdTeamListComponent
-    //component: IndustryMasterListComponent
-
-}];
diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html
index 58640ef98..b548f6251 100644
--- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html
@@ -42,7 +42,7 @@
             <!-- <button *ngIf="row.isactive == 1;" mat-icon-button class="hover-icon" matTooltip="Delete" matTooltipPosition="above" (click)="deleteCity(row.city_id)"><mat-icon>delete_outline</mat-icon></button> -->
           </mat-cell>
         </ng-container>
-
+ 
         <ng-container matColumnDef="isactive">
           <mat-header-cell *matHeaderCellDef mat-sort-header> Is Active </mat-header-cell>
           <mat-cell *matCellDef="let row"><!--{{row.isactive}}-->  
@@ -51,15 +51,15 @@
                             matTooltip="Active" matTooltipPosition="above"
                             checked="true" [color]="color"
                             (change)="isactiveBranch(row.branch_id,row.isactive)"
-                            onclick="return confirm('Are you sure?')">
+                            (click)="deactive()">
             </mat-slide-toggle>
             <ng-template #notactive >
-            <mat-slide-toggle
+            <mat-slide-toggle 
                 class="example-margin"
                 matTooltip="Inactive" matTooltipPosition="above"
                 checked="false" [color]="color"
                 (change)="isactiveBranch(row.branch_id,row.isactive)"
-                onclick="return confirm('Are you sure?')">
+                (click)="active()">
             </mat-slide-toggle></ng-template>
 
           </mat-cell>
diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts
index fe0195e1b..edd6fd2d5 100644
--- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts
@@ -14,8 +14,9 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { BranchDialogComponent } from '../branch-dialog/branch-dialog.component';
 /** Model */
 import { Branch } from '../../../model/branch';
-
-@Component({
+/**sweet alert */
+import Swal from 'sweetalert2';
+@Component({ 
   selector: 'app-branch-list',
   templateUrl: './branch-list.component.html',
   styleUrls: ['./branch-list.component.scss']
@@ -120,7 +121,7 @@ export class BranchListComponent implements OnInit {
               this.getBranch();
           }
           else{
-            alert("SomeThing Wents Wrong Try Again !");
+            Swal("SomeThing Wents Wrong Try Again !");
           }
          });
    }
@@ -140,11 +141,46 @@ export class BranchListComponent implements OnInit {
                           this.getBranch();
                     }
                     else{
-                          alert("SomeThing Wents Wrong Try Again !");
+                          Swal("SomeThing Wents Wrong Try Again !");
                     }
         });
   }
-
+//Sweetalert2  for active and deactive
+active(){
+    Swal({
+      title: 'Are you sure?', 
+      type: 'warning',
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      confirmButtonText: 'Yes, activate it!'
+    }).then((result) => {
+      if (result.value) {
+        Swal(
+          'Activated!', 
+          'success'
+        )
+      }
+    }) 
+  }
+  deactive()
+  {
+    Swal({
+      title: 'Are you sure?', 
+      type: 'warning',
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      confirmButtonText: 'Yes, deactivate it!'
+    }).then((result) => {
+      if (result.value) {
+        Swal(
+          'Deactivated!', 
+          'success'
+        )
+      }
+    })
+  }
   /** For Display Tables Pagination And Sorting */
   ngAfterViewInit() {
     this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html
index c59e33199..ad8dec250 100644
--- a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html
@@ -141,15 +141,15 @@
                   matTooltip="Active" matTooltipPosition="above"
                   checked="true"
                   (change)="isactiveCity(row.city_id,row.isactive)"
-                  onclick="return confirm('Are you sure?')">
+                  (click)="deactive()">
   </mat-slide-toggle>
-  <ng-template #notactive >
+  <ng-template #notactive > 
   <mat-slide-toggle
       class="example-margin" [color]="color"
       matTooltip="Inactive" matTooltipPosition="above"
       checked="false"
       (change)="isactiveCity(row.city_id,row.isactive)"
-      onclick="return confirm('Are you sure?')">
+      (click)="active()">
   </mat-slide-toggle></ng-template>
                   <!-- <button mat-icon-button class="active" matTooltip="Active" matTooltipPosition="above" (click)="isactiveCity(row.city_id,row.isactive)" *ngIf="row.isactive == 1;else notactive;"><mat-icon>done</mat-icon></button>
                   <ng-template #notactive><button mat-icon-button class="deactive" matTooltip="Inactive" matTooltipPosition="above" (click)="isactiveCity(row.city_id,row.isactive)"><mat-icon>clear</mat-icon></button></ng-template> -->
diff --git a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.ts b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.ts
index 0a9c73892..7ffbdfaca 100644
--- a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.ts
@@ -14,6 +14,10 @@ import { CityDialogComponent } from '../city-dialog/city-dialog.component';
 /** Model */
 import { City } from '../../../model/city';
 
+
+/**sweet alert */
+import Swal from 'sweetalert2';
+
 @Component({
   selector: 'app-city-list',
   templateUrl: './city-list.component.html',
@@ -126,12 +130,50 @@ pageSize = 10;
                         this.getCity();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                        Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
 
 
+//Sweetalert2  for active and deactive
+active(){
+    Swal({
+      title: 'Are you sure?', 
+      type: 'warning',
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      confirmButtonText: 'Yes, activate it!'
+    }).then((result) => {
+      if (result.value) {
+        Swal(
+          'Activated!', 
+          'success'
+        )
+      }
+    }) 
+  }
+  deactive()
+  {
+    Swal({
+      title: 'Are you sure?', 
+      type: 'warning',
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      confirmButtonText: 'Yes, deactivate it!'
+    }).then((result) => {
+      if (result.value) {
+        Swal(
+          'Deactivated!', 
+          'success'
+        )
+      }
+    })
+  }
+  
+
   /** For Display Tables Pagination And Sorting */
   ngAfterViewInit() {
     this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html
index 12e107a52..860e77df7 100644
--- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html
@@ -122,7 +122,7 @@
                 matTooltip="Active" matTooltipPosition="above"
                 checked="true" [color]="color"
                 (change)="isactiveCommentsOnLocality(row.comments_on_locality_id,row.isactive)"
-                onclick="return confirm('Are you sure?')">
+                (click)="deactive()">
 </mat-slide-toggle>
 <ng-template #notactive >
 <mat-slide-toggle
@@ -130,7 +130,7 @@
     matTooltip="Inactive" matTooltipPosition="above"
     checked="false" [color]="color"
     (change)="isactiveCommentsOnLocality(row.comments_on_locality_id,row.isactive)"
-    onclick="return confirm('Are you sure?')">
+    (click)="active()">
 </mat-slide-toggle></ng-template>
               </mat-cell>
             </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.ts b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.ts
index df441e9c8..555e8188e 100644
--- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.ts
@@ -16,6 +16,8 @@ import { CommentsOnLocalityDialogComponent } from '../comments-on-locality-dialo
 /** Model */
 import { CommentsOnLocality } from '../../../model/comments-on-locality';
 
+/**sweet alert */
+import Swal from 'sweetalert2';
 @Component({
   selector: 'app-comments-on-locality-list',
   templateUrl: './comments-on-locality-list.component.html',
@@ -125,12 +127,50 @@ export class CommentsOnLocalityListComponent implements OnInit {
                           this.getCommentsOnLocality();
                     }
                     else{
-                          alert("SomeThing Wents Wrong Try Again !");
+                      Swal("SomeThing Wents Wrong Try Again !");
                     }
         });
   }
   
 
+
+//Sweetalert2  for active and deactive
+active(){
+    Swal({
+      title: 'Are you sure?', 
+      type: 'warning',
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      confirmButtonText: 'Yes, activate it!'
+    }).then((result) => {
+      if (result.value) {
+        Swal(
+          'Activated!', 
+          'success'
+        )
+      }
+    }) 
+  }
+  deactive()
+  {
+    Swal({
+      title: 'Are you sure?', 
+      type: 'warning',
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      confirmButtonText: 'Yes, deactivate it!'
+    }).then((result) => {
+      if (result.value) {
+        Swal(
+          'Deactivated!', 
+          'success'
+        )
+      }
+    })
+  }
+  
     /** For Display Tables Pagination And Sorting */
     ngAfterViewInit() {
       this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/company/company.component.html b/ng6-seed/src/app/settings/masters/component/company/company.component.html
new file mode 100644
index 000000000..aa9475cdb
--- /dev/null
+++ b/ng6-seed/src/app/settings/masters/component/company/company.component.html
@@ -0,0 +1,81 @@
+<mat-card-content>
+     <h2> Company &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
+     
+<form [formGroup]="_companyForm" (submit)="onSubmit()">
+  
+      <div class="form-group">
+
+
+              <div class="ml-xs mr-xs"> 
+                    <mat-form-field style="width: 100%">
+                          <!-- <input matInput type="text" placeholder="Name" required [formControl]="_companyForm.controls['name']"> -->
+                          <input matInput type="text" placeholder="Name" required formControlName="name">
+                          <!-- <mat-error *ngIf="!_companyForm.controls['name'].valid && _companyForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error> -->
+                    </mat-form-field>
+              </div>
+
+              <div class="ml-xs mr-xs"> 
+                  <mat-form-field style="width: 100%">
+                        <input matInput type="text" placeholder="Addressline1" required formControlName="addressline1">
+                        <!-- <mat-error  *ngIf="!_companyForm.controls['addressline1'].valid && _companyForm.controls['addressline1'].touched" class="mat-text-warn">You must include a addressline1.</mat-error> -->
+                  </mat-form-field>     
+              </div>
+
+              <div class="ml-xs mr-xs"> 
+                <mat-form-field style="width: 100%">
+                      <input matInput type="text" placeholder="Addressline2" formControlName="addressline2">
+                      <!-- <mat-error *ngIf="!_companyForm.controls['addressline2'].valid && _companyForm.controls['addressline2'].touched" class="mat-text-warn">You must include a Name.</mat-error> -->
+                </mat-form-field>  
+              </div>
+
+              <div class="ml-xs mr-xs"> 
+                  <mat-form-field style="width: 100%">
+                        <input matInput type="text" placeholder="Addressline3" formControlName="addressline3">
+                        <!-- <mat-error *ngIf="!_companyForm.controls['addressline3'].valid && _companyForm.controls['addressline3'].touched" class="mat-text-warn">You must include a Name.</mat-error> -->
+                  </mat-form-field>    
+              </div>
+
+              <div class="ml-xs mr-xs"> 
+                              <mat-form-field style="width: 100%">
+                              <mat-select placeholder="City" required formControlName="city"   (selectionChange)="getRelevantState($event)">
+
+                                          <mat-option  *ngFor="let cd of citydatas" [value]="cd.city_id">{{ cd.name }}</mat-option>
+                              </mat-select>
+                              <!-- <mat-error *ngIf="!_companyForm.controls['city'].valid && _companyForm.controls['city'].touched" class="mat-text-warn">You must include a City.</mat-error> -->
+                        </mat-form-field>
+                        <!-- <small *ngIf="!_branchForm.controls['fk_city_id'].valid && _branchForm.controls['fk_city_id'].touched" class="mat-text-warn">You must Pickup City Name.</small> -->
+               </div>
+
+              <div class="ml-xs mr-xs"> 
+                  <mat-form-field style="width: 100%">
+                        <mat-select placeholder="State" formControlName="state" [disabled]="true">
+                                    <mat-option  *ngFor="let sd of stateDatas"  [value]="sd.state_id">{{ sd.name }}</mat-option>
+                        </mat-select>
+                         <!-- <mat-error *ngIf="!_companyForm.controls['state'].valid && _companyForm.controls['state'].touched" class="mat-text-warn">You must Pickup a State.</mat-error>  -->
+                  </mat-form-field>
+              </div>
+
+              <div class="ml-xs mr-xs"> 
+                  <mat-form-field style="width: 100%">
+                        <input matInput type="text" placeholder="Pin code" required formControlName="pincode">
+                        <mat-hint>pincode should be in 6 digit format</mat-hint>
+                        <!-- <mat-error *ngIf="_companyForm.controls['pincode'].hasError('required') && _companyForm.controls['pincode'].touched" class="mat-text-warn">You must include phone number.</mat-error> -->
+                        <!-- <mat-error *ngIf="!_companyForm.controls['pincode'].valid && _companyForm.controls['pincode'].touched" class="mat-text-warn">You must include a pincode number.</mat-error> -->
+                        <!-- <mat-error *ngIf="_companyForm.controls['pincode'].hasError('minlength') && _companyForm.controls['pincode'].touched" class="mat-text-warn">Your pincode must be at least 5 characters long.</mat-error>
+                        <mat-error *ngIf="_companyForm.controls['pincode'].hasError('maxlength') && _companyForm.controls['pincode'].touched" class="mat-text-warn">Your pincode name cannot exceed 6 characters.</mat-error> -->
+                  </mat-form-field>    
+              </div>
+
+              <br>
+
+              <div class="row" style="text-align:right;">
+                  
+                  <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above"  type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>        
+                  
+                  <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above"   type="submit"  [disabled]="!_companyForm.valid"><mat-icon>save</mat-icon></button>        
+                  
+              </div>
+      
+      </div>
+</form>
+</mat-card-content>
\ No newline at end of file
diff --git a/ng6-seed/src/app/settings/masters/component/company/company.component.scss b/ng6-seed/src/app/settings/masters/component/company/company.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/ng6-seed/src/app/settings/masters/component/company/company.component.spec.ts b/ng6-seed/src/app/settings/masters/component/company/company.component.spec.ts
new file mode 100644
index 000000000..d56536e7e
--- /dev/null
+++ b/ng6-seed/src/app/settings/masters/component/company/company.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CompanyComponent } from './company.component';
+
+describe('CompanyComponent', () => {
+  let component: CompanyComponent;
+  let fixture: ComponentFixture<CompanyComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CompanyComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CompanyComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/ng6-seed/src/app/settings/masters/component/company/company.component.ts b/ng6-seed/src/app/settings/masters/component/company/company.component.ts
new file mode 100644
index 000000000..17b2f760f
--- /dev/null
+++ b/ng6-seed/src/app/settings/masters/component/company/company.component.ts
@@ -0,0 +1,180 @@
+
+import { Component, 
+            OnInit, 
+            Inject } from '@angular/core';
+import { FormBuilder, 
+           FormGroup, 
+          Validators, 
+          FormControl } from '@angular/forms'; 
+
+/** Service */
+import { MastersService } from '../../../service/masters/masters.service';
+
+
+@Component({
+  selector: 'app-company',
+  templateUrl: './company.component.html',
+  styleUrls: ['./company.component.scss']
+})
+
+export class CompanyComponent implements OnInit {
+
+  public _companyForm: FormGroup;
+  public companyData: any = [];
+  
+  stateDatas: any[];
+  citydatas: any[];
+  errorMessage:string;
+  
+  
+  constructor(private _formBuilder: FormBuilder,
+  private _mastersService: MastersService) { }
+
+  FetchFormValue() {
+    this._mastersService.getAllCompany().subscribe(
+      dataresult => {
+        if(dataresult.dataStatus == true){
+          
+          this.companyData = dataresult.records;
+        
+          this._companyForm.controls['company_id'].setValue(this.companyData[0].company_id);
+          this._companyForm.controls['name'].setValue(this.companyData[0].name);
+          this._companyForm.controls['addressline1'].setValue(this.companyData[0].addressline1);
+          this._companyForm.controls['addressline2'].setValue(this.companyData[0].addressline2);
+          this._companyForm.controls['addressline3'].setValue(this.companyData[0].addressline3);
+          this._companyForm.controls['city'].setValue(this.companyData[0].city);
+          this._companyForm.controls['state'].setValue(this.companyData[0].state);
+          this._companyForm.controls['pincode'].setValue(this.companyData[0].pincode);
+        }
+      }
+    )
+}
+  ngOnInit() {
+    
+          this.CompanyFormData();
+          this.FetchFormValue();
+          // this._mastersService.getAllCompany().subscribe(
+          //   dataresult => {
+          //     if(dataresult.dataStatus == true){
+                
+          //       this.companyData = dataresult.records;
+              
+          //       this._companyForm.controls['company_id'].setValue(this.companyData[0].company_id);
+          //       this._companyForm.controls['name'].setValue(this.companyData[0].name);
+          //       this._companyForm.controls['addressline1'].setValue(this.companyData[0].addressline1);
+          //       this._companyForm.controls['addressline2'].setValue(this.companyData[0].addressline2);
+          //       this._companyForm.controls['addressline3'].setValue(this.companyData[0].addressline3);
+          //       this._companyForm.controls['city'].setValue(this.companyData[0].city);
+          //       this._companyForm.controls['state'].setValue(this.companyData[0].state);
+          //       this._companyForm.controls['pincode'].setValue(this.companyData[0].pincode);
+          //     }
+          //   }
+          // )
+    
+      
+    this._mastersService.getAllMasterData('STATE')
+          .subscribe(
+                    data => {
+                              if (data.dataStatus == true){
+                                this.stateDatas = data.records;
+                                this.stateDatas = this.stateDatas.filter(dataresult=>dataresult.isactive == 1 );
+                              }
+          
+                              }, error => this.errorMessage = <any> error);
+
+        this._mastersService.getAllMasterData('CITY')
+            .subscribe(
+                       data => {
+                              if (data.dataStatus == true){
+                                this.citydatas = data.records;
+                                this.citydatas = this.citydatas.filter(dataresult=>dataresult.isactive == 1 );
+                                //this._companyForm.controls['state'].setValue(this.companyData[0].state);
+                              }
+                              }, error => this.errorMessage = <any> error);
+        }
+
+
+    getRelevantState(event){
+        // console.log(event);
+        // console.log('cityid',event.value);
+        // console.log('statedata',this.stateDatas);        
+        //let cityid = event.value;
+        let alldata = this.citydatas.filter(data => data.city_id == event.value);
+        // console.log('to getrelated id datas',alldata);
+        // console.log('get correct', alldata[0].name);
+        this._companyForm.controls['state'].setValue(alldata[0].fk_state_id);
+        //event.source.disabled = true;
+    }
+  
+  /** For CompanyFormData */
+  CompanyFormData() {
+ 
+  this._companyForm = this._formBuilder.group({
+   
+      company_id: [null],
+      name: [null, Validators.compose([Validators.required])],
+      addressline1: [null, Validators.compose([Validators.required])],
+      addressline2: [null],
+      addressline3: [null],
+      city: [null, Validators.compose([Validators.required])],
+      state: [null,{disabled: true}],
+      pincode: [null, Validators.compose([Validators.required, Validators.minLength(5), Validators.maxLength(6)])],
+      
+  });
+}
+
+  
+  /** To Save/Edited Popup Data */
+  onSubmit() {
+    
+    var CompanyFormValue = this._companyForm.value;
+    
+     if(isNaN(this._companyForm['company_id']))
+     {       
+
+      Object.keys(CompanyFormValue).forEach((key) => ( CompanyFormValue[key] == null) && delete CompanyFormValue[key]);
+      
+      //After Saving the Company data then popup close
+      this._mastersService.addCompanyDetails(CompanyFormValue).subscribe(
+        
+          dataresult=>{   
+            if (dataresult.dataStatus == true){  
+              
+              alert("Data Saved Successfully");
+            }
+            else{
+              alert("SomeThing Wents Wrong Try Again !");
+            }
+  
+          });
+      
+    } else {
+      
+      this._mastersService.editMasterDetails(CompanyFormValue,'COMPANY').subscribe(
+        dataresult=>{   
+          if (dataresult.dataStatus == true){  
+            
+            alert("Data Edited Successfully");
+          }
+          else{
+            alert("SomeThing Wents Wrong Try Again !");
+          }
+
+        }
+      );
+    }
+  }
+
+
+  
+/** To Reset Popup Data For Edit*/
+onResetForEdit(){
+  //this.CompanyFormData();
+  this.FetchFormValue();
+}
+
+isEmptyObject(obj) {
+  return (obj && (Object.keys(obj).length === 0));
+}
+
+}
diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html
index de991df88..1c738a32b 100644
--- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html
@@ -122,7 +122,7 @@
                   matTooltip="Active" matTooltipPosition="above"
                   checked="true" [color]="color"
                   (change)="isactiveCustomerBehaviour(row.customer_behaviour_id,row.isactive)"
-                  onclick="return confirm('Are you sure?')">
+                  (click)="deactive()">
   </mat-slide-toggle>
   <ng-template #notactive >
   <mat-slide-toggle
@@ -130,7 +130,7 @@
       matTooltip="Inactive" matTooltipPosition="above"
       checked="false"
       (change)="isactiveCustomerBehaviour(row.customer_behaviour_id,row.isactive)"
-      onclick="return confirm('Are you sure?')">
+      (click)="active()">
   </mat-slide-toggle></ng-template>
                </mat-cell>
             </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.ts b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.ts
index 7aa955569..23d9d760b 100644
--- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.ts
@@ -15,7 +15,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { CustomerBehaviourDialogComponent } from '../customer-behaviour-dialog/customer-behaviour-dialog.component';
 /** Model */
 import { CustomerBehaviour } from '../../../model/customer-behaviour';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 
 @Component({
   selector: 'app-customer-behaviour-list',
@@ -127,10 +128,50 @@ pageSize = 10;
                         this.getCustomerBehaviour();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                    Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
+
+
+
+//Sweetalert2  for active and deactive
+active(){
+    Swal({
+      title: 'Are you sure?', 
+      type: 'warning',
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      confirmButtonText: 'Yes, activate it!'
+    }).then((result) => {
+      if (result.value) {
+        Swal(
+          'Activated!', 
+          'success'
+        )
+      }
+    }) 
+  }
+  deactive()
+  {
+    Swal({
+      title: 'Are you sure?', 
+      type: 'warning',
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      confirmButtonText: 'Yes, deactivate it!'
+    }).then((result) => {
+      if (result.value) {
+        Swal(
+          'Deactivated!', 
+          'success'
+        )
+      }
+    })
+  }
+  
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
   this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html
index 6d7d5d5ea..4a701354a 100644
--- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html
@@ -118,7 +118,7 @@
                      matTooltip="Active" matTooltipPosition="above"
                      checked="true" [color]="color"
                      (change)="isactiveCustomerSegment(row.customer_segment_id,row.isactive)"
-                     onclick="return confirm('Are you sure?')">
+                     (click)="deactive()">
      </mat-slide-toggle>
      <ng-template #notactive >
      <mat-slide-toggle
@@ -126,7 +126,7 @@
          matTooltip="Inactive" matTooltipPosition="above"
          checked="false" [color]="color"
          (change)="isactiveCustomerSegment(row.customer_segment_id,row.isactive)"
-         onclick="return confirm('Are you sure?')">
+         (click)="active()">
      </mat-slide-toggle></ng-template>
                   </mat-cell>
                 </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.ts b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.ts
index af7d91e8c..351e48ebf 100644
--- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.ts
@@ -15,7 +15,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { CustomerSegmentDialogComponent } from '../customer-segment-dialog/customer-segment-dialog.component';
 /** Model */
 import { CustomerSegment } from '../../../model/customer-segment';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 
 @Component({
   selector: 'app-customer-segment-list',
@@ -129,10 +130,50 @@ displayedColumns = ['serialno','name','actions','isactive'];
                         this.getCustomerSegment();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                    Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
+
+
+
+//Sweetalert2  for active and deactive
+active(){
+    Swal({
+      title: 'Are you sure?', 
+      type: 'warning',
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      confirmButtonText: 'Yes, activate it!'
+    }).then((result) => {
+      if (result.value) {
+        Swal(
+          'Activated!', 
+          'success'
+        )
+      }
+    }) 
+  }
+  deactive()
+  {
+    Swal({
+      title: 'Are you sure?', 
+      type: 'warning',
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      confirmButtonText: 'Yes, deactivate it!'
+    }).then((result) => {
+      if (result.value) {
+        Swal(
+          'Deactivated!', 
+          'success'
+        )
+      }
+    })
+  }
+  
   /** For Display Tables Pagination And Sorting */
   ngAfterViewInit() {
     this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html
index eaf71e234..c7ba7e2d7 100644
--- a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html
@@ -110,7 +110,7 @@
                  matTooltip="Active" matTooltipPosition="above"
                  checked="true" [color]="color"
                  (change)="isactiveDesignation(row.designation_id,row.isactive)"
-                 onclick="return confirm('Are you sure?')">
+                 (click)="deactive()">
  </mat-slide-toggle>
  <ng-template #notactive >
  <mat-slide-toggle
@@ -118,7 +118,7 @@
      matTooltip="Inactive" matTooltipPosition="above"
      checked="false" [color]="color"
      (change)="isactiveDesignation(row.designation_id,row.isactive)"
-     onclick="return confirm('Are you sure?')">
+     (click)="active()">
  </mat-slide-toggle></ng-template>
               </mat-cell>
             </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.ts b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.ts
index e9d8a0194..bcd5f4da9 100644
--- a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.ts
@@ -15,7 +15,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { DesignationDialogComponent } from '../designation-dialog/designation-dialog.component';
 /** Model */
 import { Designation } from '../../../model/designation';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 
 @Component({
   selector: 'app-designation-list',
@@ -123,10 +124,50 @@ pageSize = 10;
                         this.getDesignation();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                    Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
+
+
+
+//Sweetalert2  for active and deactive
+active(){
+    Swal({
+      title: 'Are you sure?', 
+      type: 'warning',
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      confirmButtonText: 'Yes, activate it!'
+    }).then((result) => {
+      if (result.value) {
+        Swal(
+          'Activated!', 
+          'success'
+        )
+      }
+    }) 
+  }
+  deactive()
+  {
+    Swal({
+      title: 'Are you sure?', 
+      type: 'warning',
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      confirmButtonText: 'Yes, deactivate it!'
+    }).then((result) => {
+      if (result.value) {
+        Swal(
+          'Deactivated!', 
+          'success'
+        )
+      }
+    })
+  }
+  
     /** For Display Tables Pagination And Sorting */
   ngAfterViewInit() {
     this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html
index 0b5e5d7ef..ee86a9249 100644
--- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html
@@ -117,7 +117,7 @@
                   matTooltip="Active" matTooltipPosition="above"
                   checked="true" [color]="color"
                   (change)="isactiveFrequency(row.frequency_id,row.isactive)"
-                  onclick="return confirm('Are you sure?')">
+                  (click)="deactive()">
   </mat-slide-toggle>
   <ng-template #notactive >
   <mat-slide-toggle
@@ -125,7 +125,7 @@
       matTooltip="Inactive" matTooltipPosition="above"
       checked="false"
       (change)="isactiveFrequency(row.frequency_id,row.isactive)"
-      onclick="return confirm('Are you sure?')">
+      (click)="active()">
   </mat-slide-toggle></ng-template>
                 </mat-cell>
               </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.ts b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.ts
index 13ec1b4d0..ae4898113 100644
--- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.ts
@@ -16,6 +16,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { FrequencyDialogComponent }from '../frequency-dialog/frequency-dialog.component';
 /** Model */
 import { Frequency } from '../../../model/frequency';
+/**sweet alert */
+import Swal from 'sweetalert2';
 
 
 @Component({
@@ -134,10 +136,49 @@ export class FrequencyListComponent implements OnInit {
                         this.getFrequency();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                    Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
+
+
+//Sweetalert2  for active and deactive
+active(){
+    Swal({
+      title: 'Are you sure?', 
+      type: 'warning',
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      confirmButtonText: 'Yes, activate it!'
+    }).then((result) => {
+      if (result.value) {
+        Swal(
+          'Activated!', 
+          'success'
+        )
+      }
+    }) 
+  }
+  deactive()
+  {
+    Swal({
+      title: 'Are you sure?', 
+      type: 'warning',
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      confirmButtonText: 'Yes, deactivate it!'
+    }).then((result) => {
+      if (result.value) {
+        Swal(
+          'Deactivated!', 
+          'success'
+        )
+      }
+    })
+  }
+  
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
   this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html
index 9e1baa7b0..5925987f3 100644
--- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html
@@ -48,18 +48,18 @@
                         matTooltip="Active" matTooltipPosition="above"
                         checked="true" [color]="color"
                         (change)="isactiveIndustryClassification(row.industry_classification_id,row.isactive)"
-                        onclick="return confirm('Are you sure?')"></mat-slide-toggle>
+                        (click)="deactive()"></mat-slide-toggle>
                    <ng-template #notactive >
                     <mat-slide-toggle
                         class="example-margin"
                         matTooltip="Inactive" matTooltipPosition="above"
                         checked="false" [color]="color"
                         (change)="isactiveIndustryClassification(row.industry_classification_id,row.isactive)"
-                        onclick="return confirm('Are you sure?')">
+                        (click)="active()">
                     </mat-slide-toggle></ng-template>
                 </mat-cell>
               </ng-container>
-       
+        
               <ng-container matColumnDef="actions">
                 <mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
                 <mat-cell *matCellDef="let row"> 
diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.ts b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.ts
index 2fbbd0284..094b66889 100644
--- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.ts
@@ -16,6 +16,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { IndustryClassificationDialogComponent } from '../industry_classification-dialog/industry_classification-dialog.component';
 /** Model */
 import {  IndustryClassification } from '../../../model/industry_classification';
+/**sweet alert */
+import Swal from 'sweetalert2';
 
 @Component({
   selector: 'app-industry_classification-list',
@@ -143,10 +145,47 @@ pageSize = 10;
                         this.getIndustryClassification();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                    Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
+ 
+//Sweetalert2  for active and deactive
+active(){
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, activate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Activated!', 
+        'success'
+      )
+    }
+  }) 
+}
+deactive()
+{
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, deactivate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Deactivated!', 
+        'success'
+      )
+    }
+  })
+}
 
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html
index 84a27fc29..669e3cb9d 100644
--- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html
@@ -107,7 +107,7 @@
                     matTooltip="Active" matTooltipPosition="above"
                     checked="true" [color]="color"
                     (change)="isactiveLenderHierarchy(row.lender_hierarchy_id,row.isactive)"
-                    onclick="return confirm('Are you sure?')">
+                    (click)="deactive()">
     </mat-slide-toggle>
     <ng-template #notactive >
     <mat-slide-toggle
@@ -115,7 +115,7 @@
         matTooltip="Inactive" matTooltipPosition="above"
         checked="false" [color]="color"
         (change)="isactiveLenderHierarchy(row.lender_hierarchy_id,row.isactive)"
-        onclick="return confirm('Are you sure?')">
+        (click)="active()">
     </mat-slide-toggle></ng-template>
                 </mat-cell>
               </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.ts b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.ts
index 9d87e5dfe..ba8c91a0c 100644
--- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.ts
@@ -19,7 +19,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { LenderHierarchyDialogComponent }from '../lender-hierarchy-dialog/lender-hierarchy-dialog.component';
 /**Model */
 import { LenderHierarchy } from '../../../model/lender-hierarchy';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 
 @Component({
   selector: 'app-lender-hierarchy-list',
@@ -146,10 +147,47 @@ isactiveLenderHierarchy(id: number,isactive : number) {
                       this.getLenderHierarchy();
                 }
                 else{
-                      alert("SomeThing Wents Wrong Try Again !");
+                  Swal("SomeThing Wents Wrong Try Again !");
                 }
     });
 }
+//Sweetalert2  for active and deactive
+active(){
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, activate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Activated!', 
+        'success'
+      )
+    }
+  }) 
+}
+deactive()
+{
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, deactivate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Deactivated!', 
+        'success'
+      )
+    }
+  })
+}
+
   /** For Display Tables Pagination And Sorting */
   ngAfterViewInit() {
     this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html
index 743410f48..00da6e7cc 100644
--- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html
@@ -123,7 +123,7 @@
                   matTooltip="Active" matTooltipPosition="above"
                   checked="true" [color]="color"
                   (change)="isactiveMemberOccupations(row.occupation_non_earning_member_id,row.isactive)"
-                  onclick="return confirm('Are you sure?')">
+                  (click)="deactive()">
   </mat-slide-toggle>
   <ng-template #notactive >
   <mat-slide-toggle
@@ -131,7 +131,7 @@
       matTooltip="Inactive" matTooltipPosition="above"
       checked="false" [color]="color"
       (change)="isactiveMemberOccupations(row.occupation_non_earning_member_id,row.isactive)"
-      onclick="return confirm('Are you sure?')">
+      (click)="active()">
   </mat-slide-toggle></ng-template>
                    <!-- <mat-icon *ngIf="row.isactive == 1;else notactive;" class="hover-icon" matTooltip="Active" matTooltipPosition="above">done</mat-icon>
                    <ng-template #notactive ><mat-icon class="hover-icon" matTooltip="Inactive" matTooltipPosition="above">clear</mat-icon></ng-template>  -->
diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.ts b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.ts
index c5c6666e1..64a5e7508 100644
--- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.ts
@@ -18,7 +18,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { MembersOccupationDialogComponent } from '../members-occupation-dialog/members-occupation-dialog.component';
 /** Model */
 import { MembersOccupation } from '../../../model/members-occupation';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 
 @Component({
   selector: 'app-members-occupation-list',
@@ -149,10 +150,47 @@ export class MembersOccupationListComponent implements OnInit {
                         this.getMemberOccupation();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                    Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
+//Sweetalert2  for active and deactive
+active(){
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, activate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Activated!', 
+        'success'
+      )
+    }
+  }) 
+}
+deactive()
+{
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, deactivate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Deactivated!', 
+        'success'
+      )
+    }
+  })
+}
+
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
   this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html
index 702f0cc0a..a0b0d17a2 100644
--- a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html
@@ -62,7 +62,7 @@
                                   matTooltipPosition="above"
                                   checked="false" [color]="color"
                                   (change)="defaultPDAllocationType(row.pd_allocation_type_id)"
-                                  onclick="return confirm('Are you sure?')">
+                                  (click)="active()">
                 </mat-slide-toggle>
                 <ng-template #alternative>
                     <mat-slide-toggle class="example-margin"
diff --git a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts
index 8dbb8a3fe..990a71daa 100644
--- a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts
@@ -15,6 +15,8 @@ import { NotifierService } from 'angular-notifier';
 /** Model */
 import { PdAllocationType } from '../../model/pd';
 
+/**sweet alert */
+import Swal from 'sweetalert2';
 
 @Component({
   selector: 'app-pd-allocation-type-list',
@@ -121,7 +123,9 @@ export class PdAllocationTypeListComponent implements OnInit {
        });
        //console.log('at last Completed Section');
 }
-
+active(){
+  Swal('Are you sure?')
+}
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
   this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html
index 122e67d21..69b6028a0 100644
--- a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html
@@ -102,7 +102,7 @@
                   matTooltip="Active" matTooltipPosition="above"
                   checked="true" [color]="color"
                   (change)="isactivePdLocationApproach(row.pd_location_approach_id,row.isactive)"
-                  onclick="return confirm('Are you sure?')">
+                  (click)="deactive()">
   </mat-slide-toggle>
   <ng-template #notactive >
   <mat-slide-toggle
@@ -110,7 +110,7 @@
       matTooltip="Inactive" matTooltipPosition="above"
       checked="false" [color]="color"
       (change)="isactivePdLocationApproach(row.pd_location_approach_id,row.isactive)"
-      onclick="return confirm('Are you sure?')">
+      (click)="active()">
   </mat-slide-toggle></ng-template>
                  <!-- <mat-icon *ngIf="row.isactive == 1;else notactive;" class="hover-icon" matTooltip="Active" matTooltipPosition="above">done</mat-icon>
                  <ng-template #notactive ><mat-icon class="hover-icon" matTooltip="Inactive" matTooltipPosition="above">clear</mat-icon></ng-template>  -->
diff --git a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.ts
index ceab4afa1..eea52387e 100644
--- a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.ts
@@ -23,7 +23,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { PdLocationApproachDialogComponent } from '../pd-location-approach-dialog/pd-location-approach-dialog.component';
 /** Model */
 import { PdLocationApproach } from '../../../model/pd';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 
 @Component({
   selector: 'app-pd-location-approach-list',
@@ -137,10 +138,46 @@ export class PdLocationApproachListComponent implements OnInit {
                       this.getPdLocationApproach();
                 }
                 else{
-                      alert("SomeThing Wents Wrong Try Again !");
+                  Swal("SomeThing Wents Wrong Try Again !");
                 }
     });
 }
+//Sweetalert2  for active and deactive
+active(){
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, activate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Activated!', 
+        'success'
+      )
+    }
+  }) 
+}
+deactive()
+{
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, deactivate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Deactivated!', 
+        'success'
+      )
+    }
+  })
+}
 
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
diff --git a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html
index 190dc380f..45815f287 100644
--- a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html
@@ -104,7 +104,7 @@
                  matTooltip="Active" matTooltipPosition="above"
                  checked="true" [color]="color"
                  (change)="isactivePDType(row.pd_type_id,row.isactive)"
-                 onclick="return confirm('Are you sure?')">
+                 (click)="deactive()">
  </mat-slide-toggle>
  <ng-template #notactive >
  <mat-slide-toggle
@@ -112,7 +112,7 @@
      matTooltip="Inactive" matTooltipPosition="above"
      checked="false" [color]="color"
      (change)="isactivePDType(row.pd_type_id,row.isactive)"
-     onclick="return confirm('Are you sure?')">
+     (click)="active()">
  </mat-slide-toggle></ng-template>
               </mat-cell>
             </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.ts
index 99306684c..2b8fd6a48 100644
--- a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.ts
@@ -15,7 +15,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { PdTypeDialogComponent } from '../pd-type-dialog/pd-type-dialog.component';
 /**Model */
 import { PdType } from '../../../model/pd';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 
 @Component({
   selector: 'app-pd-type-list',
@@ -129,10 +130,46 @@ isactivePDType(id: number,isactive : number) {
                       this.getPDType();
                 }
                 else{
-                      alert("SomeThing Wents Wrong Try Again !");
+                  Swal("SomeThing Wents Wrong Try Again !");
                 }
     });
 }
+//Sweetalert2  for active and deactive
+active(){
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, activate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Activated!', 
+        'success'
+      )
+    }
+  }) 
+}
+deactive()
+{
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, deactivate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Deactivated!', 
+        'success'
+      )
+    }
+  })
+}
 
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
diff --git a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html
index 60b3bc04b..59d48ad1c 100644
--- a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html
@@ -55,7 +55,7 @@
              matTooltip="Active" matTooltipPosition="above"
              checked="true" [color]="color"
              (change)="isactiveProductMaster(row.product_id,row.isactive)"
-             onclick="return confirm('Are you sure?')">
+             (click)="deactive()">
 </mat-slide-toggle>
 <ng-template #notactive >
 <mat-slide-toggle
@@ -63,7 +63,7 @@
  matTooltip="Inactive" matTooltipPosition="above"
  checked="false" [color]="color"
  (change)="isactiveProductMaster(row.product_id,row.isactive)"
- onclick="return confirm('Are you sure?')">
+ (click)="active()">
 </mat-slide-toggle></ng-template>
           </mat-cell>
         </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.ts b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.ts
index a21203975..b9450c013 100644
--- a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.ts
@@ -16,7 +16,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { ProductDialogComponent } from '../product-dialog/product-dialog.component';
 /** Model */
 import { ProductMaster } from '../../../model/product-master';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 @Component({
   selector: 'app-product-list',
   templateUrl: './product-list.component.html',
@@ -137,11 +138,46 @@ export class ProductListComponent implements OnInit {
                         this.getProductMaster();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                    Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
-  
+  //Sweetalert2  for active and deactive
+active(){
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, activate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Activated!', 
+        'success'
+      )
+    }
+  }) 
+}
+deactive()
+{
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, deactivate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Deactivated!', 
+        'success'
+      )
+    }
+  })
+}
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
   this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html
index 45ac1b8a5..23d77bb4d 100644
--- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html
@@ -48,7 +48,7 @@
                               matTooltip="Active" matTooltipPosition="above"
                               checked="true" [color]="color"
                               (change)="isactiveQuestionCategory(row.question_categroy_id,row.isactive)"
-                              onclick="return confirm('Are you sure?')">
+                              (click)="deactive()">
           </mat-slide-toggle>
           <ng-template #notactive >
           <mat-slide-toggle
@@ -56,7 +56,7 @@
                               matTooltip="Inactive" matTooltipPosition="above"
                               checked="false" [color]="color"
                               (change)="isactiveQuestionCategory(row.question_categroy_id,row.isactive)"
-                              onclick="return confirm('Are you sure?')">
+                              (click)="active()">
           </mat-slide-toggle></ng-template>
         </mat-cell>
       </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.ts b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.ts
index 105002311..fd3169758 100644
--- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.ts
@@ -14,7 +14,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 
 /** Dialog Component */
 import { QuestionCategoryDialogComponent } from '../question-category-dialog/question-category-dialog.component';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 @Component({
   selector: 'app-question-category-list',
   templateUrl: './question-category-list.component.html',
@@ -121,11 +122,47 @@ export class QuestionCategoryListComponent implements OnInit {
                         this.getQuestionCategory();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                    Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
-  
+  //Sweetalert2  for active and deactive
+active(){
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, activate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Activated!', 
+        'success'
+      )
+    }
+  }) 
+}
+deactive()
+{
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, deactivate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Deactivated!', 
+        'success'
+      )
+    }
+  })
+}
+
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
   this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html
index 7139f4fd2..721a29181 100644
--- a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html
@@ -33,7 +33,7 @@
                    matTooltip="Active" matTooltipPosition="above"
                    checked="true" [color]="color"
                    (change)="isactiveregions(row.region_id,row.isactive)"
-                   onclick="return confirm('Are you sure?')">
+                   (click)="deactive()">
                    </mat-slide-toggle>
                     <ng-template #notactive >
                     <mat-slide-toggle
@@ -41,7 +41,7 @@
                         matTooltip="Inactive" matTooltipPosition="above"
                         checked="false" [color]="color"
                         (change)="isactiveregions(row.region_id,row.isactive)"
-                        onclick="return confirm('Are you sure?')">
+                        (click)="active()">
                     </mat-slide-toggle></ng-template>
                 </mat-cell>
               </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.ts b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.ts
index 96484306a..6c557b120 100644
--- a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.ts
@@ -16,7 +16,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { RegionsDialogComponent } from '../regions-dialog/regions-dialog.component';
 /** Model */
 import { Regions } from '../../../model/regions';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 
 @Component({
   selector: 'app-regions-list',
@@ -112,7 +113,7 @@ export class RegionsListComponent implements OnInit {
                         this.getregions();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                    Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
@@ -124,6 +125,42 @@ export class RegionsListComponent implements OnInit {
     this.getregions();
     //this._regionsService.deleteMasterDetails('region_id',id,'REGIONS');
   }
+//Sweetalert2  for active and deactive
+active(){
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, activate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Activated!', 
+        'success'
+      )
+    }
+  }) 
+}
+deactive()
+{
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, deactivate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Deactivated!', 
+        'success'
+      )
+    }
+  })
+}
 
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html
index bfa0b81b6..47ac9f9b0 100644
--- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html
@@ -127,7 +127,7 @@
                    matTooltip="Active" matTooltipPosition="above"
                    checked="true" [color]="color"
                    (change)="isactiveRelationShip(row.relationship_id,row.isactive)"
-                   onclick="return confirm('Are you sure?')">
+                   (click)="deactive()">
    </mat-slide-toggle>
    <ng-template #notactive >
    <mat-slide-toggle
@@ -135,7 +135,7 @@
        matTooltip="Inactive" matTooltipPosition="above"
        checked="false" [color]="color"
        (change)="isactiveRelationShip(row.relationship_id,row.isactive)"
-       onclick="return confirm('Are you sure?')">
+       (click)="active()">
    </mat-slide-toggle></ng-template>
                 </mat-cell>
               </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.ts b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.ts
index d3d37ad33..66a664b08 100644
--- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.ts
@@ -16,7 +16,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { RelationShipDialogComponent } from '../relation-ship-dialog/relation-ship-dialog.component';
 /** Model */
 import { RelationShip } from '../../../model/relation-ship';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 @Component({
   selector: 'app-relation-ship-list',
   templateUrl: './relation-ship-list.component.html',
@@ -108,7 +109,7 @@ export class RelationShipListComponent implements OnInit {
                         this.getRelationShip();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                    Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
@@ -145,6 +146,42 @@ export class RelationShipListComponent implements OnInit {
     
     //this._MastersService.deleteMasterDetails('relationship_id',id,'RELATIONSHIPS');
   }
+  //Sweetalert2  for active and deactive
+active(){
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, activate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Activated!', 
+        'success'
+      )
+    }
+  }) 
+}
+deactive()
+{
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, deactivate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Deactivated!', 
+        'success'
+      )
+    }
+  })
+}
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
   this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html
index 2ea2da2ee..22983dd36 100644
--- a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html
@@ -150,7 +150,7 @@
                    matTooltip="Active" matTooltipPosition="above"
                    checked="true" [color]="color"
                    (change)="isactiveState(row.state_id,row.isactive)"
-                   onclick="return confirm('Are you sure?')">
+                   (click)="deactive()">
    </mat-slide-toggle>
    <ng-template #notactive >
    <mat-slide-toggle
@@ -158,7 +158,7 @@
        matTooltip="Inactive" matTooltipPosition="above"
        checked="false" [color]="color"
        (change)="isactiveState(row.state_id,row.isactive)"
-       onclick="return confirm('Are you sure?')">
+       (click)="active()">
    </mat-slide-toggle></ng-template>
                 </mat-cell>
               </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.ts b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.ts
index 3fe180cd1..d15ad883e 100644
--- a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.ts
@@ -16,7 +16,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { StatesDialogComponent } from '../states-dialog/states-dialog.component';
 /** Model */
 import { States } from '../../../model/states';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 
 @Component({
   selector: 'app-states-list',
@@ -105,7 +106,7 @@ isactiveState(id: number,isactive : number) {
                       this.getState();
                 }
                 else{
-                      alert("SomeThing Wents Wrong Try Again !");
+                  Swal("SomeThing Wents Wrong Try Again !");
                 }
     });
 }
@@ -137,7 +138,42 @@ isactiveState(id: number,isactive : number) {
     this.getState();
     //this._statesService.deleteMasterDetails('state_id',id,'STATE');
   }
-
+//Sweetalert2  for active and deactive
+active(){
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, activate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Activated!', 
+        'success'
+      )
+    }
+  }) 
+}
+deactive()
+{
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, deactivate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Deactivated!', 
+        'success'
+      )
+    }
+  })
+}
   
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html
index 031422274..8ddf1791e 100644
--- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html
@@ -139,7 +139,7 @@
                    matTooltip="Active" matTooltipPosition="above"
                    checked="true" [color]="color"
                    (change)="isactiveSubProductMaster(row.subproduct_id,row.isactive)"
-                   onclick="return confirm('Are you sure?')">
+                   (click)="deactive()">
    </mat-slide-toggle>
    <ng-template #notactive >
    <mat-slide-toggle
@@ -147,7 +147,7 @@
        matTooltip="Inactive" matTooltipPosition="above"
        checked="false" [color]="color"
        (change)="isactiveSubProductMaster(row.subproduct_id,row.isactive)"
-       onclick="return confirm('Are you sure?')">
+       (click)="active()">
    </mat-slide-toggle></ng-template>
                 </mat-cell>
               </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.ts b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.ts
index ee31d5e89..13dbcdf18 100644
--- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.ts
@@ -16,7 +16,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { SubProductDialogComponent } from '../sub-product-dialog/sub-product-dialog.component';
 /** Model */
 import { SubProductMaster } from '../../../model/sub-product-master';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 
 @Component({
   selector: 'app-sub-product-list',
@@ -145,10 +146,47 @@ getSubProductMaster() {
                         this.getSubProductMaster();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                    Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
+//Sweetalert2  for active and deactive
+active(){
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, activate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Activated!', 
+        'success'
+      )
+    }
+  }) 
+}
+deactive()
+{
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, deactivate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Deactivated!', 
+        'success'
+      )
+    }
+  })
+}
+
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
   this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html
index 925b5c249..216b2fa5b 100644
--- a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html
@@ -123,7 +123,7 @@
                    matTooltip="Active" matTooltipPosition="above"
                    checked="true" [color]="color"
                    (change)="isactiveTitle(row.title_id,row.isactive)"
-                   onclick="return confirm('Are you sure?')">
+                   (click)="deactive()">
    </mat-slide-toggle>
    <ng-template #notactive >
    <mat-slide-toggle
@@ -131,7 +131,7 @@
        matTooltip="Inactive" matTooltipPosition="above"
        checked="false" [color]="color"
        (change)="isactiveTitle(row.title_id,row.isactive)"
-       onclick="return confirm('Are you sure?')">
+       (click)="active()">
    </mat-slide-toggle></ng-template>
                 </mat-cell>
               </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.ts b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.ts
index 473db1820..2bb829d34 100644
--- a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.ts
@@ -14,7 +14,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { TitleDialogComponent } from '../title-dialog/title-dialog.component';
 /** Model */
 import { Title } from '../../../model/title';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 @Component({
   selector: 'app-title-list',
   templateUrl: './title-list.component.html',
@@ -132,10 +133,47 @@ export class TitleListComponent implements OnInit {
                         this.getTitle();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                    Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
+//Sweetalert2  for active and deactive
+active(){
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, activate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Activated!', 
+        'success'
+      )
+    }
+  }) 
+}
+deactive()
+{
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, deactivate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Deactivated!', 
+        'success'
+      )
+    }
+  })
+}
+
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
   this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html
index 11659f5a2..478f72eef 100644
--- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html
@@ -117,7 +117,7 @@
                    matTooltip="Active" matTooltipPosition="above"
                    checked="true" [color]="color"
                    (change)="isactiveActivity(row.type_of_activity_id,row.isactive)"
-                   onclick="return confirm('Are you sure?')">
+                   (click)="deactive()">
    </mat-slide-toggle>
    <ng-template #notactive >
    <mat-slide-toggle
@@ -125,7 +125,7 @@
        matTooltip="Inactive" matTooltipPosition="above"
        checked="false"
        (change)="isactiveActivity(row.type_of_activity_id,row.isactive)"
-       onclick="return confirm('Are you sure?')">
+       (click)="active()">
    </mat-slide-toggle></ng-template>
                 </mat-cell>
               </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.ts b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.ts
index 7b3c2120f..903302c6f 100644
--- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.ts
@@ -16,7 +16,8 @@ import { MastersService } from '../../../../service/masters/masters.service';
 import { ActivityDialogComponent } from '../activity-dialog/activity-dialog.component';
 /** Model */
 import { Activity } from '../../../model/activity';
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 @Component({
   selector: 'app-activity-list',
   templateUrl: './activity-list.component.html',
@@ -140,10 +141,47 @@ export class ActivityListComponent implements OnInit {
                         this.getActivity();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                    Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
+//Sweetalert2  for active and deactive
+active(){
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, activate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Activated!', 
+        'success'
+      )
+    }
+  }) 
+}
+deactive()
+{
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, deactivate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Deactivated!', 
+        'success'
+      )
+    }
+  })
+}
+
 
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html
index 738cca2ff..dc2e9ab0f 100644
--- a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html
@@ -44,7 +44,7 @@
                    matTooltip="Active" matTooltipPosition="above"
                    checked="true" [color]="color"
                    (change)="isactiveUOM(row.uom_id,row.isactive)"
-                   onclick="return confirm('Are you sure?')">
+                   (click)="deactive()">
    </mat-slide-toggle>
    <ng-template #notactive >
    <mat-slide-toggle
@@ -52,7 +52,7 @@
        matTooltip="Inactive" matTooltipPosition="above"
        checked="false" [color]="color"
        (change)="isactiveUOM(row.uom_id,row.isactive)"
-       onclick="return confirm('Are you sure?')">
+       (click)="active()">
    </mat-slide-toggle></ng-template>
                 </mat-cell>
               </ng-container>
diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.ts b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.ts
index 5a93a0dce..e34ced40b 100644
--- a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.ts
@@ -20,7 +20,8 @@ import { UomDialogComponent } from '../uom-dialog/uom-dialog.component';
 /** Model */
 import { Uom } from '../../../model/uom';
 
-
+/**sweet alert */
+import Swal from 'sweetalert2';
 
 @Component({
   selector: 'app-uom-list',
@@ -155,10 +156,48 @@ export class UomListComponent implements OnInit {
                         this.getUOM();
                   }
                   else{
-                        alert("SomeThing Wents Wrong Try Again !");
+                    Swal("SomeThing Wents Wrong Try Again !");
                   }
       });
 }
+//Sweetalert2  for active and deactive
+active(){
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, activate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Activated!', 
+        'success'
+      )
+    }
+  }) 
+}
+deactive()
+{
+  Swal({
+    title: 'Are you sure?', 
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#3085d6',
+    cancelButtonColor: '#d33',
+    confirmButtonText: 'Yes, deactivate it!'
+  }).then((result) => {
+    if (result.value) {
+      Swal(
+        'Deactivated!', 
+        'success'
+      )
+    }
+  })
+}
+
+
 /** For Display Tables Pagination And Sorting */
 ngAfterViewInit() {
   this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/settings/masters/masters.component.html b/ng6-seed/src/app/settings/masters/masters.component.html
index d8d42e07b..c1825639c 100644
--- a/ng6-seed/src/app/settings/masters/masters.component.html
+++ b/ng6-seed/src/app/settings/masters/masters.component.html
@@ -7,7 +7,10 @@
                         <br>
                 <mat-form-field>
                                 <mat-select color="accent" placeholder="Select" #singleSelect required [formControl]="masterCtrl">
-                                  <ngx-mat-select-search [formControl]="masterFilterCtrl" ></ngx-mat-select-search>
+                                  <ngx-mat-select-search [formControl]="masterFilterCtrl"  
+                                                         [placeholderLabel]="'Find Masters...'" 
+                                                         [noEntriesFoundLabel]="'no matching found'">
+                                  </ngx-mat-select-search>
                                   <mat-option *ngFor="let master of filteredMasters | async" [value]="master.id">
                                     {{master.name}}
                                   </mat-option>
@@ -70,9 +73,10 @@
     <div *ngIf="masterCtrl.value =='master-18'">
                 <app-lender-hierarchy-list></app-lender-hierarchy-list>
     </div>
-    <!-- <div *ngIf="masterCtrl.value =='master-19'">
-                <app-company-list></app-company-list>
-    </div> -->
+    <div *ngIf="masterCtrl.value =='master-19'">
+                <!-- <app-company-list></app-company-list> -->
+                <app-company></app-company>
+    </div>
     <div *ngIf="masterCtrl.value =='master-20'">
         <app-question-category-list></app-question-category-list>
     </div>
diff --git a/ng6-seed/src/app/settings/masters/masters.component.ts b/ng6-seed/src/app/settings/masters/masters.component.ts
index 34529d22d..3c840fa23 100644
--- a/ng6-seed/src/app/settings/masters/masters.component.ts
+++ b/ng6-seed/src/app/settings/masters/masters.component.ts
@@ -3,7 +3,7 @@
 //import { startWith } from 'rxjs/operators';
 
 
-  import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+  import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild, Input } from '@angular/core';
   import { FormControl, FormGroup, FormBuilder } from '@angular/forms';
   import { ReplaySubject } from 'rxjs';
   import { MatSelect } from '@angular/material';
@@ -118,7 +118,7 @@ export class MastersComponent implements OnInit {
     {id: 'master-16',name: 'Customer Segment'},
     {id: 'master-17',name: 'Designation'},
     {id: 'master-18',name: 'Lender Hierarchy'},
-    // {id: 'master-19',name: 'Company Details'},
+    {id: 'master-19',name: 'Company Details'},
     {id: 'master-20',name: 'Question Category'},
     {id: 'master-21',name: 'PD Type'},
     {id: 'master-22',name: 'Approach to PD location'},
@@ -126,15 +126,13 @@ export class MastersComponent implements OnInit {
     {id: 'master-24',name: 'PD Notification'},
     // {id: 'master-25',name: 'PD Office Lender'},
     // {id: 'master-25',name: 'PD Team'},
-    
-    
   ];
 
   /** list of masters filtered by search keyword */
   public filteredMasters: ReplaySubject<Master[]> = new ReplaySubject<Master[]>(1);
-
   
   @ViewChild('singleSelect') singleSelect: MatSelect;
+ 
   
   /** Subject that emits when the component has been destroyed. */
   private _onDestroy = new Subject<void>();
@@ -151,10 +149,10 @@ export class MastersComponent implements OnInit {
     
     // listen for search field value changes
     this.masterFilterCtrl.valueChanges
-      .pipe(takeUntil(this._onDestroy))
-      .subscribe(() => {
-        this.filterMasters();
-      });
+        .pipe(takeUntil(this._onDestroy))
+        .subscribe(() => {
+          this.filterMasters();
+        });
     
   }
 
diff --git a/ng6-seed/src/app/settings/masters/masters.module.ts b/ng6-seed/src/app/settings/masters/masters.module.ts
index 3690e9add..5a37c89bf 100644
--- a/ng6-seed/src/app/settings/masters/masters.module.ts
+++ b/ng6-seed/src/app/settings/masters/masters.module.ts
@@ -82,6 +82,7 @@ import { CityDialogComponent } from './component/city/city-dialog/city-dialog.co
 import { RegionsDialogComponent } from './component/regions/regions-dialog/regions-dialog.component';
 import { QuestionCategoryDialogComponent } from './component/question-category/question-category-dialog/question-category-dialog.component';
 import { PdNotificationListComponent } from './component/pd-notification/pd-notification-list.component';
+import { CompanyComponent } from './component/company/company.component';
 //import { PdTeamListComponent } from './component/pd-team/pd-team-list/pd-team-list.component';
 
 
@@ -206,6 +207,7 @@ const customNotifierOptions: NotifierOptions = {
                  CustomerSegmentDialogComponent,
                  StatesDialogComponent,
                  CompanyDialogComponent,
+                 CompanyComponent,
                  CityDialogComponent,
                  RegionsDialogComponent,
                  QuestionCategoryDialogComponent,
diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html
index 42f4f724f..f3fc99660 100644
--- a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html
+++ b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html
@@ -28,7 +28,7 @@
                 <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
                     <mat-form-field fxFlex="0 1 auto" class="ml-xs">
                         <mat-select placeholder="City" required formControlName="fk_city" multiple>
-                            <mat-option  *ngFor="let cd of citydatas"  [value]="cd.city_id" (onSelectionChange)="onChangeCityDatas($event)" >{{ cd.name }} </mat-option>
+                            <mat-option  *ngFor="let cd of citydatas "  [value]="cd.city_id" (onSelectionChange)="onChangeCityDatas($event)" >{{ cd.name }} </mat-option>
                         </mat-select>
                         <mat-error *ngIf="submitted && f.fk_city.hasError('required')" class="mat-text-warn">You must Select Cities.</mat-error>
                     </mat-form-field>
@@ -78,7 +78,7 @@
 
                 <div class="row" style="text-align:right;">
                     <!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset"><mat-icon>settings_backup_restore</mat-icon></button> -->  
-                    <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"  matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>        
+                    <!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"  matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit($event)" ><mat-icon>settings_backup_restore</mat-icon></button>         -->
                     <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
                 </div>
         </mat-card>      
diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts
index a0cc5afa9..2463d5b52 100644
--- a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts
+++ b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts
@@ -162,9 +162,9 @@ export class PdTeamEditComponent implements OnInit {
   }
   
   /** To Reset Popup Data For Add*/
-  onResetForEdit(){
-    this.PdTeamFormDatas();
-  }
+  // onResetForEdit(){
+  //   this.PdTeamFormDatas();
+  // }
   
   /**on change function for customer segment to dispaly the as List in html page */
   onChangeCustomerSegmentDatas($event){
@@ -182,11 +182,12 @@ export class PdTeamEditComponent implements OnInit {
   
   /**on change function for City to display the as List in html page */
   onChangeCityDatas($event){
+  
       var mycheck = 0 ;
-      //let cityName = $event.source.value;
+  
       let cityName = this.citydatas.filter(city=>city.city_id == $event.source.value)[0];
       
-      if($event.source._selected === true ){
+      if($event.source._selected == true ){
         
         for(let Duplication_City of this.pdTeamCityArray){
           
@@ -199,7 +200,7 @@ export class PdTeamEditComponent implements OnInit {
                     if(data.name == cityName.name){
                       alert('"'+data.name+'" Already Existing with "'+ teamname +'"');
                       $event.source._selected = false;
-                      mycheck++;
+                      mycheck=1;
                     }
     
                 }
@@ -216,6 +217,7 @@ export class PdTeamEditComponent implements OnInit {
         this.selectedCityDatas.splice(index,1);
       }
   }
+  
 
   /**on change function for Product to display the data as List in html page */
   onChangeProductDatas($event){
@@ -241,7 +243,7 @@ export class PdTeamEditComponent implements OnInit {
   
   this._pdTeamService.editPdTeamDetail(pdTeamFormValues).subscribe(
     
-  dataresult=>{  
+  dataresult=>{
   if (dataresult.dataStatus == true){  
               alert("Data Edited Successfully");
               this.notifier.notify('success', 'Record Edited Successfully.!');
diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html
index e7598cf3c..67e0462a9 100644
--- a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html
+++ b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html
@@ -19,10 +19,14 @@
         </div>
         <div *ngIf="noRecordFound" class="nocontent ml-xs mr-xs" style="width: 90%;">No records found</div>  
         <div class="ml-xs mr-xs" style="width: 10%; text-align: right;">
+<<<<<<< HEAD
+            <button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color"  matTooltip="Add PD Team" matTooltipPosition="above" [routerLink]="['/setting/pdteam/addpdteam']" ><mat-icon>add</mat-icon></button>
+=======
           <button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="managepdteam()" matTooltip="Manage PD Team" matTooltipPosition="above"><mat-icon>people</mat-icon></button>
       </div> 
         <div class="ml-xs mr-xs" style="width: 10%; text-align: right;">
             <button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="addPdTeam()" matTooltip="Add PD Team" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
+>>>>>>> 3ad6314e0e602cb2c232acb142715009dca646f9
         </div>
     </div>
     
@@ -79,7 +83,7 @@
         </mat-row>
       </mat-table>
     
-      <mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
+      <mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
     </div>
 </mat-card-content>
 </mat-card>
diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts
index b9455fbaa..31a0d1a02 100644
--- a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts
+++ b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts
@@ -1,7 +1,7 @@
 import { Component, 
             OnInit, 
          ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
+
 import {   MatSort,
       MatPaginator, 
 MatTableDataSource } from '@angular/material';
@@ -29,6 +29,7 @@ export class PdTeamListComponent implements OnInit {
   loader: boolean = false;  
   PdTeamList: any = [];
   color = 'primary';
+  pageSize = 10;
   userData = null;
   noRecordFound: boolean = false;
   
@@ -44,7 +45,7 @@ export class PdTeamListComponent implements OnInit {
   @ViewChild(MatSort) sort: MatSort;
 
   constructor(notifier: NotifierService,
-              private router: Router,
+              
               private _MasterService: MastersService,
               private _PdTeamService: PdTeamService) {
                                 this.getPdTeam();
@@ -53,11 +54,6 @@ export class PdTeamListComponent implements OnInit {
 
   ngOnInit() { this.getPdTeam(); }
 
-  /** To add data */
-  addPdTeam() {
-    this.router.navigate(['/setting/pdteam/addpdteam']);
-  }
-
   /** To edit data */
   editPdTeam(detail){
   
@@ -102,6 +98,25 @@ managepdteam(){
     }
   })
 }
+
+  /** For Changing Active States., which means both Changing Active And Inactive alternatively */
+  isactivePdTeam(id: number,isactive : number) {
+    
+    let ActiveDatas = isactive == 0 
+                   ? { 'pdteam_id':id,'isactive': '1'}
+                   : { 'pdteam_id':id,'isactive': '0'}
+  
+    this._MasterService.editMasterDetails(ActiveDatas,'PDTEAM')
+        .subscribe(dataresult=>{       
+                  if (dataresult.dataStatus == true){  
+                        //alert("my check");
+                        this.getPdTeam();
+                  }
+                  else{
+                        alert("SomeThing Wents Wrong Try Again !");
+                  }
+      });
+}
  
   /** For Display Tables Pagination And Sorting */
   ngAfterViewInit() {
diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html
index d30fab3a0..6a07b4430 100644
--- a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html
+++ b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html
@@ -1,54 +1,53 @@
 <mat-card>
         
-<div style="margin: 6px; padding: 4px;">
-  <div class="p_title" style="font-size: 26px; font-style: bold;">Manage PD Team</div>
-  <!--<div class="sub_title" style="font-size: 11px;">List of Entity Master Details</div>-->
-<hr>
-</div>
-<div *ngIf="loader">
-        <mat-progress-bar mode="indeterminate" color="primary" class="mb-1"></mat-progress-bar>
-    
+    <div style="margin: 6px; padding: 4px;">
+      <div class="p_title" style="font-size: 26px; font-style: bold;">Manage PD Team</div>
+      <!--<div class="sub_title" style="font-size: 11px;">List of Entity Master Details</div>-->
+    <hr>
     </div>
-<div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutAlign="center none"  *ngIf="viewpage">
-  <div fxFlex="100%">
-      
-    <div fxLayout="row wrap">
-      <div fxFlex.gt-sm="30" fxFlex.gt-xs="30" fxFlex="50" *ngFor="let pdteamdetails of pdTeamManageData; let i = index;" >
-          <mat-card class="mb-1">
-              
+    <div *ngIf="loader">
+            <mat-progress-bar mode="indeterminate" color="primary" class="mb-1"></mat-progress-bar>
+        
+        </div>
+    <div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutAlign="center none"  *ngIf="viewpage">
+      <div fxFlex="100%">
+          
+        <div fxLayout="row wrap">
+          <div fxFlex.gt-sm="30" fxFlex.gt-xs="30" fxFlex="50" *ngFor="let pdteamdetails of pdTeamManageData; let i = index;" >
+              <mat-card class="mb-1">
                   
-              
-              <mat-card-title  style="margin-bottom:0px!important;" >{{pdteamdetails.team_name | titlecase}} <mat-icon (click)="cityinfo(pdteamdetails.pdteam_id)"style="margin-left:29px;;">info</mat-icon></mat-card-title>
-              
-              <br/>
-              <mat-card-subtitle >{{pdteamdetails.short_name}}</mat-card-subtitle>
-                
-              <hr>
-
-              <mat-list class='bag' [dragula]='"bag"' [dragulaModel]="pdteamdetails.USERPROFILE" [attr.data-id]="pdteamdetails.pdteam_id" >
+                  <mat-card-title  style="margin-bottom:0px!important;" ><span fxFlex="80">{{pdteamdetails.team_name | titlecase}}</span> <mat-icon (click)="cityinfo(pdteamdetails.pdteam_id)" color="primary" matTooltip="Click for more info" matTooltipPosition="above" fxFlex="16" style="text-align:right;">info</mat-icon></mat-card-title>
                   
-              
-                  <mat-list-item *ngFor="let users of pdteamdetails.USERPROFILE let i=index" [attr.data-id]="users.userid" [attr.data-index]="i">  
-                     <div #bag1 class="d-flex w-100 justify-content-between">
-                          {{ users.user_full_name |titlecase}}
-                
-                      <i class="fa fa-arrows-alt ml-1 mr-1"aria-hidden="true"></i></div></mat-list-item>
+                  <br/>
+                  <mat-card-subtitle >{{pdteamdetails.short_name}}</mat-card-subtitle>
                     
-                
-            </mat-list>
-          </mat-card>
+                  <hr>
+    
+                  <mat-list class='bag' [dragula]='"bag"' [dragulaModel]="pdteamdetails.USERPROFILE" [attr.data-id]="pdteamdetails.pdteam_id" >
+                      
+                  
+                      <mat-list-item *ngFor="let users of pdteamdetails.USERPROFILE let i=index" [attr.data-id]="users.userid" [attr.data-index]="i">  
+                         <div #bag1 class="d-flex w-100 justify-content-between">
+                              {{ users.user_full_name |titlecase}}
+                    
+                          <i class="fa fa-arrows-alt ml-1 mr-1"aria-hidden="true"></i></div></mat-list-item>
+                        
+                    
+                </mat-list>
+              </mat-card>
+              
+              
+          </div>
           
           
       </div>
-      
-      
-  </div>
-  <div style="width: 10%; text-align: right;">
-        <button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" color="primary" matTooltip="Submit" [disabled]="btnsave" (click)="getnewTeamDetails()" matTooltipPosition="above"><mat-icon>save</mat-icon></button>
-    </div> 
-  </div>
-</div>
-<div *ngIf="!viewpage"  style="text-align: center">
-    <span>{{pdTeamManageData}}</span>
-</div>
-</mat-card>
+      <div style="width: 100%; text-align: right;">
+            <button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" color="primary" matTooltip="Submit" [disabled]="btnsave" (click)="getnewTeamDetails()" matTooltipPosition="above"><mat-icon>save</mat-icon></button>
+        </div> 
+      </div>
+    </div>
+    <div *ngIf="!viewpage"  style="text-align: center">
+        <span>{{pdTeamManageData}}</span>
+    </div>
+    </mat-card>
+    
\ No newline at end of file
diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.scss b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.scss
index 38135d397..8d03eb286 100644
--- a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.scss
+++ b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.scss
@@ -22,3 +22,4 @@
     .tooltip:hover .tooltiptext {
         visibility: visible;
     }
+     
\ No newline at end of file
diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.ts
index 1f8368b2a..52aa91afe 100644
--- a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.ts
+++ b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.ts
@@ -111,7 +111,7 @@ export class PdTeamManageComponent implements OnInit {
     }
   }
   cityinfo(id) {
-   Swal("<h5 style='align-items:left !important';>CITY:<br/>"+this.pdTeamManageData[id].CITYMAP+'<br/>'+"PRODUCTS: "+this.pdTeamManageData[id].PRODUCTS+"<br/>"+"CS: "+this.pdTeamManageData[id].CUSTOMERSEGMENT+".. </h5 >");
+   Swal("<h5>CITY:<br/>"+this.pdTeamManageData[id].CITYMAP+'<br/>'+"PRODUCTS: <br/>"+this.pdTeamManageData[id].PRODUCTS+"<br/>"+"CS: "+this.pdTeamManageData[id].CUSTOMERSEGMENT+".. </h5 >");
    
   
     
diff --git a/ng6-seed/src/app/settings/service/masters/masters.service.ts b/ng6-seed/src/app/settings/service/masters/masters.service.ts
index 3015d8376..16a5ce73c 100644
--- a/ng6-seed/src/app/settings/service/masters/masters.service.ts
+++ b/ng6-seed/src/app/settings/service/masters/masters.service.ts
@@ -286,7 +286,7 @@ editPDAllocationType(Records: any,MasterName:string):  Observable<any> {
       // formData.append('logo',Records.logo);
       // formData.append('records',JSON.stringify(Records));
       
-      return this._http.post<any>(this.apiUrl+"saveCompany", ArrayData)
+      return this._http.post<any>(this.apiUrl+"saveMaster", ArrayData)
                  .pipe(
                         catchError(this.handleError('role', []))
                       )
diff --git a/ng6-seed/src/app/settings/service/masters/pd-team.service.ts b/ng6-seed/src/app/settings/service/masters/pd-team.service.ts
index 31f81afc4..f6b8c606e 100644
--- a/ng6-seed/src/app/settings/service/masters/pd-team.service.ts
+++ b/ng6-seed/src/app/settings/service/masters/pd-team.service.ts
@@ -64,7 +64,7 @@ return this._http.post<any>(this.apiUrl+"savePDTeam", ArrayData)
     Records.updatedon = currentdate;//to get Current date and Time for when the Record is updated
    
     var ArrayData = { "records": Records }
-   
+   console.log(ArrayData);
     return this._http.post(this.apiUrl+'savePDTeam',ArrayData)
     .pipe(
       catchError(this.handleError('role', []))
diff --git a/ng6-seed/src/index.html b/ng6-seed/src/index.html
index 5e6c787ef..ec6b2a986 100644
--- a/ng6-seed/src/index.html
+++ b/ng6-seed/src/index.html
@@ -124,6 +124,12 @@
         .mat-cell{
             font-size:1.2em !important;
         }
+      .swal2-header {
+        text-align:left !important;   
+        }
+        .swal2-title {
+            text-align:left !important;
+        }
     </style>
     <link rel="icon" type="image/x-icon" href="favicon.ico">
     <link rel="stylesheet" href="assets/wheather-icon/css/weather-icons.min.css" />