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

Update tests, add translations

This commit is contained in:
Christian Cueni 2024-07-27 21:21:34 +02:00
parent b52781fe22
commit fabb759daa
6 changed files with 111 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
server/locale/de/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-06-18 15:24+0200\n" "POT-Creation-Date: 2024-07-27 20:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -38,32 +38,32 @@ msgstr ""
msgid "Nicht bestanden" msgid "Nicht bestanden"
msgstr "" msgstr ""
#: vbv_lernwelt/assignment/export.py:203 vbv_lernwelt/assignment/export.py:206 #: vbv_lernwelt/assignment/export.py:204 vbv_lernwelt/assignment/export.py:208
#: vbv_lernwelt/assignment/export.py:207 #: vbv_lernwelt/assignment/export.py:209
msgid "Keine Daten" msgid "Keine Daten"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:32 #: vbv_lernwelt/core/admin.py:38 vbv_lernwelt/sso/admin.py:83
msgid "Personal info" msgid "Personal info"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:34 #: vbv_lernwelt/core/admin.py:40
msgid "Permissions" msgid "Permissions"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:45 #: vbv_lernwelt/core/admin.py:51
msgid "Important dates" msgid "Important dates"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:47 #: vbv_lernwelt/core/admin.py:53
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:62 #: vbv_lernwelt/core/admin.py:70
msgid "Organisation" msgid "Organisation"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:75 #: vbv_lernwelt/core/admin.py:83 vbv_lernwelt/sso/admin.py:86
msgid "Additional data" msgid "Additional data"
msgstr "" msgstr ""
@ -87,31 +87,31 @@ msgstr ""
msgid "Lehrgang-Seite" msgid "Lehrgang-Seite"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:272 #: vbv_lernwelt/course/models.py:278
msgid "Teilnehmer" msgid "Teilnehmer"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:273 #: vbv_lernwelt/course/models.py:279
msgid "Experte/Trainer" msgid "Experte/Trainer"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:332 #: vbv_lernwelt/course/models.py:339
msgid "Dokumente im Circle ein/aus" msgid "Dokumente im Circle ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:336 #: vbv_lernwelt/course/models.py:343
msgid "Lernmentor-Funktion ein/aus" msgid "Lernmentor-Funktion ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:340 #: vbv_lernwelt/course/models.py:347
msgid "Kompetenzweise ein/aus" msgid "Kompetenzweise ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:343 #: vbv_lernwelt/course/models.py:350
msgid "Versicherungsvermittler-Lehrgang" msgid "Versicherungsvermittler-Lehrgang"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:344 #: vbv_lernwelt/course/models.py:351
msgid "ÜK-Lehrgang" msgid "ÜK-Lehrgang"
msgstr "" msgstr ""
@ -119,31 +119,43 @@ msgstr ""
msgid "export_anwesenheit" msgid "export_anwesenheit"
msgstr "" msgstr ""
#: vbv_lernwelt/course_session/services/export_attendance.py:92 #: vbv_lernwelt/course_session/services/export_attendance.py:86
msgid "Optionale Anwesenheit"
msgstr ""
#: vbv_lernwelt/course_session/services/export_attendance.py:96
msgid "Anwesenheit" msgid "Anwesenheit"
msgstr "" msgstr ""
#: vbv_lernwelt/course_session/services/export_attendance.py:116 #: vbv_lernwelt/course_session/services/export_attendance.py:119
msgid "Ja"
msgstr ""
#: vbv_lernwelt/course_session/services/export_attendance.py:119
msgid "Nein"
msgstr ""
#: vbv_lernwelt/course_session/services/export_attendance.py:128
msgid "Anwesend" msgid "Anwesend"
msgstr "" msgstr ""
#: vbv_lernwelt/course_session/services/export_attendance.py:116 #: vbv_lernwelt/course_session/services/export_attendance.py:128
msgid "Nicht anwesend" msgid "Nicht anwesend"
msgstr "" msgstr ""
#: vbv_lernwelt/course_session/services/export_attendance.py:123 #: vbv_lernwelt/course_session/services/export_attendance.py:135
msgid "Vorname" msgid "Vorname"
msgstr "" msgstr ""
#: vbv_lernwelt/course_session/services/export_attendance.py:124 #: vbv_lernwelt/course_session/services/export_attendance.py:136
msgid "Nachname" msgid "Nachname"
msgstr "" msgstr ""
#: vbv_lernwelt/course_session/services/export_attendance.py:125 #: vbv_lernwelt/course_session/services/export_attendance.py:137
msgid "Email" msgid "Email"
msgstr "Email" msgstr "Email"
#: vbv_lernwelt/course_session/services/export_attendance.py:126 #: vbv_lernwelt/course_session/services/export_attendance.py:138
msgid "Lehrvertragsnummer" msgid "Lehrvertragsnummer"
msgstr "" msgstr ""

BIN
server/locale/fr/LC_MESSAGES/django.mo
View File

Binary file not shown.

39
server/locale/fr/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-07-12 09:37+0200\n" "POT-Creation-Date: 2024-07-27 20:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -95,23 +95,23 @@ msgstr ""
msgid "Experte/Trainer" msgid "Experte/Trainer"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:338 #: vbv_lernwelt/course/models.py:339
msgid "Dokumente im Circle ein/aus" msgid "Dokumente im Circle ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:342 #: vbv_lernwelt/course/models.py:343
msgid "Lernmentor-Funktion ein/aus" msgid "Lernmentor-Funktion ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:346 #: vbv_lernwelt/course/models.py:347
msgid "Kompetenzweise ein/aus" msgid "Kompetenzweise ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:349 #: vbv_lernwelt/course/models.py:350
msgid "Versicherungsvermittler-Lehrgang" msgid "Versicherungsvermittler-Lehrgang"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:350 #: vbv_lernwelt/course/models.py:351
msgid "ÜK-Lehrgang" msgid "ÜK-Lehrgang"
msgstr "" msgstr ""
@ -119,31 +119,44 @@ msgstr ""
msgid "export_anwesenheit" msgid "export_anwesenheit"
msgstr "export_presence" msgstr "export_presence"
#: vbv_lernwelt/course_session/services/export_attendance.py:92 #: vbv_lernwelt/course_session/services/export_attendance.py:86
#| msgid "Anwesenheit"
msgid "Optionale Anwesenheit"
msgstr "Présence facultative"
#: vbv_lernwelt/course_session/services/export_attendance.py:96
msgid "Anwesenheit" msgid "Anwesenheit"
msgstr "Présence" msgstr "Présence"
#: vbv_lernwelt/course_session/services/export_attendance.py:117 #: vbv_lernwelt/course_session/services/export_attendance.py:119
msgid "Ja"
msgstr "Oui"
#: vbv_lernwelt/course_session/services/export_attendance.py:119
msgid "Nein"
msgstr "Non"
#: vbv_lernwelt/course_session/services/export_attendance.py:128
msgid "Anwesend" msgid "Anwesend"
msgstr "Présent" msgstr "Présent"
#: vbv_lernwelt/course_session/services/export_attendance.py:117 #: vbv_lernwelt/course_session/services/export_attendance.py:128
msgid "Nicht anwesend" msgid "Nicht anwesend"
msgstr "Pas présent" msgstr "Pas présent"
#: vbv_lernwelt/course_session/services/export_attendance.py:124 #: vbv_lernwelt/course_session/services/export_attendance.py:135
msgid "Vorname" msgid "Vorname"
msgstr "Prénom" msgstr "Prénom"
#: vbv_lernwelt/course_session/services/export_attendance.py:125 #: vbv_lernwelt/course_session/services/export_attendance.py:136
msgid "Nachname" msgid "Nachname"
msgstr "Nom de famille" msgstr "Nom de famille"
#: vbv_lernwelt/course_session/services/export_attendance.py:126 #: vbv_lernwelt/course_session/services/export_attendance.py:137
msgid "Email" msgid "Email"
msgstr "E-mail" msgstr "E-mail"
#: vbv_lernwelt/course_session/services/export_attendance.py:127 #: vbv_lernwelt/course_session/services/export_attendance.py:138
msgid "Lehrvertragsnummer" msgid "Lehrvertragsnummer"
msgstr "Numéro de contrat d'apprentissage" msgstr "Numéro de contrat d'apprentissage"

BIN
server/locale/it/LC_MESSAGES/django.mo
View File

Binary file not shown.

39
server/locale/it/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-07-12 09:36+0200\n" "POT-Creation-Date: 2024-07-27 20:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -95,23 +95,23 @@ msgstr ""
msgid "Experte/Trainer" msgid "Experte/Trainer"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:338 #: vbv_lernwelt/course/models.py:339
msgid "Dokumente im Circle ein/aus" msgid "Dokumente im Circle ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:342 #: vbv_lernwelt/course/models.py:343
msgid "Lernmentor-Funktion ein/aus" msgid "Lernmentor-Funktion ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:346 #: vbv_lernwelt/course/models.py:347
msgid "Kompetenzweise ein/aus" msgid "Kompetenzweise ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:349 #: vbv_lernwelt/course/models.py:350
msgid "Versicherungsvermittler-Lehrgang" msgid "Versicherungsvermittler-Lehrgang"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:350 #: vbv_lernwelt/course/models.py:351
msgid "ÜK-Lehrgang" msgid "ÜK-Lehrgang"
msgstr "" msgstr ""
@ -119,31 +119,44 @@ msgstr ""
msgid "export_anwesenheit" msgid "export_anwesenheit"
msgstr "esportazione_presenza" msgstr "esportazione_presenza"
#: vbv_lernwelt/course_session/services/export_attendance.py:92 #: vbv_lernwelt/course_session/services/export_attendance.py:86
#| msgid "Anwesenheit"
msgid "Optionale Anwesenheit"
msgstr "Presenza opzionale"
#: vbv_lernwelt/course_session/services/export_attendance.py:96
msgid "Anwesenheit" msgid "Anwesenheit"
msgstr "Presenza" msgstr "Presenza"
#: vbv_lernwelt/course_session/services/export_attendance.py:117 #: vbv_lernwelt/course_session/services/export_attendance.py:119
msgid "Ja"
msgstr "Sì"
#: vbv_lernwelt/course_session/services/export_attendance.py:119
msgid "Nein"
msgstr "No"
#: vbv_lernwelt/course_session/services/export_attendance.py:128
msgid "Anwesend" msgid "Anwesend"
msgstr "Presente" msgstr "Presente"
#: vbv_lernwelt/course_session/services/export_attendance.py:117 #: vbv_lernwelt/course_session/services/export_attendance.py:128
msgid "Nicht anwesend" msgid "Nicht anwesend"
msgstr "Non presente" msgstr "Non presente"
#: vbv_lernwelt/course_session/services/export_attendance.py:124 #: vbv_lernwelt/course_session/services/export_attendance.py:135
msgid "Vorname" msgid "Vorname"
msgstr "Nome" msgstr "Nome"
#: vbv_lernwelt/course_session/services/export_attendance.py:125 #: vbv_lernwelt/course_session/services/export_attendance.py:136
msgid "Nachname" msgid "Nachname"
msgstr "Cognome" msgstr "Cognome"
#: vbv_lernwelt/course_session/services/export_attendance.py:126 #: vbv_lernwelt/course_session/services/export_attendance.py:137
msgid "Email" msgid "Email"
msgstr "Email" msgstr "Email"
#: vbv_lernwelt/course_session/services/export_attendance.py:127 #: vbv_lernwelt/course_session/services/export_attendance.py:138
msgid "Lehrvertragsnummer" msgid "Lehrvertragsnummer"
msgstr "Numero di contratto di tirocinio" msgstr "Numero di contratto di tirocinio"

30
server/vbv_lernwelt/course_session/tests/test_attendance_export.py
View File

@ -8,7 +8,7 @@ from vbv_lernwelt.core.constants import TEST_STUDENT1_USER_ID, TEST_STUDENT2_USE
from vbv_lernwelt.core.create_default_users import create_default_users from vbv_lernwelt.core.create_default_users import create_default_users
from vbv_lernwelt.core.models import User from vbv_lernwelt.core.models import User
from vbv_lernwelt.course.creators.test_course import create_test_course from vbv_lernwelt.course.creators.test_course import create_test_course
from vbv_lernwelt.course.models import CourseSession from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
from vbv_lernwelt.course_session.services.export_attendance import export_attendance from vbv_lernwelt.course_session.services.export_attendance import export_attendance
@ -42,6 +42,11 @@ class AttendanceExportTestCase(ExportBaseTestCase):
self.test_student1 = User.objects.get(id=TEST_STUDENT1_USER_ID) self.test_student1 = User.objects.get(id=TEST_STUDENT1_USER_ID)
self.test_student1.additional_json_data = {"Lehrvertragsnummer": 1234567890} self.test_student1.additional_json_data = {"Lehrvertragsnummer": 1234567890}
self.test_student1.save() self.test_student1.save()
csu1 = CourseSessionUser.objects.get(
user=self.test_student1, course_session=self.course_session_be
)
csu1.optional_attendance = True
csu1.save()
self.test_student2 = User.objects.get(id=TEST_STUDENT2_USER_ID) self.test_student2 = User.objects.get(id=TEST_STUDENT2_USER_ID)
self.test_student2.additional_json_data = {"Lehrvertragsnummer": 1987654321} self.test_student2.additional_json_data = {"Lehrvertragsnummer": 1987654321}
self.test_student2.save() self.test_student2.save()
@ -64,6 +69,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
self.test_student1.last_name, self.test_student1.last_name,
self.test_student1.email, self.test_student1.email,
self.test_student1.additional_json_data["Lehrvertragsnummer"], self.test_student1.additional_json_data["Lehrvertragsnummer"],
"Ja",
"Anwesend", "Anwesend",
], ],
[ [
@ -71,6 +77,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
self.test_student2.last_name, self.test_student2.last_name,
self.test_student2.email, self.test_student2.email,
self.test_student2.additional_json_data["Lehrvertragsnummer"], self.test_student2.additional_json_data["Lehrvertragsnummer"],
"Nein",
"Nicht anwesend", "Nicht anwesend",
], ],
[ [
@ -78,6 +85,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
self.test_student3.last_name, self.test_student3.last_name,
self.test_student3.email, self.test_student3.email,
None, None,
"Nein",
"Nicht anwesend", "Nicht anwesend",
], ],
] ]
@ -95,6 +103,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
"Nachname", "Nachname",
"Email", "Email",
"Lehrvertragsnummer", "Lehrvertragsnummer",
"Optionale Anwesenheit",
f"Anwesenheit {csac.get_circle().title} {csac.due_date.start.strftime('%d.%m.%Y')}", f"Anwesenheit {csac.get_circle().title} {csac.due_date.start.strftime('%d.%m.%Y')}",
] ]
@ -103,7 +112,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
self.assertEqual(len(wb.sheetnames), 1) self.assertEqual(len(wb.sheetnames), 1)
self.assertEqual(wb.sheetnames[0], "Test Bern 2022 a") self.assertEqual(wb.sheetnames[0], "Test Bern 2022 a")
self._check_export(wb, self.expected_data_be, 4, 5) self._check_export(wb, self.expected_data_be, 4, 6)
def test_attendance_export_multiple_cs(self): def test_attendance_export_multiple_cs(self):
self.attendance_course_zh.attendance_user_list = [ self.attendance_course_zh.attendance_user_list = [
@ -123,6 +132,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
self.test_student2.last_name, self.test_student2.last_name,
self.test_student2.email, self.test_student2.email,
self.test_student2.additional_json_data["Lehrvertragsnummer"], self.test_student2.additional_json_data["Lehrvertragsnummer"],
"Nein",
"Anwesend", "Anwesend",
], ],
] ]
@ -136,10 +146,10 @@ class AttendanceExportTestCase(ExportBaseTestCase):
self.assertEqual(wb.sheetnames[0], "Test Bern 2022 a") self.assertEqual(wb.sheetnames[0], "Test Bern 2022 a")
self.assertEqual(wb.sheetnames[1], "Test Zürich 2022 a") self.assertEqual(wb.sheetnames[1], "Test Zürich 2022 a")
self._check_export(wb, self.expected_data_be, 4, 5) self._check_export(wb, self.expected_data_be, 4, 6)
wb.active = wb["Test Zürich 2022 a"] wb.active = wb["Test Zürich 2022 a"]
self._check_export(wb, expected_data_zh, 2, 5) self._check_export(wb, expected_data_zh, 2, 6)
def test_french_export(self): def test_french_export(self):
activate("fr") activate("fr")
@ -150,6 +160,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
"Nom de famille", "Nom de famille",
"E-mail", "E-mail",
"Numéro de contrat d'apprentissage", "Numéro de contrat d'apprentissage",
"Présence facultative",
f"Présence {self.attendance_course_be.get_circle().title} {self.attendance_course_be.due_date.start.strftime('%d.%m.%Y')}", f"Présence {self.attendance_course_be.get_circle().title} {self.attendance_course_be.due_date.start.strftime('%d.%m.%Y')}",
] ]
@ -160,6 +171,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
self.test_student1.last_name, self.test_student1.last_name,
self.test_student1.email, self.test_student1.email,
self.test_student1.additional_json_data["Lehrvertragsnummer"], self.test_student1.additional_json_data["Lehrvertragsnummer"],
"Oui",
"Présent", "Présent",
], ],
[ [
@ -167,6 +179,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
self.test_student2.last_name, self.test_student2.last_name,
self.test_student2.email, self.test_student2.email,
self.test_student2.additional_json_data["Lehrvertragsnummer"], self.test_student2.additional_json_data["Lehrvertragsnummer"],
"Non",
"Pas présent", "Pas présent",
], ],
[ [
@ -174,10 +187,11 @@ class AttendanceExportTestCase(ExportBaseTestCase):
self.test_student3.last_name, self.test_student3.last_name,
self.test_student3.email, self.test_student3.email,
None, None,
"Non",
"Pas présent", "Pas présent",
], ],
] ]
self._check_export(wb, expected_data_be, 4, 5) self._check_export(wb, expected_data_be, 4, 6)
def test_italian_export(self): def test_italian_export(self):
activate("it") activate("it")
@ -188,6 +202,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
"Cognome", "Cognome",
"Email", "Email",
"Numero di contratto di tirocinio", "Numero di contratto di tirocinio",
"Presenza opzionale",
f"Presenza {self.attendance_course_be.get_circle().title} {self.attendance_course_be.due_date.start.strftime('%d.%m.%Y')}", f"Presenza {self.attendance_course_be.get_circle().title} {self.attendance_course_be.due_date.start.strftime('%d.%m.%Y')}",
] ]
@ -198,6 +213,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
self.test_student1.last_name, self.test_student1.last_name,
self.test_student1.email, self.test_student1.email,
self.test_student1.additional_json_data["Lehrvertragsnummer"], self.test_student1.additional_json_data["Lehrvertragsnummer"],
"Sì",
"Presente", "Presente",
], ],
[ [
@ -205,6 +221,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
self.test_student2.last_name, self.test_student2.last_name,
self.test_student2.email, self.test_student2.email,
self.test_student2.additional_json_data["Lehrvertragsnummer"], self.test_student2.additional_json_data["Lehrvertragsnummer"],
"No",
"Non presente", "Non presente",
], ],
[ [
@ -212,7 +229,8 @@ class AttendanceExportTestCase(ExportBaseTestCase):
self.test_student3.last_name, self.test_student3.last_name,
self.test_student3.email, self.test_student3.email,
None, None,
"No",
"Non presente", "Non presente",
], ],
] ]
self._check_export(wb, expected_data_be, 4, 5) self._check_export(wb, expected_data_be, 4, 6)