diff --git a/angular/src/app/_components/list/list.component.ts b/angular/src/app/_components/list/list.component.ts
index 466a970..128d8eb 100644
--- a/angular/src/app/_components/list/list.component.ts
+++ b/angular/src/app/_components/list/list.component.ts
@@ -386,11 +386,14 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
}
public onCreateData() {
- console.log('sddssdssd');
+ this.appHelperService.openModal(
+ this.createDataComponent,
+ null,
+ this.getData
+ );
}
- public getFilterJsonString(): any
- {
+ public getFilterJsonString(): any {
return JSON.stringify(this.filterObj);
}
diff --git a/angular/src/app/_components/paging/paging.component.html b/angular/src/app/_components/paging/paging.component.html
index 4e28203..3d6c851 100644
--- a/angular/src/app/_components/paging/paging.component.html
+++ b/angular/src/app/_components/paging/paging.component.html
@@ -36,7 +36,7 @@
(click)="getData()">
diff --git a/angular/src/app/_components/search-select/search-select.component.html b/angular/src/app/_components/search-select/search-select.component.html
index 9bca4b7..5f800f0 100644
--- a/angular/src/app/_components/search-select/search-select.component.html
+++ b/angular/src/app/_components/search-select/search-select.component.html
@@ -3,7 +3,7 @@
diff --git a/angular/src/app/_components/search-select/search-select.component.ts b/angular/src/app/_components/search-select/search-select.component.ts
index 72ef45d..86c38a2 100644
--- a/angular/src/app/_components/search-select/search-select.component.ts
+++ b/angular/src/app/_components/search-select/search-select.component.ts
@@ -98,155 +98,23 @@ export class SearchSelectComponent implements OnInit, AfterViewInit {
onSortChange = (sortState: Sort) => {
}
- public static getDefaultColDefAccountsSniping(subResource?: string): ListColDefinition[] {
- return [
- ListComponent.getDefaultColPosition(),
+ public static getDefaultColDefZones(subResource?: string): ListColDefinition[] {
+ return [
{
- name: 'profile',
- text: 'game_account.profile',
- type: ListComponent.COLUMN_TYPE_TEXT_BOLD,
- field: 'profile',
- sortable: true,
- //subResource: subResource,
- } as ListColDefinition,
- {
- name: 'credits',
- text: 'game_account.credits',
- type: ListComponent.COLUMN_TYPE_NUMBER_BOLD,
- field: 'credits',
- //subResource: subResource,
- sortable: true,
- } as ListColDefinition,
- {
- name: 'running',
- text: 'sniping.running',
- type: ListComponent.COLUMN_TYPE_BOOLEAN,
- field: 'running',
- sortable: true,
- filterType: FilterBarComponent.FILTER_TYPE_BOOLEAN,
- } as ListColDefinition,
- {
- name: 'blocked',
- text: 'sniping.blocked',
- type: ListComponent.COLUMN_TYPE_BOOLEAN,
- field: 'blocked',
- sortable: true,
- filterType: FilterBarComponent.FILTER_TYPE_BOOLEAN,
- } as ListColDefinition,
- {
- name: 'snipingCnt1h',
- text: 'sniping.snipingCnt1h',
- type: ListComponent.COLUMN_TYPE_NUMBER,
- field: 'snipingCnt1h',
- sortable: true,
- } as ListColDefinition,
- {
- name: 'snipingCnt3h',
- text: 'sniping.snipingCnt3h',
- type: ListComponent.COLUMN_TYPE_NUMBER,
- field: 'snipingCnt3h',
- sortable: true,
- } as ListColDefinition,
- {
- name: 'snipingCnt6h',
- text: 'sniping.snipingCnt6h',
- type: ListComponent.COLUMN_TYPE_NUMBER,
- field: 'snipingCnt6h',
- sortable: true,
- } as ListColDefinition,
- {
- name: 'snipingCnt12h',
- text: 'sniping.snipingCnt12h',
- type: ListComponent.COLUMN_TYPE_NUMBER,
- field: 'snipingCnt12h',
- sortable: true,
- } as ListColDefinition,
- {
- name: 'snipingCnt24h',
- text: 'sniping.snipingCnt24h',
- type: ListComponent.COLUMN_TYPE_NUMBER,
- field: 'snipingCnt24h',
- sortable: true,
- } as ListColDefinition,
- {
- name: 'snipingCnt3d',
- text: 'sniping.snipingCnt3d',
- type: ListComponent.COLUMN_TYPE_NUMBER,
- field: 'snipingCnt3d',
- sortable: true,
- } as ListColDefinition,
- {
- name: 'snipingCnt1w',
- text: 'sniping.snipingCnt1w',
- type: ListComponent.COLUMN_TYPE_NUMBER,
- field: 'snipingCnt1w',
- sortable: true,
- } as ListColDefinition,
- {
- name: 'snipingDate',
- text: 'game_account.snipingDate',
- type: ListComponent.COLUMN_TYPE_DATE,
- field: 'snipingDate',
+ name: 'name',
+ text: 'common.name',
+ type: ListComponent.COLUMN_TYPE_TEXT,
+ field: 'name',
sortable: true,
+ filterType: FilterBarComponent.FILTER_TYPE_TEXT,
} as ListColDefinition,
{
- name: 'relistDate',
- text: 'game_account.relistDate',
+ name: 'createdAt',
+ text: 'common.created_at',
type: ListComponent.COLUMN_TYPE_DATE,
- field: 'relistDate',
- sortable: true,
- } as ListColDefinition,
- ];
- }
-
- public static getDefaultColDefCandidates(subResource?: string): ListColDefinition[] {
- return [
- ListComponent.getDefaultColPosition(),
- {
- name: 'image',
- text: 'basic.image',
- type: ListComponent.COLUMN_TYPE_COMBINED_IMAGES,
- multipleFields: ['cardImageUrl', 'imageUrl', 'rating'],
- } as ListColDefinition,
- {
- name: 'firstname',
- text: 'candidate.firstname',
- type: ListComponent.COLUMN_TYPE_TEXT_BOLD,
- field: 'firstname',
- sortingSubResource: 'player',
- sortable: true,
- } as ListColDefinition,
- {
- name: 'lastname',
- text: 'candidate.lastname',
- type: ListComponent.COLUMN_TYPE_TEXT_BOLD,
- field: 'lastname',
- sortingSubResource: 'player',
- sortable: true,
- } as ListColDefinition,
- {
- name: 'nickname',
- text: 'candidate.nickname',
- type: ListComponent.COLUMN_TYPE_TEXT_BOLD,
- field: 'nickname',
- sortingSubResource: 'player',
- sortable: true,
- } as ListColDefinition,
- {
- name: 'rating',
- text: 'candidate.rating',
- type: ListComponent.COLUMN_TYPE_TEXT_BOLD,
- field: 'rating',
- sortable: true,
- } as ListColDefinition,
- {
- name: 'rarityName',
- text: 'candidate.rarityName',
- type: ListComponent.COLUMN_TYPE_TEXT,
- field: 'name',
- subResource: 'rarity',
- sortingSubResource: 'rarity',
+ field: 'createdAt',
sortable: true,
+ filterType: FilterBarComponent.FILTER_TYPE_DATE,
} as ListColDefinition,
];
}
diff --git a/angular/src/app/_interfaces/AbstractCreateDataComponent.ts b/angular/src/app/_interfaces/AbstractCreateDataComponent.ts
index 061f01b..c53b6ca 100644
--- a/angular/src/app/_interfaces/AbstractCreateDataComponent.ts
+++ b/angular/src/app/_interfaces/AbstractCreateDataComponent.ts
@@ -11,6 +11,7 @@ export abstract class AbstractCreateDataComponent
implements CreateDataCompon
form!: FormGroup;
ngOnInit(): void {
+ this.data = this.getInitialData();
this.form = FormGroupInitializer.initFormGroup(this.form, this.data);
}
diff --git a/angular/src/app/_views/location/location-list/location-list.component.html b/angular/src/app/_views/location/location-list/location-list.component.html
index d89cf02..d52e990 100644
--- a/angular/src/app/_views/location/location-list/location-list.component.html
+++ b/angular/src/app/_views/location/location-list/location-list.component.html
@@ -5,5 +5,6 @@
[onNavigateToDetailsFunction]="navigateToLocationDetail"
[onSortFunction]="onSortChange"
[listColDefinitions]="listColDefinitions"
+ [createDataComponent]="LocationNewComponent"
>
\ No newline at end of file
diff --git a/angular/src/app/_views/location/location-list/location-list.component.ts b/angular/src/app/_views/location/location-list/location-list.component.ts
index 1a8e830..cddaf5b 100644
--- a/angular/src/app/_views/location/location-list/location-list.component.ts
+++ b/angular/src/app/_views/location/location-list/location-list.component.ts
@@ -9,6 +9,8 @@ import {FilterBarComponent} from "@app/_components/filter-bar/filter-bar.compone
import {ListGetDataFunctionType} from "@app/_components/list/list-get-data-function-type";
import {ROUTE_LOCATIONS} from "@app/app-routing.module";
import {Sort} from "@angular/material/sort";
+import {ZoneNewComponent} from "@app/_views/zone/zone-new/zone-new.component";
+import {LocationNewComponent} from "@app/_views/location/location-new/location-new.component";
@Component({
selector: 'app-location-list',
@@ -38,7 +40,7 @@ export class LocationListComponent implements OnInit, AfterViewInit {
} as ListColDefinition,
{
name: 'zone',
- text: 'location.zone',
+ text: 'model.zone',
type: ListComponent.COLUMN_TYPE_TEXT,
field: 'name',
sortable: true,
@@ -85,4 +87,6 @@ export class LocationListComponent implements OnInit, AfterViewInit {
this.router.navigate(['/' + ROUTE_LOCATIONS, this.appHelperService.extractId(location.id)]);
}
+ protected readonly ZoneNewComponent = ZoneNewComponent;
+ protected readonly LocationNewComponent = LocationNewComponent;
}
diff --git a/angular/src/app/_views/location/location-new/location-new.component.html b/angular/src/app/_views/location/location-new/location-new.component.html
new file mode 100644
index 0000000..8a17766
--- /dev/null
+++ b/angular/src/app/_views/location/location-new/location-new.component.html
@@ -0,0 +1,24 @@
+