From 78060e6bf8938f4f2a877eb5471de197184f203a Mon Sep 17 00:00:00 2001
From: JUNG YI DAM <breeze@loafle.com>
Date: Fri, 22 Jul 2022 04:58:29 +0000
Subject: [PATCH] =?UTF-8?q?=EC=A0=84=EC=B2=B4=ED=8C=8C=ED=8A=B8=EB=84=88?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/mock-api/apps/member/partner/api.ts   |   4 +-
 src/app/mock-api/apps/member/partner/data.ts  |  38 +-
 .../components/all-list.component.html        | 384 ++++--------------
 .../partner/components/all-list.component.ts  |  12 +-
 .../admin/member/partner/models/partner.ts    |  13 +-
 5 files changed, 131 insertions(+), 320 deletions(-)

diff --git a/src/app/mock-api/apps/member/partner/api.ts b/src/app/mock-api/apps/member/partner/api.ts
index aec6a86..f957c34 100644
--- a/src/app/mock-api/apps/member/partner/api.ts
+++ b/src/app/mock-api/apps/member/partner/api.ts
@@ -33,7 +33,7 @@ export class MemberPartnerMockApi {
       .reply(({ request }) => {
         // Get available queries
         const search = request.params.get('search');
-        const sort = request.params.get('sort') || 'name';
+        const sort = request.params.get('sort') || 'signinId';
         const order = request.params.get('order') || 'asc';
         const page = parseInt(request.params.get('page') ?? '1', 10);
         const size = parseInt(request.params.get('size') ?? '10', 10);
@@ -42,7 +42,7 @@ export class MemberPartnerMockApi {
         let partners: any[] | null = cloneDeep(this._partners);
 
         // Sort the partners
-        if (sort === 'sku' || sort === 'name' || sort === 'active') {
+        if (sort === 'signinId' || sort === 'nickname' || sort === 'state') {
           partners.sort((a, b) => {
             const fieldA = a[sort].toString().toUpperCase();
             const fieldB = b[sort].toString().toUpperCase();
diff --git a/src/app/mock-api/apps/member/partner/data.ts b/src/app/mock-api/apps/member/partner/data.ts
index 66280ff..6ee949b 100644
--- a/src/app/mock-api/apps/member/partner/data.ts
+++ b/src/app/mock-api/apps/member/partner/data.ts
@@ -2,7 +2,8 @@
 
 export const partners = [
   {
-    id: 'kgon1',
+    id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+    signinId: 'kgon1',
     nickname: '본사',
     rank: '본사',
     branchCount: 2,
@@ -15,16 +16,43 @@ export const partners = [
     holdingMoney: 253675,
     accountHolder: '본사',
     phoneNumber: '010-0000-0000',
-    comp: 100737,
-    coupon: 1900000,
+    ownCash: 253675,
+    ownComp: 100737,
+    ownCoupon: 1900000,
     ownCharge: 460000,
     bottomCharge: 54020000,
     ownExchange: 100000,
     bottomExchange: 19970000,
     ownRevenue: 360000,
     bottomRevenue: 34050000,
-    accession: '2021-10-14 10:53',
+    registDate: '2021-10-14 10:53',
+    state: '정상',
+  },
+  {
+    id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+    signinId: 'test11',
+    nickname: '본사',
+    rank: '본사',
+    branchCount: 2,
+    divisionCount: 2,
+    officeCount: 1,
+    storeCount: 1,
+    memberCount: 5,
+    level: '1',
+    calculateType: '롤링',
+    holdingMoney: 253675,
+    accountHolder: '테스트',
+    phoneNumber: '010-1234-5678',
+    ownCash: 0,
+    ownComp: 6485,
+    ownCoupon: 0,
+    ownCharge: 0,
+    bottomCharge: 1000000,
+    ownExchange: 0,
+    bottomExchange: 0,
+    ownRevenue: 0,
+    bottomRevenue: 1000000,
+    registDate: '2022-04-22 18:55',
     state: '정상',
-    note: '대본등록',
   },
 ];
diff --git a/src/app/modules/admin/member/partner/components/all-list.component.html b/src/app/modules/admin/member/partner/components/all-list.component.html
index 258fa76..65c5198 100644
--- a/src/app/modules/admin/member/partner/components/all-list.component.html
+++ b/src/app/modules/admin/member/partner/components/all-list.component.html
@@ -13,56 +13,18 @@
     <div class="text-4xl font-extrabold tracking-tight">전체목록</div>
     <!-- Actions -->
     <div class="flex shrink-0 items-center mt-6 sm:mt-0 sm:ml-4">
-      <!-- Memo -->
-      <!-- <mat-form-field>
-        <ng-container *ngIf="partners$ | async as partners">
-          <ng-container
-            *ngFor="let partner of partners; trackBy: __trackByFn"
-          >
-            <div
-              class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
-            >
-              <fieldset>
-                총 회원수:{{ partenr.totalMemberCount }}
-                총 보유머니:{{ partner.totalHoldingMoney }}
-                총 콤프:{{ partner.totalComp }}
-                총 합계:{{ partner.total }}
-              </fieldset>
-            </div>
-          </ng-container>
-        </ng-container>
-      </mat-form-field> -->
-
       <!-- Search -->
-      <mat-form-field
-        class="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded min-w-64"
-      >
-        <mat-icon
-          class="icon-size-5"
-          matPrefix
-          [svgIcon]="'heroicons_solid:search'"
-        ></mat-icon>
-        <input
-          matInput
-          [formControl]="searchInputControl"
-          [autocomplete]="'off'"
-          [placeholder]="'Search user'"
-        />
-      </mat-form-field>
-      <!-- Add user button -->
-      <button
-        class="ml-4"
-        mat-flat-button
-        [color]="'primary'"
-        (click)="__createProduct()"
-      >
-        <mat-icon [svgIcon]="'heroicons_outline:plus'"></mat-icon>
-        <span class="ml-2 mr-1">Add</span>
-      </button>
+      <div>
+        <span>총회원수:<span style="color: red">38</span>명</span>&nbsp;&nbsp;
+        <span>총 보유머니:<span style="color: red">21,437,873</span>원</span
+        >&nbsp;&nbsp;
+        <span>총 콤프:<span style="color: red">394,860</span>원</span
+        >&nbsp;&nbsp;
+        <span>총 합계:<span style="color: blue">21,832,733</span>원</span>
+      </div>
     </div>
   </div>
 
-  <!-- Main -->
   <div class="flex flex-auto overflow-hidden">
     <!-- Products list -->
     <div
@@ -74,40 +36,34 @@
             <!-- Header -->
             <div
               class="inventory-grid z-10 sticky top-0 grid gap-4 py-4 px-6 md:px-8 shadow text-md font-semibold text-secondary bg-gray-50 dark:bg-black dark:bg-opacity-5"
-              matSort
-              matSortDisableClear
             >
-              <div></div>
-              <div class="hidden sm:block">아이디</div>
-              <div class="hidden sm:block">매장수</div>
-              <div class="hidden sm:block">관리</div>
-              <div class="hidden sm:block">요율</div>
-              <div class="hidden sm:block">예금주</div>
-              <div class="hidden sm:block">연락처</div>
-              <div class="hidden sm:block">등급</div>
-              <div class="hidden sm:block">정산</div>
-              <div class="hidden sm:block">보유금</div>
-              <div class="hidden sm:block">로그</div>
-              <div class="hidden sm:block">콤프</div>
-              <div class="hidden sm:block">쿠폰</div>
-              <div class="hidden sm:block">충전금</div>
-              <div class="hidden sm:block">환전금</div>
-              <div class="hidden sm:block">수익금</div>
-              <div class="hidden sm:block">가입날짜</div>
-              <div class="hidden sm:block">상태</div>
-              <div class="hidden sm:block">비고</div>
-              <!-- <div class="hidden md:block" [mat-sort-header]="'sku'">SKU</div>
-              <div [mat-sort-header]="'name'">Name</div>
-              <div class="hidden sm:block" [mat-sort-header]="'price'">
-                Price
+              <div>관리</div>
+              <div>요율</div>
+              <div>매장수</div>
+              <div>
+                아이디
+                <hr style="margin: 7px 0px" />
+                닉네임
+                <hr style="margin: 7px 0px" />
+                상태
               </div>
-              <div class="hidden lg:block" [mat-sort-header]="'stock'">
-                Stock
+              <div>
+                등급
+                <hr style="margin: 7px 0px" />
+                레벨
               </div>
-              <div class="hidden lg:block" [mat-sort-header]="'active'">
-                Active
+              <div class="hidden sm:block">
+                예금주
+                <hr style="margin: 7px 0px" />
+                연락처
               </div>
-              <div class="hidden sm:block">Details</div> -->
+              <div class="hidden md:block">정산종류</div>
+              <div class="hidden md:block">보유금</div>
+              <div class="hidden lg:block">충전금</div>
+              <div class="hidden lg:block">환전금</div>
+              <div class="hidden lg:block">수익금</div>
+              <div class="hidden lg:block">가입날짜</div>
+              <div class="hidden lg:block">비고</div>
             </div>
             <!-- Rows -->
             <ng-container *ngIf="partners$ | async as partners">
@@ -117,238 +73,68 @@
                 <div
                   class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
                 >
-                  <!-- id -->
-                  <ng-container *ngIf="users$ | async as users">
-                    <ng-container
-                      *ngFor="let user of users; trackBy: __trackByFn"
-                    >
-                      <!-- rank -->
-                      {{ partner.rank }}
-                      <div
-                        class="hidden sm:block truncate"
-                        (click)="viewUserDetail(user.id!)"
-                      >
-                        {{ partner.id }}
-                      </div>
-                      <!-- nickname -->
-                      {{ partner.nickname }}
-                    </ng-container>
-                  </ng-container>
-
-                  <!-- 매장수 -->
-                  <div class="hidden sm:block truncate">
-                    {{ partner.branchCount }}
-                    {{ partner.divisionCount }}
-                    {{ partner.officeCount }}
-                    {{ partner.storeCount }}
-                    {{ partner.memberCount }}
+                  <div>관리</div>
+                  <div>요율</div>
+                  <div>
+                    {{ partner.branchCount }}{{ partner.divisionCount
+                    }}{{ partner.officeCount }}{{ partner.storeCount
+                    }}{{ partner.memberCount }}
                   </div>
-                  <!-- management -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      <mat-form-field>
-                        <mat-select placeholder="관리">
-                          <mat-option value="">보유금지급/회수</mat-option>
-                          <mat-option value="">수수료설정</mat-option>
-                          <mat-option value="">콤프지급/회수</mat-option>
-                          <mat-option value="">쿠폰머니지급/회수</mat-option>
-                          <mat-option value="">쪽지보내기</mat-option>
-                          <mat-option value="">베팅리스트</mat-option>
-                          <mat-option value="">강제로그아웃</mat-option>
-                        </mat-select>
-                      </mat-form-field>
-                    </button>
-                  </div>
-                  <!-- rate -->
-                  <div class="hidden sm:block truncate">
-                    <button
-                      mat-button
-                      color="primary"
-                      matTooltip="요율확인
-                                카지노-바카라: 0%
-                                카지노-룰렛: 0%
-                                카지노-드레곤타이거: 0%
-                                카지노-그외: 0%
-                                슬롯: 0%
-                                카지노루징: 0%
-                                슬롯루징: 0%"
-                    >
-                      요율
-                    </button>
-
-                    <!-- accountHolder -->
-                    <div class="hidden sm:block truncate">
-                      {{ partner.accountHolder }}
-                    </div>
-
-                    <!-- contact -->
-                    <div class="hidden sm:block truncate">
-                      {{ partner.phoneNumber }}
-                    </div>
-
-                    <!-- level -->
-                    <div class="hidden sm:block truncate">
-                      LV.{{ partner.level }}
-                    </div>
-                  </div>
-
-                  <!-- calculateType -->
-                  <div class="hidden sm:block truncate">
-                    {{ partner.calculateType }}
-                  </div>
-
-                  <!-- reserve -->
-                  <div class="hidden sm:block truncate">
-                    콤프{{ partner.comp }} 쿠폰{{ partner.coupon }}
-                  </div>
-
-                  <!-- holdingMoney -->
-                  <div class="hidden sm:block truncate">
-                    {{ partner.holdingMoney }}
-                  </div>
-
-                  <!-- comp -->
-                  <div class="hidden sm:block truncate">
-                    {{ partner.comp }}P
-                  </div>
-
-                  <!-- coupon -->
-                  <div class="hidden sm:block truncate">
-                    {{ partner.coupon }}
-                  </div>
-
-                  <!-- charge -->
-                  <div class="hidden sm:block truncate">
-                    본인 {{ partner.ownCharge }} 하부
-                    {{ partner.bottomCharge }}
-                  </div>
-
-                  <!-- exchange -->
-                  <div class="hidden sm:block truncate">
-                    본인 {{ partner.ownExchange }} 하부
-                    {{ partner.bottomExchange }}
-                  </div>
-
-                  <!-- revenue -->
-                  <div class="hidden sm:block truncate">
-                    본인 {{ partner.ownRevenue }} 하부
-                    {{ partner.bottomRevenue }}
-                  </div>
-
-                  <!-- accession -->
-                  <div class="hidden sm:block truncate">
-                    가입날짜{{ partner.accession }}
-                  </div>
-
-                  <!-- state -->
-                  <div class="hidden sm:block truncate">
+                  <div>
+                    {{ partner.signinId }}
+                    <hr style="margin: 7px 0px" />
+                    {{ partner.nickname }}
+                    <hr style="margin: 7px 0px" />
                     {{ partner.state }}
                   </div>
-
-                  <!-- note -->
-                  <div class="hidden sm:block truncate">
+                  <div>
+                    {{ partner.rank }}
+                    <hr style="margin: 7px 0px" />
+                    LV{{ partner.level }}
+                  </div>
+                  <div class="hidden sm:block">
+                    {{ partner.accountHolder }}
+                    <hr style="margin: 7px 0px" />
+                    {{ partner.phoneNumber }}
+                  </div>
+                  <div class="hidden md:block">
+                    {{ partner.calculateType }}
+                  </div>
+                  <div class="hidden md:block">
+                    캐쉬{{ partner.ownCash }}
+                    <hr style="margin: 7px 0px" />
+                    콤프{{ partner.ownComp }}P
+                    <hr style="margin: 7px 0px" />
+                    쿠폰{{ partner.ownCoupon }}
+                  </div>
+                  <div class="hidden lg:block">
+                    본인{{ partner.ownCharge }}
+                    <hr style="margin: 7px 0px" />
+                    하부{{ partner.bottomCharge }}
+                  </div>
+                  <div class="hidden lg:block">
+                    본인{{ partner.ownExchange }}
+                    <hr style="margin: 7px 0px" />
+                    하부{{ partner.bottomExchange }}
+                  </div>
+                  <div class="hidden lg:block">
+                    본인{{ partner.ownRevenue }}
+                    <hr style="margin: 7px 0px" />
+                    하부{{ partner.bottomRevenue }}
+                  </div>
+                  <div class="hidden lg:block">
+                    {{ partner.registDate }}
+                  </div>
+                  <div class="hidden lg:block">
                     <button
                       mat-flat-button
+                      class="bet-mat-small-8"
                       [color]="'primary'"
                       (click)="__onClickRegist($event)"
                     >
-                      {{ partner.note }}
+                      대본등록
                     </button>
                   </div>
-                  <!-- Image -->
-                  <!-- <div class="flex items-center">
-                    <div
-                      class="relative flex flex-0 items-center justify-center w-12 h-12 mr-6 rounded overflow-hidden border"
-                    >
-                      <img
-                        class="w-8"
-                        *ngIf="user.thumbnail"
-                        [alt]="'Product thumbnail image'"
-                        [src]="user.thumbnail"
-                      />
-                      <div
-                        class="flex items-center justify-center w-full h-full text-xs font-semibold leading-none text-center uppercase"
-                        *ngIf="!user.thumbnail"
-                      >
-                        NO THUMB
-                      </div>
-                    </div>
-                  </div> -->
-
-                  <!-- SKU -->
-                  <!-- <div class="hidden md:block truncate">
-                    {{ user.sku }}
-                  </div> -->
-
-                  <!-- Name -->
-                  <!-- <div class="truncate">
-                    {{ user.name }}
-                  </div> -->
-
-                  <!-- Price -->
-                  <!-- <div class="hidden sm:block">
-                    {{ user.price | currency: "USD":"symbol":"1.2-2" }}
-                  </div> -->
-
-                  <!-- Stock -->
-                  <!-- <div class="hidden lg:flex items-center">
-                    <div class="min-w-4">{{ user.stock }}</div> -->
-                  <!-- Low stock -->
-                  <!-- <div
-                      class="flex items-end ml-2 w-1 h-4 bg-red-200 rounded overflow-hidden"
-                      *ngIf="user.stock < 20"
-                    >
-                      <div class="flex w-full h-1/3 bg-red-600"></div>
-                    </div> -->
-                  <!-- Medium stock -->
-                  <!-- <div
-                      class="flex items-end ml-2 w-1 h-4 bg-orange-200 rounded overflow-hidden"
-                      *ngIf="user.stock >= 20 && user.stock < 30"
-                    >
-                      <div class="flex w-full h-2/4 bg-orange-400"></div>
-                    </div> -->
-                  <!-- High stock -->
-                  <!-- <div
-                      class="flex items-end ml-2 w-1 h-4 bg-green-100 rounded overflow-hidden"
-                      *ngIf="user.stock >= 30"
-                    >
-                      <div class="flex w-full h-full bg-green-400"></div>
-                    </div>
-                  </div> -->
-
-                  <!-- Active -->
-                  <!-- <div class="hidden lg:block">
-                    <ng-container *ngIf="user.active">
-                      <mat-icon
-                        class="text-green-400 icon-size-5"
-                        [svgIcon]="'heroicons_solid:check'"
-                      ></mat-icon>
-                    </ng-container>
-                    <ng-container *ngIf="!user.active">
-                      <mat-icon
-                        class="text-gray-400 icon-size-5"
-                        [svgIcon]="'heroicons_solid:x'"
-                      ></mat-icon>
-                    </ng-container>
-                  </div> -->
-
-                  <!-- Details button -->
-                  <!-- <div>
-                    <button
-                      class="min-w-10 min-h-7 h-7 px-2 leading-6"
-                      mat-stroked-button
-                      (click)="__toggleDetails(user.id)"
-                    >
-                      <mat-icon
-                        class="icon-size-5"
-                        [svgIcon]="
-                          selectedUser?.id === user.id
-                            ? 'heroicons_solid:chevron-up'
-                            : 'heroicons_solid:chevron-down'
-                        "
-                      ></mat-icon>
-                    </button>
-                  </div> -->
                 </div>
               </ng-container>
             </ng-container>
@@ -370,7 +156,7 @@
         <div
           class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
         >
-          There are no partners!
+          There are no partner!
         </div>
       </ng-template>
     </div>
diff --git a/src/app/modules/admin/member/partner/components/all-list.component.ts b/src/app/modules/admin/member/partner/components/all-list.component.ts
index a7eff03..5dc9b39 100644
--- a/src/app/modules/admin/member/partner/components/all-list.component.ts
+++ b/src/app/modules/admin/member/partner/components/all-list.component.ts
@@ -44,18 +44,22 @@ import { MatDialog } from '@angular/material/dialog';
     /* language=SCSS */
     `
       .inventory-grid {
-        grid-template-columns: 60px auto 40px;
+        /*                     관리   요율  매장  아이디  등급 */
+        grid-template-columns: 40px 40px 100px auto 40px;
 
         @screen sm {
-          grid-template-columns: 60px auto 60px 72px;
+          /*                     관리   요율  매장  아이디  등급 예금주 */
+          grid-template-columns: 40px 40px 100px auto 40px 140px;
         }
 
         @screen md {
-          grid-template-columns: 60px 60px auto 112px 72px;
+          /*                     관리   요율  매장  아이디  등급  예금주 정산 보유금 */
+          grid-template-columns: 40px 40px 100px auto 40px 140px 20px 140px;
         }
 
         @screen lg {
-          grid-template-columns: 60px 60px auto 112px 96px 96px 72px;
+          /*                     관리   요율  매장  아이디  등급 예금주  정산  보유금 충전금  환전금 수익금 가입   비고 */
+          grid-template-columns: 40px 40px 100px auto 40px 140px 20px 140px 140px 140px 140px 140px 140px;
         }
       }
     `,
diff --git a/src/app/modules/admin/member/partner/models/partner.ts b/src/app/modules/admin/member/partner/models/partner.ts
index 0b776d2..cec5b3f 100644
--- a/src/app/modules/admin/member/partner/models/partner.ts
+++ b/src/app/modules/admin/member/partner/models/partner.ts
@@ -1,10 +1,8 @@
 import { NumberValueAccessor } from '@angular/forms';
 
 export interface Partner {
-  id?: string;
-  totalMemberCount?: number;
-  totalHoldingMoney?: number;
-  totalComp?: number;
+  id: string;
+  signinId?: string;
   nickname?: string;
   rank?: string;
   branchCount?: number;
@@ -17,8 +15,6 @@ export interface Partner {
   holdingMoney?: number;
   accountHolder?: string;
   phoneNumber?: string;
-  comp?: number;
-  coupon?: number;
   ownCharge?: number;
   ownCash?: number;
   ownComp?: number;
@@ -28,12 +24,8 @@ export interface Partner {
   bottomExchange?: number;
   ownRevenue?: number;
   bottomRevenue?: number;
-  accession?: string;
   state?: string;
-  note?: string;
   ip?: string;
-  totalPartnerCount?: number;
-  total?: number;
   gameMoney?: number;
   todayComp?: number;
   totalDeposit?: number;
@@ -41,4 +33,5 @@ export interface Partner {
   balance?: number;
   registDate?: string;
   finalSigninDate?: string;
+  note?: string;
 }