feat: edit groups pop up verbeteren

This commit is contained in:
Joyelle Ndagijimana 2025-05-16 22:18:57 +02:00
parent a3185ed1c1
commit 45563b68ea
2 changed files with 292 additions and 290 deletions

View file

@ -1,6 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed, ref, watch } from "vue"; import { computed, ref, watch } from "vue";
import draggable from "vuedraggable";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { useClassStudentsQuery } from "@/queries/classes"; import { useClassStudentsQuery } from "@/queries/classes";
@ -46,7 +45,12 @@
// Initialize groups if they exist // Initialize groups if they exist
if (existingGroups && existingGroups.length > 0) { if (existingGroups && existingGroups.length > 0) {
currentGroups.value = existingGroups.map((g) => [...g.members]); currentGroups.value = existingGroups.map((group) =>
group.members.map(member => ({
username: member.username,
fullName: `${member.firstName} ${member.lastName}`
}))
);
const assignedUsernames = new Set( const assignedUsernames = new Set(
existingGroups.flatMap((g) => g.members.map((m: StudentItem) => m.username)), existingGroups.flatMap((g) => g.members.map((m: StudentItem) => m.username)),
); );
@ -63,6 +67,7 @@
{ immediate: true }, { immediate: true },
); );
// Random groups functions // Random groups functions
function generateRandomGroups() { function generateRandomGroups() {
if (groupSize.value < 1) return; if (groupSize.value < 1) return;
@ -195,22 +200,9 @@
> >
<h3 class="mb-2">{{ t("current-groups") }}</h3> <h3 class="mb-2">{{ t("current-groups") }}</h3>
<div <div
v-for="(group, index) in currentGroups"
:key="'preview-' + index"
class="mb-3"
> >
<div class="d-flex align-center">
<strong class="mr-2">{{ t("group") }} {{ index + 1 }}:</strong>
<span class="text-caption">({{ group.length }} {{ t("members") }})</span>
</div>
<div class="d-flex flex-wrap"> <div class="d-flex flex-wrap">
<v-chip <label>{{currentGroups.length}}</label>
v-for="student in group"
:key="student.username"
class="ma-1"
>
{{ student.fullName }}
</v-chip>
</div> </div>
</div> </div>
@ -218,7 +210,7 @@
v-if="unassignedStudents.length > 0" v-if="unassignedStudents.length > 0"
class="mt-3" class="mt-3"
> >
<strong>{{ t("unassigned") }}:</strong> <strong>{{ t("unassigned-students") }}:</strong>
<div class="d-flex flex-wrap"> <div class="d-flex flex-wrap">
<label>{{unassignedStudents.length}}</label> <label>{{unassignedStudents.length}}</label>
</div> </div>

View file

@ -1,146 +1,146 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed, type Ref, ref, watch, watchEffect } from "vue"; import {computed, type Ref, ref, watch, watchEffect} from "vue";
import { useI18n } from "vue-i18n"; import {useI18n} from "vue-i18n";
import { import {
useAssignmentQuery, useAssignmentQuery,
useDeleteAssignmentMutation, useDeleteAssignmentMutation,
useUpdateAssignmentMutation, useUpdateAssignmentMutation,
} from "@/queries/assignments.ts"; } from "@/queries/assignments.ts";
import UsingQueryResult from "@/components/UsingQueryResult.vue"; import UsingQueryResult from "@/components/UsingQueryResult.vue";
import { useGroupsQuery } from "@/queries/groups.ts"; import {useGroupsQuery} from "@/queries/groups.ts";
import { useGetAllLearningPaths, useGetLearningPathQuery } from "@/queries/learning-paths.ts"; import {useGetAllLearningPaths, useGetLearningPathQuery} from "@/queries/learning-paths.ts";
import type { Language } from "@/data-objects/language.ts"; import type {Language} from "@/data-objects/language.ts";
import type { AssignmentResponse } from "@/controllers/assignments.ts"; import type {AssignmentResponse} from "@/controllers/assignments.ts";
import type { GroupDTO, GroupDTOId } from "@dwengo-1/common/interfaces/group"; import type {GroupDTO, GroupDTOId} from "@dwengo-1/common/interfaces/group";
import type { LearningPath } from "@/data-objects/learning-paths/learning-path"; import type {LearningPath} from "@/data-objects/learning-paths/learning-path";
import { descriptionRules, learningPathRules } from "@/utils/assignment-rules.ts"; import {descriptionRules, learningPathRules} from "@/utils/assignment-rules.ts";
import GroupSubmissionStatus from "@/components/GroupSubmissionStatus.vue"; import GroupSubmissionStatus from "@/components/GroupSubmissionStatus.vue";
import GroupProgressRow from "@/components/GroupProgressRow.vue"; import GroupProgressRow from "@/components/GroupProgressRow.vue";
import type { AssignmentDTO } from "@dwengo-1/common/dist/interfaces/assignment.ts"; import type {AssignmentDTO} from "@dwengo-1/common/dist/interfaces/assignment.ts";
import GroupSelector from "@/components/assignments/GroupSelector.vue"; import GroupSelector from "@/components/assignments/GroupSelector.vue";
const props = defineProps<{ const props = defineProps<{
classId: string; classId: string;
assignmentId: number; assignmentId: number;
useGroupsWithProgress: ( useGroupsWithProgress: (
groups: Ref<GroupDTO[]>, groups: Ref<GroupDTO[]>,
hruid: Ref<string>, hruid: Ref<string>,
language: Ref<Language>, language: Ref<Language>,
) => { groupProgressMap: Map<number, number> }; ) => { groupProgressMap: Map<number, number> };
}>(); }>();
const isEditing = ref(false); const isEditing = ref(false);
const { t } = useI18n(); const {t} = useI18n();
const lang = ref(); const lang = ref();
const groups = ref<GroupDTO[] | GroupDTOId[]>([]); const groups = ref<GroupDTO[] | GroupDTOId[]>([]);
const learningPath = ref(); const learningPath = ref();
const form = ref(); const form = ref();
const editingLearningPath = ref(learningPath); const editingLearningPath = ref(learningPath);
const description = ref(""); const description = ref("");
const editGroups = ref(false); const editGroups = ref(false);
const assignmentQueryResult = useAssignmentQuery(() => props.classId, props.assignmentId); const assignmentQueryResult = useAssignmentQuery(() => props.classId, props.assignmentId);
// Get learning path object // Get learning path object
const lpQueryResult = useGetLearningPathQuery( const lpQueryResult = useGetLearningPathQuery(
computed(() => assignmentQueryResult.data.value?.assignment?.learningPath ?? ""), computed(() => assignmentQueryResult.data.value?.assignment?.learningPath ?? ""),
computed(() => assignmentQueryResult.data.value?.assignment?.language as Language), computed(() => assignmentQueryResult.data.value?.assignment?.language as Language),
); );
// Get all the groups withing the assignment // Get all the groups withing the assignment
const groupsQueryResult = useGroupsQuery(props.classId, props.assignmentId, true); const groupsQueryResult = useGroupsQuery(props.classId, props.assignmentId, true);
groups.value = groupsQueryResult.data.value?.groups ?? []; groups.value = groupsQueryResult.data.value?.groups ?? [];
watchEffect(() => { watchEffect(() => {
learningPath.value = assignmentQueryResult.data.value?.assignment?.learningPath; learningPath.value = assignmentQueryResult.data.value?.assignment?.learningPath;
lang.value = assignmentQueryResult.data.value?.assignment?.language as Language; lang.value = assignmentQueryResult.data.value?.assignment?.language as Language;
}); });
const allGroups = computed(() => { const allGroups = computed(() => {
const groups = groupsQueryResult.data.value?.groups; const groups = groupsQueryResult.data.value?.groups;
if (!groups) return []; if (!groups) return [];
// Sort by original groupNumber // Sort by original groupNumber
const sortedGroups = [...groups].sort((a, b) => a.groupNumber - b.groupNumber); const sortedGroups = [...groups].sort((a, b) => a.groupNumber - b.groupNumber);
// Assign new sequential numbers starting from 1 // Assign new sequential numbers starting from 1
return sortedGroups.map((group, index) => ({ return sortedGroups.map((group, index) => ({
groupNo: index + 1, // New group number that will be used groupNo: index + 1, // New group number that will be used
name: `${t("group")} ${index + 1}`, name: `${t("group")} ${index + 1}`,
members: group.members, members: group.members,
originalGroupNo: group.groupNumber, // Keep original number if needed originalGroupNo: group.groupNumber, // Keep original number if needed
})); }));
}); });
const dialog = ref(false); const dialog = ref(false);
const selectedGroup = ref({}); const selectedGroup = ref({});
function openGroupDetails(group): void { function openGroupDetails(group): void {
selectedGroup.value = group; selectedGroup.value = group;
dialog.value = true; dialog.value = true;
} }
async function deleteAssignment(num: number, clsId: string): Promise<void> { async function deleteAssignment(num: number, clsId: string): Promise<void> {
const { mutate } = useDeleteAssignmentMutation(); const {mutate} = useDeleteAssignmentMutation();
mutate( mutate(
{ cid: clsId, an: num }, {cid: clsId, an: num},
{ {
onSuccess: () => { onSuccess: () => {
window.location.href = "/user/assignment"; window.location.href = "/user/assignment";
},
}, },
); },
);
}
function goToLearningPathLink(): string | undefined {
const assignment = assignmentQueryResult.data.value?.assignment;
const lp = lpQueryResult.data.value;
if (!assignment || !lp) return undefined;
return `/learningPath/${lp.hruid}/${assignment.language}/${lp.startNode.learningobjectHruid}?assignmentNo=${props.assignmentId}&classId=${props.classId}`;
}
function goToGroupSubmissionLink(groupNo: number): string | undefined {
const lp = lpQueryResult.data.value;
if (!lp) return undefined;
return `/learningPath/${lp.hruid}/${lp.language}/${lp.startNode.learningobjectHruid}?forGroup=${groupNo}&assignmentNo=${props.assignmentId}&classId=${props.classId}`;
}
const learningPathsQueryResults = useGetAllLearningPaths(lang);
const {mutate, data, isSuccess} = useUpdateAssignmentMutation();
watch([isSuccess, data], ([success, newData]) => {
if (success && newData?.assignment) {
window.location.reload();
} }
});
function goToLearningPathLink(): string | undefined { async function saveChanges(): Promise<void> {
const assignment = assignmentQueryResult.data.value?.assignment; const {valid} = await form.value.validate();
const lp = lpQueryResult.data.value; if (!valid) return;
if (!assignment || !lp) return undefined; isEditing.value = false;
return `/learningPath/${lp.hruid}/${assignment.language}/${lp.startNode.learningobjectHruid}?assignmentNo=${props.assignmentId}&classId=${props.classId}`; const lp = learningPath.value;
}
function goToGroupSubmissionLink(groupNo: number): string | undefined { const assignmentDTO: AssignmentDTO = {
const lp = lpQueryResult.data.value; id: assignmentQueryResult.data.value?.assignment.id,
if (!lp) return undefined; description: description.value,
learningPath: lp || "",
deadline: new Date(),
};
return `/learningPath/${lp.hruid}/${lp.language}/${lp.startNode.learningobjectHruid}?forGroup=${groupNo}&assignmentNo=${props.assignmentId}&classId=${props.classId}`; mutate({
} cid: assignmentQueryResult.data.value?.assignment.within,
an: assignmentQueryResult.data.value?.assignment.id,
const learningPathsQueryResults = useGetAllLearningPaths(lang); data: assignmentDTO,
const { mutate, data, isSuccess } = useUpdateAssignmentMutation();
watch([isSuccess, data], ([success, newData]) => {
if (success && newData?.assignment) {
window.location.reload();
}
}); });
}
async function saveChanges(): Promise<void> {
const { valid } = await form.value.validate();
if (!valid) return;
isEditing.value = false;
const lp = learningPath.value;
const assignmentDTO: AssignmentDTO = {
id: assignmentQueryResult.data.value?.assignment.id,
description: description.value,
learningPath: lp || "",
deadline: new Date(),
};
mutate({
cid: assignmentQueryResult.data.value?.assignment.within,
an: assignmentQueryResult.data.value?.assignment.id,
data: assignmentDTO,
});
}
</script> </script>
<template> <template>
@ -207,7 +207,7 @@
editingLearningPath = learningPath; editingLearningPath = learningPath;
} }
" "
>{{ t("cancel") }} >{{ t("cancel") }}
</v-btn> </v-btn>
<v-btn <v-btn
@ -238,7 +238,7 @@
</div> </div>
<v-card-title class="text-h4 assignmentTopTitle" <v-card-title class="text-h4 assignmentTopTitle"
>{{ assignmentResponse.data.assignment.title }} >{{ assignmentResponse.data.assignment.title }}
</v-card-title> </v-card-title>
<v-card-subtitle <v-card-subtitle
v-if="!isEditing" v-if="!isEditing"
@ -320,7 +320,7 @@
> >
<v-list-item-content> <v-list-item-content>
<v-list-item-title <v-list-item-title
>{{ member.firstName + " " + member.lastName }} >{{ member.firstName + " " + member.lastName }}
</v-list-item-title> </v-list-item-title>
</v-list-item-content> </v-list-item-content>
</v-list-item> </v-list-item>
@ -330,7 +330,7 @@
<v-btn <v-btn
color="primary" color="primary"
@click="dialog = false" @click="dialog = false"
>Close >Close
</v-btn> </v-btn>
</v-card-actions> </v-card-actions>
</v-card> </v-card>
@ -346,65 +346,65 @@
> >
<v-table class="table"> <v-table class="table">
<thead> <thead>
<tr> <tr>
<th class="header">{{ t("group") }}</th> <th class="header">{{ t("group") }}</th>
<th class="header">{{ t("progress") }}</th> <th class="header">{{ t("progress") }}</th>
<th class="header">{{ t("submission") }}</th> <th class="header">{{ t("submission") }}</th>
<th class="header"> <th class="header">
<v-btn <v-btn
@click="editGroups = true" @click="editGroups = true"
variant="text" variant="text"
> >
<v-icon>mdi-pencil</v-icon> <v-icon>mdi-pencil</v-icon>
</v-btn> </v-btn>
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr <tr
v-for="g in allGroups" v-for="g in allGroups"
:key="g.originalGroupNo" :key="g.originalGroupNo"
> >
<td> <td>
<v-btn <v-btn
@click="openGroupDetails(g)" @click="openGroupDetails(g)"
variant="text" variant="text"
> >
{{ g.name }} {{ g.name }}
<v-icon end>mdi-menu-right</v-icon> <v-icon end>mdi-menu-right</v-icon>
</v-btn> </v-btn>
</td> </td>
<td> <td>
<GroupProgressRow <GroupProgressRow
:group-number="g.originalGroupNo" :group-number="g.originalGroupNo"
:learning-path="learningPath" :learning-path="learningPath"
:language="lang" :language="lang"
:assignment-id="assignmentId" :assignment-id="assignmentId"
:class-id="classId" :class-id="classId"
/> />
</td> </td>
<td> <td>
<GroupSubmissionStatus <GroupSubmissionStatus
:group="g" :group="g"
:assignment-id="assignmentId" :assignment-id="assignmentId"
:class-id="classId" :class-id="classId"
:language="lang" :language="lang"
:go-to-group-submission-link="goToGroupSubmissionLink" :go-to-group-submission-link="goToGroupSubmissionLink"
/> />
</td> </td>
<!-- Edit icon --> <!-- Edit icon -->
<td> <td>
<v-btn <v-btn
@click="" @click=""
variant="text" variant="text"
> >
<v-icon color="red">mdi-delete</v-icon> <v-icon color="red">mdi-delete</v-icon>
</v-btn> </v-btn>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</v-table> </v-table>
</v-col> </v-col>
@ -414,14 +414,24 @@
max-width="800" max-width="800"
persistent persistent
> >
<v-card-text> <v-card>
<GroupSelector <v-card-text>
:groups="allGroups" <GroupSelector
:class-id="props.classId" :groups="allGroups"
:assignment-id="props.assignmentId" :class-id="props.classId"
@close="editGroups = false" :assignment-id="props.assignmentId"
/> @close="editGroups = false"
</v-card-text> />
</v-card-text>
<v-card-actions>
<v-btn
text
@click="editGroups = false"
>{{ t("cancel") }}
</v-btn
>
</v-card-actions>
</v-card>
</v-dialog> </v-dialog>
</v-container> </v-container>
</using-query-result> </using-query-result>
@ -429,112 +439,112 @@
</template> </template>
<style scoped> <style scoped>
@import "@/assets/assignment.css"; @import "@/assets/assignment.css";
.table-scroll { .table-scroll {
overflow-x: auto; overflow-x: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
.header { .header {
font-weight: bold !important; font-weight: bold !important;
background-color: #0e6942; background-color: #0e6942;
color: white; color: white;
padding: 10px; padding: 10px;
} }
table thead th:first-child { table thead th:first-child {
border-top-left-radius: 10px; border-top-left-radius: 10px;
} }
.table thead th:last-child { .table thead th:last-child {
border-top-right-radius: 10px; border-top-right-radius: 10px;
} }
.table tbody tr:nth-child(odd) { .table tbody tr:nth-child(odd) {
background-color: white; background-color: white;
} }
.table tbody tr:nth-child(even) { .table tbody tr:nth-child(even) {
background-color: #f6faf2; background-color: #f6faf2;
} }
td, td,
th { th {
border-bottom: 1px solid #0e6942; border-bottom: 1px solid #0e6942;
border-top: 1px solid #0e6942; border-top: 1px solid #0e6942;
} }
.table { .table {
width: 90%; width: 90%;
padding-top: 10px; padding-top: 10px;
border-collapse: collapse; border-collapse: collapse;
} }
h1 {
color: #0e6942;
text-transform: uppercase;
font-weight: bolder;
padding-top: 2%;
font-size: 50px;
}
h2 {
color: #0e6942;
font-size: 30px;
}
.join {
display: flex;
flex-direction: column;
gap: 20px;
margin-top: 50px;
}
.link {
color: #0b75bb;
text-decoration: underline;
}
main {
margin-left: 30px;
}
@media screen and (max-width: 850px) {
h1 { h1 {
color: #0e6942; text-align: center;
text-transform: uppercase; padding-left: 0;
font-weight: bolder;
padding-top: 2%;
font-size: 50px;
}
h2 {
color: #0e6942;
font-size: 30px;
} }
.join { .join {
display: flex; text-align: center;
flex-direction: column; align-items: center;
gap: 20px; margin-left: 0;
margin-top: 50px;
} }
.link { .sheet {
color: #0b75bb; width: 100%;
text-decoration: underline;
} }
main { main {
margin-left: 30px; display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
margin: 5px;
} }
@media screen and (max-width: 850px) { .custom-breakpoint {
h1 { flex-direction: column !important;
text-align: center;
padding-left: 0;
}
.join {
text-align: center;
align-items: center;
margin-left: 0;
}
.sheet {
width: 100%;
}
main {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
margin: 5px;
}
.custom-breakpoint {
flex-direction: column !important;
}
.table {
width: 100%;
}
.responsive-col {
max-width: 100% !important;
flex-basis: 100% !important;
}
} }
.table {
width: 100%;
}
.responsive-col {
max-width: 100% !important;
flex-basis: 100% !important;
}
}
</style> </style>