diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a4db615..f923641 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -34,9 +34,13 @@ import {MatDividerModule} from "@angular/material/divider"; import {MatListModule} from "@angular/material/list"; import {MatProgressBarModule} from "@angular/material/progress-bar"; import { MessagesPageComponent } from './pages/messages-page/messages-page.component'; -import {MatPaginatorModule} from "@angular/material/paginator"; +import {MatPaginatorIntl, MatPaginatorModule} from "@angular/material/paginator"; import {MatTableModule} from "@angular/material/table"; import {MatSortModule} from "@angular/material/sort"; +import {RussianPaginatorIntl} from "./utils/RussianPaginatorIntl"; +import {MatSelectModule} from "@angular/material/select"; +import {MatDatepickerModule} from "@angular/material/datepicker"; +import {MatNativeDateModule} from "@angular/material/core"; registerLocaleData(localeRu, "ru") @@ -74,15 +78,20 @@ registerLocaleData(localeRu, "ru") ValueServerMapDatePipe, MatPaginatorModule, MatTableModule, - MatSortModule + MatSortModule, + MatSelectModule, + MatDatepickerModule, + MatNativeDateModule ], providers: [ {provide: LOCALE_ID, useValue: 'ru' }, + {provide: MatPaginatorIntl, useValue: RussianPaginatorIntl() }, AnnonceService, PlayerService, BanService, ServerService, - Tf2dataService + Tf2dataService, + MatDatepickerModule ], bootstrap: [AppComponent] }) diff --git a/src/app/entities/PagingAndSortingPaginator.ts b/src/app/entities/PagingAndSortingPaginator.ts index e79f8a9..87a3b86 100644 --- a/src/app/entities/PagingAndSortingPaginator.ts +++ b/src/app/entities/PagingAndSortingPaginator.ts @@ -3,13 +3,15 @@ import {ChangeDetectorRef} from "@angular/core"; export class PagingAndSortingPaginator { data: T[] = []; - count: number = 0; + totalElements: number = 0; + number: number = 0; size: number = 0; fromData(data: any) { - this.data = data['content']; - this.count = data['totalElements']; - this.size = data['size']; + this.data = data.content; + this.size = data.size; + this.totalElements = data.totalElements; + this.number = data.number; return this; } @@ -17,11 +19,11 @@ export class PagingAndSortingPaginator { return new PagingAndSortingPaginator(); } - updatePaginator(paginator: MatPaginator) { - if (paginator == null) - paginator = new MatPaginator(new MatPaginatorIntl(), ChangeDetectorRef.prototype); - paginator.pageSize = this.size; - paginator.length = this.count; + updatePaginator(paginator: MatPaginator|undefined) { + if (paginator) { + paginator.pageIndex = this.number; + paginator.length = this.totalElements; + } return this; } } diff --git a/src/app/entities/profile/Message.ts b/src/app/entities/profile/Message.ts index f012a9c..2c5d712 100644 --- a/src/app/entities/profile/Message.ts +++ b/src/app/entities/profile/Message.ts @@ -4,4 +4,5 @@ export class Message { utime: number =0 ; server_id: string = ""; account_name: string = ""; + serverName: string = ""; } diff --git a/src/app/entities/search/MessageSearchFilter.ts b/src/app/entities/search/MessageSearchFilter.ts new file mode 100644 index 0000000..ef5529f --- /dev/null +++ b/src/app/entities/search/MessageSearchFilter.ts @@ -0,0 +1,5 @@ +import {SearchFilter} from "./SearchFilter"; + +export class MessageSearchFilter extends SearchFilter { + message: string | null = null; +} diff --git a/src/app/entities/search/SearchFilter.ts b/src/app/entities/search/SearchFilter.ts new file mode 100644 index 0000000..fe3a167 --- /dev/null +++ b/src/app/entities/search/SearchFilter.ts @@ -0,0 +1,7 @@ +export class SearchFilter { + accounts: string[]|null = null; + begin: Date | null = null; + end: Date | null = null; + serverId : string | null = null; + updated: boolean = false; +} diff --git a/src/app/pages/internal-components/abstract-search-table.component.ts b/src/app/pages/internal-components/abstract-search-table.component.ts new file mode 100644 index 0000000..5d14d77 --- /dev/null +++ b/src/app/pages/internal-components/abstract-search-table.component.ts @@ -0,0 +1,106 @@ +import {AfterViewInit, Component, ViewChild} from "@angular/core"; +import {MatTableDataSource} from "@angular/material/table"; +import {Message} from "../../entities/profile/Message"; +import {MatPaginator} from "@angular/material/paginator"; +import {merge, switchMap} from "rxjs"; +import {MatSort} from "@angular/material/sort"; +import {SearchFilter} from "../../entities/search/SearchFilter"; +import {ServerService} from "../../services/server.service"; + +@Component({template: ''}) +export abstract class AbstractSearchTable implements AfterViewInit { + + dataSource: MatTableDataSource; + filter: U = new SearchFilter() as U; + @ViewChild(MatPaginator) paginator: MatPaginator | undefined; + @ViewChild(MatSort) sort: MatSort | undefined; + serverList: {name: string, server_id: string }[] = [] + + protected constructor(protected serverService: ServerService) { + this.dataSource = new MatTableDataSource(); + } + + public updateData() {} + + ngAfterViewInit(): void { + this.updateData(); + this.serverService.getStats("servers").subscribe( + (res) => { + const keys = Object.keys(res.data); + for (const key of keys) { + this.serverList.push({name: res.data[key].name, server_id: key}); + } + console.log(this.serverList); + } + ) + } + + addAccountToSearch(name: string) { + if (this.filter.accounts == null) + this.filter.accounts = []; + if (this.filter.accounts.indexOf(name) == -1) + this.filter.accounts.push(name); + this.filter.updated = true; + } + + removeAccountFromSearch(name: string) { + if (this.filter.accounts == null) return; + this.filter.accounts = this.filter.accounts.filter(v => v !== name); + this.filter.updated = true; + } + + addServerToSearch(server_id: string|null = null) { + this.filter.serverId = server_id == null ? "%" : server_id; + if (server_id != null) { + this.filter.updated = true; + } + } + + removeServerFromSearch() { + this.filter.serverId = null; + this.filter.updated = true; + } + + getServerName(server_id: string|null) { + try { + // @ts-ignore + return this.serverList.filter(s => s.server_id == server_id).pop().name; + } catch (e) { + return "Выбрать сервер"; + } + } + + addBeginTimeToSearch(custom_date: number|null = null) { + if (custom_date == null) { + const d: Date = new Date(); + d.setUTCHours(0, 0, 0, 0); + this.filter.begin = d; + } + if (typeof custom_date == "number") { + this.filter.begin = new Date(custom_date); + } + this.filter.updated = true; + } + + removeBeginTimeFromSearch() { + this.filter.begin = null; + this.filter.updated = true; + } + + addEndTimeToSearch(custom_date: number|null = null) { + if (custom_date == null) { + const d: Date = new Date(); + d.setUTCHours(23, 59, 59, 999); + this.filter.end = d; + } + if (typeof custom_date == "number") { + this.filter.end = new Date(custom_date); + } + this.filter.updated = true; + } + + removeEndTimeFromSearch() { + this.filter.end = null; + this.filter.updated = true; + } +} diff --git a/src/app/pages/messages-page/messages-page.component.html b/src/app/pages/messages-page/messages-page.component.html index aa9a493..5371f55 100644 --- a/src/app/pages/messages-page/messages-page.component.html +++ b/src/app/pages/messages-page/messages-page.component.html @@ -7,26 +7,121 @@
- +
+ + Искать по... + + + - -
- + + + + + + + + + + Обновить + {{acId}} + + + Сообщение содержит: {{filter.message}} + + + + + {{getServerName(filter.serverId)}} + + + + + + + + Дата после {{filter.begin | date:"HH:mm dd/MM/yyyy"}} + + + + Дата после + + + + + + + Дата до {{filter.end | date:"HH:mm dd/MM/yyyy"}} + + + + Дата после + + + + + + + +
AccountId {{row.account_id}}
+ + + + - - + + - - + + - - - + + + @@ -34,11 +129,15 @@ - +
Игрок {{row.account_name}} + + + + Date {{row.utime*1000 | date:"hh:mm:ss dd/MM/yyyy"}} Дата {{row.utime*1000 | date:"HH:mm:ss dd/MM/yyyy"}} + + + + + Message {{row.message}} Сообщение {{row.message}} + + + ServerId {{row.server_id}} Сервер {{row.serverName}} + + + +
No data matching the filter Нет сообщений
- +
diff --git a/src/app/pages/messages-page/messages-page.component.scss b/src/app/pages/messages-page/messages-page.component.scss index e69de29..666696a 100644 --- a/src/app/pages/messages-page/messages-page.component.scss +++ b/src/app/pages/messages-page/messages-page.component.scss @@ -0,0 +1,7 @@ +::ng-deep .mat-form-field-wrapper { + padding-bottom: unset !important; +} + +::ng-deep .mat-form-field-underline { + display: none; +} diff --git a/src/app/pages/messages-page/messages-page.component.ts b/src/app/pages/messages-page/messages-page.component.ts index 30dac06..92aa46e 100644 --- a/src/app/pages/messages-page/messages-page.component.ts +++ b/src/app/pages/messages-page/messages-page.component.ts @@ -5,42 +5,69 @@ import {MatPaginator, MatPaginatorIntl} from "@angular/material/paginator"; import {MatSort} from "@angular/material/sort"; import {Message} from "../../entities/profile/Message"; import {MessageService} from "../../services/message.service"; +import {AbstractSearchTable} from "../internal-components/abstract-search-table.component"; +import {SearchFilter} from "../../entities/search/SearchFilter"; +import {ServerService} from "../../services/server.service"; +import {MessageSearchFilter} from "../../entities/search/MessageSearchFilter"; +import {PlayerService} from "../../services/player.service"; +import {Router} from "@angular/router"; @Component({ selector: 'app-messages-page', templateUrl: './messages-page.component.html', styleUrls: ['./messages-page.component.scss'] }) -export class MessagesPageComponent implements OnInit, AfterViewInit { +export class MessagesPageComponent extends AbstractSearchTable { - displayedColumns: string[] = ['account_id', 'date', 'message', 'server_id']; - dataSource: MatTableDataSource; - - @ViewChild(MatPaginator, { static: true }) paginator!: MatPaginator; - @ViewChild(MatSort, { static: true }) sort!: MatSort; + displayedColumns: string[] = ['account_name', 'date', 'message', 'serverName']; constructor(public authService: AuthService, - private messageService: MessageService) { - this.dataSource = new MatTableDataSource(); - this.dataSource.paginator = this.paginator; - this.dataSource.sort = this.sort; - } - - ngOnInit(): void { - this.getMessages(null); + private messageService: MessageService, + protected override serverService: ServerService, + private playerService: PlayerService, + private router: Router) { + super(serverService); + super.filter = new MessageSearchFilter(); } - getMessages(filter:any) { - this.messageService.getMessages(filter, this.paginator).subscribe( + getMessages(): boolean { + this.filter.updated = false; + this.messageService.getMessages(this.filter, this.paginator).subscribe( (res) => { - this.dataSource = new MatTableDataSource(res.data) + this.dataSource = new MatTableDataSource(res.data); } ) + return true; } - ngAfterViewInit() { - this.paginator ? this.dataSource.paginator = this.paginator: null; - this.sort ? this.dataSource.sort = this.sort : null; + override updateData() { + this.getMessages(); } + addMessageToSearch(name: string) { + this.filter.message = name; + this.filter.updated = true; + } + + removeMessageFromSearch() { + this.filter.message = null; + this.filter.updated = true; + } + + searchPlayer(search: string) { + if (search.length == 0) { + return; + } + if (!this.authService.isAuth()) { + return; + } + + this.playerService.searchProfile(search).subscribe( + (res) => { + if (res.steam64 != null) + this.router.navigate(['profile', res.steam64]) + }, + (err) => {} + ) + } } diff --git a/src/app/pages/profile-page/profile-page.component.html b/src/app/pages/profile-page/profile-page.component.html index 10ecf18..34d0eb8 100644 --- a/src/app/pages/profile-page/profile-page.component.html +++ b/src/app/pages/profile-page/profile-page.component.html @@ -39,17 +39,17 @@ Имеет {{profile.permition.status}} права
-

Назначены: {{profile.permition.u_timestamp * 1000 | date:"hh:mm dd.MM.YYYY"}}

-

{{profile.permition.amount == 0?'Выданы на неопределенный срок':'Выданы до: ' + (((profile.permition.u_timestamp + profile.permition.amount) * 1000)| date:"hh:mm dd.MM.YYYY")}}

+

Назначены: {{profile.permition.u_timestamp * 1000 | date:"HH:mm dd.MM.YYYY"}}

+

{{profile.permition.amount == 0?'Выданы на неопределенный срок':'Выданы до: ' + (((profile.permition.u_timestamp + profile.permition.amount) * 1000)| date:"HH:mm dd.MM.YYYY")}}

 - Бан, {{profile.ban.ban_length_seconds > 0?'до ' + ((profile.ban.ban_utime+profile.ban.ban_length_seconds)*1000 | date:"hh:mm dd.MM.YYYY"):'навсегда'}} + Бан, {{profile.ban.ban_length_seconds > 0?'до ' + ((profile.ban.ban_utime+profile.ban.ban_length_seconds)*1000 | date:"HH:mm dd.MM.YYYY"):'навсегда'}}

Причина: {{profile.ban.ban_reason}}

-

Дата: {{profile.ban.ban_utime*1000 | date:"hh:mm dd.MM.YYYY"}}

+

Дата: {{profile.ban.ban_utime*1000 | date:"HH:mm dd.MM.YYYY"}}

 diff --git a/src/app/services/message.service.ts b/src/app/services/message.service.ts index 001ca2d..4afde67 100644 --- a/src/app/services/message.service.ts +++ b/src/app/services/message.service.ts @@ -4,6 +4,7 @@ import {MatPaginator} from "@angular/material/paginator"; import {map} from "rxjs"; import {PagingAndSortingPaginator} from "../entities/PagingAndSortingPaginator"; import {Message} from "../entities/profile/Message"; +import {SearchFilter} from "../entities/search/SearchFilter"; @Injectable({ providedIn: 'root' @@ -12,7 +13,7 @@ export class MessageService { constructor(private http: HttpClient) { } - getMessages(filters: any, paginator: MatPaginator) { + getMessages(filters: SearchFilter, paginator: MatPaginator | undefined) { return this.http.post( `/api/profile/messages/pages`, filters, diff --git a/src/app/utils/RussianPaginatorIntl.ts b/src/app/utils/RussianPaginatorIntl.ts new file mode 100644 index 0000000..399185c --- /dev/null +++ b/src/app/utils/RussianPaginatorIntl.ts @@ -0,0 +1,21 @@ +import {MatPaginatorIntl} from "@angular/material/paginator"; + +const rangeLevel = (page: number, pageSize: number, length: number) => { + if (length == 0 || pageSize == 0) { + return `0 из ${length}`; + } + + length = Math.max(length, 0); + const startIndex = page * pageSize; + const endIndex = startIndex < length ? Math.min(startIndex + pageSize, length) : startIndex + pageSize; + return `${startIndex + 1} - ${endIndex} из ${length}`; +} + +export function RussianPaginatorIntl() { + const p = new MatPaginatorIntl(); + p.getRangeLabel = rangeLevel; + p.itemsPerPageLabel = 'Количество строк:'; + p.nextPageLabel = 'Следующая страница'; + p.previousPageLabel = 'Предыдущая страница'; + return p; +}