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

Fix utils

This commit is contained in:
Christian Cueni 2024-08-07 09:19:51 +02:00
parent 77dce844d3
commit ed1375ba33
3 changed files with 90 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/pages/dashboard/DashboardPersonsPage.vue
View File

@ -254,6 +254,7 @@ function exportData() {
course_session_id: csId,
generation: "",
circle_id: "",
region: "",
});
}
exportDataAsXls(items, exportPersons, userStore.language);

4
server/vbv_lernwelt/dashboard/tests/test_export.py
View File

@ -139,9 +139,7 @@ class PersonsExportTestCase(ExportBaseTestCase):
self.assertEqual(wb.sheetnames[0], "Test Zürich 2022 a")
wb.active = wb["Test Zürich 2022 a"]
data = self._generate_expected_data([[None] * 6])
self._check_export(wb, data, 1, 6)
self._check_export(wb, [[None] * 6], 1, 6)
def test_export_in_fr(self):
activate("fr")

18
server/vbv_lernwelt/dashboard/utils.py
View File

@ -99,8 +99,7 @@ def create_person_list_with_roles(
user, course_session_ids=None, include_private_data=False
):
def create_user_dict(user_object):
def create_user_dict(user_object):
return {
user_data = {
"user_id": user_object.id,
"first_name": user_object.first_name,
"last_name": user_object.last_name,
@ -109,8 +108,19 @@ def create_person_list_with_roles(
"avatar_url": user_object.avatar_url,
"course_sessions": [],
}
if include_private_data:
user_data["phone_number"] = user_object.phone_number
user_data["Lehrvertragsnummer"] = user_object.additional_json_data.get(
"Lehrvertragsnummer", ""
)
return user_data
course_sessions = get_course_sessions_with_roles_for_user(user)
if course_session_ids:
course_sessions = [
csr for csr in course_sessions if csr._original.id in course_session_ids
]
result_persons = {}
for cs in course_sessions:
@ -132,9 +142,7 @@ def create_person_list_with_roles(
for cs in course_sessions:
def _add_agent_relation(my_role, user_role):
course_session_entry = create_course_session_dict(
cs, my_role, user_role
)
course_session_entry = create_course_session_dict(cs, my_role, user_role)
participant_user = relation.participant.user
if participant_user.id not in result_persons: