Merge branch 'feature/BETERAN-BACKEND-APP-BROWSER-init' of https://gitlab.loafle.net/bet/beteran-backend-app-browser into feature/BETERAN-BACKEND-APP-BROWSER-init

This commit is contained in:
Park Byung Eun 2022-08-12 07:59:30 +00:00
commit 8b65a73c71
8 changed files with 201 additions and 4 deletions

View File

@ -90,7 +90,9 @@
관리 관리
</div> </div>
<mat-menu #menu="matMenu"> <mat-menu #menu="matMenu">
<button mat-menu-item>보유금지급/회수</button> <button mat-menu-item (click)="__onClickCash($event)">
보유금지급/회수
</button>
<button mat-menu-item>수수료설정</button> <button mat-menu-item>수수료설정</button>
<button mat-menu-item>콤프지급/회수</button> <button mat-menu-item>콤프지급/회수</button>
<button mat-menu-item>쿠폰머니지급/회수</button> <button mat-menu-item>쿠폰머니지급/회수</button>

View File

@ -33,6 +33,7 @@ import { PartnerPagination } from '../models/partner-pagination';
import { PartnerService } from '../services/partner.service'; import { PartnerService } from '../services/partner.service';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { RegistComposeComponent } from '../compose/regist-compose.component'; import { RegistComposeComponent } from '../compose/regist-compose.component';
import { CashComposeComponent } from '../compose/cash-compose.component';
import { MatDialog } from '@angular/material/dialog'; import { MatDialog } from '@angular/material/dialog';
import { SiteService } from 'app/modules/polyglot/domain/services/site.service'; import { SiteService } from 'app/modules/polyglot/domain/services/site.service';
@ -246,6 +247,15 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
console.log('Compose dialog was closed!'); console.log('Compose dialog was closed!');
}); });
} }
__onClickCash(event: MouseEvent): void {
const dialogRef = this._matDialog.open(CashComposeComponent, {
data: { price: '', memo: '' },
});
dialogRef.afterClosed().subscribe((result) => {
console.log('Compose dialog was closed!');
});
}
__getRateTooltop(): string { __getRateTooltop(): string {
const tempRate = 0; const tempRate = 0;

View File

@ -0,0 +1,88 @@
<div class="flex flex-col max-w-240 md:min-w-160 max-h-screen -m-6">
<!-- Header -->
<div
class="flex flex-0 items-center justify-between h-16 pr-3 sm:pr-5 pl-6 sm:pl-8 bg-primary text-on-primary"
>
<div class="text-lg font-medium">캐쉬 충환전</div>
<button mat-icon-button (click)="saveAndClose()" [tabIndex]="-1">
<mat-icon
class="text-current"
[svgIcon]="'heroicons_outline:x'"
></mat-icon>
</button>
</div>
<!-- Compose form -->
<form
class="flex flex-col flex-auto p-6 sm:p-8 overflow-y-auto"
[formGroup]="composeForm"
>
<div>
<span class="font-semibold mb-2">캐쉬구분</span>
<mat-radio-group
class="flex flex-col w-1/3 pr-2"
[color]="'primary'"
[value]="'cash'"
>
<mat-radio-button class="mb-2" [value]="'cash'">
캐쉬
</mat-radio-button>
</mat-radio-group>
</div>
<div>
<span class="font-semibold mb-2">추가/삭제</span>
<mat-radio-group
class="flex flex-col w-1/3 pr-2"
[color]="'primary'"
[value]="'give'"
>
<mat-radio-button class="mb-2" [value]="'give'">
지급
</mat-radio-button>
<mat-radio-button class="mb-2" [value]="'take'">
회수
</mat-radio-button>
</mat-radio-group>
</div>
<!-- To -->
<mat-form-field>
<mat-label>입력금액</mat-label>
<input matInput [formControlName]="'price'" />
</mat-form-field>
<!-- <div *ngFor="let f of sites">{{ f.getUrl() }}</div> -->
<!-- Cc -->
<mat-form-field>
<mat-label>메모</mat-label>
<input matInput [formControlName]="'memo'" />
</mat-form-field>
<!-- Body -->
<!-- <quill-editor
class="mt-2"
[formControlName]="'body'"
[modules]="quillModules"
></quill-editor> -->
<!-- Actions -->
<div
class="flex flex-col sm:flex-row sm:items-center justify-between mt-4 sm:mt-6"
>
<div class="flex items-center mt-4 sm:mt-0">
<!-- Send -->
<button
class="order-first sm:order-last"
mat-flat-button
[color]="'primary'"
(click)="send()"
>
캐쉬충환전
</button>
<!-- Save as draft -->
<button class="sm:mx-3" mat-stroked-button (click)="saveAsDraft()">
<span>닫기</span>
</button>
</div>
</div>
</form>
</div>

View File

@ -0,0 +1,94 @@
import {
ChangeDetectorRef,
Component,
Inject,
OnInit,
ViewEncapsulation,
} from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { SiteService } from 'app/modules/polyglot/domain/services/site.service';
import { IdentityService } from 'app/modules/polyglot/member/services/identity.service';
import { Site } from 'app/modules/protobuf/models/domain/site_pb';
export interface CashComposeData {
price: string;
memo: string;
}
export interface CashComposeResult {
price: string;
memo: string;
}
@Component({
selector: 'app-cash-compose',
templateUrl: './cash-compose.component.html',
encapsulation: ViewEncapsulation.None,
})
export class CashComposeComponent implements OnInit {
composeForm!: FormGroup;
sites: any[] = [];
// quillModules: any = {
// toolbar: [
// ['bold', 'italic', 'underline'],
// [{ align: [] }, { list: 'ordered' }, { list: 'bullet' }],
// ['clean'],
// ],
// };
/**
* Constructor
*/
constructor(
public matDialogRef: MatDialogRef<CashComposeComponent>,
@Inject(MAT_DIALOG_DATA) public data: CashComposeData,
private _formBuilder: FormBuilder,
private _identityService: IdentityService,
private _changeDetectorRef: ChangeDetectorRef
) {}
// -----------------------------------------------------------------------------------------------------
// @ Lifecycle hooks
// -----------------------------------------------------------------------------------------------------
/**
* On init
*/
ngOnInit(): void {
// Create the form
this.composeForm = this._formBuilder.group({
price: ['', [Validators.required]],
memo: ['', [Validators.required]],
});
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Save and close
*/
saveAndClose(): void {
// Save the message as a draft
this.saveAsDraft();
// Close the dialog
this.matDialogRef.close();
}
/**
* Discard the message
*/
discard(): void {}
/**
* Save the message as a draft
*/
saveAsDraft(): void {}
/**
* Send the message
*/
send(): void {}
}

View File

@ -1,3 +1,4 @@
import { RegistComposeComponent } from './regist-compose.component'; import { RegistComposeComponent } from './regist-compose.component';
import { CashComposeComponent } from './cash-compose.component';
export const COMPOSE = [RegistComposeComponent]; export const COMPOSE = [RegistComposeComponent, CashComposeComponent];

View File

@ -15,6 +15,7 @@ import { MatSelectModule } from '@angular/material/select';
import { MatTooltipModule } from '@angular/material/tooltip'; import { MatTooltipModule } from '@angular/material/tooltip';
import { MatGridListModule } from '@angular/material/grid-list'; import { MatGridListModule } from '@angular/material/grid-list';
import { MatMenuModule } from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import { MatRadioModule } from '@angular/material/radio';
import { TranslocoModule } from '@ngneat/transloco'; import { TranslocoModule } from '@ngneat/transloco';
@ -49,6 +50,7 @@ import { MatDialogModule } from '@angular/material/dialog';
MatTooltipModule, MatTooltipModule,
MatGridListModule, MatGridListModule,
MatMenuModule, MatMenuModule,
MatRadioModule,
], ],
}) })
export class PartnerModule {} export class PartnerModule {}

View File

@ -4,7 +4,7 @@ export const environment: Environment = {
production: true, production: true,
nats: { nats: {
connectionOptions: { connectionOptions: {
servers: ['ws://192.168.50.200:8088'], servers: ['ws://192.168.50.208:8088'],
}, },
}, },
}; };

View File

@ -8,7 +8,7 @@ export const environment: Environment = {
production: false, production: false,
nats: { nats: {
connectionOptions: { connectionOptions: {
servers: ['ws://192.168.50.200:8088'], servers: ['ws://192.168.50.208:8088'],
}, },
}, },
}; };