ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix userprofile data

This commit is contained in:
Christian Cueni 2024-07-29 09:49:14 +02:00
parent fabb759daa
commit 9e46e844c6
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/pages/userProfile/UserProfilePage.vue
View File

@ -55,7 +55,12 @@ onMounted(() => {
<p class="mb-2">{{ user.email }}</p> <p class="mb-2">{{ user.email }}</p>
<p class="text-gray-800"> <p class="text-gray-800">
{{ $t("a.Teilnehmer") }} {{ $t("a.Teilnehmer") }}
<span v-if="user.optional_attendance" data-cy="optional-attendance"> <span
v-if="
user.optional_attendance.some((id: string) => id === courseSession.id)
"
data-cy="optional-attendance"
>
{{ $t("a.Optionale Anwesenheit") }} {{ $t("a.Optionale Anwesenheit") }}
</span> </span>
</p> </p>

2
server/vbv_lernwelt/api/tests/test_profile.py
View File

@ -71,6 +71,6 @@ class ProfileViewTest(APITestCase):
"organisation_postal_code": "", "organisation_postal_code": "",
"organisation_city": "", "organisation_city": "",
"organisation_country": None, "organisation_country": None,
"optional_attendance": False, "optional_attendance": [],
}, },
) )

3
server/vbv_lernwelt/core/serializers.py
View File

@ -111,9 +111,10 @@ class UserSerializer(serializers.ModelSerializer):
return [str(_id) for _id in (supervisor_in_session_ids | expert_in_session_ids)] return [str(_id) for _id in (supervisor_in_session_ids | expert_in_session_ids)]
def get_optional_attendance(self, obj: User) -> bool: def get_optional_attendance(self, obj: User) -> bool:
return CourseSessionUser.objects.filter( optional_attendance_ids = CourseSessionUser.objects.filter(
user=obj, optional_attendance=True user=obj, optional_attendance=True
).values_list("course_session__id", flat=True) ).values_list("course_session__id", flat=True)
return [str(id) for id in optional_attendance_ids]
def update(self, instance, validated_data): def update(self, instance, validated_data):
country_data = validated_data.pop("country", None) country_data = validated_data.pop("country", None)