From e27884a07a31d21e5b1cbe1fdfc0465aca96881c Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Wed, 20 Jul 2022 07:10:54 +0000 Subject: [PATCH] bug fix --- package-lock.json | 18 +-- package.json | 4 +- .../components/list.component.html | 117 +++++++++++++++++- .../components/list.component.ts | 24 +++- .../daily-partner/daily-partner.module.ts | 6 + 5 files changed, 157 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 74a15d9..59a7874 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@angular/core": "13.2.3", "@angular/forms": "13.2.3", "@angular/material": "13.2.3", - "@angular/material-moment-adapter": "13.2.3", + "@angular/material-moment-adapter": "^13.2.3", "@angular/platform-browser": "13.2.3", "@angular/platform-browser-dynamic": "13.2.3", "@angular/router": "13.2.3", @@ -25,7 +25,6 @@ "crypto-js": "3.3.0", "highlight.js": "11.4.0", "lodash-es": "4.17.21", - "moment": "2.29.1", "ng-apexcharts": "1.7.0", "ngx-markdown": "13.1.0", "ngx-quill": "16.1.2", @@ -69,6 +68,7 @@ "karma-jasmine": "4.0.1", "karma-jasmine-html-reporter": "1.7.0", "lodash": "4.17.21", + "moment": "^2.29.4", "postcss": "8.4.6", "tailwindcss": "3.0.23", "typescript": "4.5.5" @@ -10317,9 +10317,10 @@ } }, "node_modules/moment": { - "version": "2.29.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", - "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==", + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "dev": true, "engines": { "node": "*" } @@ -22479,9 +22480,10 @@ "dev": true }, "moment": { - "version": "2.29.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", - "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "dev": true }, "ms": { "version": "2.1.2", diff --git a/package.json b/package.json index 6ea5254..839c65c 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@angular/core": "13.2.3", "@angular/forms": "13.2.3", "@angular/material": "13.2.3", - "@angular/material-moment-adapter": "13.2.3", + "@angular/material-moment-adapter": "^13.2.3", "@angular/platform-browser": "13.2.3", "@angular/platform-browser-dynamic": "13.2.3", "@angular/router": "13.2.3", @@ -30,7 +30,6 @@ "crypto-js": "3.3.0", "highlight.js": "11.4.0", "lodash-es": "4.17.21", - "moment": "2.29.1", "ng-apexcharts": "1.7.0", "ngx-markdown": "13.1.0", "ngx-quill": "16.1.2", @@ -74,6 +73,7 @@ "karma-jasmine": "4.0.1", "karma-jasmine-html-reporter": "1.7.0", "lodash": "4.17.21", + "moment": "^2.29.4", "postcss": "8.4.6", "tailwindcss": "3.0.23", "typescript": "4.5.5" diff --git a/src/app/modules/admin/report/daily-partner/components/list.component.html b/src/app/modules/admin/report/daily-partner/components/list.component.html index a51a62f..42182b6 100644 --- a/src/app/modules/admin/report/daily-partner/components/list.component.html +++ b/src/app/modules/admin/report/daily-partner/components/list.component.html @@ -7,7 +7,122 @@ class="sm:col-span-6 flex flex-col flex-auto p-6 bg-card shadow rounded-2xl overflow-hidden" >
- 대본별 계좌 설정 + 파트너일일현황 +
+
+ + +
+ +
+ + + + {{ + roleSelect.value | titlecase + }} + + + +
{{ role.label }}
+
+
+
+
+
+ +
+ + + + + +
+ +
+ + + + + +
+ +
+
+ + + + +
+
+
diff --git a/src/app/modules/admin/report/daily-partner/components/list.component.ts b/src/app/modules/admin/report/daily-partner/components/list.component.ts index 5c40732..d1af010 100644 --- a/src/app/modules/admin/report/daily-partner/components/list.component.ts +++ b/src/app/modules/admin/report/daily-partner/components/list.component.ts @@ -101,6 +101,8 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { ]; private _unsubscribeAll: Subject = new Subject(); + roles: any[]; + /** * Constructor */ @@ -110,7 +112,27 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { private _formBuilder: FormBuilder, private _dailyPartnerService: DailyPartnerService, private router: Router - ) {} + ) { + this.roles = [ + { + label: '전체', + value: '전체', + }, + { + label: '파워볼', + value: '파워볼', + }, + { + label: '카지노', + value: '카지노', + }, + + { + label: '슬롯', + value: '슬롯', + }, + ]; + } // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks diff --git a/src/app/modules/admin/report/daily-partner/daily-partner.module.ts b/src/app/modules/admin/report/daily-partner/daily-partner.module.ts index 3db0ac6..8d3f800 100644 --- a/src/app/modules/admin/report/daily-partner/daily-partner.module.ts +++ b/src/app/modules/admin/report/daily-partner/daily-partner.module.ts @@ -16,6 +16,9 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatRadioModule } from '@angular/material/radio'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatTableModule } from '@angular/material/table'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatMomentDateModule } from '@angular/material-moment-adapter'; +import { MatDividerModule } from '@angular/material/divider'; import { TranslocoModule } from '@ngneat/transloco'; @@ -47,6 +50,9 @@ import { dailyPartnerRoutes } from './daily-partner.routing'; MatRadioModule, MatCheckboxModule, MatTableModule, + MatDatepickerModule, + MatDividerModule, + MatMomentDateModule, ], }) export class DailyPartnerModule {}