Skip to content

Fv 150 anpassung filtermenü fahrzeuge #559

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.

Sign up for GitHub

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

Open
martind260 wants to merge 14 commits into
base: sprint
Choose a base branch
from
Open

Fv 150 anpassung filtermenü fahrzeuge #559

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8a13aa9
Merge branch 'sprint' of https://github.com/it-at-m/dave-frontend int…
martind260 Apr 8, 2025
2c8515d
Merge branch 'sprint' of https://github.com/it-at-m/dave-frontend int…
martind260 May 6, 2025
f6e6b6f
Merge branch 'sprint' of https://github.com/it-at-m/dave-frontend int…
martind260 May 28, 2025
7e1760d
Merge branch 'sprint' of https://github.com/it-at-m/dave-frontend int…
martind260 Dec 9, 2025
33a6e96
Merge branch 'sprint' of https://github.com/it-at-m/dave-frontend int…
martind260 Dec 17, 2025
41d9f68
Merge branch 'sprint' of https://github.com/it-at-m/dave-frontend int…
martind260 Jan 12, 2026
1c61ceb
Merge branch 'sprint' of https://github.com/it-at-m/dave-frontend int…
martind260 Jan 16, 2026
b152758
Merge branch 'sprint' of https://github.com/it-at-m/dave-frontend int…
martind260 Jan 27, 2026
deb8e92
Merge branch 'sprint' of https://github.com/it-at-m/dave-frontend int…
martind260 Feb 5, 2026
394de71
working draft
martind260 Feb 9, 2026
1539be0
cleanup
martind260 Feb 9, 2026
52d0e2b
renamings
martind260 Feb 11, 2026
78ea952
default selections FUSS impl.
martind260 Feb 12, 2026
ac50ebf
review comments impl.
martind260 Feb 18, 2026
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
18 changes: 15 additions & 3 deletions frontend/src/components/zaehlstelle/optionsmenue/OptionsmenueZaehlstelle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,20 @@ const activeZaehlung = computed<LadeZaehlungDTO>(() => {
return zaehlstelleStore.getAktiveZaehlung;
});

const isTeilzaehlungFussverkehr = computed(() => {
return (activeZaehlung.value.kategorien.length === 1 &&
activeZaehlung.value.kategorien[0] === Fahrzeug.FUSS &&
activeZaehlung.value.zaehldauer != Zaehldauer.DAUER_24_STUNDEN);
});

/**
* Setzt die Default-Einstellungen für das Optionsmenü je nach Zählung
*/
function setDefaultOptionsForZaehlung() {
const optionsCopy = {} as ZaehlstelleOptionsDTO;
Object.assign(optionsCopy, options.value);

if (activeZaehlung.value.zaehldauer === Zaehldauer.DAUER_13_STUNDEN) {
if (activeZaehlung.value.zaehldauer === Zaehldauer.DAUER_13_STUNDEN || isTeilzaehlungFussverkehr.value) {
optionsCopy.zeitauswahl = Zeitauswahl.BLOCK;
optionsCopy.zeitblock = Zeitblock.ZB_06_19;
}
Expand Down Expand Up @@ -192,11 +198,17 @@ function setDefaultOptionsForZaehlung() {
optionsCopy.gueterverkehrsanteilProzent = true;
break;
case Fahrzeug.RAD:
// Rad soll nur bei reinen Radzählungen aktiviert sein
optionsCopy.radverkehr = ["R", "QR"].includes(
// Rad soll nur bei best. Zählarten aktiviert sein
optionsCopy.radverkehr = [Zaehlart.R, Zaehlart.QR, Zaehlart.FJS, Zaehlart.QU, Zaehlart.QJS].includes(
activeZaehlung.value.zaehlart
);
break;
case Fahrzeug.FUSS:
// Fuss soll nur bei Zählarten FjS, Qu, QjS aktiviert sein
optionsCopy.fussverkehr = [Zaehlart.FJS, Zaehlart.QU, Zaehlart.QJS].includes(
activeZaehlung.value.zaehlart
);
break;
}
});
optionsCopy.beideRichtungen = false;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/zaehlstelle/optionsmenue/panels/FahrzeugPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
start
icon="mdi-car-multiple"
/>
Fahrzeuge
Verkehrsarten & Fahrzeuge
</div>
</v-expansion-panel-title>
<v-expansion-panel-text class="mt-1">
Expand Down Expand Up @@ -256,7 +256,7 @@
<v-col cols="6">
<v-checkbox
v-model="chosenOptionsCopy.fussverkehr"
:label="'Fußgänger (Fuß)'"
:label="'Fußverkehr'"
:hint="getHintToDisplay('FUSS')"
:color="getCheckboxColor('FUSS')"
:persistent-hint="
Expand Down
38 changes: 37 additions & 1 deletion frontend/src/components/zaehlstelle/optionsmenue/panels/ZeitauswahlPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<v-radio
label="Tageswert"
:value="Zeitauswahl.TAGESWERT"
:disabled="isTeilzaehlungFussverkehr || isOnlyFussgaengerSelected"
@mouseover="hoverTageswert = true"
@mouseleave="hoverTageswert = false"
/>
Expand Down Expand Up @@ -162,7 +163,7 @@ import type LadeZaehlungDTO from "@/types/zaehlung/LadeZaehlungDTO";
import type ZaehlstelleOptionsDTO from "@/types/zaehlung/ZaehlstelleOptionsDTO";

import { isEmpty } from "lodash";
import { computed, ref } from "vue";
import { computed, ref, watch } from "vue";

import PanelHeader from "@/components/common/PanelHeader.vue";
import { useZaehlstelleStore } from "@/store/ZaehlstelleStore";
Expand All @@ -174,6 +175,7 @@ import ZeitblockStuendlich, {
zeitblockStuendlichInfo,
} from "@/types/enum/ZeitblockStuendlich";
import { useZaehlstelleUtils } from "@/util/ZaehlstelleUtils";
import Fahrzeug from "@/types/enum/Fahrzeug";

const chosenOptionsCopy = defineModel<ZaehlstelleOptionsDTO>({
required: true,
Expand Down Expand Up @@ -325,6 +327,40 @@ const zaehldatenIntervalle = computed<Array<KeyVal>>(() => {
return ZaehldatenIntervallToSelect;
});

const isTeilzaehlungFussverkehr = computed(() => {
return (activeZaehlung.value.kategorien.length === 1 &&
activeZaehlung.value.kategorien[0] === Fahrzeug.FUSS &&
activeZaehlung.value.zaehldauer != Zaehldauer.DAUER_24_STUNDEN);
});

const isOnlyFussgaengerSelected = computed(() => {
return chosenOptionsCopy.value.fussverkehr && !(
chosenOptionsCopy.value.kraftfahrzeugverkehr ||
chosenOptionsCopy.value.schwerverkehr ||
chosenOptionsCopy.value.gueterverkehr ||
chosenOptionsCopy.value.radverkehr ||
chosenOptionsCopy.value.schwerverkehrsanteilProzent ||
chosenOptionsCopy.value.gueterverkehrsanteilProzent);
});

watch(
() => chosenOptionsCopy.value,
() => {
adaptOptionsUpdate();
},
{ deep: true }
);

/**
* Passt die Controls anhand ihrer Abhängigkeiten zu anderen Optionen an.
*/
function adaptOptionsUpdate(){
if (isOnlyFussgaengerSelected.value){
chosenOptionsCopy.value.zeitauswahl = Zeitauswahl.BLOCK;
chosenOptionsCopy.value.zeitblock = Zeitblock.ZB_06_19;
}
}
Comment on lines +346 to +362
Copy link

@coderabbitai coderabbitai bot Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Hardcoded ZB_06_19 in adaptOptionsUpdate may be invalid for certain counting configurations.

adaptOptionsUpdate unconditionally sets zeitblock = Zeitblock.ZB_06_19 whenever only Fußgänger is selected, but ZB_06_19 may not exist in the active counting's zeitblockValues (e.g., a DAUER_2_X_4_STUNDEN or SONSTIGE counting). When the selected zeitblock is not in the dropdown's :items, the v-select will show nothing or an unresolvable value.

A safer approach mirrors what zeitauswahlChanged already does — pick the first entry from zeitblockValues:

🔧 Proposed fix 
 function adaptOptionsUpdate(){
   if (isOnlyFussgaengerSelected.value){
     chosenOptionsCopy.value.zeitauswahl = Zeitauswahl.BLOCK;
-    chosenOptionsCopy.value.zeitblock = Zeitblock.ZB_06_19;
+    const preferredBlock = zeitblockValues.value.find(
+      (kv) => kv.value === Zeitblock.ZB_06_19
+    );
+    const firstBlock = zeitblockValues.value[0];
+    chosenOptionsCopy.value.zeitblock =
+      preferredBlock?.value ?? firstBlock?.value ?? Zeitblock.ZB_06_19;
   }
 }

Additionally, the { deep: true } watch on the entire chosenOptionsCopy.value object fires for every property change (including unrelated ones like intervall). Narrowing the watch source to only the relevant fields avoids unnecessary calls and the self-triggered re-run when adaptOptionsUpdate itself mutates the object:

♻️ Targeted watch (optional) 
-watch(
-    () => chosenOptionsCopy.value,
-    () => {
-      adaptOptionsUpdate();
-    },
-    { deep: true }
-);
+watch(
+    () => [
+      chosenOptionsCopy.value.fussverkehr,
+      chosenOptionsCopy.value.kraftfahrzeugverkehr,
+      chosenOptionsCopy.value.schwerverkehr,
+      chosenOptionsCopy.value.gueterverkehr,
+      chosenOptionsCopy.value.radverkehr,
+      chosenOptionsCopy.value.schwerverkehrsanteilProzent,
+      chosenOptionsCopy.value.gueterverkehrsanteilProzent,
+    ],
+    adaptOptionsUpdate
+);
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
watch(
() => chosenOptionsCopy.value,
() => {
adaptOptionsUpdate();
},
{ deep: true }
);
/**
* Passt die Controls anhand ihrer Abhängigkeiten zu anderen Optionen an.
*/
function adaptOptionsUpdate(){
if (isOnlyFussgaengerSelected.value){
chosenOptionsCopy.value.zeitauswahl = Zeitauswahl.BLOCK;
chosenOptionsCopy.value.zeitblock = Zeitblock.ZB_06_19;
}
}
watch(
() => [
chosenOptionsCopy.value.fussverkehr,
chosenOptionsCopy.value.kraftfahrzeugverkehr,
chosenOptionsCopy.value.schwerverkehr,
chosenOptionsCopy.value.gueterverkehr,
chosenOptionsCopy.value.radverkehr,
chosenOptionsCopy.value.schwerverkehrsanteilProzent,
chosenOptionsCopy.value.gueterverkehrsanteilProzent,
],
adaptOptionsUpdate
);
/**
* Passt die Controls anhand ihrer Abhängigkeiten zu anderen Optionen an.
*/
function adaptOptionsUpdate(){
if (isOnlyFussgaengerSelected.value){
chosenOptionsCopy.value.zeitauswahl = Zeitauswahl.BLOCK;
const preferredBlock = zeitblockValues.value.find(
(kv) => kv.value === Zeitblock.ZB_06_19
);
const firstBlock = zeitblockValues.value[0];
chosenOptionsCopy.value.zeitblock =
preferredBlock?.value ?? firstBlock?.value ?? Zeitblock.ZB_06_19;
}
}
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@frontend/src/components/zaehlstelle/optionsmenue/panels/ZeitauswahlPanel.vue`
around lines 346 - 362, adaptOptionsUpdate currently forces
chosenOptionsCopy.value.zeitblock to the hardcoded Zeitblock.ZB_06_19 which can
be invalid; change adaptOptionsUpdate so when isOnlyFussgaengerSelected is true
it sets chosenOptionsCopy.value.zeitauswahl = Zeitauswahl.BLOCK and chooses the
zeitblock from the active counting's zeitblockValues (use the first entry like
zeitauswahlChanged does) instead of the hardcoded constant; also narrow the
watch so it only observes the relevant fields (e.g., isOnlyFussgaengerSelected /
chosenOptionsCopy.value.zeitauswahl or chosenOptionsCopy.value.zeitblock) rather
than deeply watching the whole chosenOptionsCopy object to avoid unnecessary
self-triggered updates.


/**
* Wird der Tageswert gewählt, so gibt es kein Dropdown Menü, da die Ansicht dann immer
* über den kompletten Tag geht. Deshalb muss hier auf das "Change" event der Checkbox
Expand Down