generated from it-at-m/oss-repository-en-template
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* demodaten angepasst * tooltip messstelle angepasst * Testdatenangepasst * messstelle tooltip angepasst * working draft * working draft * cleanup * cleanup2 * Sprint 3 (#32) * Feat/dave 118 anpassungen tooltip und marker (#28) * demodaten angepasst * tooltip messstelle angepasst * Testdatenangepasst * messstelle tooltip angepasst * name entfernt und durch id ersetzt, (#30) * testdaten angepasst (#31) * Feature/dave 150 zurueckspringen karte (#29) * 🚧 koordinaten werden als query string in url gespeichert und ausgelesen * 🚧 aktuelle position wird auch für messstellen gespeichert * center wert wird an map übergeben * 🎨 --------- Co-authored-by: DanielOber <145556033+DanielOber@users.noreply.github.com> Co-authored-by: VJ <145964798+vjohnslhm@users.noreply.github.com> * edit messstelle angefangen * merged from sprint * Revert "merged from sprint" This reverts commit f9dc47b. * removed unused attr. * removed unused attr. * umgestellt auf composition api * review comments implemented * docu * if-else reorganized * add Todo * edit Messstelle implementiert, Messquerschnitt vorbereitet * edit Messquerschnitt implementiert * Layout angepasst * Tooltip angepasst * Sprint 4 (#34) * Feat/dave 118 anpassungen tooltip und marker (#28) * demodaten angepasst * tooltip messstelle angepasst * Testdatenangepasst * messstelle tooltip angepasst * name entfernt und durch id ersetzt, (#30) * testdaten angepasst (#31) * Feature/dave 150 zurueckspringen karte (#29) * 🚧 koordinaten werden als query string in url gespeichert und ausgelesen * 🚧 aktuelle position wird auch für messstellen gespeichert * center wert wird an map übergeben * 🎨 * Feat/dave 128 suche detektordaten adminportal (#33) * 🐛 no-console rule wieder aktiviert (#23) --------- Co-authored-by: DanielOber <145556033+DanielOber@users.noreply.github.com> Co-authored-by: VJ <145964798+vjohnslhm@users.noreply.github.com> Co-authored-by: martind260 <99957516+martind260@users.noreply.github.com> Co-authored-by: alexander.kerscher <alexander.kerscher@muenchen.de> * Anmerkungen umgesetzt --------- Co-authored-by: DanielOber <145556033+DanielOber@users.noreply.github.com> Co-authored-by: martin.dietrich <martin.dietrich@muenchen.de> Co-authored-by: Bianca <150359703+BiancaBriller@users.noreply.github.com> Co-authored-by: VJ <145964798+vjohnslhm@users.noreply.github.com> Co-authored-by: martind260 <99957516+martind260@users.noreply.github.com>
- Loading branch information
6 people
committed
Jan 15, 2024
1 parent
8db1fed
commit 5660378
Showing
17 changed files
with
768 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,64 +1,30 @@ | ||
| import MessstelleDTO from "@/domain/dto/MessstelleDTO"; | ||
| import MessstelleEditDTO from "@/domain/dto/messstelle/MessstelleEditDTO"; | ||
| import FetchService from "@/api/service/FetchService"; | ||
| import BackendIdDTO from "@/domain/dto/bearbeiten/BackendIdDTO"; | ||
| import MessstelleInfoDTO from "@/domain/dto/messstelle/MessstelleInfoDTO"; | ||
|
|
||
| export default class MessstelleService { | ||
| static getMessstelleById(id: string): MessstelleDTO { | ||
| switch (id) { | ||
| case "randomID": | ||
| return { | ||
| createdTime: "heute", | ||
| entityVersion: 0, | ||
| id: "randomID", | ||
| mstId: "MSTID1", | ||
| name: "Messstelle 1", | ||
| stadtbezirkNummer: 13, | ||
| lat: 48.1887227, | ||
| lng: 11.4290655, | ||
| customSuchwoerter: ["suchwort1", "suchwort2"], | ||
| kommentar: "string", | ||
| sichtbarDatenportal: true, | ||
| }; | ||
| case "randomID2": | ||
| return { | ||
| createdTime: "heute", | ||
| entityVersion: 0, | ||
| mstId: "MSTID2", | ||
| id: "randomID2", | ||
| name: "Messstelle 2", | ||
| stadtbezirkNummer: 13, | ||
| lat: 48.1316995, | ||
| lng: 11.6227731, | ||
| customSuchwoerter: ["suchwort1", "suchwort2"], | ||
| kommentar: "string", | ||
| sichtbarDatenportal: true, | ||
| }; | ||
| case "randomID3": | ||
| return { | ||
| createdTime: "heute", | ||
| entityVersion: 0, | ||
| id: "randomID3", | ||
| mstId: "MSTID3", | ||
| name: "Messstelle 3", | ||
| stadtbezirkNummer: 13, | ||
| lat: 48.1315995, | ||
| lng: 11.6217731, | ||
| customSuchwoerter: ["suchwort1", "suchwort2"], | ||
| kommentar: "string", | ||
| sichtbarDatenportal: true, | ||
| }; | ||
| default: | ||
| return { | ||
| createdTime: "error", | ||
| entityVersion: 0, | ||
| id: "error", | ||
| mstId: "error", | ||
| name: "error", | ||
| stadtbezirkNummer: 13, | ||
| lat: 48.1315995, | ||
| lng: 11.6217731, | ||
| customSuchwoerter: ["error", "error2"], | ||
| kommentar: "error", | ||
| sichtbarDatenportal: true, | ||
| }; | ||
| } | ||
| private static readonly ENDPOINT: string = | ||
| "api/dave-backend-service/messstelle"; | ||
| static getMessstelleInfo(id: string): Promise<MessstelleInfoDTO> { | ||
| return FetchService.getData( | ||
| `${this.ENDPOINT}/info?id=${id}`, | ||
| "Beim Laden der Messstellen-Info ist ein Fehler aufgetreten." | ||
| ); | ||
| } | ||
|
|
||
| static getMessstelleToEdit(id: string): Promise<MessstelleEditDTO> { | ||
| return FetchService.getData( | ||
| `${this.ENDPOINT}/edit?id=${id}`, | ||
| "Beim Laden der Messstellen ist ein Fehler aufgetreten." | ||
| ); | ||
| } | ||
|
|
||
| static saveMessstelle(data: MessstelleEditDTO): Promise<BackendIdDTO> { | ||
| return FetchService.patchData( | ||
| data, | ||
| `${this.ENDPOINT}/update`, | ||
| "Beim Aktualisieren der Daten ist ein Fehler aufgetreten. Bitte Daten kontrollieren." | ||
| ); | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
141 changes: 141 additions & 0 deletions
141
frontend/src/components/messstelle/MessquerschnittForm.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| <template> | ||
| <v-sheet | ||
| width="100%" | ||
| :height="height" | ||
| :max-height="height" | ||
| class="overflow-y-auto" | ||
| > | ||
| <v-card-text> | ||
| <v-form> | ||
| <v-row dense> | ||
| <v-col | ||
| cols="12" | ||
| md="4" | ||
| > | ||
| <v-autocomplete | ||
| v-model="selectedMessquerschnitt" | ||
| outlined | ||
| :items="editMessstelle.messquerschnitte" | ||
| item-text="mqId" | ||
| return-object | ||
| dense | ||
| label="ID Messquerschnitt" | ||
| ></v-autocomplete> | ||
| </v-col> | ||
| <v-spacer /> | ||
| </v-row> | ||
| <v-row dense> | ||
| <v-col | ||
| cols="12" | ||
| md="4" | ||
| > | ||
| <lhm-text-field | ||
| :text="selectedMessquerschnitt.strassenname" | ||
| caption="Straßenname" | ||
| /> | ||
| </v-col> | ||
| <v-col | ||
| cols="12" | ||
| md="4" | ||
| > | ||
| <lhm-text-field | ||
| :text="selectedMessquerschnitt.fahrtrichtung" | ||
| caption="Fahrtrichtung" | ||
| /> | ||
| </v-col> | ||
| <v-col | ||
| cols="12" | ||
| md="4" | ||
| > | ||
| <lhm-text-field | ||
| :text="selectedMessquerschnitt.fahrzeugKlassen" | ||
| caption="FZ-Klassen" | ||
| /> | ||
| </v-col> | ||
| </v-row> | ||
| <v-row dense> | ||
| <v-col | ||
| cols="12" | ||
| md="4" | ||
| > | ||
| <lhm-text-field | ||
| :text="selectedMessquerschnitt.lageMessquerschnitt" | ||
| caption="Lage" | ||
| /> | ||
| </v-col> | ||
| <v-col | ||
| cols="12" | ||
| md="4" | ||
| > | ||
| <lhm-text-field | ||
| :text="`${selectedMessquerschnitt.anzahlFahrspuren}`" | ||
| caption="Anzahl Fahrstreifen" | ||
| /> | ||
| </v-col> | ||
| <v-col | ||
| cols="12" | ||
| md="4" | ||
| > | ||
| <lhm-text-field | ||
| :text="`${selectedMessquerschnitt.anzahlDetektoren}`" | ||
| caption="Anzahl Detektoren" | ||
| /> | ||
| </v-col> | ||
| </v-row> | ||
| <v-row dense> | ||
| <v-col | ||
| cols="12" | ||
| md="12" | ||
| > | ||
| <v-textarea | ||
| v-model="selectedMessquerschnitt.standort" | ||
| label="Standort MQ" | ||
| outlined | ||
| dense | ||
| rows="2" | ||
| row-height="10" | ||
| counter="255" | ||
| maxlength="255" | ||
| ></v-textarea> | ||
| </v-col> | ||
| </v-row> | ||
| </v-form> | ||
| </v-card-text> | ||
| </v-sheet> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { computed, ComputedRef, ref, Ref } from "vue"; | ||
| /* eslint-disable no-unused-vars */ | ||
| import MessstelleEditDTO from "@/domain/dto/messstelle/MessstelleEditDTO"; | ||
| import LhmTextField from "@/components/common/LhmTextField.vue"; | ||
| import MessquerschnittEditDTO from "@/domain/dto/messstelle/MessquerschnittEditDTO"; | ||
| /* eslint-enable no-unused-vars */ | ||
| interface Props { | ||
| height: string; | ||
| value: MessstelleEditDTO; | ||
| } | ||
| const props = defineProps<Props>(); | ||
| const emits = defineEmits<{ | ||
| (e: "input", v: MessstelleEditDTO): void; | ||
| }>(); | ||
| const editMessstelle = computed({ | ||
| get: () => props.value, | ||
| set: (v) => emits("input", v), | ||
| }); | ||
| const model: Ref<string> = ref(editMessstelle.value.messquerschnitte[0].mqId); | ||
| const selectedMessquerschnitt: Ref<MessquerschnittEditDTO> = ref( | ||
| editMessstelle.value.messquerschnitte[0] | ||
| ); | ||
| const stadtbezirk: ComputedRef<string> = computed(() => { | ||
| return `${editMessstelle.value.stadtbezirkNummer} - ${editMessstelle.value.stadtbezirk}`; | ||
| }); | ||
| </script> |
Oops, something went wrong.