Skip to content

Commit fa49d9a

Browse files
authored
Merge branch 'main' into feat/ticketing-eventing
2 parents a313a89 + 9e9e941 commit fa49d9a

File tree

8 files changed

+78
-103
lines changed

8 files changed

+78
-103
lines changed

docs/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"devDependencies": {
1616
"@muenchen/prettier-codeformat": "1.0.2",
1717
"markdownlint-cli": "0.45.0",
18-
"mermaid": "11.10.0",
18+
"mermaid": "11.10.1",
1919
"vitepress": "1.6.4",
2020
"vitepress-plugin-mermaid": "2.0.17"
2121
}

personalization-service/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.5.4</version>
8+
<version>3.5.5</version>
99
<relativePath />
1010
</parent>
1111

@@ -53,7 +53,7 @@
5353

5454
<!-- Additional required dependencies -->
5555
<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version> <!-- Needed to make MapStruct and Lombok work together -->
56-
<springdoc-openapi-starter-webmvc-ui.version>2.8.9</springdoc-openapi-starter-webmvc-ui.version>
56+
<springdoc-openapi-starter-webmvc-ui.version>2.8.11</springdoc-openapi-starter-webmvc-ui.version>
5757
<springdoc-openapi-maven-plugin.version>1.5</springdoc-openapi-maven-plugin.version>
5858
<therapi-runtime-javadoc.version>0.15.0</therapi-runtime-javadoc.version>
5959

personalization-webcomponents/package-lock.json

Lines changed: 58 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

personalization-webcomponents/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"fix": "prettier . --write && eslint . --fix"
1818
},
1919
"dependencies": {
20-
"@muenchen/muc-patternlab-vue": "5.6.0",
20+
"@muenchen/muc-patternlab-vue": "5.6.2",
2121
"@vueuse/core": "13.6.0",
22-
"vue": "3.5.18",
22+
"vue": "3.5.19",
2323
"sortablejs": "1.15.6",
2424
"sortablejs-vue3": "1.3.0"
2525
},

personalization-webcomponents/src/components/ChecklistCard.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ function gotoChecklist(checklistId: string) {
106106
<style scoped>
107107
.card-header-icon {
108108
margin-right: 16px;
109-
border: 1px solid var(--color-neutrals-blue);
110-
border-radius: 50%;
111109
}
112110
113111
.pt-8 {

personalization-webcomponents/src/components/ChecklistList.vue

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="container">
33
<sortable
4-
:list="list"
4+
:list="modelValue"
55
tag="ul"
66
class="list"
77
:animation="200"
@@ -66,9 +66,9 @@ import type DummyChecklistItem from "@/api/dummyservice/DummyChecklistItem.ts";
6666
6767
import { MucIcon } from "@muenchen/muc-patternlab-vue";
6868
import { Sortable } from "sortablejs-vue3";
69-
import { defineEmits, ref, watch } from "vue";
69+
import { defineEmits, ref } from "vue";
7070
71-
const props = withDefaults(
71+
withDefaults(
7272
defineProps<{
7373
modelValue: DummyChecklistItem[];
7474
isDraggable?: boolean;
@@ -79,28 +79,12 @@ const props = withDefaults(
7979
disabled: false,
8080
}
8181
);
82-
const emit = defineEmits(["checked", "update:modelValue", "label-click"]);
83-
const list = ref<DummyChecklistItem[]>([...props.modelValue]);
82+
const emit = defineEmits(["checked", "label-click"]);
8483
const drag = ref(false);
8584
8685
const dialogVisible = ref(false);
8786
const dialogItem = ref<DummyChecklistItem | null>(null);
8887
89-
watch(
90-
() => props.modelValue,
91-
(newVal) => {
92-
list.value = [...newVal];
93-
}
94-
);
95-
96-
watch(
97-
list,
98-
(newVal) => {
99-
emit("update:modelValue", [...newVal]);
100-
},
101-
{ deep: true }
102-
);
103-
10488
function onSelectChange(serviceID: string) {
10589
emit("checked", serviceID);
10690
}

personalization-webcomponents/src/util/constants.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@ export const QUERY_PARAM_CHECKLIST_ID = "cl-id";
44

55
export function getChecklistIconByTitle(checklistTitle: string) {
66
return {
7-
"Ich habe wenig Geld.": "./assets/img/placeholder_checklist_icon.png",
8-
"Ich will umziehen.": "./assets/img/placeholder_checklist_icon.png",
9-
"Ich manage eine Familie.": "./assets/img/placeholder_checklist_icon.png",
7+
"Ich habe wenig Geld.":
8+
"https://stadt.muenchen.de/dam/Home/lhm_common/service-navigator/10482730.svg",
9+
"Ich will umziehen.":
10+
"https://stadt.muenchen.de/dam/Home/lhm_common/service-navigator/10482700.svg",
11+
"Ich manage eine Familie.":
12+
"https://stadt.muenchen.de/dam/Home/lhm_common/service-navigator/10483310.svg",
13+
Einwanderung:
14+
"https://stadt.muenchen.de/dam/Home/lhm_common/service-navigator/10483311.svg",
1015
}[checklistTitle];
1116
}

0 commit comments

Comments
 (0)