From 354e84dc863e25cccd57ef25d7e233bc2e4b82b1 Mon Sep 17 00:00:00 2001
From: JUNG YI DAM <breeze@loafle.com>
Date: Mon, 1 Aug 2022 11:05:00 +0000
Subject: [PATCH] =?UTF-8?q?=EC=BD=A4=ED=94=84=EC=82=AC=EC=9A=A9logs=20?=
 =?UTF-8?q?=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/report/comp-log/api.ts  |   4 +-
 src/app/mock-api/apps/report/comp-log/data.ts |  61 ++--
 .../comp-log/components/list.component.html   | 333 +++++-------------
 .../comp-log/components/list.component.ts     |  23 +-
 .../admin/report/comp-log/models/comp-log.ts  |  41 +--
 5 files changed, 155 insertions(+), 307 deletions(-)

diff --git a/src/app/mock-api/apps/report/comp-log/api.ts b/src/app/mock-api/apps/report/comp-log/api.ts
index 197cef5..c2068b7 100644
--- a/src/app/mock-api/apps/report/comp-log/api.ts
+++ b/src/app/mock-api/apps/report/comp-log/api.ts
@@ -33,7 +33,7 @@ export class ReportCompLogMockApi {
       .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 ReportCompLogMockApi {
         let compLogs: any[] | null = cloneDeep(this._compLogs);
 
         // Sort the compLogs
-        if (sort === 'sku' || sort === 'name' || sort === 'active') {
+        if (sort === 'signinId' || sort === 'nickname' || sort === 'type') {
           compLogs.sort((a, b) => {
             const fieldA = a[sort].toString().toUpperCase();
             const fieldB = b[sort].toString().toUpperCase();
diff --git a/src/app/mock-api/apps/report/comp-log/data.ts b/src/app/mock-api/apps/report/comp-log/data.ts
index f927297..10d2325 100644
--- a/src/app/mock-api/apps/report/comp-log/data.ts
+++ b/src/app/mock-api/apps/report/comp-log/data.ts
@@ -2,32 +2,39 @@
 
 export const compLogs = [
   {
-    id: 'on00',
-    totalPartnerCount: '5',
-    totalHoldingMoney: 303675,
-    totalComp: 108933,
-    total: 412608,
-    branchCount: 1,
-    divisionCount: 1,
-    officeCount: 1,
-    storeCount: 1,
-    memberCount: 1,
-    nickname: 'on00',
-    accountHolder: '11',
-    phoneNumber: '010-1111-1111',
-    calculateType: '롤링',
-    ownCash: 50000,
-    ownComp: 1711,
-    ownCoupon: 50000,
-    gameMoney: 0,
-    todayComp: 0,
-    totalDeposit: 0,
-    totalWithdraw: 0,
-    balance: 0,
-    registDate: '2022-06-12 15:38',
-    finalSigninDate: '',
-    ip: '',
-    state: '정상',
-    note: '',
+    id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+    idx: 17183,
+    rank: '매장',
+    signinId: 'kgon5',
+    nickname: '매장',
+    rate: 1.5,
+    bettingMoney: 800,
+    beforeComp: 28418.37,
+    changeComp: 12.0,
+    afterComp: 28430.37,
+    type: '적립',
+    compContents: '슬롯콤프',
+    registrationDate: '2022-06-20 11:43:37',
+    memo: '',
+    bettingId: 'test1111',
+    bettingNumber: 5970,
+  },
+  {
+    id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+    idx: 17182,
+    rank: '총판',
+    signinId: 'kgon4',
+    nickname: '총판',
+    rate: 0.3,
+    bettingMoney: 800,
+    beforeComp: 32925.03,
+    changeComp: 2.4,
+    afterComp: 32927.43,
+    type: '적립',
+    compContents: '슬롯콤프',
+    registrationDate: '2022-06-20 11:43:37',
+    memo: '',
+    bettingId: 'test1111',
+    bettingNumber: 5970,
   },
 ];
diff --git a/src/app/modules/admin/report/comp-log/components/list.component.html b/src/app/modules/admin/report/comp-log/components/list.component.html
index 28dcac1..e58806d 100644
--- a/src/app/modules/admin/report/comp-log/components/list.component.html
+++ b/src/app/modules/admin/report/comp-log/components/list.component.html
@@ -10,113 +10,50 @@
       <mat-progress-bar [mode]="'indeterminate'"></mat-progress-bar>
     </div>
     <!-- Title -->
-    <div class="text-4xl font-extrabold tracking-tight">콤프 사용 Logs</div>
+    <div class="text-4xl font-extrabold tracking-tight">콤프사용Logs</div>
     <!-- Actions -->
     <div class="flex shrink-0 items-center mt-6 sm:mt-0 sm:ml-4">
-      <!-- Memo -->
-      <!-- <mat-form-field>
-        <ng-container *ngIf="compLogs$ | async as compLogs">
-          <ng-container
-            *ngFor="let compLog of compLogs; trackBy: __trackByFn"
-          >
-            <div
-              class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
-            >
-              <fieldset>
-                총 파트너수:{{ compLog.totalPartnerCount }} 총 보유머니:{{
-                  compLog.totalHoldingcomp
-                }}
-                총 콤프:{{ compLog.totalComp }} 총 합계:{{
-                  compLog.total
-                }}
-              </fieldset>
-            </div>
-          </ng-container>
-        </ng-container>
-      </mat-form-field> -->
-
+      <!-- Search -->
+      <div>
+        <span>콤프합계:<span style="color: red">7,600</span>콤프</span
+        >&nbsp;&nbsp;
+      </div>
+      <button mat-icon-button (click)="__onClickSearch()">
+        <mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
+      </button>
+    </div>
+  </div>
+  <!-- Search -->
+  <div
+    *ngIf="__isSearchOpened"
+    class="relative flex flex-col sm:flex-row flex-0 sm:items-center sm:justify-between py-4 px-6 md:px-8 border-b"
+  >
+    <!-- Actions -->
+    <div fxLayout="row wrap" class="items-center mt-6 sm:mt-0 sm:ml-0">
       <!-- SelectBox -->
-      <mat-form-field>
-        <mat-select placeholder="리스트수">
-          <mat-option value="40">40</mat-option>
-          <mat-option value="60">60</mat-option>
-          <mat-option value="80">80</mat-option>
-          <mat-option value="100">100</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="레벨">
-          <mat-option value="level1">LV.1</mat-option>
-          <mat-option value="level2">LV.2</mat-option>
-          <mat-option value="level3">LV.3</mat-option>
-          <mat-option value="level4">LV.4</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <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-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="제한">
-          <mat-option value="">카지노제한</mat-option>
-          <mat-option value="">슬롯제한</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="입금">
-          <mat-option value="">계좌입금</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
+      <mat-form-field fxFlex class="bet-mat-form-field-wrapper-mb-0 mr-2">
         <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-select>
       </mat-form-field>
-      <!-- <mat-form-field>
-        <mat-select placeholder="입금">
-          <mat-option value="">계좌입금</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="아이디">
+      <mat-form-field fxFlex class="bet-mat-form-field-wrapper-mb-0 mr-2">
+        <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-option value="">관리자회수</mat-option>
         </mat-select>
       </mat-form-field>
-      <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-option value="">출금 정렬</mat-option>
-          <mat-option value="">차익 정렬</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="내림차순">
-          <mat-option value="">내림차순</mat-option>
-          <mat-option value="">오름차순</mat-option>
-        </mat-select>
-      </mat-form-field> -->
       <!-- Search -->
       <mat-form-field
-        class="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded min-w-64"
+        fxFlex
+        class="fuse-mat-rounded min-w-64 bet-mat-form-field-wrapper-mb-0 mr-2"
       >
         <mat-icon
           class="icon-size-5"
@@ -127,24 +64,27 @@
           matInput
           [formControl]="searchInputControl"
           [autocomplete]="'off'"
-          [placeholder]="'Search'"
+          [placeholder]="'Search user'"
         />
       </mat-form-field>
       <!-- Add user button -->
       <button
-        class="ml-4"
+        fxFlex
         mat-flat-button
+        style="position: fixed; margin-top: 4px"
         [color]="'primary'"
         (click)="__createProduct()"
       >
-        <!-- <mat-icon [svgIcon]="'heroicons_outline:plus'"></mat-icon> -->
-        <span class="ml-2 mr-1">검색하기</span>
+        <mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
+        <span class="ml-2 mr-1">Search</span>
       </button>
-      <button>엑셀저장</button>
-      <button>카지노머니확인</button>
+      <div>
+        <button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
+          관리자지급/회수
+        </button>
+      </div>
     </div>
   </div>
-
   <!-- Main -->
   <div class="flex flex-auto overflow-hidden">
     <!-- Products list -->
@@ -157,29 +97,29 @@
             <!-- 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 class="hidden sm:block"><mat-checkbox></mat-checkbox></div>
+              <div>번호</div>
+              <div>
+                아이디
+                <hr style="margin: 7px 0px" />
+                닉네임
+              </div>
+              <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 sm:block">비고</div>
+              <div>배팅금액</div>
+              <div>
+                이전콤프
+                <hr style="margin: 7px 0px" />
+                변동콤프
+                <hr style="margin: 7px 0px" />
+                이후콤프
+              </div>
+              <div>타입</div>
+              <div class="hidden md:block">내용</div>
+              <div class="hidden md:block">등록일시</div>
+              <div class="hidden md:block">메모</div>
+              <div class="hidden lg:block">배팅ID</div>
+              <div class="hidden lg:block">배팅번호</div>
             </div>
             <!-- Rows -->
             <ng-container *ngIf="compLogs$ | async as compLogs">
@@ -189,142 +129,41 @@
                 <div
                   class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
                 >
-                  <div class="hidden sm:block truncate">
-                    <mat-checkbox></mat-checkbox>
+                  <div>
+                    {{ compLog.idx }}
                   </div>
-                  <!-- rate -->
-                  <div class="hidden sm:block truncate">
-                    <button
-                      mat-button
-                      color="primary"
-                      matTooltip="요율확인
-                                카지노-바카라: 0%
-                                카지노-룰렛: 0%
-                                카지노-드레곤타이거: 0%
-                                카지노-그외: 0%
-                                슬롯: 0%
-                                카지노루징: 0%
-                                슬롯루징: 0%"
-                    >
-                      요율
-                    </button>
-                    <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>
-                  </div>
-                  <!-- 매장수 -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      {{ compLog.branchCount }}
-                    </button>
-                    <button mat-flat-button [color]="'primary'">
-                      {{ compLog.divisionCount }}
-                    </button>
-                    <button mat-flat-button [color]="'primary'">
-                      {{ compLog.officeCount }}
-                    </button>
-                    <button mat-flat-button [color]="'primary'">
-                      {{ compLog.storeCount }}
-                    </button>
-                  </div>
-                  <!-- 회원수 -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      {{ compLog.memberCount }}
-                    </button>
-                  </div>
-                  <!-- id -->
-                  <ng-container *ngIf="users$ | async as users">
-                    <ng-container
-                      *ngFor="let user of users; trackBy: __trackByFn"
-                    >
-                      <div
-                        class="hidden sm:block truncate"
-                        (click)="viewUserDetail(user.id!)"
-                      >
-                        {{ compLog.id }}
-                      </div>
-                    </ng-container>
-                  </ng-container>
-                  <!-- nickname -->
-                  <div class="hidden sm:block truncate">
+                  <div>
+                    {{ compLog.signinId }}
+                    <hr style="margin: 7px 0px" />
                     {{ compLog.nickname }}
                   </div>
-                  <!-- accountHolder -->
-                  <div class="hidden sm:block truncate">
-                    {{ compLog.accountHolder }}
+                  <div>
+                    {{ compLog.rank }}
                   </div>
-                  <!-- 연락처 -->
-                  <div class="hidden sm:block truncate">
-                    {{ compLog.phoneNumber }}
+                  <div class="hidden sm:block">{{ compLog.rate }}%</div>
+                  <div>{{ compLog.bettingMoney }}원</div>
+                  <div>
+                    {{ compLog.beforeComp }}P
+                    <hr style="margin: 7px 0px" />
+                    {{ compLog.changeComp }}P
+                    <hr style="margin: 7px 0px" />
+                    {{ compLog.afterComp }}P
                   </div>
-                  <!-- 정산 -->
-                  <div class="hidden sm:block truncate">
-                    {{ compLog.calculateType }}
+                  <div>{{ compLog.type }}</div>
+                  <div class="hidden md:block">
+                    {{ compLog.compContents }}
                   </div>
-                  <!-- 보유금 -->
-                  <div class="hidden sm:block truncate">
-                    캐쉬{{ compLog.ownCash }} 콤프{{ compLog.ownComp }} 쿠폰{{
-                      compLog.ownCoupon
-                    }}
+                  <div class="hidden md:block">
+                    {{ compLog.registrationDate }}
                   </div>
-                  <!-- gamecomp -->
-                  <div class="hidden sm:block truncate">
-                    {{ compLog.gameMoney }}
+                  <div class="hidden md:block">
+                    {{ compLog.memo }}
                   </div>
-                  <!-- casinoCash -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      게임머니확인
-                    </button>
-                    <button mat-flat-button [color]="'primary'">
-                      게임머니회수
-                    </button>
+                  <div class="hidden lg:block">
+                    {{ compLog.bettingId }}
                   </div>
-                  <!-- todayComp -->
-                  <div class="hidden sm:block truncate">
-                    {{ compLog.todayComp }}P
-                  </div>
-                  <!-- 총입출 -->
-                  <div class="hidden sm:block truncate">
-                    입금{{ compLog.totalDeposit }} 출금{{
-                      compLog.totalWithdraw
-                    }}
-                    차익{{ compLog.balance }}
-                  </div>
-                  <!-- log -->
-                  <div class="hidden sm:block truncate">
-                    가입{{ compLog.registDate }} 최종{{
-                      compLog.finalSigninDate
-                    }}
-                    IP{{ compLog.ip }}
-                  </div>
-                  <!-- state -->
-                  <div class="hidden sm:block truncate">
-                    {{ compLog.state }}
-                  </div>
-                  <!-- 회원수 -->
-                  <div class="hidden sm:block truncate">
-                    {{ compLog.memberCount }}
-                  </div>
-                  <!-- 비고 -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      {{ compLog.note }}
-                    </button>
+                  <div class="hidden lg:block">
+                    {{ compLog.bettingNumber }}
                   </div>
                 </div>
               </ng-container>
@@ -347,7 +186,7 @@
         <div
           class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
         >
-          There are no compLogs!
+          There are no data!
         </div>
       </ng-template>
     </div>
diff --git a/src/app/modules/admin/report/comp-log/components/list.component.ts b/src/app/modules/admin/report/comp-log/components/list.component.ts
index a6c187c..972f3ac 100644
--- a/src/app/modules/admin/report/comp-log/components/list.component.ts
+++ b/src/app/modules/admin/report/comp-log/components/list.component.ts
@@ -42,18 +42,22 @@ import { Router } from '@angular/router';
     /* language=SCSS */
     `
       .inventory-grid {
-        grid-template-columns: 60px auto 40px;
+        /*                     번호  아이디 등급 요율 배팅금액 콤프 */
+        grid-template-columns: 60px 60px 60px 60px 60px auto;
 
         @screen sm {
-          grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px;
+          /*                     번호  아이디 등급 요율 배팅금액 콤프 타입  내용  등록일*/
+          grid-template-columns: 60px 60px 60px 60px 60px auto 60px 60px 60px;
         }
 
         @screen md {
-          grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px;
+          /*                     번호  아이디 등급 요율 배팅금액 콤프 타입  내용 등록일  메모 */
+          grid-template-columns: 60px 60px 60px 60px 60px auto 60px 60px 60px 60px;
         }
 
         @screen lg {
-          grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px;
+          /*                     번호  아이디 등급 요율 배팅금액 콤프 타입  내용 등록일  메모 배팅ID 배팅번호 */
+          grid-template-columns: 60px 60px 60px 60px 60px auto 60px 60px 60px 60px 60px 60px;
         }
       }
     `,
@@ -69,6 +73,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
   compLogs$!: Observable<CompLog[] | undefined>;
   users$!: Observable<User[] | undefined>;
 
+  __isSearchOpened = false;
   isLoading = false;
   searchInputControl = new FormControl();
   selectedCompLog?: CompLog;
@@ -117,7 +122,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
     if (this._sort && this._paginator) {
       // Set the initial sort
       this._sort.sort({
-        id: 'name',
+        id: 'signinId',
         start: 'asc',
         disableClear: true,
       });
@@ -186,6 +191,14 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
    */
   __toggleDetails(productId: string): void {}
 
+  /**
+   * toggle the search
+   * Used in 'bar'
+   */
+  __onClickSearch(): void {
+    this.__isSearchOpened = !this.__isSearchOpened;
+  }
+
   /**
    * Track by function for ngFor loops
    *
diff --git a/src/app/modules/admin/report/comp-log/models/comp-log.ts b/src/app/modules/admin/report/comp-log/models/comp-log.ts
index 4e1e7c4..82b3d41 100644
--- a/src/app/modules/admin/report/comp-log/models/comp-log.ts
+++ b/src/app/modules/admin/report/comp-log/models/comp-log.ts
@@ -1,29 +1,18 @@
 export interface CompLog {
-  id?: string;
-  totalPartnerCount?: number;
-  totalHoldingMoney?: number;
-  totalComp?: number;
-  total?: number;
-  branchCount?: number;
-  divisionCount?: number;
-  officeCount?: number;
-  storeCount?: number;
-  memberCount?: number;
+  id: string;
+  idx?: number;
+  rank?: string;
+  signinId?: string;
   nickname?: string;
-  accountHolder?: string;
-  phoneNumber?: string;
-  calculateType?: string;
-  ownCash?: number;
-  ownComp?: number;
-  ownCoupon?: number;
-  gameMoney?: number;
-  todayComp?: number;
-  totalDeposit?: number;
-  totalWithdraw?: number;
-  balance?: number;
-  registDate?: string;
-  finalSigninDate?: string;
-  ip?: string;
-  state?: string;
-  note?: string;
+  rate?: number; //  요율
+  bettingMoney?: number;
+  beforeComp?: number; //  이전콤프
+  changeComp?: number; //  변동콤프
+  afterComp?: number; //  이후콤프
+  type?: string;
+  compContents?: string; //  내용
+  registrationDate?: Date; //  등록일시
+  memo?: string;
+  bettingId?: string; //  배팅ID
+  bettingNumber?: number; //  배팅번호
 }