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

Bugfix: load only assignment completion data with given learning_content_id. Will fix bug with Reflexion

This commit is contained in:
Daniel Egger 2023-09-06 17:31:27 +02:00
parent 6175ca75ed
commit 515ef3707a
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
View File

@ -39,7 +39,8 @@ onMounted(async () => {
const { gradedUsers, assignmentSubmittedUsers } = const { gradedUsers, assignmentSubmittedUsers } =
await loadAssignmentCompletionStatusData( await loadAssignmentCompletionStatusData(
props.learningContentAssignment.content_assignment_id, props.learningContentAssignment.content_assignment_id,
props.courseSession.id props.courseSession.id,
props.learningContentAssignment.id
); );
state.gradedUsers = gradedUsers; state.gradedUsers = gradedUsers;
state.assignmentSubmittedUsers = assignmentSubmittedUsers; state.assignmentSubmittedUsers = assignmentSubmittedUsers;

3
client/src/pages/cockpit/cockpitPage/AssignmentSubmissionProgress.vue
View File

@ -35,7 +35,8 @@ onMounted(async () => {
const { assignmentSubmittedUsers, gradedUsers, total } = const { assignmentSubmittedUsers, gradedUsers, total } =
await loadAssignmentCompletionStatusData( await loadAssignmentCompletionStatusData(
props.learningContentAssignment.content_assignment_id, props.learningContentAssignment.content_assignment_id,
props.courseSession.id props.courseSession.id,
props.learningContentAssignment.id
); );
state.submissionProgressStatusCount = { state.submissionProgressStatusCount = {

7
client/src/services/assignmentService.ts
View File

@ -32,7 +32,8 @@ export function calcLearningContentAssignments(learningPath?: LearningPath) {
export async function loadAssignmentCompletionStatusData( export async function loadAssignmentCompletionStatusData(
assignmentId: number, assignmentId: number,
courseSessionId: number courseSessionId: number,
learningContentId: number
) { ) {
const cockpitStore = useCockpitStore(); const cockpitStore = useCockpitStore();
@ -46,7 +47,9 @@ export async function loadAssignmentCompletionStatusData(
const assignmentSubmittedUsers: CourseSessionUser[] = []; const assignmentSubmittedUsers: CourseSessionUser[] = [];
for (const csu of courseSessionUsers) { for (const csu of courseSessionUsers) {
const userAssignmentStatus = assignmentCompletionData.find( const userAssignmentStatus = assignmentCompletionData.find(
(s) => s.assignment_user_id === csu.user_id (s) =>
s.assignment_user_id === csu.user_id &&
s.learning_content_page_id === learningContentId
); );
if ( if (
userAssignmentStatus?.completion_status === "SUBMITTED" || userAssignmentStatus?.completion_status === "SUBMITTED" ||

1
client/src/types.ts
View File

@ -569,6 +569,7 @@ export interface UserAssignmentCompletionStatus {
assignment_user_id: string; assignment_user_id: string;
completion_status: AssignmentCompletionStatus; completion_status: AssignmentCompletionStatus;
evaluation_grade: number | null; evaluation_grade: number | null;
learning_content_page_id: number;
} }
export type DueDate = { export type DueDate = {

8
server/vbv_lernwelt/assignment/views.py
View File

@ -16,7 +16,13 @@ def request_assignment_completion_status(request, assignment_id, course_session_
qs = AssignmentCompletion.objects.filter( qs = AssignmentCompletion.objects.filter(
course_session_id=course_session_id, course_session_id=course_session_id,
assignment_id=assignment_id, assignment_id=assignment_id,
).values("id", "assignment_user_id", "completion_status", "evaluation_grade") ).values(
"id",
"assignment_user_id",
"completion_status",
"evaluation_grade",
"learning_content_page_id",
)
return Response(status=200, data=qs) return Response(status=200, data=qs)
raise PermissionDenied() raise PermissionDenied()