From da69b69dd0fe495ed0af8307f81437b7a7adef28 Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Fri, 14 Dec 2018 12:08:41 +0530
Subject: [PATCH] entity branch edit , delete changes : kdk

---
 .../entity-branch-add.component.html             | 16 +++++++++-------
 .../entity-branch-add.component.ts               |  9 ++++++---
 .../entity-edit/entity.edit.component.html       |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.html
index 4df9dc3d9..3042b3c1c 100644
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.html
@@ -5,13 +5,15 @@
 </form>
 <div *ngIf="listOfBranch.length > 0">
   <mat-list role="list" class="inlist">
-    <mat-list-item role="listitem" *ngFor="let branch of listOfBranch; let i = index;" class="list-item" [ngStyle]="{ 'border-color': i === currentElement ? '#f44336' : 'gray'}">
-      <label style="width: 80%" [hidden]="currentElement === i">{{branch.branch_name}}</label>
-      <input *ngIf="currentElement === i" matInput placeholder="Add Branch" [(ngModel)]="branch.branch_name">
-      <span (click)="editItem(i)" [hidden]="currentElement === i"><mat-icon>edit</mat-icon></span>
-      <span (click)="editItem(-1)" *ngIf="currentElement === i"><mat-icon>check</mat-icon></span>
-      <span (click)="deleteItem(i)"><mat-icon>delete</mat-icon></span>
-    </mat-list-item>
+    <ng-container *ngFor="let branch of listOfBranch; let i = index;">
+      <mat-list-item role="listitem" *ngIf="branch.isactive == 1" class="list-item" [ngStyle]="{ 'border-color': i === currentElement ? '#f44336' : 'gray'}">
+        <label style="width: 80%" [hidden]="currentElement === i">{{branch.branch_name}}</label>
+        <input *ngIf="currentElement === i" matInput placeholder="Add Branch" [(ngModel)]="branch.branch_name">
+        <span (click)="editItem(i)" [hidden]="currentElement === i"><mat-icon>edit</mat-icon></span>
+        <span (click)="editItem(-1)" *ngIf="currentElement === i"><mat-icon>check</mat-icon></span>
+        <span (click)="deleteItem(branch, i)"><mat-icon>delete</mat-icon></span>
+      </mat-list-item>
+    </ng-container>
   </mat-list>
 
   <div class="row" style="text-align:right;">
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts
index 23dc8426d..a6b927778 100644
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts
@@ -90,8 +90,12 @@ export class EntityBranchAddComponent implements OnInit {
     this.currentElement = i;
   }
 
-  deleteItem(i): void {
-    this.listOfBranch.splice(i, 1);
+  deleteItem(obj, i): void {
+    if (obj.entity_lender_branch_id !== null) {
+      obj.isactive = 0;
+    } else {
+      this.listOfBranch.splice(i, 1);
+    }
   }
 
   saveBranch(): void {
@@ -112,7 +116,6 @@ export class EntityBranchAddComponent implements OnInit {
   }
 }
 
-
 // "records": [
 // 		{
 // 			"entity_lender_branch_id": null,
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html
index 486a28bc6..90a324cf4 100755
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html
@@ -240,7 +240,7 @@
                     </app-entity-edit-tat>
                 </ng-template>
             </mat-tab>
-             <mat-tab label="Branch">
+             <mat-tab  *ngIf="localEntityType == 2" label="Branch">
                 <ng-template matTabContent>
                     <app-entity-branch-add [entityId]="entity_id">
                     </app-entity-branch-add>