Skip to content

Commit

Permalink
Feat/dave 200 anbindung featureservices (#216)
Browse files Browse the repository at this point in the history
* add default TagesTyp unspecified

* prettier

* remove unused code

* an neue api angepasst

* fix format bug

* update versions

* update versions

* update versions

* fix route
  • Loading branch information
Der-Alex-K authored Oct 17, 2024
1 parent 26b5a06 commit 24e5d3e
Show file tree
Hide file tree
Showing 22 changed files with 229 additions and 212 deletions.
4 changes: 2 additions & 2 deletions apigateway/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.release>${java.version}</maven.compiler.release>
<spring.boot.version>3.3.3</spring.boot.version>
<spring.boot.version>3.3.4</spring.boot.version>
<spring.cloud.version>2023.0.3</spring.cloud.version>
<!-- Version muss mit der in den spring-boot-dependencies bereitgestellten Lombok-Version übereinstimmen -->
<org.projectlombok.lombok.version>1.18.34</org.projectlombok.lombok.version>
Expand Down Expand Up @@ -158,7 +158,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.2</version>
<version>3.5.1</version>
<configuration>
<argLine>${jvm.options}</argLine>
</configuration>
Expand Down
83 changes: 42 additions & 41 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,27 @@
"pinia": "^2.1.7",
"sass": "^1.77.6",
"vue": "^3.4.31",
"vue-router": "^4.4.0",
"vue-router": "^4.4.5",
"vuetify": "^3.7.1"
},
"devDependencies": {
"@babel/types": "^7.23.0",
"@ianvs/prettier-plugin-sort-imports": "^4.1.1",
"@ianvs/prettier-plugin-sort-imports": "^4.3.1",
"@muenchen/prettier-codeformat": "^1.0.1",
"@svgdotjs/svg.js": "3.0.16",
"@types/jsdom": "^21.1.4",
"@types/leaflet": "^1.9.12",
"@types/leaflet.fullscreen": "^3.0.2",
"@types/leaflet.markercluster": "^1.5.4",
"@types/lodash": "^4.17.6",
"@types/node": "^18.18.8",
"@types/lodash": "^4.17.10",
"@types/node": "^18.19.55",
"@vitejs/plugin-vue": "^4.4.0",
"@vue/eslint-config-prettier": "^8.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/test-utils": "^2.4.1",
"base64-blob": "1.4.1",
"echarts": "^5.5.1",
"eslint": "^8.52.0",
"eslint": "^8.57.1",
"eslint-plugin-vue": "^9.18.1",
"html2canvas": "^1.4.1",
"jsdom": "^22.1.0",
Expand All @@ -47,11 +47,11 @@
"leaflet.markercluster": "^1.5.3",
"leaflet.nontiledlayer": "^1.0.9",
"lodash": "^4.17.21",
"prettier": "^3.0.3",
"prettier": "^3.3.3",
"save-svg-as-png": "1.4.17",
"typescript": "^5.2.2",
"unplugin-fonts": "^1.0.3",
"vite": "^4.5.0",
"vite": "^4.5.5",
"vite-plugin-vuetify": "^1.0.2",
"vitest": "^0.34.6",
"vue-echarts": "^6.6.1",
Expand Down
4 changes: 2 additions & 2 deletions frontend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.release>${java.version}</maven.compiler.release>
<exec.maven.plugin>3.0.0</exec.maven.plugin>
<maven.clean.plugin>3.1.0</maven.clean.plugin>
<exec.maven.plugin>3.4.1</exec.maven.plugin>
<maven.clean.plugin>3.4.0</maven.clean.plugin>
<sonar.sources>src,public</sonar.sources>
<sonar.coverage.exclusions>src,public</sonar.coverage.exclusions>
</properties>
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

<router-view
v-slot="{ Component }"
:key="$route.fullPath"
:key="route.fullPath"
>
<v-fade-transition mode="out-in">
<component :is="Component" />
Expand All @@ -69,6 +69,7 @@

<script setup lang="ts">
import { ref } from "vue";
import { useRoute } from "vue-router";
import goldTrophy from "@/../public/easteregg/trophy-outline-gold.svg";
import silverTrophy from "@/../public/easteregg/trophy-outline-silver.svg";
Expand All @@ -92,6 +93,7 @@ const frontendVersion = ref("");
const snackbarStore = useSnackbarStore();
const userStore = useUserStore();
const route = useRoute();
created();
Expand Down
11 changes: 0 additions & 11 deletions frontend/src/api/service/MessstelleOptionsmenuService.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type ChosenTagesTypValidDTO from "@/types/messstelle/ChosenTagesTypValidDTO";
import type ChosenTagesTypValidRequestDTO from "@/types/messstelle/ChosenTagesTypValidRequestDTO";
import type NichtPlausibleTageDTO from "@/types/messstelle/NichtPlausibleTageDTO";
import type { ValidWochentageInPeriodRequestDto } from "@/types/messstelle/ValidWochentageInPeriodRequestDto";

import FetchService from "@/api/service/FetchService";

Expand All @@ -26,14 +25,4 @@ export default class MessstelleOptionsmenuService {
"Beim Lesen ob der Tagestyp valide ist, ist ein Fehler aufgetreten."
);
}

static getValidWochentageInPeriod(
validWochentageinPeriodRequestDto: ValidWochentageInPeriodRequestDto
) {
return FetchService.postData(
validWochentageinPeriodRequestDto,
`${this.ENDPOINT}/messstelleOptionsmenu/validWochentageInPeriod`,
"Beim Lesen ob der Tagestyp valide ist, ist ein Fehler aufgetreten."
);
}
}
7 changes: 4 additions & 3 deletions frontend/src/components/map/ZaehlstelleMap.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ const zaehlstelleStore = useZaehlstelleStore();
const searchStore = useSearchStore();
const snackbarStore = useSnackbarStore();
const router = useRouter();
const dateUtils = useDateUtils();
const mapRef = ref<HTMLDivElement | null>(null);
Expand Down Expand Up @@ -510,17 +511,17 @@ function createTooltipMessstelle(tooltipDto: TooltipMessstelleDTO): string {
tooltip = `${tooltip}${tooltipDto.stadtbezirk}<br/>`;
}
if (tooltipDto.realisierungsdatum) {
tooltip = `${tooltip} Aufbau: ${useDateUtils().formatDate(
tooltip = `${tooltip} Aufbau: ${dateUtils.formatDate(
tooltipDto.realisierungsdatum
)}<br/>`;
}
if (tooltipDto.abbaudatum) {
tooltip = `${tooltip}Abbau: ${useDateUtils().formatDate(
tooltip = `${tooltip}Abbau: ${dateUtils.formatDate(
tooltipDto.abbaudatum
)}<br/>`;
}
if (tooltipDto.datumLetztePlausibleMessung) {
tooltip = `${tooltip}Letzte plausible Messung: ${useDateUtils().formatDate(
tooltip = `${tooltip}Letzte plausible Messung: ${dateUtils.formatDate(
tooltipDto.datumLetztePlausibleMessung
)}<br/>`;
}
Expand Down
17 changes: 6 additions & 11 deletions frontend/src/components/messstelle/MessstelleInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
class="mb-1 mr-1"
:icon="aufbauIcon.iconPath"
/>
{{ formatDate(messstelle.realisierungsdatum) }}
{{ dateUtils.formatDate(messstelle.realisierungsdatum) }}
</span>

<span
Expand All @@ -50,7 +50,7 @@
class="mb-1 mx-1"
:icon="abbauIcon.iconPath"
/>
{{ formatDate(messstelle.abbaudatum) }}
{{ dateUtils.formatDate(messstelle.abbaudatum) }}
</span>
</span>
</v-row>
Expand Down Expand Up @@ -103,28 +103,23 @@ import FahrzeugklassenIcon from "@/components/messstelle/icons/FahrzeugklassenIc
import MessstelleGeometrie from "@/components/messstelle/MessstelleGeometrie.vue";
import MessstelleKommentar from "@/components/messstelle/MessstelleKommentar.vue";
import IconTooltip from "@/types/util/IconTooltip";
import { useDateUtils } from "@/util/DateUtils";
interface Props {
messstelle: MessstelleInfoDTO;
}
const props = defineProps<Props>();
const dateUtils = useDateUtils();
const aufbauIcon = new IconTooltip("mdi-elevator-up", "Aufbaudatum");
const abbauIcon = new IconTooltip("mdi-elevator-down", "Abbaudatum");
const datumLetztePlausibleMessung = computed(() => {
return formatDate(props.messstelle.datumLetztePlausibleMessung.toString());
return dateUtils.formatDate(props.messstelle.datumLetztePlausibleMessung);
});
function formatDate(date: string): string {
if (!date) {
return "";
}
const [year, month, day] = date.split("-");
return `${day}.${month}.${year}`;
}
const fahrzeugKlasse = computed(() => {
if (props.messstelle.messquerschnitte.length > 0) {
return props.messstelle.fahrzeugKlassen;
Expand Down
Loading

0 comments on commit 24e5d3e

Please sign in to comment.