amigan/stillbox
1
1
Fork 0
Code Issues 33 Pull requests Projects Releases Packages Wiki Activity Actions

Fix icon save #63

Merged
amigan merged 2 commits from fixiconsave into trunk 2024-12-01 20:44:11 -05:00
Conversation 0 Commits 2 Files changed 3 +6 -5
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/admin/src/app/app.component.html
View file

@ -260,7 +260,7 @@
@if (auth.loggedIn) { @if (auth.loggedIn) {
<div class="container w-full lg:ps-64"> <div class="container w-full lg:ps-64">
<div <div
class="object-contain object-scale-down p-4 sm:p-6 space-y-4 sm:space-y-6" class="object-contain p-4 sm:p-6 "
> >
<router-outlet /> <router-outlet />
</div> </div>

6
client/admin/src/app/talkgroups/talkgroup-record/talkgroup-record.component.ts
View file

@ -54,7 +54,6 @@ export class TalkgroupRecordComponent {
weight: new FormControl(this.tg.weight), weight: new FormControl(this.tg.weight),
icon: new FormControl(this.tg.icon), icon: new FormControl(this.tg.icon),
}); });
console.log(this.tg.icon);
}); });
} }
@ -83,14 +82,15 @@ export class TalkgroupRecordComponent {
tgu.weight = Number(this.form.controls['weight'].value); tgu.weight = Number(this.form.controls['weight'].value);
} }
if (this.form.controls['icon'].dirty) { if (this.form.controls['icon'].dirty) {
let iv: string = this.form.controls['icon'].value;
if (tgu.metadata == null) { if (tgu.metadata == null) {
tgu.metadata = {}; tgu.metadata = {};
} }
if (this.tg.icon == null || this.tg.icon == '') { if (iv == '') {
tgu.metadata = Object.assign(tgu.metadata, { icon: undefined }); tgu.metadata = Object.assign(tgu.metadata, { icon: undefined });
} else { } else {
tgu.metadata = Object.assign(tgu.metadata!, { tgu.metadata = Object.assign(tgu.metadata!, {
icon: this.form.controls['icon'], icon: iv,
}); });
} }
} }

3
client/admin/src/app/talkgroups/talkgroups.component.html
View file

@ -1,5 +1,4 @@
<div class="w-100 justify-center overflow-x-auto"> <div class="w-100 justify-center overflow-x-auto">
<a href="#" class="btn btn-primary" routerLink="/talkgroups/import">Import</a>
<div class="rounded-lg border border-gray-200 dark:border-gray-700"> <div class="rounded-lg border border-gray-200 dark:border-gray-700">
<div class="overflow-x-auto rounded-t-lg"> <div class="overflow-x-auto rounded-t-lg">
<table <table
@ -177,3 +176,5 @@
</div> </div>
</div> </div>
</div> </div>
<a href="#" class="btn btn-primary" routerLink="/talkgroups/import">Import</a>