From 90277b9b083f901d04cc9f7ed072d80682b07ca4 Mon Sep 17 00:00:00 2001 From: PARK BYUNG JUN Date: Thu, 11 Aug 2022 05:35:25 +0000 Subject: [PATCH 01/10] member list is added --- .../member/partner/components/list.component.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/app/modules/admin/member/partner/components/list.component.ts b/src/app/modules/admin/member/partner/components/list.component.ts index a828fd2..be40978 100644 --- a/src/app/modules/admin/member/partner/components/list.component.ts +++ b/src/app/modules/admin/member/partner/components/list.component.ts @@ -39,6 +39,10 @@ import { MatDialog } from '@angular/material/dialog'; import { SiteService } from 'app/modules/polyglot/domain/services/site.service'; import { Site } from 'app/modules/protobuf/models/domain/site_pb'; import { MembeerService } from 'app/modules/polyglot/member/services/member.service'; +import { + Member, + MemberModel, +} from 'app/modules/protobuf/models/member/member_pb'; @Component({ selector: 'partner-list', templateUrl: './list.component.html', @@ -84,6 +88,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { selectedPartner?: Partner; pagination?: PartnerPagination; sites!: Site[]; + __members: MemberModel[] = []; private _unsubscribeAll: Subject = new Subject(); @@ -129,6 +134,14 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { this.sites = result.getSitesList(); }) .catch((reson) => console.log(reson)); + + this.__memberService + .listMembers() + .then((result) => { + this.__members = result.getMembersList(); + console.log('member list', this.__members); + }) + .catch((reson) => console.log(reson)); } /** From 0e07f16204eaec6ba5160e95fe4a682c5264b1cb Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Thu, 11 Aug 2022 07:01:53 +0000 Subject: [PATCH 02/10] =?UTF-8?q?=ED=8C=8C=ED=8A=B8=EB=84=88=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partner/components/list.component.html | 57 ++++++++----------- .../partner/components/list.component.ts | 28 ++++++--- .../admin/member/partner/partner.routing.ts | 7 ++- .../partner/resolvers/partner.resolver.ts | 32 +++++++++++ .../modules/polyglot/member/services/index.ts | 4 +- .../member/services/member.service.ts | 2 +- 6 files changed, 86 insertions(+), 44 deletions(-) diff --git a/src/app/modules/admin/member/partner/components/list.component.html b/src/app/modules/admin/member/partner/components/list.component.html index d4e86c4..cdf7201 100644 --- a/src/app/modules/admin/member/partner/components/list.component.html +++ b/src/app/modules/admin/member/partner/components/list.component.html @@ -30,8 +30,8 @@
- - + +
- +
요율

-
- {{ partner.branchCount }}{{ partner.divisionCount }} - {{ partner.officeCount }}{{ partner.storeCount - }}{{ partner.memberCount }} -
+
2 3 2 1 5
- + - +