self-hosted/pigallery2
1
0
Fork 0
mirror of https://github.com/bpatrik/pigallery2.git synced 2024-12-23 01:27:14 +02:00
Code Issues Releases Activity

Improving settings for map themes #587

Browse Source 
#667
This commit is contained in:
Patrik J. Braun 2023-07-04 22:49:05 +02:00
parent b1a19df2c3
commit 4a1daff947
3 changed files with 112 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/config/public/ClientConfig.ts
View File

@ -403,7 +403,7 @@ export class MapPathGroupThemeConfig {
@ConfigProperty({
arrayType: 'string',
tags: {
name: $localize`Matcher`,
name: $localize`Matchers`,
priority: ConfigPriority.advanced
},
description: $localize`List of regex string to match the name of the path. Case insensitive.`,
@ -442,7 +442,7 @@ export class MapPathGroupConfig {
@ConfigProperty({
arrayType: MapPathGroupThemeConfig,
tags: {
name: $localize`Matchers`,
name: $localize`Path themes`,
priority: ConfigPriority.advanced
},
description: $localize`Matchers for a given map and path theme.`,
@ -516,7 +516,7 @@ export class ClientMapConfig {
@ConfigProperty({
arrayType: MapPathGroupConfig,
tags: {
name: $localize`Path and marker group`,
name: $localize`Path theme groups`,
priority: ConfigPriority.advanced
} as TAGS,
description: $localize`Markers are grouped and themed by these settings`,

102
src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.html
View File

@ -191,6 +191,108 @@
</div>
</ng-container>
<ng-container *ngSwitchCase="'MapPathGroupThemeConfig'">
<div class="container">
<div class="row mt-1 mb-1 bg-body-tertiary" *ngFor="let val of state.value; let i = index">
<div class="row mt-1 mb-1 bg-body-tertiary">
<div class="col ps-0">
<app-settings-entry
[ngModel]="val.__state.matchers"
[name]="'val_m_'+idName+i"
[id]="'val_m_'+idName+i"
(change)="onChange($event)"></app-settings-entry>
</div>
<div class="col-1 pe-0">
<button [disabled]="state.value.length == 1" (click)="remove(i)"
[ngClass]="state.value.length > 1? 'btn-danger':'btn-secondary'"
class="btn float-end">
<span class="oi oi-trash" aria-hidden="true" aria-label="Delete"></span>
</button>
</div>
</div>
<div class="row mt-1 mb-1 bg-body-tertiary">
<app-settings-entry
[ngModel]="val.theme.__state.color"
[name]="'color_m_'+idName+i"
[id]="'color_m_'+idName+i"
(change)="onChange($event)"></app-settings-entry>
</div>
<div class="row mt-1 mb-1 bg-body-tertiary">
<app-settings-entry
[ngModel]="val.theme.__state.dashArray"
[name]="'dashArray_n_'+idName+i"
[id]="'dashArray_n_'+idName+i"
(change)="onChange($event)"></app-settings-entry>
</div>
<div class="row mt-1 mb-1 bg-body-tertiary">
<app-settings-entry
[ngModel]="val.theme.svgIcon.__state.viewBoxWidth"
[name]="'viewBoxWidth_n_'+idName+i"
[id]="'viewBoxWidth_n_'+idName+i"
(change)="onChange($event)"></app-settings-entry>
</div>
<div class="row mt-1 mb-1 bg-body-tertiary">
<app-settings-entry
[ngModel]="val.theme.svgIcon.__state.path"
[name]="'path_n_'+idName+i"
[id]="'path_n_'+idName+i"
(change)="onChange($event)"></app-settings-entry>
</div>
</div>
<div class="row">
<div class="col pe-0">
<button class="btn btn-primary float-end"
(click)="AddNew()" i18n>+ Add Link
</button>
</div>
</div>
</div>
</ng-container>
<ng-container *ngSwitchCase="'MapPathGroupConfig'">
<div class="container">
<div class="bg-body-tertiary row mt-1 mb-1" *ngFor="let arr of state.value; let i = index">
<div class="row mt-1 mb-1 me-0 ms-0 pe-0 ps-0">
<div class="col ps-0">
<input type="text" class="form-control"
placeholder="Name"
[(ngModel)]="arr.name"
(ngModelChange)="onChange($event)"
[name]="'arr_n_'+idName+i"
[id]="'arr_n_'+idName+i" required>
</div>
<div class="col-1 pe-0">
<button [disabled]="state.value.length == 1" (click)="remove(i)"
[ngClass]="state.value.length > 1? 'btn-danger':'btn-secondary'"
class="btn float-end">
<span class="oi oi-trash" aria-hidden="true" aria-label="Delete"></span>
</button>
</div>
</div>
<div class="row mt-1 mb-1 me-0 ms-0">
<div class="col">
<app-settings-entry
[ngModel]="arr.__state.matchers"
[name]="'arr_m_'+idName+i"
[id]="'arr_m_'+idName+i"
(change)="onChange($event)"></app-settings-entry>
</div>
</div>
</div>
<div class="row">
<div class="col pe-0">
<button class="btn btn-primary float-end"
(click)="AddNew()" i18n>+ Add Link
</button>
</div>
</div>
</div>
</ng-container>
<ng-container *ngSwitchCase="'NavigationLinkConfig'">
<div class="container">
<div class="row mt-1 mb-1 bg-body-tertiary" *ngFor="let link of state.value; let i = index">

8
src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.ts
View File

@ -3,7 +3,7 @@ import {ControlValueAccessor, NG_VALIDATORS, NG_VALUE_ACCESSOR, ValidationErrors
import {Utils} from '../../../../../../common/Utils';
import {propertyTypes} from 'typeconfig/common';
import {SearchQueryParserService} from '../../../gallery/search/search-query-parser.service';
import {MapLayers, NavigationLinkConfig, NavigationLinkTypes, TAGS, ThemeConfig} from '../../../../../../common/config/public/ClientConfig';
import {MapLayers, MapPathGroupConfig, MapPathGroupThemeConfig, NavigationLinkConfig, NavigationLinkTypes, TAGS, ThemeConfig} from '../../../../../../common/config/public/ClientConfig';
import {SettingsService} from '../../settings.service';
import {WebConfig} from '../../../../../../common/config/private/WebConfig';
import {JobScheduleConfig, UserConfig} from '../../../../../../common/config/private/PrivateConfig';
@ -206,6 +206,10 @@ export class SettingsEntryComponent
this.arrayType = 'MapLayers';
} else if (this.state.arrayType === NavigationLinkConfig) {
this.arrayType = 'NavigationLinkConfig';
} else if (this.state.arrayType === MapPathGroupConfig) {
this.arrayType = 'MapPathGroupConfig';
} else if (this.state.arrayType === MapPathGroupThemeConfig) {
this.arrayType = 'MapPathGroupThemeConfig';
} else if (this.state.arrayType === UserConfig) {
this.arrayType = 'UserConfig';
} else if (this.state.arrayType === JobScheduleConfig) {
@ -220,6 +224,8 @@ export class SettingsEntryComponent
this.type !== 'SearchQuery' &&
this.arrayType !== 'MapLayers' &&
this.arrayType !== 'NavigationLinkConfig' &&
this.arrayType !== 'MapPathGroupConfig' &&
this.arrayType !== 'MapPathGroupThemeConfig' &&
this.arrayType !== 'JobScheduleConfig' &&
this.arrayType !== 'UserConfig') {
this.uiType = 'StringInput';