Merge pull request #1053 from TMS-Uni-Stuttgart/zeliadev

Fixes to the display of stundent list, scheinstatus and top bar

Author: Morphenoed

client/src/pages/studentmanagement/TutorStudentmanagement.tsx

@@ -1,17 +1,17 @@
 import { Button } from '@material-ui/core';
-import React, { useCallback, useState } from 'react';
+import { TableArrowDown as ImportIcon } from 'mdi-material-ui';
+import { useCallback, useEffect, useState } from 'react';
 import { useParams } from 'react-router';
-import { ROUTES } from '../../routes/Routing.routes';
+import { Link } from 'react-router-dom';
 import StudentForm, {
   convertFormStateToDTO,
   StudentFormSubmitCallback,
 } from '../../components/forms/StudentForm';
 import LoadingSpinner from '../../components/loading/LoadingSpinner';
 import OpenableFormWithFab, { EditorOpenState } from '../../components/OpenableFormWithFab';
+import { ROUTES } from '../../routes/Routing.routes';
 import StudentList from './student-list/StudentList';
 import { useStudentsForStudentList } from './student-list/StudentList.helpers';
-import { Link } from 'react-router-dom';
-import { TableArrowDown as ImportIcon } from 'mdi-material-ui';
 
 interface Params {
   tutorialId: string;
@@ -27,6 +27,10 @@ function TutorStudentmanagement(): JSX.Element {
   const { students, teams, summaries, isLoading, createStudent, editStudent, deleteStudent } =
     useStudentsForStudentList({ tutorialId });
 
+  useEffect(() => {
+    setEditorState({ isAnimating: false, isEditorOpen: false });
+  }, [students]);
+
   const handleCreateSubmit: StudentFormSubmitCallback = useCallback(
     async (values, helpers) => {
       const dto = convertFormStateToDTO(values, tutorialId);

client/src/pages/studentmanagement/student-list/StudentList.helpers.ts

@@ -64,13 +64,13 @@ export function useStudentsForStudentList({
 
     const [students, , , fetchStudents] = useFetchState({
         fetchFunction: async (tutorialId: string) => {
-            return tutorialId === undefined ? getAllStudents() : getStudentsOfTutorial(tutorialId);
+            return tutorialId ? getStudentsOfTutorial(tutorialId) : getAllStudents();
         },
         immediate: true,
         params: [tutorialId ?? ''],
     });
 
-    const [summaries = {}, isLoadingSummaries] = useFetchState({
+    const [summaries = {}, isLoadingSummaries, , fetchSummaries] = useFetchState({
         fetchFunction: async (tutorialId: string) => {
             return tutorialId
                 ? getScheinCriteriaSummariesOfAllStudentsOfTutorial(tutorialId)
@@ -93,6 +93,7 @@ export function useStudentsForStudentList({
                 const student = await fetchCreateStudent(dto);
                 await fetchTeams(tutorialId ?? '');
                 await fetchStudents(tutorialId ?? '');
+                await fetchSummaries(tutorialId ?? '');
 
                 enqueueSnackbar(`${student.nameFirstnameFirst} wurde erfolgreich erstellt.`, {
                     variant: 'success',

server/src/module/scheincriteria/scheincriteria.service.ts

@@ -1,4 +1,5 @@
 import { EntityRepository } from '@mikro-orm/core';
+import { InjectRepository } from '@mikro-orm/nestjs';
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { FormDataResponse } from 'shared/model/FormTypes';
 import {
@@ -8,6 +9,7 @@ import {
     ScheincriteriaSummaryByStudents,
     SingleScheincriteriaSummaryByStudents,
 } from 'shared/model/ScheinCriteria';
+import { StudentStatus } from 'shared/model/Student';
 import { ScheincriteriaEntity } from '../../database/entities/scheincriteria.entity';
 import { Scheinexam } from '../../database/entities/scheinexam.entity';
 import { Sheet } from '../../database/entities/sheet.entity';
@@ -17,13 +19,12 @@ import { CRUDService } from '../../helpers/CRUDService';
 import { ScheinexamService } from '../scheinexam/scheinexam.service';
 import { SheetService } from '../sheet/sheet.service';
 import { ShortTestService } from '../short-test/short-test.service';
+import { GradingService, StudentAndGradings } from '../student/grading.service';
 import { StudentService } from '../student/student.service';
 import { TutorialService } from '../tutorial/tutorial.service';
 import { Scheincriteria } from './container/Scheincriteria';
 import { ScheincriteriaContainer } from './container/scheincriteria.container';
 import { ScheinCriteriaDTO } from './scheincriteria.dto';
-import { GradingService, StudentAndGradings } from '../student/grading.service';
-import { InjectRepository } from '@mikro-orm/nestjs';
 
 interface CalculationParams {
     criterias: ScheincriteriaEntity[];
@@ -260,7 +261,8 @@ export class ScheincriteriaService
 
         return {
             student: params.studentInfo.student.toDTO(),
-            passed,
+            passed:
+                passed || params.studentInfo.student.status === StudentStatus.NO_SCHEIN_REQUIRED,
             scheinCriteriaSummary: summaries,
         };
     }