tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

fix(frontend): Juiste groep ID gebruiken op leerpadpagina.

Browse source 
Vroeger werd zowel bij de redirect vanuit assignments als bij het kiezen van een groep in de ComboBox de "mooie" groeps-ID i.p.v. de echte gebruikt.
This commit is contained in:
Gerald Schmittinger 2025-05-20 14:44:26 +02:00
parent 74099fedc7
commit cac944e9c3
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/components/GroupSubmissionStatus.vue
View file

@ -41,7 +41,7 @@
<v-btn <v-btn
:color="data?.submissions?.length > 0 ? 'green' : 'red'" :color="data?.submissions?.length > 0 ? 'green' : 'red'"
variant="text" variant="text"
:to="data.submissions.length > 0 ? goToGroupSubmissionLink(props.group.groupNo) : undefined" :to="data.submissions.length > 0 ? goToGroupSubmissionLink(props.group.originalGroupNo) : undefined"
:disabled="data.submissions.length === 0" :disabled="data.submissions.length === 0"
> >
{{ data.submissions.length > 0 ? t("submission") : t("noSubmissionsYet") }} {{ data.submissions.length > 0 ? t("submission") : t("noSubmissionsYet") }}

21
frontend/src/views/learning-paths/LearningPathGroupSelector.vue
View file

@ -16,18 +16,14 @@
const groupsQuery = useGroupsQuery(props.classId, props.assignmentNumber, true); const groupsQuery = useGroupsQuery(props.classId, props.assignmentNumber, true);
interface GroupSelectorOption { function sortedGroups(groups: GroupDTO[]): GroupDTO[] {
groupNumber: number | undefined; return [...groups].sort((a, b) => a.groupNumber - b.groupNumber)
label: string;
} }
function groupOptions(groups: GroupDTO[]): number[] {
function groupOptions(groups: GroupDTO[]): GroupSelectorOption[] { return sortedGroups(groups).map((group) => group.groupNumber);
return [...groups] }
.sort((a, b) => a.groupNumber - b.groupNumber) function labelForGroup(groups: GroupDTO[], groupId: number): string {
.map((group, index) => ({ return `${sortedGroups(groups).findIndex(group => group.groupNumber === groupId) + 1}`;
groupNumber: group.groupNumber,
label: `${index + 1}`,
}));
} }
</script> </script>
@ -40,7 +36,8 @@
:label="t('viewAsGroup')" :label="t('viewAsGroup')"
:items="groupOptions(data.groups)" :items="groupOptions(data.groups)"
v-model="model" v-model="model"
item-title="label" :item-title="item => labelForGroup(data.groups, parseInt(`${item}`))"
:item-value="item => item"
class="group-selector-cb" class="group-selector-cb"
variant="outlined" variant="outlined"
clearable clearable