From 80b91726024a57985953a5c1841d24dd34e9d299 Mon Sep 17 00:00:00 2001
From: Phet <rawkidz@hotmail.com>
Date: Fri, 20 Sep 2024 15:31:18 +0700
Subject: [PATCH] [hotfx] - adjust html

---
 .../kyc/presenter/list/list.component.html    |  2 ++
 .../kyc/presenter/list/list.component.ts      |  2 +-
 .../presenter/modal/modal.component.html      |  3 +-
 .../user-list/user-list.component.html        | 31 ++++++++++++++-----
 .../user-list/user-list.component.ts          |  1 +
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/app/pages/manage/kyc/presenter/list/list.component.html b/src/app/pages/manage/kyc/presenter/list/list.component.html
index 1bea7d4..b983063 100644
--- a/src/app/pages/manage/kyc/presenter/list/list.component.html
+++ b/src/app/pages/manage/kyc/presenter/list/list.component.html
@@ -29,6 +29,8 @@
           <td mat-cell *matCellDef="let item; let i = index;" width="100" class="tac">{{getIndex(i)}}</td>
         </ng-container>
 
+
+
         <ng-container matColumnDef="2">
           <th mat-header-cell *matHeaderCellDef class="tac">เลขบัตรประชาชน</th>
           <td mat-cell *matCellDef="let item" class="tac" style="min-width: 200px;">
diff --git a/src/app/pages/manage/kyc/presenter/list/list.component.ts b/src/app/pages/manage/kyc/presenter/list/list.component.ts
index d329e9a..2f66ccc 100644
--- a/src/app/pages/manage/kyc/presenter/list/list.component.ts
+++ b/src/app/pages/manage/kyc/presenter/list/list.component.ts
@@ -19,7 +19,7 @@ export class ListComponent extends BaseList implements OnChanges {
   name: string;
   filterCard: Subject<string> = new Subject<string>();
 
-  header = ['1', '2', '3', '4', '6', '8', '9', '10', 'create_date', 'register_no', '11', '12']
+  header = ['1', 'create_date', '2', '3', '4', '6', '8', '9', '10', 'register_no', '11', '12']
   constructor() {
     super()
     this.filterCard.pipe(
diff --git a/src/app/pages/manage/users/presenter/modal/modal.component.html b/src/app/pages/manage/users/presenter/modal/modal.component.html
index f019718..04925f1 100644
--- a/src/app/pages/manage/users/presenter/modal/modal.component.html
+++ b/src/app/pages/manage/users/presenter/modal/modal.component.html
@@ -69,8 +69,7 @@
           <div class="lg:flex lg:flex-col grid grid-cols-9 gap-2">
             <mat-label class="col-span-1 lg:text-left lg:self-auto text-right self-center mr-4"></mat-label>
             <button mat-raised-button class="btn btn-submit" (click)="save()">
-              <div> User เป็น
-                Merchant</div>
+              <div style="white-space: nowrap;"> User เป็น Merchant</div>
             </button>
           </div>
         </div>
diff --git a/src/app/pages/manage/users/presenter/user-list/user-list.component.html b/src/app/pages/manage/users/presenter/user-list/user-list.component.html
index cfc4a1a..2d276fe 100644
--- a/src/app/pages/manage/users/presenter/user-list/user-list.component.html
+++ b/src/app/pages/manage/users/presenter/user-list/user-list.component.html
@@ -21,37 +21,52 @@
   <div class="card-body">
     <div class="table-wrap">
       <table class="" mat-table [dataSource]="userList" matSort>
-        <tr mat-header-row *matHeaderRowDef="['1','2','3','4','6']"></tr>
-        <tr mat-row *matRowDef="let row; columns: ['1','2','3','4','6'];"></tr>
+        <tr mat-header-row *matHeaderRowDef="userListKey"></tr>
+        <tr mat-row *matRowDef="let row; columns: userListKey;"></tr>
 
         <ng-container matColumnDef="1">
           <th mat-header-cell *matHeaderCellDef class="tac">ลำดับ</th>
           <td mat-cell *matCellDef="let item; let i = index;" width="100" class="tac">{{getIndex(i)}}</td>
         </ng-container>
 
-        <ng-container matColumnDef="2">
+        <!-- <ng-container matColumnDef="personalCardId">
           <th mat-header-cell *matHeaderCellDef class="tac">เลขบัตรประชาชน</th>
           <td mat-cell *matCellDef="let item" class="tac" style="min-width: 200px;">
             {{item.personalCardId}}
           </td>
-        </ng-container>
+        </ng-container> -->
 
-        <ng-container matColumnDef="3">
+        <ng-container matColumnDef="fullName">
           <th mat-header-cell *matHeaderCellDef class="tac" width="200">ชื่อ นามสกุล</th>
           <td mat-cell *matCellDef="let item" class="tac whitespace-nowrap">{{item.fullName}}</td>
         </ng-container>
 
-        <ng-container matColumnDef="4">
+        <ng-container matColumnDef="userName">
           <th mat-header-cell *matHeaderCellDef class="tal" width="150">Username</th>
           <td mat-cell *matCellDef="let item" class="whitespace-nowrap">{{item.userName }}</td>
         </ng-container>
 
-        <ng-container matColumnDef="5">
+        <ng-container matColumnDef="email">
           <th mat-header-cell *matHeaderCellDef class="tac" width="100">Email</th>
           <td mat-cell *matCellDef="let item" class="tac">{{item.email}}</td>
         </ng-container>
 
-        <ng-container matColumnDef="6">
+        <ng-container matColumnDef="phoneNumber">
+          <th mat-header-cell *matHeaderCellDef class="tac" width="100">เบอร์โทรศัพท์</th>
+          <td mat-cell *matCellDef="let item" class="tac">{{item.phoneNumber}}</td>
+        </ng-container>
+
+        <ng-container matColumnDef="userType">
+          <th mat-header-cell *matHeaderCellDef class="tac" width="100">ประเภทผู้ใช้งาน</th>
+          <td mat-cell *matCellDef="let item" class="tac">{{item.userType}}</td>
+        </ng-container>
+
+        <ng-container matColumnDef="id">
+          <th mat-header-cell *matHeaderCellDef class="tac" width="100">Id</th>
+          <td mat-cell *matCellDef="let item" class="tac">{{item.id}}</td>
+        </ng-container>
+
+        <ng-container matColumnDef="action">
           <th mat-header-cell *matHeaderCellDef class="tac" width="150">More Detail</th>
           <td mat-cell *matCellDef="let item" class="tac">
             <div class="action flex justify-center">
diff --git a/src/app/pages/manage/users/presenter/user-list/user-list.component.ts b/src/app/pages/manage/users/presenter/user-list/user-list.component.ts
index 915d537..ab580a2 100644
--- a/src/app/pages/manage/users/presenter/user-list/user-list.component.ts
+++ b/src/app/pages/manage/users/presenter/user-list/user-list.component.ts
@@ -18,6 +18,7 @@ export class UserListComponent extends BaseList implements OnChanges {
   }
   name: string;
   filterCard: Subject<string> = new Subject<string>();
+  userListKey = ['1', 'fullName', 'userName', 'email', 'phoneNumber', 'userType', 'id', 'action']
   constructor() {
     super()
     this.filterCard.pipe(