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
commit
05a54fa16f
|
|
@ -423,25 +423,25 @@ export const appRoutes: Route[] = [
|
|||
).then((m: any) => m.PaymentLogModule),
|
||||
},
|
||||
{
|
||||
path: 'sessionin-info',
|
||||
path: 'user-session',
|
||||
loadChildren: () =>
|
||||
import(
|
||||
'app/modules/admin/report/sessionin-info/sessionin-info.module'
|
||||
).then((m: any) => m.SessioninInfoModule),
|
||||
'app/modules/admin/report/user-session/user-session.module'
|
||||
).then((m: any) => m.UserSessionModule),
|
||||
},
|
||||
{
|
||||
path: 'sessionin-overlap',
|
||||
path: 'duplicated-session',
|
||||
loadChildren: () =>
|
||||
import(
|
||||
'app/modules/admin/report/sessionin-overlap/sessionin-overlap.module'
|
||||
).then((m: any) => m.SessioninOverlapModule),
|
||||
'app/modules/admin/report/duplicated-session/duplicated-session.module'
|
||||
).then((m: any) => m.DuplicatedSessionModule),
|
||||
},
|
||||
{
|
||||
path: 'sessionin-admin',
|
||||
path: 'admin-session',
|
||||
loadChildren: () =>
|
||||
import(
|
||||
'app/modules/admin/report/sessionin-admin/sessionin-admin.module'
|
||||
).then((m: any) => m.SessioninAdminModule),
|
||||
'app/modules/admin/report/admin-session/admin-session.module'
|
||||
).then((m: any) => m.AdminSessionModule),
|
||||
},
|
||||
{
|
||||
path: 'excel-log',
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { assign, cloneDeep } from 'lodash-es';
|
||||
import { FuseMockApiService, FuseMockApiUtils } from '@fuse/lib/mock-api';
|
||||
import { sessioninAdmins as sessioninAdminsData } from './data';
|
||||
import { adminSessions as adminSessionsData } from './data';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class ReportSessioninAdminMockApi {
|
||||
private _sessioninAdmins: any[] = sessioninAdminsData;
|
||||
export class ReportAdminSessionMockApi {
|
||||
private _adminSessions: any[] = adminSessionsData;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
@ -26,10 +26,10 @@ export class ReportSessioninAdminMockApi {
|
|||
*/
|
||||
registerHandlers(): void {
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninAdmins - GET
|
||||
// @ AdminSessions - GET
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onGet('api/apps/report/sessionin-admin/sessionin-admins', 300)
|
||||
.onGet('api/apps/report/admin-session/admin-sessions', 300)
|
||||
.reply(({ request }) => {
|
||||
// Get available queries
|
||||
const search = request.params.get('search');
|
||||
|
|
@ -38,12 +38,12 @@ export class ReportSessioninAdminMockApi {
|
|||
const page = parseInt(request.params.get('page') ?? '1', 10);
|
||||
const size = parseInt(request.params.get('size') ?? '10', 10);
|
||||
|
||||
// Clone the sessioninAdmins
|
||||
let sessioninAdmins: any[] | null = cloneDeep(this._sessioninAdmins);
|
||||
// Clone the adminSessions
|
||||
let adminSessions: any[] | null = cloneDeep(this._adminSessions);
|
||||
|
||||
// Sort the sessioninAdmins
|
||||
// Sort the adminSessions
|
||||
// if (sort === 'sku' || sort === 'name' || sort === 'active') {
|
||||
// sessioninAdmins.sort((a, b) => {
|
||||
// adminSessions.sort((a, b) => {
|
||||
// const fieldA = a[sort].toString().toUpperCase();
|
||||
// const fieldB = b[sort].toString().toUpperCase();
|
||||
// return order === 'asc'
|
||||
|
|
@ -51,15 +51,15 @@ export class ReportSessioninAdminMockApi {
|
|||
// : fieldB.localeCompare(fieldA);
|
||||
// });
|
||||
// } else {
|
||||
// sessioninAdmins.sort((a, b) =>
|
||||
// adminSessions.sort((a, b) =>
|
||||
// order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort]
|
||||
// );
|
||||
// }
|
||||
|
||||
// If search exists...
|
||||
if (search) {
|
||||
// Filter the sessioninAdmins
|
||||
sessioninAdmins = sessioninAdmins.filter(
|
||||
// Filter the adminSessions
|
||||
adminSessions = adminSessions.filter(
|
||||
(contact: any) =>
|
||||
contact.name &&
|
||||
contact.name.toLowerCase().includes(search.toLowerCase())
|
||||
|
|
@ -67,32 +67,32 @@ export class ReportSessioninAdminMockApi {
|
|||
}
|
||||
|
||||
// Paginate - Start
|
||||
const sessioninAdminsLength = sessioninAdmins.length;
|
||||
const adminSessionsLength = adminSessions.length;
|
||||
|
||||
// Calculate pagination details
|
||||
const begin = page * size;
|
||||
const end = Math.min(size * (page + 1), sessioninAdminsLength);
|
||||
const lastPage = Math.max(Math.ceil(sessioninAdminsLength / size), 1);
|
||||
const end = Math.min(size * (page + 1), adminSessionsLength);
|
||||
const lastPage = Math.max(Math.ceil(adminSessionsLength / size), 1);
|
||||
|
||||
// Prepare the pagination object
|
||||
let pagination = {};
|
||||
|
||||
// If the requested page number is bigger than
|
||||
// the last possible page number, return null for
|
||||
// sessioninAdmins but also send the last possible page so
|
||||
// adminSessions but also send the last possible page so
|
||||
// the app can navigate to there
|
||||
if (page > lastPage) {
|
||||
sessioninAdmins = null;
|
||||
adminSessions = null;
|
||||
pagination = {
|
||||
lastPage,
|
||||
};
|
||||
} else {
|
||||
// Paginate the results by size
|
||||
sessioninAdmins = sessioninAdmins.slice(begin, end);
|
||||
adminSessions = adminSessions.slice(begin, end);
|
||||
|
||||
// Prepare the pagination mock-api
|
||||
pagination = {
|
||||
length: sessioninAdminsLength,
|
||||
length: adminSessionsLength,
|
||||
size: size,
|
||||
page: page,
|
||||
lastPage: lastPage,
|
||||
|
|
@ -105,41 +105,39 @@ export class ReportSessioninAdminMockApi {
|
|||
return [
|
||||
200,
|
||||
{
|
||||
sessioninAdmins,
|
||||
adminSessions,
|
||||
pagination,
|
||||
},
|
||||
];
|
||||
});
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninAdmin - GET
|
||||
// @ AdminSession - GET
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onGet('api/apps/report/sessionin-admin/sessionin-admin')
|
||||
.onGet('api/apps/report/admin-session/admin-session')
|
||||
.reply(({ request }) => {
|
||||
// Get the id from the params
|
||||
const id = request.params.get('id');
|
||||
|
||||
// Clone the sessioninAdmins
|
||||
const sessioninAdmins = cloneDeep(this._sessioninAdmins);
|
||||
// Clone the adminSessions
|
||||
const adminSessions = cloneDeep(this._adminSessions);
|
||||
|
||||
// Find the sessioninAdmin
|
||||
const sessioninAdmin = sessioninAdmins.find(
|
||||
(item: any) => item.id === id
|
||||
);
|
||||
// Find the adminSession
|
||||
const adminSession = adminSessions.find((item: any) => item.id === id);
|
||||
|
||||
// Return the response
|
||||
return [200, sessioninAdmin];
|
||||
return [200, adminSession];
|
||||
});
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninAdmin - POST
|
||||
// @ AdminSession - POST
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onPost('api/apps/report/sessionin-admin/sessionin-admin')
|
||||
.onPost('api/apps/report/admin-session/admin-session')
|
||||
.reply(() => {
|
||||
// Generate a new sessioninAdmin
|
||||
const newSessioninAdmin = {
|
||||
// Generate a new adminSession
|
||||
const newAdminSession = {
|
||||
id: FuseMockApiUtils.guid(),
|
||||
category: '',
|
||||
name: 'A New User',
|
||||
|
|
@ -161,58 +159,58 @@ export class ReportSessioninAdminMockApi {
|
|||
active: false,
|
||||
};
|
||||
|
||||
// Unshift the new sessioninAdmin
|
||||
this._sessioninAdmins.unshift(newSessioninAdmin);
|
||||
// Unshift the new adminSession
|
||||
this._adminSessions.unshift(newAdminSession);
|
||||
|
||||
// Return the response
|
||||
return [200, newSessioninAdmin];
|
||||
return [200, newAdminSession];
|
||||
});
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninAdmin - PATCH
|
||||
// @ AdminSession - PATCH
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onPatch('api/apps/report/sessionin-admin/sessionin-admin')
|
||||
.onPatch('api/apps/report/admin-session/admin-session')
|
||||
.reply(({ request }) => {
|
||||
// Get the id and sessioninAdmin
|
||||
// Get the id and adminSession
|
||||
const id = request.body.id;
|
||||
const sessioninAdmin = cloneDeep(request.body.sessioninAdmin);
|
||||
const adminSession = cloneDeep(request.body.adminSession);
|
||||
|
||||
// Prepare the updated sessioninAdmin
|
||||
let updatedSessioninAdmin = null;
|
||||
// Prepare the updated adminSession
|
||||
let updatedAdminSession = null;
|
||||
|
||||
// Find the sessioninAdmin and update it
|
||||
this._sessioninAdmins.forEach((item, index, sessioninAdmins) => {
|
||||
// Find the adminSession and update it
|
||||
this._adminSessions.forEach((item, index, adminSessions) => {
|
||||
if (item.id === id) {
|
||||
// Update the sessioninAdmin
|
||||
sessioninAdmins[index] = assign(
|
||||
// Update the adminSession
|
||||
adminSessions[index] = assign(
|
||||
{},
|
||||
sessioninAdmins[index],
|
||||
sessioninAdmin
|
||||
adminSessions[index],
|
||||
adminSession
|
||||
);
|
||||
|
||||
// Store the updated sessioninAdmin
|
||||
updatedSessioninAdmin = sessioninAdmins[index];
|
||||
// Store the updated adminSession
|
||||
updatedAdminSession = adminSessions[index];
|
||||
}
|
||||
});
|
||||
|
||||
// Return the response
|
||||
return [200, updatedSessioninAdmin];
|
||||
return [200, updatedAdminSession];
|
||||
});
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninAdmin - DELETE
|
||||
// @ AdminSession - DELETE
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onDelete('api/apps/report/sessionin-admin/sessionin-admin')
|
||||
.onDelete('api/apps/report/admin-session/admin-session')
|
||||
.reply(({ request }) => {
|
||||
// Get the id
|
||||
const id = request.params.get('id');
|
||||
|
||||
// Find the sessioninAdmin and delete it
|
||||
this._sessioninAdmins.forEach((item, index) => {
|
||||
// Find the adminSession and delete it
|
||||
this._adminSessions.forEach((item, index) => {
|
||||
if (item.id === id) {
|
||||
this._sessioninAdmins.splice(index, 1);
|
||||
this._adminSessions.splice(index, 1);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/* eslint-disable */
|
||||
|
||||
export const sessioninAdmins = [
|
||||
export const adminSessions = [
|
||||
{
|
||||
id: '1',
|
||||
rank: '본사',
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { assign, cloneDeep } from 'lodash-es';
|
||||
import { FuseMockApiService, FuseMockApiUtils } from '@fuse/lib/mock-api';
|
||||
import { sessioninOverlaps as sessioninOverlapsData } from './data';
|
||||
import { duplicatedSessions as duplicatedSessionsData } from './data';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class ReportSessioninOverlapMockApi {
|
||||
private _sessioninOverlaps: any[] = sessioninOverlapsData;
|
||||
export class ReportDuplicatedSessionMockApi {
|
||||
private _duplicatedSessions: any[] = duplicatedSessionsData;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
@ -26,26 +26,26 @@ export class ReportSessioninOverlapMockApi {
|
|||
*/
|
||||
registerHandlers(): void {
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninOverlaps - GET
|
||||
// @ DuplicatedSessions - GET
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onGet('api/apps/report/sessionin-overlap/sessionin-overlaps', 300)
|
||||
.onGet('api/apps/report/duplicated-session/duplicated-sessions', 300)
|
||||
.reply(({ request }) => {
|
||||
// Get available queries
|
||||
const search = request.params.get('search');
|
||||
const sort = request.params.get('sort') || 'name';
|
||||
const sort = request.params.get('sort') || 'overlapCount';
|
||||
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);
|
||||
|
||||
// Clone the sessioninoverlaps
|
||||
let sessioninOverlaps: any[] | null = cloneDeep(
|
||||
this._sessioninOverlaps
|
||||
// Clone the duplicatedSessions
|
||||
let duplicatedSessions: any[] | null = cloneDeep(
|
||||
this._duplicatedSessions
|
||||
);
|
||||
|
||||
// Sort the sessioninOverlaps
|
||||
// Sort the duplicatedSessions
|
||||
if (sort === 'overlapCount') {
|
||||
sessioninOverlaps.sort((a, b) => {
|
||||
duplicatedSessions.sort((a, b) => {
|
||||
const fieldA = a[sort].toString().toUpperCase();
|
||||
const fieldB = b[sort].toString().toUpperCase();
|
||||
return order === 'asc'
|
||||
|
|
@ -53,15 +53,15 @@ export class ReportSessioninOverlapMockApi {
|
|||
: fieldB.localeCompare(fieldA);
|
||||
});
|
||||
} else {
|
||||
sessioninOverlaps.sort((a, b) =>
|
||||
duplicatedSessions.sort((a, b) =>
|
||||
order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort]
|
||||
);
|
||||
}
|
||||
|
||||
// If search exists...
|
||||
if (search) {
|
||||
// Filter the sessioninOverlaps
|
||||
sessioninOverlaps = sessioninOverlaps.filter(
|
||||
// Filter the duplicatedSessions
|
||||
duplicatedSessions = duplicatedSessions.filter(
|
||||
(contact: any) =>
|
||||
contact.name &&
|
||||
contact.name.toLowerCase().includes(search.toLowerCase())
|
||||
|
|
@ -69,32 +69,35 @@ export class ReportSessioninOverlapMockApi {
|
|||
}
|
||||
|
||||
// Paginate - Start
|
||||
const sessioninOverlapsLength = sessioninOverlaps.length;
|
||||
const duplicatedSessionsLength = duplicatedSessions.length;
|
||||
|
||||
// Calculate pagination details
|
||||
const begin = page * size;
|
||||
const end = Math.min(size * (page + 1), sessioninOverlapsLength);
|
||||
const lastPage = Math.max(Math.ceil(sessioninOverlapsLength / size), 1);
|
||||
const end = Math.min(size * (page + 1), duplicatedSessionsLength);
|
||||
const lastPage = Math.max(
|
||||
Math.ceil(duplicatedSessionsLength / size),
|
||||
1
|
||||
);
|
||||
|
||||
// Prepare the pagination object
|
||||
let pagination = {};
|
||||
|
||||
// If the requested page number is bigger than
|
||||
// the last possible page number, return null for
|
||||
// sessioninOverlaps but also send the last possible page so
|
||||
// duplicatedSessions but also send the last possible page so
|
||||
// the app can navigate to there
|
||||
if (page > lastPage) {
|
||||
sessioninOverlaps = null;
|
||||
duplicatedSessions = null;
|
||||
pagination = {
|
||||
lastPage,
|
||||
};
|
||||
} else {
|
||||
// Paginate the results by size
|
||||
sessioninOverlaps = sessioninOverlaps.slice(begin, end);
|
||||
duplicatedSessions = duplicatedSessions.slice(begin, end);
|
||||
|
||||
// Prepare the pagination mock-api
|
||||
pagination = {
|
||||
length: sessioninOverlapsLength,
|
||||
length: duplicatedSessionsLength,
|
||||
size: size,
|
||||
page: page,
|
||||
lastPage: lastPage,
|
||||
|
|
@ -107,41 +110,41 @@ export class ReportSessioninOverlapMockApi {
|
|||
return [
|
||||
200,
|
||||
{
|
||||
sessioninOverlaps,
|
||||
duplicatedSessions,
|
||||
pagination,
|
||||
},
|
||||
];
|
||||
});
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninOverlap - GET
|
||||
// @ DuplicatedSession - GET
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onGet('api/apps/report/sessionin-overlap/sessionin-overlap')
|
||||
.onGet('api/apps/report/duplicated-session/duplicated-session')
|
||||
.reply(({ request }) => {
|
||||
// Get the id from the params
|
||||
const id = request.params.get('id');
|
||||
|
||||
// Clone the sessioninOverlaps
|
||||
const sessioninOverlaps = cloneDeep(this._sessioninOverlaps);
|
||||
// Clone the duplicatedSessions
|
||||
const duplicatedSessions = cloneDeep(this._duplicatedSessions);
|
||||
|
||||
// Find the sessioninOverlap
|
||||
const sessioninOverlap = sessioninOverlaps.find(
|
||||
// Find the duplicatedSession
|
||||
const duplicatedSession = duplicatedSessions.find(
|
||||
(item: any) => item.id === id
|
||||
);
|
||||
|
||||
// Return the response
|
||||
return [200, sessioninOverlap];
|
||||
return [200, duplicatedSession];
|
||||
});
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninOverlap - POST
|
||||
// @ DuplicatedSession - POST
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onPost('api/apps/report/sessionin-overlap/sessionin-overlap')
|
||||
.onPost('api/apps/report/duplicated-session/duplicated-session')
|
||||
.reply(() => {
|
||||
// Generate a new sessioninOverlap
|
||||
const newSessioninOverlap = {
|
||||
// Generate a new duplicatedSession
|
||||
const newDuplicatedSession = {
|
||||
id: FuseMockApiUtils.guid(),
|
||||
category: '',
|
||||
name: 'A New User',
|
||||
|
|
@ -163,58 +166,58 @@ export class ReportSessioninOverlapMockApi {
|
|||
active: false,
|
||||
};
|
||||
|
||||
// Unshift the new sessioninOverlap
|
||||
this._sessioninOverlaps.unshift(newSessioninOverlap);
|
||||
// Unshift the new duplicatedSession
|
||||
this._duplicatedSessions.unshift(newDuplicatedSession);
|
||||
|
||||
// Return the response
|
||||
return [200, newSessioninOverlap];
|
||||
return [200, newDuplicatedSession];
|
||||
});
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninOverlap - PATCH
|
||||
// @ DuplicatedSession - PATCH
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onPatch('api/apps/report/sessionin-overlap/sessionin-overlap')
|
||||
.onPatch('api/apps/report/duplicated-session/duplicated-session')
|
||||
.reply(({ request }) => {
|
||||
// Get the id and sessioninOverlap
|
||||
// Get the id and duplicatedSession
|
||||
const id = request.body.id;
|
||||
const sessioninOverlap = cloneDeep(request.body.sessioninOverlap);
|
||||
const duplicatedSession = cloneDeep(request.body.duplicatedSession);
|
||||
|
||||
// Prepare the updated sessioninOverlap
|
||||
let updatedSessioninOverlap = null;
|
||||
// Prepare the updated duplicatedSession
|
||||
let updatedDuplicatedSession = null;
|
||||
|
||||
// Find the sessioninOverlap and update it
|
||||
this._sessioninOverlaps.forEach((item, index, sessioninOverlaps) => {
|
||||
// Find the duplicatedSession and update it
|
||||
this._duplicatedSessions.forEach((item, index, duplicatedSessions) => {
|
||||
if (item.id === id) {
|
||||
// Update the sessioninOverlap
|
||||
sessioninOverlaps[index] = assign(
|
||||
// Update the duplicatedSession
|
||||
duplicatedSessions[index] = assign(
|
||||
{},
|
||||
sessioninOverlaps[index],
|
||||
sessioninOverlap
|
||||
duplicatedSessions[index],
|
||||
duplicatedSession
|
||||
);
|
||||
|
||||
// Store the updated sessioninOverlap
|
||||
updatedSessioninOverlap = sessioninOverlaps[index];
|
||||
// Store the updated duplicatedSession
|
||||
updatedDuplicatedSession = duplicatedSessions[index];
|
||||
}
|
||||
});
|
||||
|
||||
// Return the response
|
||||
return [200, updatedSessioninOverlap];
|
||||
return [200, updatedDuplicatedSession];
|
||||
});
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninOverlap - DELETE
|
||||
// @ DuplicatedSession - DELETE
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onDelete('api/apps/report/sessionin-overlap/sessionin-overlap')
|
||||
.onDelete('api/apps/report/duplicated-session/duplicated-session')
|
||||
.reply(({ request }) => {
|
||||
// Get the id
|
||||
const id = request.params.get('id');
|
||||
|
||||
// Find the sessioninOverlap and delete it
|
||||
this._sessioninOverlaps.forEach((item, index) => {
|
||||
// Find the duplicatedSession and delete it
|
||||
this._duplicatedSessions.forEach((item, index) => {
|
||||
if (item.id === id) {
|
||||
this._sessioninOverlaps.splice(index, 1);
|
||||
this._duplicatedSessions.splice(index, 1);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/* eslint-disable */
|
||||
|
||||
export const sessioninOverlaps = [
|
||||
export const duplicatedSessions = [
|
||||
{
|
||||
id: '1',
|
||||
overlapCount: '3',
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { assign, cloneDeep } from 'lodash-es';
|
||||
import { FuseMockApiService, FuseMockApiUtils } from '@fuse/lib/mock-api';
|
||||
import { sessioninInfos as sessioninInfosData } from './data';
|
||||
import { userSessions as userSessionsData } from './data';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class ReportSessioninInfoMockApi {
|
||||
private _sessioninInfos: any[] = sessioninInfosData;
|
||||
export class ReportUserSessionMockApi {
|
||||
private _userSessions: any[] = userSessionsData;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
@ -26,10 +26,10 @@ export class ReportSessioninInfoMockApi {
|
|||
*/
|
||||
registerHandlers(): void {
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninInfos - GET
|
||||
// @ UserSessions - GET
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onGet('api/apps/report/sessionin-info/sessionin-infos', 300)
|
||||
.onGet('api/apps/report/user-session/user-sessions', 300)
|
||||
.reply(({ request }) => {
|
||||
// Get available queries
|
||||
const search = request.params.get('search');
|
||||
|
|
@ -38,12 +38,12 @@ export class ReportSessioninInfoMockApi {
|
|||
const page = parseInt(request.params.get('page') ?? '1', 10);
|
||||
const size = parseInt(request.params.get('size') ?? '10', 10);
|
||||
|
||||
// Clone the sessioninInfos
|
||||
let sessioninInfos: any[] | null = cloneDeep(this._sessioninInfos);
|
||||
// Clone the userSessions
|
||||
let userSessions: any[] | null = cloneDeep(this._userSessions);
|
||||
|
||||
// Sort the sessioninInfos
|
||||
// Sort the userSessions
|
||||
if (sort === 'signinId' || sort === 'nickname') {
|
||||
sessioninInfos.sort((a, b) => {
|
||||
userSessions.sort((a, b) => {
|
||||
const fieldA = a[sort].toString().toUpperCase();
|
||||
const fieldB = b[sort].toString().toUpperCase();
|
||||
return order === 'asc'
|
||||
|
|
@ -51,15 +51,15 @@ export class ReportSessioninInfoMockApi {
|
|||
: fieldB.localeCompare(fieldA);
|
||||
});
|
||||
} else {
|
||||
sessioninInfos.sort((a, b) =>
|
||||
userSessions.sort((a, b) =>
|
||||
order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort]
|
||||
);
|
||||
}
|
||||
|
||||
// If search exists...
|
||||
if (search) {
|
||||
// Filter the sessioninInfos
|
||||
sessioninInfos = sessioninInfos.filter(
|
||||
// Filter the userSessions
|
||||
userSessions = userSessions.filter(
|
||||
(contact: any) =>
|
||||
contact.name &&
|
||||
contact.name.toLowerCase().includes(search.toLowerCase())
|
||||
|
|
@ -67,32 +67,32 @@ export class ReportSessioninInfoMockApi {
|
|||
}
|
||||
|
||||
// Paginate - Start
|
||||
const sessioninInfosLength = sessioninInfos.length;
|
||||
const userSessionsLength = userSessions.length;
|
||||
|
||||
// Calculate pagination details
|
||||
const begin = page * size;
|
||||
const end = Math.min(size * (page + 1), sessioninInfosLength);
|
||||
const lastPage = Math.max(Math.ceil(sessioninInfosLength / size), 1);
|
||||
const end = Math.min(size * (page + 1), userSessionsLength);
|
||||
const lastPage = Math.max(Math.ceil(userSessionsLength / size), 1);
|
||||
|
||||
// Prepare the pagination object
|
||||
let pagination = {};
|
||||
|
||||
// If the requested page number is bigger than
|
||||
// the last possible page number, return null for
|
||||
// sessioninInfos but also send the last possible page so
|
||||
// userSessions but also send the last possible page so
|
||||
// the app can navigate to there
|
||||
if (page > lastPage) {
|
||||
sessioninInfos = null;
|
||||
userSessions = null;
|
||||
pagination = {
|
||||
lastPage,
|
||||
};
|
||||
} else {
|
||||
// Paginate the results by size
|
||||
sessioninInfos = sessioninInfos.slice(begin, end);
|
||||
userSessions = userSessions.slice(begin, end);
|
||||
|
||||
// Prepare the pagination mock-api
|
||||
pagination = {
|
||||
length: sessioninInfosLength,
|
||||
length: userSessionsLength,
|
||||
size: size,
|
||||
page: page,
|
||||
lastPage: lastPage,
|
||||
|
|
@ -105,41 +105,39 @@ export class ReportSessioninInfoMockApi {
|
|||
return [
|
||||
200,
|
||||
{
|
||||
sessioninInfos,
|
||||
userSessions,
|
||||
pagination,
|
||||
},
|
||||
];
|
||||
});
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninInfo - GET
|
||||
// @ UserSession - GET
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onGet('api/apps/report/sessionin-info/sessionin-info')
|
||||
.onGet('api/apps/report/user-session/user-session')
|
||||
.reply(({ request }) => {
|
||||
// Get the id from the params
|
||||
const id = request.params.get('id');
|
||||
|
||||
// Clone the sessioninInfos
|
||||
const sessioninInfos = cloneDeep(this._sessioninInfos);
|
||||
// Clone the userSessions
|
||||
const userSessions = cloneDeep(this._userSessions);
|
||||
|
||||
// Find the sessioninInfo
|
||||
const sessioninInfo = sessioninInfos.find(
|
||||
(item: any) => item.id === id
|
||||
);
|
||||
// Find the userSession
|
||||
const userSession = userSessions.find((item: any) => item.id === id);
|
||||
|
||||
// Return the response
|
||||
return [200, sessioninInfo];
|
||||
return [200, userSession];
|
||||
});
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninInfo - POST
|
||||
// @ UserSession - POST
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onPost('api/apps/report/sessionin-info/sessionin-info')
|
||||
.onPost('api/apps/report/user-session/user-session')
|
||||
.reply(() => {
|
||||
// Generate a new sessioninInfo
|
||||
const newSessioninInfo = {
|
||||
// Generate a new userSession
|
||||
const newUserSession = {
|
||||
id: FuseMockApiUtils.guid(),
|
||||
category: '',
|
||||
name: 'A New User',
|
||||
|
|
@ -161,58 +159,54 @@ export class ReportSessioninInfoMockApi {
|
|||
active: false,
|
||||
};
|
||||
|
||||
// Unshift the new sessioninInfo
|
||||
this._sessioninInfos.unshift(newSessioninInfo);
|
||||
// Unshift the new userSession
|
||||
this._userSessions.unshift(newUserSession);
|
||||
|
||||
// Return the response
|
||||
return [200, newSessioninInfo];
|
||||
return [200, newUserSession];
|
||||
});
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninInfo - PATCH
|
||||
// @ UserSession - PATCH
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onPatch('api/apps/report/sessionin-info/sessionin-info')
|
||||
.onPatch('api/apps/report/user-session/user-session')
|
||||
.reply(({ request }) => {
|
||||
// Get the id and sessioninInfo
|
||||
// Get the id and userSession
|
||||
const id = request.body.id;
|
||||
const sessioninInfo = cloneDeep(request.body.sessioninInfo);
|
||||
const userSession = cloneDeep(request.body.userSession);
|
||||
|
||||
// Prepare the updated sessioninInfo
|
||||
let updatedSessioninInfo = null;
|
||||
// Prepare the updated userSession
|
||||
let updatedUserSession = null;
|
||||
|
||||
// Find the sessioninInfo and update it
|
||||
this._sessioninInfos.forEach((item, index, sessioninInfos) => {
|
||||
// Find the userSession and update it
|
||||
this._userSessions.forEach((item, index, userSessions) => {
|
||||
if (item.id === id) {
|
||||
// Update the sessioninInfo
|
||||
sessioninInfos[index] = assign(
|
||||
{},
|
||||
sessioninInfos[index],
|
||||
sessioninInfo
|
||||
);
|
||||
// Update the userSession
|
||||
userSessions[index] = assign({}, userSessions[index], userSession);
|
||||
|
||||
// Store the updated sessioninInfo
|
||||
updatedSessioninInfo = sessioninInfos[index];
|
||||
// Store the updated userSession
|
||||
updatedUserSession = userSessions[index];
|
||||
}
|
||||
});
|
||||
|
||||
// Return the response
|
||||
return [200, updatedSessioninInfo];
|
||||
return [200, updatedUserSession];
|
||||
});
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ SessioninInfo - DELETE
|
||||
// @ UserSession - DELETE
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
this._fuseMockApiService
|
||||
.onDelete('api/apps/report/sessionin-info/sessionin-info')
|
||||
.onDelete('api/apps/report/user-session/user-session')
|
||||
.reply(({ request }) => {
|
||||
// Get the id
|
||||
const id = request.params.get('id');
|
||||
|
||||
// Find the sessioninInfo and delete it
|
||||
this._sessioninInfos.forEach((item, index) => {
|
||||
// Find the userSession and delete it
|
||||
this._userSessions.forEach((item, index) => {
|
||||
if (item.id === id) {
|
||||
this._sessioninInfos.splice(index, 1);
|
||||
this._userSessions.splice(index, 1);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/* eslint-disable */
|
||||
|
||||
export const sessioninInfos = [
|
||||
export const userSessions = [
|
||||
{
|
||||
id: '1',
|
||||
signinId: 'lala1',
|
||||
|
|
@ -315,25 +315,25 @@ export const defaultNavigation: FuseNavigationItem[] = [
|
|||
link: '/report/payment-log',
|
||||
},
|
||||
{
|
||||
id: 'report.sessionin-info',
|
||||
title: 'Sessionin Info',
|
||||
id: 'report.user-session',
|
||||
title: 'User Session',
|
||||
type: 'basic',
|
||||
icon: 'heroicons_outline:academic-cap',
|
||||
link: '/report/sessionin-info',
|
||||
link: '/report/user-session',
|
||||
},
|
||||
{
|
||||
id: 'report.sessionin-overlap',
|
||||
title: 'Sessionin Overlap',
|
||||
id: 'report.duplicated-session',
|
||||
title: 'Duplicated Session',
|
||||
type: 'basic',
|
||||
icon: 'heroicons_outline:academic-cap',
|
||||
link: '/report/sessionin-overlap',
|
||||
link: '/report/duplicated-session',
|
||||
},
|
||||
{
|
||||
id: 'report.sessionin-admin',
|
||||
title: 'Sessionin Admin',
|
||||
id: 'report.admin-session',
|
||||
title: 'Admin Session',
|
||||
type: 'basic',
|
||||
icon: 'heroicons_outline:academic-cap',
|
||||
link: '/report/sessionin-admin',
|
||||
link: '/report/admin-session',
|
||||
},
|
||||
{
|
||||
id: 'report.excel-log',
|
||||
|
|
|
|||
|
|
@ -58,9 +58,9 @@ import { ReportMoneyLogMockApi } from './apps/report/money-log/api';
|
|||
import { ReportCompLogMockApi } from './apps/report/comp-log/api';
|
||||
import { ReportModificationLogMockApi } from './apps/report/modification-log/api';
|
||||
import { ReportPaymentLogMockApi } from './apps/report/payment-log/api';
|
||||
import { ReportSessioninInfoMockApi } from './apps/report/sessionin-info/api';
|
||||
import { ReportSessioninOverlapMockApi } from './apps/report/sessionin-overlap/api';
|
||||
import { ReportSessioninAdminMockApi } from './apps/report/sessionin-admin/api';
|
||||
import { ReportUserSessionMockApi } from './apps/report/user-session/api';
|
||||
import { ReportDuplicatedSessionMockApi } from './apps/report/duplicated-session/api';
|
||||
import { ReportAdminSessionMockApi } from './apps/report/admin-session/api';
|
||||
import { ReportExcelLogMockApi } from './apps/report/excel-log/api';
|
||||
import { ReportLoosingMockApi } from './apps/report/loosing/api';
|
||||
import { BoardNoticeMockApi } from './apps/board/notice/api';
|
||||
|
|
@ -131,9 +131,9 @@ export const mockApiServices = [
|
|||
ReportCompLogMockApi,
|
||||
ReportModificationLogMockApi,
|
||||
ReportPaymentLogMockApi,
|
||||
ReportSessioninInfoMockApi,
|
||||
ReportSessioninOverlapMockApi,
|
||||
ReportSessioninAdminMockApi,
|
||||
ReportUserSessionMockApi,
|
||||
ReportDuplicatedSessionMockApi,
|
||||
ReportAdminSessionMockApi,
|
||||
ReportExcelLogMockApi,
|
||||
ReportLoosingMockApi,
|
||||
BoardNoticeMockApi,
|
||||
|
|
|
|||
|
|
@ -24,14 +24,14 @@ import { SharedModule } from 'app/shared/shared.module';
|
|||
|
||||
import { COMPONENTS } from './components';
|
||||
|
||||
import { sessioninInfoRoutes } from './sessionin-info.routing';
|
||||
import { adminSessionRoutes } from './admin-session.routing';
|
||||
|
||||
@NgModule({
|
||||
declarations: [COMPONENTS],
|
||||
imports: [
|
||||
TranslocoModule,
|
||||
SharedModule,
|
||||
RouterModule.forChild(sessioninInfoRoutes),
|
||||
RouterModule.forChild(adminSessionRoutes),
|
||||
|
||||
MatButtonModule,
|
||||
MatFormFieldModule,
|
||||
|
|
@ -51,4 +51,4 @@ import { sessioninInfoRoutes } from './sessionin-info.routing';
|
|||
MatMomentDateModule,
|
||||
],
|
||||
})
|
||||
export class SessioninInfoModule {}
|
||||
export class AdminSessionModule {}
|
||||
|
|
@ -3,15 +3,15 @@ import { Route } from '@angular/router';
|
|||
import { ListComponent } from './components/list.component';
|
||||
import { ViewComponent } from '../../member/user/components/view.component';
|
||||
|
||||
import { SessioninInfosResolver } from './resolvers/sessionin-info.resolver';
|
||||
import { AdminSessionsResolver } from './resolvers/admin-session.resolver';
|
||||
import { UserResolver } from '../../member/user/resolvers/user.resolver';
|
||||
|
||||
export const sessioninInfoRoutes: Route[] = [
|
||||
export const adminSessionRoutes: Route[] = [
|
||||
{
|
||||
path: '',
|
||||
component: ListComponent,
|
||||
resolve: {
|
||||
sessioninInfos: SessioninInfosResolver,
|
||||
adminSessions: AdminSessionsResolver,
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -99,8 +99,8 @@
|
|||
<div
|
||||
class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto"
|
||||
>
|
||||
<ng-container *ngIf="sessioninAdmins$ | async as sessioninAdmins">
|
||||
<ng-container *ngIf="sessioninAdmins.length > 0; else noUser">
|
||||
<ng-container *ngIf="adminSessions$ | async as adminSessions">
|
||||
<ng-container *ngIf="adminSessions.length > 0; else noAdminSession">
|
||||
<div class="grid">
|
||||
<!-- Header -->
|
||||
<div
|
||||
|
|
@ -128,10 +128,10 @@
|
|||
<div class="hidden lg:block">회원차단/해제</div>
|
||||
</div>
|
||||
<!-- Rows -->
|
||||
<ng-container *ngIf="sessioninAdmins$ | async as sessioninAdmins">
|
||||
<ng-container *ngIf="adminSessions$ | async as adminSessions">
|
||||
<ng-container
|
||||
*ngFor="
|
||||
let admin of sessioninAdmins;
|
||||
let admin of adminSessions;
|
||||
let i = index;
|
||||
trackBy: __trackByFn
|
||||
"
|
||||
|
|
@ -211,7 +211,7 @@
|
|||
</ng-container>
|
||||
</ng-container>
|
||||
|
||||
<ng-template #noUser>
|
||||
<ng-template #noAdminSession>
|
||||
<div
|
||||
class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
|
||||
>
|
||||
|
|
@ -24,13 +24,13 @@ import {
|
|||
import { fuseAnimations } from '@fuse/animations';
|
||||
import { FuseConfirmationService } from '@fuse/services/confirmation';
|
||||
|
||||
import { SessioninAdmin } from '../models/sessionin-admin';
|
||||
import { SessioninAdminPagination } from '../models/sessionin-admin-pagination';
|
||||
import { SessioninAdminService } from '../services/sessionin-admin.service';
|
||||
import { AdminSession } from '../models/admin-session';
|
||||
import { AdminSessionPagination } from '../models/admin-session-pagination';
|
||||
import { AdminSessionService } from '../services/admin-session.service';
|
||||
import { Router } from '@angular/router';
|
||||
|
||||
@Component({
|
||||
selector: 'sessionin-admin-list',
|
||||
selector: 'admin-session-list',
|
||||
templateUrl: './list.component.html',
|
||||
styles: [
|
||||
/* language=SCSS */
|
||||
|
|
@ -60,12 +60,12 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
@ViewChild(MatPaginator) private _paginator!: MatPaginator;
|
||||
@ViewChild(MatSort) private _sort!: MatSort;
|
||||
|
||||
sessioninAdmins$!: Observable<SessioninAdmin[] | undefined>;
|
||||
adminSessions$!: Observable<AdminSession[] | undefined>;
|
||||
|
||||
isLoading = false;
|
||||
searchInputControl = new FormControl();
|
||||
selectedSessioninAdmin?: SessioninAdmin;
|
||||
pagination?: SessioninAdminPagination;
|
||||
selectedAdminSession?: AdminSession;
|
||||
pagination?: AdminSessionPagination;
|
||||
__isSearchOpened = false;
|
||||
|
||||
ipBlockConfigForm!: FormGroup;
|
||||
|
|
@ -80,7 +80,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
private _changeDetectorRef: ChangeDetectorRef,
|
||||
private _fuseConfirmationService: FuseConfirmationService,
|
||||
private _formBuilder: FormBuilder,
|
||||
private _sessioninAdminService: SessioninAdminService,
|
||||
private _adminSessionService: AdminSessionService,
|
||||
private router: Router
|
||||
) {}
|
||||
|
||||
|
|
@ -93,9 +93,9 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
*/
|
||||
ngOnInit(): void {
|
||||
// Get the pagination
|
||||
this._sessioninAdminService.pagination$
|
||||
this._adminSessionService.pagination$
|
||||
.pipe(takeUntil(this._unsubscribeAll))
|
||||
.subscribe((pagination: SessioninAdminPagination | undefined) => {
|
||||
.subscribe((pagination: AdminSessionPagination | undefined) => {
|
||||
// Update the pagination
|
||||
this.pagination = pagination;
|
||||
|
||||
|
|
@ -104,7 +104,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
});
|
||||
|
||||
// Get the products
|
||||
this.sessioninAdmins$ = this._sessioninAdminService.sessioninAdmins$;
|
||||
this.adminSessions$ = this._adminSessionService.adminSessions$;
|
||||
|
||||
// Set ip, id block config
|
||||
this.__idBlockConfirmConfig();
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
export interface SessioninInfoPagination {
|
||||
export interface AdminSessionPagination {
|
||||
length: number;
|
||||
size: number;
|
||||
page: number;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
export interface SessioninAdmin {
|
||||
export interface AdminSession {
|
||||
id: string;
|
||||
rank?: string;
|
||||
userId?: string;
|
||||
|
|
@ -7,19 +7,19 @@ import {
|
|||
} from '@angular/router';
|
||||
import { catchError, Observable, throwError } from 'rxjs';
|
||||
|
||||
import { SessioninInfo } from '../models/sessionin-info';
|
||||
import { SessioninInfoPagination } from '../models/sessionin-info-pagination';
|
||||
import { SessioninInfoService } from '../services/sessionin-info.service';
|
||||
import { AdminSession } from '../models/admin-session';
|
||||
import { AdminSessionPagination } from '../models/admin-session-pagination';
|
||||
import { AdminSessionService } from '../services/admin-session.service';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class SessioninInfoResolver implements Resolve<any> {
|
||||
export class AdminSessionResolver implements Resolve<any> {
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
constructor(
|
||||
private _sessioninInfoService: SessioninInfoService,
|
||||
private _adminSessionService: AdminSessionService,
|
||||
private _router: Router
|
||||
) {}
|
||||
|
||||
|
|
@ -36,9 +36,9 @@ export class SessioninInfoResolver implements Resolve<any> {
|
|||
resolve(
|
||||
route: ActivatedRouteSnapshot,
|
||||
state: RouterStateSnapshot
|
||||
): Observable<SessioninInfo | undefined> {
|
||||
return this._sessioninInfoService
|
||||
.getSessioninInfoById(route.paramMap.get('id'))
|
||||
): Observable<AdminSession | undefined> {
|
||||
return this._adminSessionService
|
||||
.getAdminSessionById(route.paramMap.get('id'))
|
||||
.pipe(
|
||||
// Error here means the requested product is not available
|
||||
catchError((error) => {
|
||||
|
|
@ -61,11 +61,11 @@ export class SessioninInfoResolver implements Resolve<any> {
|
|||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class SessioninInfosResolver implements Resolve<any> {
|
||||
export class AdminSessionsResolver implements Resolve<any> {
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
constructor(private _sessioninInfoService: SessioninInfoService) {}
|
||||
constructor(private _adminSessionService: AdminSessionService) {}
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ Public methods
|
||||
|
|
@ -81,9 +81,9 @@ export class SessioninInfosResolver implements Resolve<any> {
|
|||
route: ActivatedRouteSnapshot,
|
||||
state: RouterStateSnapshot
|
||||
): Observable<{
|
||||
pagination: SessioninInfoPagination;
|
||||
sessioninInfos: SessioninInfo[];
|
||||
pagination: AdminSessionPagination;
|
||||
adminSessions: AdminSession[];
|
||||
}> {
|
||||
return this._sessioninInfoService.getSessioninInfos();
|
||||
return this._adminSessionService.getAdminSessions();
|
||||
}
|
||||
}
|
||||
|
|
@ -12,21 +12,21 @@ import {
|
|||
throwError,
|
||||
} from 'rxjs';
|
||||
|
||||
import { SessioninInfo } from '../models/sessionin-info';
|
||||
import { SessioninInfoPagination } from '../models/sessionin-info-pagination';
|
||||
import { AdminSession } from '../models/admin-session';
|
||||
import { AdminSessionPagination } from '../models/admin-session-pagination';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class SessioninInfoService {
|
||||
export class AdminSessionService {
|
||||
// Private
|
||||
private __pagination = new BehaviorSubject<
|
||||
SessioninInfoPagination | undefined
|
||||
AdminSessionPagination | undefined
|
||||
>(undefined);
|
||||
private __sessioninInfo = new BehaviorSubject<SessioninInfo | undefined>(
|
||||
private __adminSession = new BehaviorSubject<AdminSession | undefined>(
|
||||
undefined
|
||||
);
|
||||
private __sessioninInfos = new BehaviorSubject<SessioninInfo[] | undefined>(
|
||||
private __adminSessions = new BehaviorSubject<AdminSession[] | undefined>(
|
||||
undefined
|
||||
);
|
||||
|
||||
|
|
@ -42,22 +42,22 @@ export class SessioninInfoService {
|
|||
/**
|
||||
* Getter for pagination
|
||||
*/
|
||||
get pagination$(): Observable<SessioninInfoPagination | undefined> {
|
||||
get pagination$(): Observable<AdminSessionPagination | undefined> {
|
||||
return this.__pagination.asObservable();
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for sessioninInfo
|
||||
* Getter for adminSession
|
||||
*/
|
||||
get sessioninInfo$(): Observable<SessioninInfo | undefined> {
|
||||
return this.__sessioninInfo.asObservable();
|
||||
get adminSession$(): Observable<AdminSession | undefined> {
|
||||
return this.__adminSession.asObservable();
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for sessioninInfos
|
||||
* Getter for adminSessions
|
||||
*/
|
||||
get sessioninInfos$(): Observable<SessioninInfo[] | undefined> {
|
||||
return this.__sessioninInfos.asObservable();
|
||||
get adminSessions$(): Observable<AdminSession[] | undefined> {
|
||||
return this.__adminSessions.asObservable();
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
|
|
@ -65,7 +65,7 @@ export class SessioninInfoService {
|
|||
// -----------------------------------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Get SessioninInfos
|
||||
* Get AdminSessions
|
||||
*
|
||||
*
|
||||
* @param page
|
||||
|
|
@ -74,21 +74,21 @@ export class SessioninInfoService {
|
|||
* @param order
|
||||
* @param search
|
||||
*/
|
||||
getSessioninInfos(
|
||||
getAdminSessions(
|
||||
page: number = 0,
|
||||
size: number = 10,
|
||||
sort: string = 'name',
|
||||
order: 'asc' | 'desc' | '' = 'asc',
|
||||
search: string = ''
|
||||
): Observable<{
|
||||
pagination: SessioninInfoPagination;
|
||||
sessioninInfos: SessioninInfo[];
|
||||
pagination: AdminSessionPagination;
|
||||
adminSessions: AdminSession[];
|
||||
}> {
|
||||
return this._httpClient
|
||||
.get<{
|
||||
pagination: SessioninInfoPagination;
|
||||
sessioninInfos: SessioninInfo[];
|
||||
}>('api/apps/report/sessionin-info/sessionin-infos', {
|
||||
pagination: AdminSessionPagination;
|
||||
adminSessions: AdminSession[];
|
||||
}>('api/apps/report/admin-session/admin-sessions', {
|
||||
params: {
|
||||
page: '' + page,
|
||||
size: '' + size,
|
||||
|
|
@ -100,7 +100,7 @@ export class SessioninInfoService {
|
|||
.pipe(
|
||||
tap((response) => {
|
||||
this.__pagination.next(response.pagination);
|
||||
this.__sessioninInfos.next(response.sessioninInfos);
|
||||
this.__adminSessions.next(response.adminSessions);
|
||||
})
|
||||
);
|
||||
}
|
||||
|
|
@ -108,19 +108,19 @@ export class SessioninInfoService {
|
|||
/**
|
||||
* Get product by id
|
||||
*/
|
||||
getSessioninInfoById(id: string | null): Observable<SessioninInfo> {
|
||||
return this.__sessioninInfos.pipe(
|
||||
getAdminSessionById(id: string | null): Observable<AdminSession> {
|
||||
return this.__adminSessions.pipe(
|
||||
take(1),
|
||||
map((sessioninInfos) => {
|
||||
map((adminSessions) => {
|
||||
// Find the product
|
||||
const sessioninInfo =
|
||||
sessioninInfos?.find((item) => item.id === id) || undefined;
|
||||
const adminSession =
|
||||
adminSessions?.find((item) => item.id === id) || undefined;
|
||||
|
||||
// Update the product
|
||||
this.__sessioninInfo.next(sessioninInfo);
|
||||
this.__adminSession.next(adminSession);
|
||||
|
||||
// Return the product
|
||||
return sessioninInfo;
|
||||
return adminSession;
|
||||
}),
|
||||
switchMap((product) => {
|
||||
if (!product) {
|
||||
|
|
@ -135,24 +135,21 @@ export class SessioninInfoService {
|
|||
/**
|
||||
* Create product
|
||||
*/
|
||||
createSessioninInfo(): Observable<SessioninInfo> {
|
||||
return this.sessioninInfos$.pipe(
|
||||
createAdminSession(): Observable<AdminSession> {
|
||||
return this.adminSessions$.pipe(
|
||||
take(1),
|
||||
switchMap((sessioninInfos) =>
|
||||
switchMap((adminSessions) =>
|
||||
this._httpClient
|
||||
.post<SessioninInfo>('api/apps/report/sessionin-info/product', {})
|
||||
.post<AdminSession>('api/apps/report/admin-session/product', {})
|
||||
.pipe(
|
||||
map((newSessioninInfo) => {
|
||||
// Update the sessioninInfos with the new product
|
||||
if (!!sessioninInfos) {
|
||||
this.__sessioninInfos.next([
|
||||
newSessioninInfo,
|
||||
...sessioninInfos,
|
||||
]);
|
||||
map((newAdminSession) => {
|
||||
// Update the adminSessions with the new product
|
||||
if (!!adminSessions) {
|
||||
this.__adminSessions.next([newAdminSession, ...adminSessions]);
|
||||
}
|
||||
|
||||
// Return the new product
|
||||
return newSessioninInfo;
|
||||
return newAdminSession;
|
||||
})
|
||||
)
|
||||
)
|
||||
|
|
@ -114,29 +114,29 @@
|
|||
<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"
|
||||
>
|
||||
<div>요율</div>
|
||||
<div>상부</div>
|
||||
<div>
|
||||
아이디
|
||||
<hr style="margin: 7px 0px" />
|
||||
닉네임
|
||||
<hr style="margin: 7px 0px" />
|
||||
연락처
|
||||
</div>
|
||||
<div>
|
||||
등급
|
||||
<hr style="margin: 7px 0px" />
|
||||
레벨
|
||||
</div>
|
||||
<div class="hidden sm:block">예금주</div>
|
||||
<div class="hidden md:block">보유금</div>
|
||||
<div class="hidden md:block">
|
||||
게임중머니
|
||||
<hr style="margin: 7px 0px" />
|
||||
금일콤프
|
||||
</div>
|
||||
<div class="hidden md:block">총입출</div>
|
||||
<div class="hidden lg:block">카지노->캐쉬</div>
|
||||
<div>처리날짜</div>
|
||||
<div>이전일 보유금</div>
|
||||
<div>회원 입출금</div>
|
||||
<div>파트너 입출금</div>
|
||||
<div class="hidden sm:block">전체손익</div>
|
||||
<div class="hidden md:block">수동머니</div>
|
||||
<div class="hidden md:block">수동콤프</div>
|
||||
<div class="hidden md:block">카-배팅</div>
|
||||
<div class="hidden lg:block">카-당첨</div>
|
||||
<div class="hidden lg:block">카-윈로스(A)</div>
|
||||
<div class="hidden lg:block">카-수수료(B)</div>
|
||||
<div class="hidden lg:block">카-벳윈정산(A-B)</div>
|
||||
<div class="hidden md:block">슬-배팅</div>
|
||||
<div class="hidden lg:block">슬-당첨</div>
|
||||
<div class="hidden lg:block">슬-윈로스(D)</div>
|
||||
<div class="hidden lg:block">슬-수수료(E)</div>
|
||||
<div class="hidden lg:block">슬-뱃윈정산(D-E)</div>
|
||||
<div class="hidden md:block">파-배팅</div>
|
||||
<div class="hidden lg:block">파-당첨</div>
|
||||
<div class="hidden lg:block">파-윈로스(H)</div>
|
||||
<div class="hidden lg:block">파-수수료(I)</div>
|
||||
<div class="hidden lg:block">파-벳윈정산(H-I)</div>
|
||||
<div class="hidden lg:block">총뱃윈정산</div>
|
||||
</div>
|
||||
<!-- Rows -->
|
||||
<ng-container *ngIf="dailyPartners$ | async as dailyPartners">
|
||||
|
|
@ -146,60 +146,90 @@
|
|||
<div
|
||||
class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
|
||||
>
|
||||
<div>요율</div>
|
||||
<div>{{ dailyPartner.processDate }}</div>
|
||||
<div>
|
||||
{{ dailyPartner.highRank }}
|
||||
{{ dailyPartner.lastDayHoldingMoney }}
|
||||
</div>
|
||||
<div>
|
||||
{{ dailyPartner.signinId }}
|
||||
충전{{ dailyPartner.memberCharge }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
{{ dailyPartner.nickname }}
|
||||
환전{{ dailyPartner.memberExchange }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
{{ dailyPartner.phoneNumber }}
|
||||
손익{{ dailyPartner.memberProfitLoss }}
|
||||
</div>
|
||||
<div>
|
||||
{{ dailyPartner.rank }}
|
||||
충전{{ dailyPartner.partnerCharge }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
LV{{ dailyPartner.level }}
|
||||
환전{{ dailyPartner.partnerExchange }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
손익{{ dailyPartner.partnerProfitLoss }}
|
||||
</div>
|
||||
<div class="hidden sm:block">
|
||||
{{ dailyPartner.accountHolder }}
|
||||
{{ dailyPartner.totalProfitLoss }}
|
||||
</div>
|
||||
<div class="hidden md:block">
|
||||
캐쉬{{ dailyPartner.ownCash }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
콤프{{ dailyPartner.ownComp }}P
|
||||
<hr style="margin: 7px 0px" />
|
||||
쿠폰{{ dailyPartner.ownCoupon }}
|
||||
{{ dailyPartner.passiveMoney }}
|
||||
</div>
|
||||
<div class="hidden md:block">
|
||||
{{ dailyPartner.gameMoney }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
{{ dailyPartner.todayComp }}P
|
||||
{{ dailyPartner.passiveComp }}
|
||||
</div>
|
||||
<div class="hidden md:block">
|
||||
입금{{ dailyPartner.totalDeposit }}
|
||||
배팅{{ dailyPartner.casinoBetting }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
출금{{ dailyPartner.totalWithdraw }}
|
||||
타이{{ dailyPartner.casinoTie }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
차익{{ dailyPartner.balance }}
|
||||
취소{{ dailyPartner.casinoCancel }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
유효{{ dailyPartner.casinoAvailable }}
|
||||
</div>
|
||||
<div class="hidden lg:block">
|
||||
<button
|
||||
mat-flat-button
|
||||
class="bet-mat-small-8"
|
||||
[color]="'primary'"
|
||||
>
|
||||
게임머니확인
|
||||
</button>
|
||||
{{ dailyPartner.casinoWinning }}
|
||||
</div>
|
||||
<div class="hidden lg:block">
|
||||
{{ dailyPartner.casinoWinLoss }}
|
||||
</div>
|
||||
<div class="hidden lg:block">
|
||||
{{ dailyPartner.casinoCommission }}
|
||||
</div>
|
||||
<div class="hidden lg:block">
|
||||
{{ dailyPartner.casinoBetWinCalculate }}
|
||||
</div>
|
||||
<div class="hidden md:block">
|
||||
배팅{{ dailyPartner.slotBetting }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
<button
|
||||
mat-flat-button
|
||||
class="bet-mat-small-8"
|
||||
[color]="'primary'"
|
||||
>
|
||||
게임머니회수
|
||||
</button>
|
||||
취소{{ dailyPartner.slotCancel }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
유효{{ dailyPartner.slotAvailable }}
|
||||
</div>
|
||||
<div class="hidden lg:block">
|
||||
{{ dailyPartner.slotWinning }}
|
||||
</div>
|
||||
<div class="hidden lg:block">
|
||||
{{ dailyPartner.slotWinLoss }}
|
||||
</div>
|
||||
<div class="hidden lg:block">
|
||||
{{ dailyPartner.slotCommission }}
|
||||
</div>
|
||||
<div class="hidden lg:block">
|
||||
{{ dailyPartner.slotBetWinCalculate }}
|
||||
</div>
|
||||
<div class="hidden md:block">
|
||||
{{ dailyPartner.powerballBetting }}
|
||||
</div>
|
||||
<div class="hidden lg:block">
|
||||
{{ dailyPartner.powerballWinning }}
|
||||
</div>
|
||||
<div class="hidden lg:block">
|
||||
{{ dailyPartner.powerballWinLoss }}
|
||||
</div>
|
||||
<div class="hidden lg:block">
|
||||
{{ dailyPartner.powerballCommission }}
|
||||
</div>
|
||||
<div class="hidden lg:block">
|
||||
{{ dailyPartner.powerballBetWinCalculate }}
|
||||
</div>
|
||||
<div class="hidden lg:block">
|
||||
{{ dailyPartner.totalBetWinCalculate }}
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
|
|
|
|||
|
|
@ -41,18 +41,22 @@ import { Router } from '@angular/router';
|
|||
/* language=SCSS */
|
||||
`
|
||||
.inventory-grid {
|
||||
grid-template-columns: 60px auto 40px;
|
||||
/* 아이디 등급 회원 */
|
||||
grid-template-columns: 40px auto 30px;
|
||||
|
||||
@screen sm {
|
||||
grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px;
|
||||
/* 아이디 등급 회원 파트너 손익 머니 콤프 카배팅 */
|
||||
grid-template-columns: 40px auto 30px 30px 30px 30px 30px 30px;
|
||||
}
|
||||
|
||||
@screen md {
|
||||
grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px;
|
||||
/* 아이디 등급 회원 파트너 손익 머니 콤프 카배팅 카당첨 */
|
||||
grid-template-columns: 40px auto 30px 30px 30px 30px 30px 30px 30px;
|
||||
}
|
||||
|
||||
@screen lg {
|
||||
grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px;
|
||||
/* 아이디 등급 회원 파트너 손익 머니 콤프 카배팅 카당첨 카윈로스 카수수료 카정산 슬배팅 슬당첨 슬윈로스 슬수수료 슬정산 파배팅 파당첨 파윈로스 파수수료 파정산 총정산 */
|
||||
grid-template-columns: 40px auto 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px;
|
||||
}
|
||||
}
|
||||
`,
|
||||
|
|
|
|||
|
|
@ -65,8 +65,10 @@
|
|||
<div
|
||||
class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto"
|
||||
>
|
||||
<ng-container *ngIf="sessioninOverlaps$ | async as sessioninOverlaps">
|
||||
<ng-container *ngIf="sessioninOverlaps.length > 0; else noUser">
|
||||
<ng-container *ngIf="duplicatedSessions$ | async as duplicatedSessions">
|
||||
<ng-container
|
||||
*ngIf="duplicatedSessions.length > 0; else noDuplicatedSession"
|
||||
>
|
||||
<div class="grid">
|
||||
<!-- Header -->
|
||||
<div
|
||||
|
|
@ -79,11 +81,11 @@
|
|||
</div>
|
||||
<!-- Rows -->
|
||||
<ng-container
|
||||
*ngIf="sessioninOverlaps$ | async as sessioninOverlaps"
|
||||
*ngIf="duplicatedSessions$ | async as duplicatedSessions"
|
||||
>
|
||||
<ng-container
|
||||
*ngFor="
|
||||
let info of sessioninOverlaps;
|
||||
let info of duplicatedSessions;
|
||||
let i = index;
|
||||
trackBy: __trackByFn
|
||||
"
|
||||
|
|
@ -130,7 +132,7 @@
|
|||
</ng-container>
|
||||
</ng-container>
|
||||
|
||||
<ng-template #noUser>
|
||||
<ng-template #noDuplicatedSession>
|
||||
<div
|
||||
class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
|
||||
>
|
||||
|
|
@ -30,13 +30,13 @@ import { fuseAnimations } from '@fuse/animations';
|
|||
import { FuseConfirmationService } from '@fuse/services/confirmation';
|
||||
|
||||
import { User } from '../../../member/user/models/user';
|
||||
import { SessioninOverlap } from '../models/sessionin-overlap';
|
||||
import { SessioninOverlapPagination } from '../models/sessionin-Overlap-pagination';
|
||||
import { SessioninOverlapService } from '../services/sessionin-overlap.service';
|
||||
import { DuplicatedSession } from '../models/duplicated-session';
|
||||
import { DuplicatedSessionPagination } from '../models/duplicated-session-pagination';
|
||||
import { DuplicatedSessionService } from '../services/duplicated-session.service';
|
||||
import { Router } from '@angular/router';
|
||||
|
||||
@Component({
|
||||
selector: 'sessionin-overlap-list',
|
||||
selector: 'duplicated-session-list',
|
||||
templateUrl: './list.component.html',
|
||||
styles: [
|
||||
/* language=SCSS */
|
||||
|
|
@ -66,13 +66,13 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
@ViewChild(MatPaginator) private _paginator!: MatPaginator;
|
||||
@ViewChild(MatSort) private _sort!: MatSort;
|
||||
|
||||
sessioninOverlaps$!: Observable<SessioninOverlap[] | undefined>;
|
||||
duplicatedSessions$!: Observable<DuplicatedSession[] | undefined>;
|
||||
users$!: Observable<User[] | undefined>;
|
||||
|
||||
isLoading = false;
|
||||
searchInputControl = new FormControl();
|
||||
selectedSessioninOverlap?: SessioninOverlap;
|
||||
pagination?: SessioninOverlapPagination;
|
||||
selectedDuplicatedSession?: DuplicatedSession;
|
||||
pagination?: DuplicatedSessionPagination;
|
||||
|
||||
__isSearchOpened = false;
|
||||
|
||||
|
|
@ -85,7 +85,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
private _changeDetectorRef: ChangeDetectorRef,
|
||||
private _fuseConfirmationService: FuseConfirmationService,
|
||||
private _formBuilder: FormBuilder,
|
||||
private _sessioninOverlapService: SessioninOverlapService,
|
||||
private _duplicatedSessionService: DuplicatedSessionService,
|
||||
private router: Router
|
||||
) {}
|
||||
|
||||
|
|
@ -98,9 +98,9 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
*/
|
||||
ngOnInit(): void {
|
||||
// Get the pagination
|
||||
this._sessioninOverlapService.pagination$
|
||||
this._duplicatedSessionService.pagination$
|
||||
.pipe(takeUntil(this._unsubscribeAll))
|
||||
.subscribe((pagination: SessioninOverlapPagination | undefined) => {
|
||||
.subscribe((pagination: DuplicatedSessionPagination | undefined) => {
|
||||
// Update the pagination
|
||||
this.pagination = pagination;
|
||||
|
||||
|
|
@ -109,7 +109,8 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
});
|
||||
|
||||
// Get the products
|
||||
this.sessioninOverlaps$ = this._sessioninOverlapService.sessioninOverlaps$;
|
||||
this.duplicatedSessions$ =
|
||||
this._duplicatedSessionService.duplicatedSessions$;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -119,7 +120,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
if (this._sort && this._paginator) {
|
||||
// Set the initial sort
|
||||
this._sort.sort({
|
||||
id: 'name',
|
||||
id: 'overlapCount',
|
||||
start: 'asc',
|
||||
disableClear: true,
|
||||
});
|
||||
|
|
@ -127,7 +128,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
// Mark for check
|
||||
this._changeDetectorRef.markForCheck();
|
||||
|
||||
// If the sessioninOverlap changes the sort order...
|
||||
// If the duplicatedSession changes the sort order...
|
||||
this._sort.sortChange
|
||||
.pipe(takeUntil(this._unsubscribeAll))
|
||||
.subscribe(() => {
|
||||
|
|
@ -140,7 +141,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
.pipe(
|
||||
switchMap(() => {
|
||||
this.isLoading = true;
|
||||
return this._sessioninOverlapService.getSessioninOverlaps(
|
||||
return this._duplicatedSessionService.getDuplicatedSessions(
|
||||
this._paginator.pageIndex,
|
||||
this._paginator.pageSize,
|
||||
this._sort.active,
|
||||
|
|
@ -22,14 +22,14 @@ import { SharedModule } from 'app/shared/shared.module';
|
|||
|
||||
import { COMPONENTS } from './components';
|
||||
|
||||
import { sessioninOverlapRoutes } from './sessionin-overlap.routing';
|
||||
import { duplicatedSessionRoutes } from './duplicated-session.routing';
|
||||
|
||||
@NgModule({
|
||||
declarations: [COMPONENTS],
|
||||
imports: [
|
||||
TranslocoModule,
|
||||
SharedModule,
|
||||
RouterModule.forChild(sessioninOverlapRoutes),
|
||||
RouterModule.forChild(duplicatedSessionRoutes),
|
||||
|
||||
MatButtonModule,
|
||||
MatFormFieldModule,
|
||||
|
|
@ -47,4 +47,4 @@ import { sessioninOverlapRoutes } from './sessionin-overlap.routing';
|
|||
MatCheckboxModule,
|
||||
],
|
||||
})
|
||||
export class SessioninOverlapModule {}
|
||||
export class DuplicatedSessionModule {}
|
||||
|
|
@ -3,15 +3,15 @@ import { Route } from '@angular/router';
|
|||
import { ListComponent } from './components/list.component';
|
||||
import { ViewComponent } from '../../member/user/components/view.component';
|
||||
|
||||
import { SessioninOverlapsResolver } from './resolvers/sessionin-overlap.resolver';
|
||||
import { DuplicatedSessionsResolver } from './resolvers/duplicated-session.resolver';
|
||||
import { UserResolver } from '../../member/user/resolvers/user.resolver';
|
||||
|
||||
export const sessioninOverlapRoutes: Route[] = [
|
||||
export const duplicatedSessionRoutes: Route[] = [
|
||||
{
|
||||
path: '',
|
||||
component: ListComponent,
|
||||
resolve: {
|
||||
sessioninOverlaps: SessioninOverlapsResolver,
|
||||
duplicatedSessions: DuplicatedSessionsResolver,
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
export interface SessioninOverlapPagination {
|
||||
export interface DuplicatedSessionPagination {
|
||||
length: number;
|
||||
size: number;
|
||||
page: number;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
export interface SessioninOverlap {
|
||||
export interface DuplicatedSession {
|
||||
id?: string;
|
||||
overlapCount?: string;
|
||||
ip?: string;
|
||||
|
|
@ -7,19 +7,19 @@ import {
|
|||
} from '@angular/router';
|
||||
import { catchError, Observable, throwError } from 'rxjs';
|
||||
|
||||
import { SessioninOverlap } from '../models/sessionin-overlap';
|
||||
import { SessioninOverlapPagination } from '../models/sessionin-Overlap-pagination';
|
||||
import { SessioninOverlapService } from '../services/sessionin-overlap.service';
|
||||
import { DuplicatedSession } from '../models/duplicated-session';
|
||||
import { DuplicatedSessionPagination } from '../models/duplicated-session-pagination';
|
||||
import { DuplicatedSessionService } from '../services/duplicated-session.service';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class SessioninOverlapResolver implements Resolve<any> {
|
||||
export class DuplicatedSessionResolver implements Resolve<any> {
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
constructor(
|
||||
private _sessioninOverlapService: SessioninOverlapService,
|
||||
private _duplicatedSessionService: DuplicatedSessionService,
|
||||
private _router: Router
|
||||
) {}
|
||||
|
||||
|
|
@ -36,9 +36,9 @@ export class SessioninOverlapResolver implements Resolve<any> {
|
|||
resolve(
|
||||
route: ActivatedRouteSnapshot,
|
||||
state: RouterStateSnapshot
|
||||
): Observable<SessioninOverlap | undefined> {
|
||||
return this._sessioninOverlapService
|
||||
.getSessioninOverlapById(route.paramMap.get('id'))
|
||||
): Observable<DuplicatedSession | undefined> {
|
||||
return this._duplicatedSessionService
|
||||
.getDuplicatedSessionById(route.paramMap.get('id'))
|
||||
.pipe(
|
||||
// Error here means the requested product is not available
|
||||
catchError((error) => {
|
||||
|
|
@ -61,11 +61,11 @@ export class SessioninOverlapResolver implements Resolve<any> {
|
|||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class SessioninOverlapsResolver implements Resolve<any> {
|
||||
export class DuplicatedSessionsResolver implements Resolve<any> {
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
constructor(private _sessioninOverlapService: SessioninOverlapService) {}
|
||||
constructor(private _duplicatedSessionService: DuplicatedSessionService) {}
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ Public methods
|
||||
|
|
@ -81,9 +81,9 @@ export class SessioninOverlapsResolver implements Resolve<any> {
|
|||
route: ActivatedRouteSnapshot,
|
||||
state: RouterStateSnapshot
|
||||
): Observable<{
|
||||
pagination: SessioninOverlapPagination;
|
||||
sessioninOverlaps: SessioninOverlap[];
|
||||
pagination: DuplicatedSessionPagination;
|
||||
duplicatedSessions: DuplicatedSession[];
|
||||
}> {
|
||||
return this._sessioninOverlapService.getSessioninOverlaps();
|
||||
return this._duplicatedSessionService.getDuplicatedSessions();
|
||||
}
|
||||
}
|
||||
|
|
@ -12,22 +12,22 @@ import {
|
|||
throwError,
|
||||
} from 'rxjs';
|
||||
|
||||
import { SessioninOverlap } from '../models/sessionin-overlap';
|
||||
import { SessioninOverlapPagination } from '../models/sessionin-Overlap-pagination';
|
||||
import { DuplicatedSession } from '../models/duplicated-session';
|
||||
import { DuplicatedSessionPagination } from '../models/duplicated-session-pagination';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class SessioninOverlapService {
|
||||
export class DuplicatedSessionService {
|
||||
// Private
|
||||
private __pagination = new BehaviorSubject<
|
||||
SessioninOverlapPagination | undefined
|
||||
DuplicatedSessionPagination | undefined
|
||||
>(undefined);
|
||||
private __sessioninOverlap = new BehaviorSubject<
|
||||
SessioninOverlap | undefined
|
||||
private __duplicatedSession = new BehaviorSubject<
|
||||
DuplicatedSession | undefined
|
||||
>(undefined);
|
||||
private __sessioninOverlaps = new BehaviorSubject<
|
||||
SessioninOverlap[] | undefined
|
||||
private __duplicatedSessions = new BehaviorSubject<
|
||||
DuplicatedSession[] | undefined
|
||||
>(undefined);
|
||||
|
||||
/**
|
||||
|
|
@ -42,22 +42,22 @@ export class SessioninOverlapService {
|
|||
/**
|
||||
* Getter for pagination
|
||||
*/
|
||||
get pagination$(): Observable<SessioninOverlapPagination | undefined> {
|
||||
get pagination$(): Observable<DuplicatedSessionPagination | undefined> {
|
||||
return this.__pagination.asObservable();
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for sessioninOverlap
|
||||
* Getter for duplicatedSession
|
||||
*/
|
||||
get sessioninOverlap$(): Observable<SessioninOverlap | undefined> {
|
||||
return this.__sessioninOverlap.asObservable();
|
||||
get duplicatedSession$(): Observable<DuplicatedSession | undefined> {
|
||||
return this.__duplicatedSession.asObservable();
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for sessioninOverlaps
|
||||
* Getter for duplicatedSessions
|
||||
*/
|
||||
get sessioninOverlaps$(): Observable<SessioninOverlap[] | undefined> {
|
||||
return this.__sessioninOverlaps.asObservable();
|
||||
get duplicatedSessions$(): Observable<DuplicatedSession[] | undefined> {
|
||||
return this.__duplicatedSessions.asObservable();
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
|
|
@ -65,7 +65,7 @@ export class SessioninOverlapService {
|
|||
// -----------------------------------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Get SessioninOverlaps
|
||||
* Get DuplicatedSessions
|
||||
*
|
||||
*
|
||||
* @param page
|
||||
|
|
@ -74,21 +74,21 @@ export class SessioninOverlapService {
|
|||
* @param order
|
||||
* @param search
|
||||
*/
|
||||
getSessioninOverlaps(
|
||||
getDuplicatedSessions(
|
||||
page: number = 0,
|
||||
size: number = 10,
|
||||
sort: string = 'name',
|
||||
sort: string = 'signinId',
|
||||
order: 'asc' | 'desc' | '' = 'asc',
|
||||
search: string = ''
|
||||
): Observable<{
|
||||
pagination: SessioninOverlapPagination;
|
||||
sessioninOverlaps: SessioninOverlap[];
|
||||
pagination: DuplicatedSessionPagination;
|
||||
duplicatedSessions: DuplicatedSession[];
|
||||
}> {
|
||||
return this._httpClient
|
||||
.get<{
|
||||
pagination: SessioninOverlapPagination;
|
||||
sessioninOverlaps: SessioninOverlap[];
|
||||
}>('api/apps/report/sessionin-overlap/sessionin-overlaps', {
|
||||
pagination: DuplicatedSessionPagination;
|
||||
duplicatedSessions: DuplicatedSession[];
|
||||
}>('api/apps/report/duplicated-session/duplicated-sessions', {
|
||||
params: {
|
||||
page: '' + page,
|
||||
size: '' + size,
|
||||
|
|
@ -100,7 +100,7 @@ export class SessioninOverlapService {
|
|||
.pipe(
|
||||
tap((response) => {
|
||||
this.__pagination.next(response.pagination);
|
||||
this.__sessioninOverlaps.next(response.sessioninOverlaps);
|
||||
this.__duplicatedSessions.next(response.duplicatedSessions);
|
||||
})
|
||||
);
|
||||
}
|
||||
|
|
@ -108,19 +108,19 @@ export class SessioninOverlapService {
|
|||
/**
|
||||
* Get product by id
|
||||
*/
|
||||
getSessioninOverlapById(id: string | null): Observable<SessioninOverlap> {
|
||||
return this.__sessioninOverlaps.pipe(
|
||||
getDuplicatedSessionById(id: string | null): Observable<DuplicatedSession> {
|
||||
return this.__duplicatedSessions.pipe(
|
||||
take(1),
|
||||
map((sessioninOverlaps) => {
|
||||
map((duplicatedSessions) => {
|
||||
// Find the product
|
||||
const sessioninOverlap =
|
||||
sessioninOverlaps?.find((item) => item.id === id) || undefined;
|
||||
const duplicatedSession =
|
||||
duplicatedSessions?.find((item) => item.id === id) || undefined;
|
||||
|
||||
// Update the product
|
||||
this.__sessioninOverlap.next(sessioninOverlap);
|
||||
this.__duplicatedSession.next(duplicatedSession);
|
||||
|
||||
// Return the product
|
||||
return sessioninOverlap;
|
||||
return duplicatedSession;
|
||||
}),
|
||||
switchMap((product) => {
|
||||
if (!product) {
|
||||
|
|
@ -135,27 +135,27 @@ export class SessioninOverlapService {
|
|||
/**
|
||||
* Create product
|
||||
*/
|
||||
createSessioninOverlap(): Observable<SessioninOverlap> {
|
||||
return this.sessioninOverlaps$.pipe(
|
||||
createDuplicatedSession(): Observable<DuplicatedSession> {
|
||||
return this.duplicatedSessions$.pipe(
|
||||
take(1),
|
||||
switchMap((sessioninOverlaps) =>
|
||||
switchMap((duplicatedSessions) =>
|
||||
this._httpClient
|
||||
.post<SessioninOverlap>(
|
||||
'api/apps/report/sessionin-overlap/product',
|
||||
.post<DuplicatedSession>(
|
||||
'api/apps/report/duplicated-session/product',
|
||||
{}
|
||||
)
|
||||
.pipe(
|
||||
map((newSessioninOverlap) => {
|
||||
// Update the sessioninOverlaps with the new product
|
||||
if (!!sessioninOverlaps) {
|
||||
this.__sessioninOverlaps.next([
|
||||
newSessioninOverlap,
|
||||
...sessioninOverlaps,
|
||||
map((newDuplicatedSession) => {
|
||||
// Update the duplicatedSessions with the new product
|
||||
if (!!duplicatedSessions) {
|
||||
this.__duplicatedSessions.next([
|
||||
newDuplicatedSession,
|
||||
...duplicatedSessions,
|
||||
]);
|
||||
}
|
||||
|
||||
// Return the new product
|
||||
return newSessioninOverlap;
|
||||
return newDuplicatedSession;
|
||||
})
|
||||
)
|
||||
)
|
||||
|
|
@ -164,18 +164,18 @@
|
|||
<div class="hidden lg:block">카-당첨</div>
|
||||
<div class="hidden lg:block">카-윈로스(A)</div>
|
||||
<div class="hidden lg:block">카-수수료(B)</div>
|
||||
<div class="hidden lg:block">카-벳윈정산(A-B)</div>
|
||||
<div class="hidden lg:block">카-뱃윈정산(A-B)</div>
|
||||
<div class="hidden md:block">슬-배팅</div>
|
||||
<div class="hidden lg:block">슬-당첨</div>
|
||||
<div class="hidden lg:block">슬-윈로스(D)</div>
|
||||
<div class="hidden lg:block">슬-수수료(E)</div>
|
||||
<div class="hidden lg:block">슬-벳윈정산(D-E)</div>
|
||||
<div class="hidden lg:block">슬-뱃윈정산(D-E)</div>
|
||||
<div class="hidden md:block">파-배팅</div>
|
||||
<div class="hidden lg:block">파-당첨</div>
|
||||
<div class="hidden lg:block">파-윈로스(H)</div>
|
||||
<div class="hidden lg:block">파-수수료(I)</div>
|
||||
<div class="hidden lg:block">파-벳윈정산(H-I)</div>
|
||||
<div class="hidden lg:block">총벳윈정산</div>
|
||||
<div class="hidden lg:block">총뱃윈정산</div>
|
||||
</div>
|
||||
<!-- Rows -->
|
||||
<ng-container *ngIf="todayBets$ | async as todayBets">
|
||||
|
|
|
|||
|
|
@ -99,8 +99,8 @@
|
|||
<div
|
||||
class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto"
|
||||
>
|
||||
<ng-container *ngIf="sessioninInfos$ | async as sessioninInfos">
|
||||
<ng-container *ngIf="sessioninInfos.length > 0; else noUser">
|
||||
<ng-container *ngIf="userSessions$ | async as userSessions">
|
||||
<ng-container *ngIf="userSessions.length > 0; else noUserSession">
|
||||
<div class="grid">
|
||||
<!-- Header -->
|
||||
<div
|
||||
|
|
@ -123,10 +123,10 @@
|
|||
<div class="hidden lg:block">회원차단/해제</div>
|
||||
</div>
|
||||
<!-- Rows -->
|
||||
<ng-container *ngIf="sessioninInfos$ | async as sessioninInfos">
|
||||
<ng-container *ngIf="userSessions$ | async as userSessions">
|
||||
<ng-container
|
||||
*ngFor="
|
||||
let info of sessioninInfos;
|
||||
let info of userSessions;
|
||||
let i = index;
|
||||
trackBy: __trackByFn
|
||||
"
|
||||
|
|
@ -196,7 +196,7 @@
|
|||
</ng-container>
|
||||
</ng-container>
|
||||
|
||||
<ng-template #noUser>
|
||||
<ng-template #noUserSession>
|
||||
<div
|
||||
class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
|
||||
>
|
||||
|
|
@ -30,13 +30,13 @@ import { fuseAnimations } from '@fuse/animations';
|
|||
import { FuseConfirmationService } from '@fuse/services/confirmation';
|
||||
|
||||
import { User } from '../../../member/user/models/user';
|
||||
import { SessioninInfo } from '../models/sessionin-info';
|
||||
import { SessioninInfoPagination } from '../models/sessionin-info-pagination';
|
||||
import { SessioninInfoService } from '../services/sessionin-info.service';
|
||||
import { UserSession } from '../models/user-session';
|
||||
import { UserSessionPagination } from '../models/user-session-pagination';
|
||||
import { UserSessionService } from '../services/user-session.service';
|
||||
import { Router } from '@angular/router';
|
||||
|
||||
@Component({
|
||||
selector: 'sessionin-info-list',
|
||||
selector: 'user-session-list',
|
||||
templateUrl: './list.component.html',
|
||||
styles: [
|
||||
/* language=SCSS */
|
||||
|
|
@ -66,13 +66,13 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
@ViewChild(MatPaginator) private _paginator!: MatPaginator;
|
||||
@ViewChild(MatSort) private _sort!: MatSort;
|
||||
|
||||
sessioninInfos$!: Observable<SessioninInfo[] | undefined>;
|
||||
userSessions$!: Observable<UserSession[] | undefined>;
|
||||
users$!: Observable<User[] | undefined>;
|
||||
|
||||
isLoading = false;
|
||||
searchInputControl = new FormControl();
|
||||
selectedSessioninInfo?: SessioninInfo;
|
||||
pagination?: SessioninInfoPagination;
|
||||
selectedUserSession?: UserSession;
|
||||
pagination?: UserSessionPagination;
|
||||
__isSearchOpened = false;
|
||||
|
||||
ipBlockConfigForm!: FormGroup;
|
||||
|
|
@ -87,7 +87,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
private _changeDetectorRef: ChangeDetectorRef,
|
||||
private _fuseConfirmationService: FuseConfirmationService,
|
||||
private _formBuilder: FormBuilder,
|
||||
private _sessioninInfoService: SessioninInfoService,
|
||||
private _userSessionService: UserSessionService,
|
||||
private router: Router
|
||||
) {}
|
||||
|
||||
|
|
@ -100,9 +100,9 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
*/
|
||||
ngOnInit(): void {
|
||||
// Get the pagination
|
||||
this._sessioninInfoService.pagination$
|
||||
this._userSessionService.pagination$
|
||||
.pipe(takeUntil(this._unsubscribeAll))
|
||||
.subscribe((pagination: SessioninInfoPagination | undefined) => {
|
||||
.subscribe((pagination: UserSessionPagination | undefined) => {
|
||||
// Update the pagination
|
||||
this.pagination = pagination;
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
});
|
||||
|
||||
// Get the products
|
||||
this.sessioninInfos$ = this._sessioninInfoService.sessioninInfos$;
|
||||
this.userSessions$ = this._userSessionService.userSessions$;
|
||||
|
||||
this.__idBlockConfirmConfig();
|
||||
this.__ipBlockConfirmConfig();
|
||||
|
|
@ -132,7 +132,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
// Mark for check
|
||||
this._changeDetectorRef.markForCheck();
|
||||
|
||||
// If the sessioninInfo changes the sort order...
|
||||
// If the userSession changes the sort order...
|
||||
this._sort.sortChange
|
||||
.pipe(takeUntil(this._unsubscribeAll))
|
||||
.subscribe(() => {
|
||||
|
|
@ -145,7 +145,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
.pipe(
|
||||
switchMap(() => {
|
||||
this.isLoading = true;
|
||||
return this._sessioninInfoService.getSessioninInfos(
|
||||
return this._userSessionService.getUserSessions(
|
||||
this._paginator.pageIndex,
|
||||
this._paginator.pageSize,
|
||||
this._sort.active,
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
export interface SessioninAdminPagination {
|
||||
export interface UserSessionPagination {
|
||||
length: number;
|
||||
size: number;
|
||||
page: number;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
export interface SessioninInfo {
|
||||
export interface UserSession {
|
||||
id?: string;
|
||||
signinId?: string;
|
||||
nickname?: string;
|
||||
|
|
@ -7,19 +7,19 @@ import {
|
|||
} from '@angular/router';
|
||||
import { catchError, Observable, throwError } from 'rxjs';
|
||||
|
||||
import { SessioninAdmin } from '../models/sessionin-admin';
|
||||
import { SessioninAdminPagination } from '../models/sessionin-admin-pagination';
|
||||
import { SessioninAdminService } from '../services/sessionin-admin.service';
|
||||
import { UserSession } from '../models/user-session';
|
||||
import { UserSessionPagination } from '../models/user-session-pagination';
|
||||
import { UserSessionService } from '../services/user-session.service';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class SessioninAdminResolver implements Resolve<any> {
|
||||
export class UserSessionResolver implements Resolve<any> {
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
constructor(
|
||||
private _sessioninAdminService: SessioninAdminService,
|
||||
private _userSessionService: UserSessionService,
|
||||
private _router: Router
|
||||
) {}
|
||||
|
||||
|
|
@ -36,9 +36,9 @@ export class SessioninAdminResolver implements Resolve<any> {
|
|||
resolve(
|
||||
route: ActivatedRouteSnapshot,
|
||||
state: RouterStateSnapshot
|
||||
): Observable<SessioninAdmin | undefined> {
|
||||
return this._sessioninAdminService
|
||||
.getSessioninAdminById(route.paramMap.get('id'))
|
||||
): Observable<UserSession | undefined> {
|
||||
return this._userSessionService
|
||||
.getUserSessionById(route.paramMap.get('id'))
|
||||
.pipe(
|
||||
// Error here means the requested product is not available
|
||||
catchError((error) => {
|
||||
|
|
@ -61,11 +61,11 @@ export class SessioninAdminResolver implements Resolve<any> {
|
|||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class SessioninAdminsResolver implements Resolve<any> {
|
||||
export class UserSessionsResolver implements Resolve<any> {
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
constructor(private _sessioninAdminService: SessioninAdminService) {}
|
||||
constructor(private _userSessionService: UserSessionService) {}
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
// @ Public methods
|
||||
|
|
@ -81,9 +81,9 @@ export class SessioninAdminsResolver implements Resolve<any> {
|
|||
route: ActivatedRouteSnapshot,
|
||||
state: RouterStateSnapshot
|
||||
): Observable<{
|
||||
pagination: SessioninAdminPagination;
|
||||
sessioninAdmins: SessioninAdmin[];
|
||||
pagination: UserSessionPagination;
|
||||
userSessions: UserSession[];
|
||||
}> {
|
||||
return this._sessioninAdminService.getSessioninAdmins();
|
||||
return this._userSessionService.getUserSessions();
|
||||
}
|
||||
}
|
||||
|
|
@ -12,21 +12,21 @@ import {
|
|||
throwError,
|
||||
} from 'rxjs';
|
||||
|
||||
import { SessioninAdmin } from '../models/sessionin-admin';
|
||||
import { SessioninAdminPagination } from '../models/sessionin-admin-pagination';
|
||||
import { UserSession } from '../models/user-session';
|
||||
import { UserSessionPagination } from '../models/user-session-pagination';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class SessioninAdminService {
|
||||
export class UserSessionService {
|
||||
// Private
|
||||
private __pagination = new BehaviorSubject<
|
||||
SessioninAdminPagination | undefined
|
||||
>(undefined);
|
||||
private __sessioninAdmin = new BehaviorSubject<SessioninAdmin | undefined>(
|
||||
private __pagination = new BehaviorSubject<UserSessionPagination | undefined>(
|
||||
undefined
|
||||
);
|
||||
private __sessioninAdmins = new BehaviorSubject<SessioninAdmin[] | undefined>(
|
||||
private __userSession = new BehaviorSubject<UserSession | undefined>(
|
||||
undefined
|
||||
);
|
||||
private __userSessions = new BehaviorSubject<UserSession[] | undefined>(
|
||||
undefined
|
||||
);
|
||||
|
||||
|
|
@ -42,22 +42,22 @@ export class SessioninAdminService {
|
|||
/**
|
||||
* Getter for pagination
|
||||
*/
|
||||
get pagination$(): Observable<SessioninAdminPagination | undefined> {
|
||||
get pagination$(): Observable<UserSessionPagination | undefined> {
|
||||
return this.__pagination.asObservable();
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for sessioninAdmin
|
||||
* Getter for userSession
|
||||
*/
|
||||
get sessioninAdmin$(): Observable<SessioninAdmin | undefined> {
|
||||
return this.__sessioninAdmin.asObservable();
|
||||
get userSession$(): Observable<UserSession | undefined> {
|
||||
return this.__userSession.asObservable();
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for sessioninAdmins
|
||||
* Getter for userSessions
|
||||
*/
|
||||
get sessioninAdmins$(): Observable<SessioninAdmin[] | undefined> {
|
||||
return this.__sessioninAdmins.asObservable();
|
||||
get userSessions$(): Observable<UserSession[] | undefined> {
|
||||
return this.__userSessions.asObservable();
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------------------------------
|
||||
|
|
@ -65,7 +65,7 @@ export class SessioninAdminService {
|
|||
// -----------------------------------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Get SessioninAdmins
|
||||
* Get UserSessions
|
||||
*
|
||||
*
|
||||
* @param page
|
||||
|
|
@ -74,21 +74,21 @@ export class SessioninAdminService {
|
|||
* @param order
|
||||
* @param search
|
||||
*/
|
||||
getSessioninAdmins(
|
||||
getUserSessions(
|
||||
page: number = 0,
|
||||
size: number = 10,
|
||||
sort: string = 'name',
|
||||
order: 'asc' | 'desc' | '' = 'asc',
|
||||
search: string = ''
|
||||
): Observable<{
|
||||
pagination: SessioninAdminPagination;
|
||||
sessioninAdmins: SessioninAdmin[];
|
||||
pagination: UserSessionPagination;
|
||||
userSessions: UserSession[];
|
||||
}> {
|
||||
return this._httpClient
|
||||
.get<{
|
||||
pagination: SessioninAdminPagination;
|
||||
sessioninAdmins: SessioninAdmin[];
|
||||
}>('api/apps/report/sessionin-admin/sessionin-admins', {
|
||||
pagination: UserSessionPagination;
|
||||
userSessions: UserSession[];
|
||||
}>('api/apps/report/user-session/user-sessions', {
|
||||
params: {
|
||||
page: '' + page,
|
||||
size: '' + size,
|
||||
|
|
@ -100,7 +100,7 @@ export class SessioninAdminService {
|
|||
.pipe(
|
||||
tap((response) => {
|
||||
this.__pagination.next(response.pagination);
|
||||
this.__sessioninAdmins.next(response.sessioninAdmins);
|
||||
this.__userSessions.next(response.userSessions);
|
||||
})
|
||||
);
|
||||
}
|
||||
|
|
@ -108,19 +108,19 @@ export class SessioninAdminService {
|
|||
/**
|
||||
* Get product by id
|
||||
*/
|
||||
getSessioninAdminById(id: string | null): Observable<SessioninAdmin> {
|
||||
return this.__sessioninAdmins.pipe(
|
||||
getUserSessionById(id: string | null): Observable<UserSession> {
|
||||
return this.__userSessions.pipe(
|
||||
take(1),
|
||||
map((sessioninAdmins) => {
|
||||
map((userSessions) => {
|
||||
// Find the product
|
||||
const sessioninAdmin =
|
||||
sessioninAdmins?.find((item) => item.id === id) || undefined;
|
||||
const userSession =
|
||||
userSessions?.find((item) => item.id === id) || undefined;
|
||||
|
||||
// Update the product
|
||||
this.__sessioninAdmin.next(sessioninAdmin);
|
||||
this.__userSession.next(userSession);
|
||||
|
||||
// Return the product
|
||||
return sessioninAdmin;
|
||||
return userSession;
|
||||
}),
|
||||
switchMap((product) => {
|
||||
if (!product) {
|
||||
|
|
@ -135,24 +135,21 @@ export class SessioninAdminService {
|
|||
/**
|
||||
* Create product
|
||||
*/
|
||||
createSessioninAdmin(): Observable<SessioninAdmin> {
|
||||
return this.sessioninAdmins$.pipe(
|
||||
createUserSession(): Observable<UserSession> {
|
||||
return this.userSessions$.pipe(
|
||||
take(1),
|
||||
switchMap((sessioninAdmins) =>
|
||||
switchMap((userSessions) =>
|
||||
this._httpClient
|
||||
.post<SessioninAdmin>('api/apps/report/sessionin-admin/product', {})
|
||||
.post<UserSession>('api/apps/report/user-session/product', {})
|
||||
.pipe(
|
||||
map((newSessioninAdmin) => {
|
||||
// Update the sessioninAdmins with the new product
|
||||
if (!!sessioninAdmins) {
|
||||
this.__sessioninAdmins.next([
|
||||
newSessioninAdmin,
|
||||
...sessioninAdmins,
|
||||
]);
|
||||
map((newUserSession) => {
|
||||
// Update the userSessions with the new product
|
||||
if (!!userSessions) {
|
||||
this.__userSessions.next([newUserSession, ...userSessions]);
|
||||
}
|
||||
|
||||
// Return the new product
|
||||
return newSessioninAdmin;
|
||||
return newUserSession;
|
||||
})
|
||||
)
|
||||
)
|
||||
|
|
@ -24,14 +24,14 @@ import { SharedModule } from 'app/shared/shared.module';
|
|||
|
||||
import { COMPONENTS } from './components';
|
||||
|
||||
import { sessioninAdminRoutes } from './sessionin-admin.routing';
|
||||
import { userSessionRoutes } from './user-session.routing';
|
||||
|
||||
@NgModule({
|
||||
declarations: [COMPONENTS],
|
||||
imports: [
|
||||
TranslocoModule,
|
||||
SharedModule,
|
||||
RouterModule.forChild(sessioninAdminRoutes),
|
||||
RouterModule.forChild(userSessionRoutes),
|
||||
|
||||
MatButtonModule,
|
||||
MatFormFieldModule,
|
||||
|
|
@ -51,4 +51,4 @@ import { sessioninAdminRoutes } from './sessionin-admin.routing';
|
|||
MatMomentDateModule,
|
||||
],
|
||||
})
|
||||
export class SessioninAdminModule {}
|
||||
export class UserSessionModule {}
|
||||
|
|
@ -3,15 +3,15 @@ import { Route } from '@angular/router';
|
|||
import { ListComponent } from './components/list.component';
|
||||
import { ViewComponent } from '../../member/user/components/view.component';
|
||||
|
||||
import { SessioninAdminsResolver } from './resolvers/sessionin-admin.resolver';
|
||||
import { UserSessionsResolver } from './resolvers/user-session.resolver';
|
||||
import { UserResolver } from '../../member/user/resolvers/user.resolver';
|
||||
|
||||
export const sessioninAdminRoutes: Route[] = [
|
||||
export const userSessionRoutes: Route[] = [
|
||||
{
|
||||
path: '',
|
||||
component: ListComponent,
|
||||
resolve: {
|
||||
sessioninAdmins: SessioninAdminsResolver,
|
||||
userSessions: UserSessionsResolver,
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -37,9 +37,9 @@
|
|||
"Comp Log": "Comp Logs",
|
||||
"Modification Log": "Member Modification Logs",
|
||||
"Payment Log": "Manual Payment Logs",
|
||||
"Sessionin Info": "Sessionin Info",
|
||||
"Sessionin Admin": "Sessionin Admin Info",
|
||||
"Sessionin Overlap": "Sessionin Overlap",
|
||||
"User Session": "User Session",
|
||||
"Admin Session": "Admin Session",
|
||||
"Duplicated Session": "Duplicated Session",
|
||||
"Excel Log": "Excel Download Logs",
|
||||
"Loosing": "Loosing Management",
|
||||
"Notice": "Notice",
|
||||
|
|
|
|||
|
|
@ -45,9 +45,9 @@
|
|||
"Comp Log": "콤프사용 Logs",
|
||||
"Modification Log": "회원수정 로그",
|
||||
"Payment Log": "수동지급/회수 로그",
|
||||
"Sessionin Info": "로그인정보",
|
||||
"Sessionin Overlap": "중복로그인",
|
||||
"Sessionin Admin": "관리자 로그인정보",
|
||||
"User Session": "로그인정보",
|
||||
"Duplicated Session": "중복로그인",
|
||||
"Admin Session": "관리자 로그인정보",
|
||||
"Excel Log": "엑셀다운 로그",
|
||||
"Loosing": "루징관리",
|
||||
"Notice": "공지사항",
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user