Skip to content

corrected Counting date in Belastungsplan #7

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

Merged
ztarbug merged 1 commit into from
Mar 5, 2026
Merged

corrected Counting date in Belastungsplan #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 20 additions & 8 deletions frontend/src/components/zaehlstelle/charts/BelastungsplanKreuzungSvg.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,24 @@ function legendeZaehlstellenInfo() {
belastungsplanMethods.ecke.value -
belastungsplanMethods.spalt.value;
const startY = belastungsplanMethods.chartPosition.value / 7;
const zeitauswahl: string = optionen.value.zeitauswahl;

let zaehldatum = "";
if (zaehlung.value.dauerzaehlung) {
if (zeitauswahl === Zeitauswahl.ZEITRAUM) {
zaehldatum = `${
optionen.value.zeitraumStartAndEndDate?.startDate ? dateUtils.getShortVersionOfDate(optionen.value.zeitraumStartAndEndDate.startDate) : ''
} - ${
optionen.value.zeitraumStartAndEndDate?.endDate ? dateUtils.getShortVersionOfDate(optionen.value.zeitraumStartAndEndDate.endDate) : ''
}`;
} else {
zaehldatum = `${optionen.value.zeitraumStartAndEndDate?.startDate ? dateUtils.getShortVersionOfDate(optionen.value.zeitraumStartAndEndDate.startDate) : ''}`;
}
} else {
zaehldatum = `${dateUtils.getShortVersionOfDate(
new Date(zaehlung.value.datum)
)}`
}

info
.text((add) => {
Expand All @@ -331,9 +349,7 @@ function legendeZaehlstellenInfo() {
add.tspan(`Stadtbezirk ${zaehlstelle.value.stadtbezirkNummer}`).newLine();
add
.tspan(
`Zähldatum: ${dateUtils.getShortVersionOfDate(
new Date(zaehlung.value.datum)
)}`
`${zaehldatum}`
)
.newLine();
if (isDifferenzdatendarstellung.value && vergleichsZaehlung.value) {
Expand Down Expand Up @@ -388,11 +404,7 @@ function legendeSpalten() {
const zaehlzeitFirstLine: string = zeitauswahl;
let zaehlzeitSecondLine = "";
if (zeitauswahl === Zeitauswahl.ZEITRAUM) {
zaehlzeitSecondLine = `${
optionen.value.zeitraumStartAndEndDate?.startDate ? dateUtils.formatDate(optionen.value.zeitraumStartAndEndDate.startDate.toLocaleDateString("de-DE")) : ''
} - ${
optionen.value.zeitraumStartAndEndDate?.endDate ? dateUtils.formatDate(optionen.value.zeitraumStartAndEndDate.endDate.toLocaleDateString("de-DE")) : ''
}`;
zaehlzeitSecondLine = "hochgerechnet";
} else if (zeitauswahl === Zeitauswahl.TAGESWERT) {
zaehlzeitSecondLine = `${
zaehlung.value.zaehldauer === Zaehldauer.DAUER_24_STUNDEN
Expand Down
Loading