Skip to content

Commit 15d8f18

Browse files
authored
Revert "Bug/dave 664 und dave 674 (#461)" (#462)
This reverts commit 10f0802.
1 parent 10f0802 commit 15d8f18

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

frontend/src/components/messstelle/MessstelleInfo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
>
1717
<v-col cols="10">
1818
<v-row no-gutters>
19-
<v-col cols="8">
19+
<v-col cols="7">
2020
<span
2121
v-tooltip:bottom="'Datum letzte plausible Messung'"
2222
class="text--body-1"

frontend/src/components/messstelle/charts/BelastungsplanMessquerschnittCard.vue

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const canvas = ref<Svg>(SVG.SVG());
3939
const viewbox = ref(1400);
4040
const querschnittGroup = ref(canvas.value.group());
4141
const fontfamily = "Roboto, Arial, Helvetica, sans-serif";
42-
const defaultFontSize = 24;
42+
const defaultFontSize = 20;
4343
const sheetId = "belastungsplan-messquerschnitt";
4444
4545
const farben = new Map<string, string>([
@@ -258,21 +258,21 @@ function drawStreetName() {
258258
SVG.SVG()
259259
.text(`${getStreetnameOrDefalutIfEmpty()}`)
260260
.move(startX.value, startY.value + 425)
261-
.font({ anchor: "middle", size: defaultFontSize })
261+
.font({ anchor: "middle", size: 20 })
262262
.rotate(270, startX.value, startY.value + 425)
263263
);
264264
}
265265
266266
function getStreetnameOrDefalutIfEmpty() {
267267
return props.belastungsplanData.strassenname
268268
? props.belastungsplanData.strassenname
269-
: "nicht vorhanden";
269+
: "unbekannt";
270270
}
271271
272272
function drawTotal() {
273273
addTextNorthSide(
274274
startX.value,
275-
startY.value - 20,
275+
startY.value - 10,
276276
props.belastungsplanData.totalKfz,
277277
props.belastungsplanData.totalGv,
278278
props.belastungsplanData.totalSv,
@@ -283,7 +283,7 @@ function drawTotal() {
283283
);
284284
addTextSouthSide(
285285
startX.value,
286-
startY.value + 923,
286+
startY.value + 910,
287287
props.belastungsplanData.totalKfz,
288288
props.belastungsplanData.totalGv,
289289
props.belastungsplanData.totalSv,
@@ -331,7 +331,7 @@ function drawArrowsPointingNorth(
331331
);
332332
addTextSouthSide(
333333
startX.value,
334-
startY.value + 923,
334+
startY.value + 910,
335335
mq.sumKfz,
336336
mq.sumGv,
337337
mq.sumSv,
@@ -384,7 +384,7 @@ function addSumNorthIfNecessary(
384384
);
385385
addTextSouthSide(
386386
startX.value - 20,
387-
startY.value + 923,
387+
startY.value + 910,
388388
sumMqKfz,
389389
sumMqGv,
390390
sumMqSv,
@@ -735,8 +735,8 @@ function drawLinienStaerke() {
735735
anchor: "middle",
736736
});
737737
})
738-
.x(1020)
739-
.dy(startY.value + 1045);
738+
.x(1030)
739+
.dy(startY.value + 1040);
740740
const text2 = SVG.SVG()
741741
.text((add) => {
742742
add.tspan(`${high}`).font({
@@ -745,8 +745,8 @@ function drawLinienStaerke() {
745745
anchor: "middle",
746746
});
747747
})
748-
.x(1100)
749-
.dy(startY.value + 1045);
748+
.x(1095)
749+
.dy(startY.value + 1040);
750750
751751
canvas.value.add(groupPath).add(text1).add(text2);
752752
}
@@ -757,7 +757,7 @@ const getZeitauswahlText = computed(() => {
757757
758758
const getZeitblockText = computed(() => {
759759
if (chosenOptionsCopy.value.zeitauswahl == Zeitauswahl.TAGESWERT) {
760-
return "0 - 24 Uhr";
760+
return "0-24 Uhr";
761761
} else if (chosenOptionsCopy.value.zeitauswahl == Zeitauswahl.BLOCK) {
762762
return zeitblockInfo.get(chosenOptionsCopy.value.zeitblock)?.title;
763763
} else if (chosenOptionsCopy.value.zeitauswahl == Zeitauswahl.STUNDE) {

frontend/src/util/DateUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export function useDateUtils() {
99

1010
function formatDate(date: string): string {
1111
if (!date) {
12-
return "nicht vorhanden";
12+
return "unbekannt";
1313
}
1414
if (date.includes("-")) {
1515
const [year, month, day] = date.split("-");
@@ -21,7 +21,7 @@ export function useDateUtils() {
2121

2222
function formatDateAsStringToISO(date: string): string {
2323
if (!date) {
24-
return "nicht vorhanden";
24+
return "unbekannt";
2525
}
2626
if (date.includes(".")) {
2727
const [day, month, year] = date.split(".");

0 commit comments

Comments
 (0)