Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/dave 157 farbige messstellen #37

Merged
merged 56 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
8c18a71
demodaten angepasst
DanielOber Dec 5, 2023
37ed442
tooltip messstelle angepasst
DanielOber Dec 5, 2023
f8a725a
Testdatenangepasst
DanielOber Dec 5, 2023
c818d66
messstelle tooltip angepasst
DanielOber Dec 5, 2023
4ecda1f
Merge remote-tracking branch 'origin/sprint' into feat/DAVE-118_anpas…
DanielOber Dec 8, 2023
ae894ad
Feat/dave 118 anpassungen tooltip und marker (#28)
DanielOber Dec 15, 2023
e91d2d0
name entfernt und durch id ersetzt, (#30)
DanielOber Dec 15, 2023
7336256
working draft
martind260 Dec 15, 2023
a2811c0
working draft
martind260 Dec 15, 2023
8450229
testdaten angepasst (#31)
DanielOber Dec 15, 2023
282792f
cleanup
martind260 Dec 20, 2023
65f6eaf
cleanup2
martind260 Dec 21, 2023
e57c540
Feature/dave 150 zurueckspringen karte (#29)
vjohnslhm Dec 22, 2023
5636ba9
edit messstelle angefangen
Der-Alex-K Jan 2, 2024
f9dc47b
merged from sprint
martind260 Jan 3, 2024
a76bb70
Revert "merged from sprint"
martind260 Jan 3, 2024
35d12d2
Merge remote-tracking branch 'origin/sprint' into feat/DAVE-128_Suche…
martind260 Jan 3, 2024
814218b
removed unused attr.
martind260 Jan 3, 2024
d398a8d
removed unused attr.
martind260 Jan 3, 2024
5ce4c4f
Merge branch 'feat/DAVE-128_Suche-Detektordaten-Adminportal' of https…
martind260 Jan 3, 2024
5b483c9
umgestellt auf composition api
Der-Alex-K Jan 3, 2024
6970349
review comments implemented
martind260 Jan 3, 2024
56b7df0
docu
martind260 Jan 4, 2024
056574e
if-else reorganized
martind260 Jan 4, 2024
b0bb6bc
merge feat/Dave-128
Der-Alex-K Jan 4, 2024
830fab6
Feat/dave 128 suche detektordaten adminportal (#33)
martind260 Jan 4, 2024
cae3477
add Todo
Der-Alex-K Jan 4, 2024
07269cb
Merge remote-tracking branch 'origin/sprint' into feat/DAVE-112_Edit-…
Der-Alex-K Jan 4, 2024
008a92a
edit Messstelle implementiert, Messquerschnitt vorbereitet
Der-Alex-K Jan 5, 2024
0dd1ddb
:bug: no-console rule wieder aktiviert (#23)
vjohnslhm Jan 8, 2024
8db7944
edit Messquerschnitt implementiert
Der-Alex-K Jan 8, 2024
5e3e535
Layout angepasst
Der-Alex-K Jan 10, 2024
2b100d7
Merge remote-tracking branch 'origin/sprint' into feat/DAVE-112_Edit-…
Der-Alex-K Jan 10, 2024
cca9c4a
Tooltip angepasst
Der-Alex-K Jan 10, 2024
8db1fed
Merge remote-tracking branch 'origin/main-ls2' into sprint
Der-Alex-K Jan 11, 2024
6fb886c
Merge remote-tracking branch 'origin/main-ls2' into feat/DAVE-112_Edi…
Der-Alex-K Jan 11, 2024
e7ebfc9
OpenZaehlungView umgestellet auf CompositionApi + rename zu Erhebungs…
Der-Alex-K Jan 11, 2024
f01dfe9
Anmerkungen umgesetzt
Der-Alex-K Jan 12, 2024
6bfc54c
Merge remote-tracking branch 'origin/feat/DAVE-112_Edit-Messstelle' i…
Der-Alex-K Jan 12, 2024
898424f
erhebungsstellen uebersicht um Messstellen erweitert
Der-Alex-K Jan 12, 2024
5660378
Feat/dave 112 edit messstelle (#35)
Der-Alex-K Jan 15, 2024
3167331
logik zur befuellung der MessstellenOverview eingebaut
Der-Alex-K Jan 15, 2024
89213bc
Merge remote-tracking branch 'origin/sprint' into feat/DAVE-122_Erheb…
Der-Alex-K Jan 15, 2024
0793e19
umgestellt
Der-Alex-K Jan 16, 2024
727c3c7
rename
Der-Alex-K Jan 16, 2024
68a0a69
fix search by enter
Der-Alex-K Jan 16, 2024
5c82bca
:bento: Assets geupdatet
vjohnslhm Jan 16, 2024
3d53827
Merge remote-tracking branch 'origin/feat/DAVE-122_Erhebungsstellen-u…
vjohnslhm Jan 16, 2024
5dce1f8
Update Messstellen Icon
vjohnslhm Jan 16, 2024
b8fe23b
:bulb: kommentar entfernt
vjohnslhm Jan 17, 2024
1ca1692
Feat/dave 122 erhebungsstellen uebersicht (#36)
Der-Alex-K Jan 18, 2024
9d59285
:bento: Neue Marker Icons + Schatten
vjohnslhm Jan 22, 2024
36b7ca3
Merge remote-tracking branch 'origin/sprint' into feat/DAVE-157_farbi…
vjohnslhm Jan 22, 2024
c769786
code aufgeräumt
vjohnslhm Jan 22, 2024
1a1a67a
Merge remote-tracking branch 'origin/sprint' into feat/DAVE-157_farbi…
vjohnslhm Jan 29, 2024
0e65ca3
update Statusvergleich wegen Groß-/Kleinschreibung
vjohnslhm Jan 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added frontend/src/assets/cards-diamond-orange.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/src/assets/cards-diamond-red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/cards-diamond-shadow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/src/assets/cards-diamond-violet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 17 additions & 2 deletions frontend/src/components/map/ZaehlstelleMap.vue
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,15 @@ import TooltipZaehlstelleDTO from "@/domain/dto/TooltipZaehlstelleDTO";
import markerIconRed from "@/assets/marker-icon-red.png";
import markerIconDiamondViolet from "@/assets/cards-diamond-violet.png";
import markerIconDiamondRed from "@/assets/cards-diamond-red.png";
import markerIconDiamondOrange from "@/assets/cards-diamond-orange.png";
import markerIconDiamondShadow from "@/assets/cards-diamond-shadow.png";
import TooltipMessstelleDTO from "@/domain/dto/TooltipMessstelleDTO";
import AnzeigeKarteDTO from "@/domain/dto/AnzeigeKarteDTO";
import MessstelleKarteDTO from "@/domain/dto/messstelle/MessstelleKarteDTO";
import {
MessstelleStatus,
messstelleStatusText,
} from "@/domain/enums/MessstelleStatus";
/* eslint-enable no-unused-vars */

@Component({
Expand Down Expand Up @@ -544,8 +550,17 @@ export default class ZaehlstelleMap extends Vue {
* Setzt die Optionen bezüglich verwendetes Icon für den Messstellenmarker.
*/
private markerOptionsMessstelle(messstelleKarte: MessstelleKarteDTO) {
let defaultIcon = new Icon.Default();
defaultIcon.options.iconUrl = markerIconDiamondViolet;
let defaultIcon = new Icon({
iconUrl: markerIconDiamondViolet,
shadowUrl: markerIconDiamondShadow,
shadowAnchor: [8, 25],
iconSize: [25, 41],
});

if (messstelleKarte.status === MessstelleStatus.IN_PLANUNG) {
defaultIcon.options.iconUrl = markerIconDiamondOrange;
}

if (this.zId) {
if (this.zId === messstelleKarte.id) {
defaultIcon.options.iconUrl = markerIconDiamondRed;
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/domain/dto/messstelle/MessstelleKarteDTO.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ export default interface MessstelleKarteDTO extends AnzeigeKarteDTO {
mstId: string;

tooltip: TooltipMessstelleDTO;

status: string;
}
Loading