Merge pull request #238 from Dudrie/add-small-adjustments

Add small adjustments

client/src/components/SplitButton.tsx

@@ -8,6 +8,7 @@ import {
   MenuList,
   Paper,
   Popper,
+  ButtonGroupProps,
 } from '@material-ui/core';
 import { MenuDown as ArrowDropDownIcon } from 'mdi-material-ui';
 import React from 'react';
@@ -18,13 +19,13 @@ interface ButtonOption {
   ButtonProps?: ButtonProps & { component?: React.ElementType; to?: string };
 }
 
-interface Props {
+interface Props extends ButtonGroupProps {
   options: ButtonOption[];
   variant?: ButtonProps['variant'];
   color?: ButtonProps['color'];
 }
 
-function SplitButton({ options, variant, color }: Props): JSX.Element {
+function SplitButton({ options, variant, color, ...props }: Props): JSX.Element {
   const [open, setOpen] = React.useState(false);
   const anchorRef = React.useRef<HTMLDivElement>(null);
   const [selectedIndex, setSelectedIndex] = React.useState(0);
@@ -53,7 +54,13 @@ function SplitButton({ options, variant, color }: Props): JSX.Element {
 
   return (
     <>
-      <ButtonGroup variant={variant} color={color} ref={anchorRef} aria-label='split button'>
+      <ButtonGroup
+        variant={variant}
+        color={color}
+        ref={anchorRef}
+        aria-label='split button'
+        {...props}
+      >
         <Button {...buttonProps}>{options[selectedIndex].label}</Button>
         <Button
           size='small'

client/src/hooks/fetching/Files.ts

@@ -30,6 +30,21 @@ export async function getScheinStatusPDF(): Promise<Blob> {
   return Promise.reject(`Wrong response code (${response.status})`);
 }
 
+export async function getClearScheinStatusPDF(): Promise<Blob> {
+  const response = await axios.get('/pdf/scheinoverview/', {
+    responseType: 'arraybuffer',
+    headers: {
+      Accept: 'application/pdf',
+    },
+  });
+
+  if (response.status === 200) {
+    return new Blob([response.data], { type: 'application/pdf' });
+  }
+
+  return Promise.reject(`Wrong response code (${response.status})`);
+}
+
 export async function getScheinexamResultPDF(examId: string): Promise<Blob> {
   const response = await axios.get(`/pdf/scheinexam/${examId}/result`, {
     responseType: 'arraybuffer',

client/src/hooks/fetching/Tutorial.ts

@@ -1,10 +1,10 @@
+import { ScheincriteriaSummaryByStudents } from 'shared/dist/model/ScheinCriteria';
 import { Student } from 'shared/dist/model/Student';
 import { SubstituteDTO, Tutorial, TutorialDTO } from 'shared/dist/model/Tutorial';
 import { TutorInfo, User } from 'shared/dist/model/User';
 import { sortByName } from 'shared/dist/util/helpers';
 import {
   StudentByTutorialSlotSummaryMap,
-  StudentScheinCriteriaSummaryMap,
   TutorialWithFetchedCorrectors,
   TutorialWithFetchedStudents,
   TutorialWithFetchedTutor,
@@ -192,8 +192,8 @@ export async function getStudentsOfTutorial(id: string): Promise<Student[]> {
 
 export async function getScheinCriteriaSummariesOfAllStudentsOfTutorial(
   id: string
-): Promise<StudentScheinCriteriaSummaryMap> {
-  const response = await axios.get<StudentScheinCriteriaSummaryMap>(
+): Promise<ScheincriteriaSummaryByStudents> {
+  const response = await axios.get<ScheincriteriaSummaryByStudents>(
     `scheincriteria/tutorial/${id}`
   );
 

client/src/typings/types.ts

@@ -31,10 +31,6 @@ export interface HasPoints extends HasId {
   points: PointMapDTO;
 }
 
-export interface StudentScheinCriteriaSummaryMap {
-  [id: string]: ScheinCriteriaSummary;
-}
-
 export interface StudentByTutorialSlotSummaryMap {
   [tutorialSlot: string]: ScheinCriteriaSummary[];
 }

client/src/view/dashboard/Dashboard.tsx

@@ -1,22 +1,20 @@
 import React, { useEffect, useState } from 'react';
 import { Role } from 'shared/dist/model/Role';
+import { ScheincriteriaSummaryByStudents } from 'shared/dist/model/ScheinCriteria';
 import { Tutorial } from 'shared/dist/model/Tutorial';
 import { LoggedInUser } from 'shared/dist/model/User';
 import LoadingSpinner from '../../components/loading/LoadingSpinner';
 import { getTutorial } from '../../hooks/fetching/Tutorial';
 import { useAxios } from '../../hooks/FetchingService';
 import { useLogin } from '../../hooks/LoginService';
-import {
-  StudentByTutorialSlotSummaryMap,
-  StudentScheinCriteriaSummaryMap,
-} from '../../typings/types';
+import { StudentByTutorialSlotSummaryMap } from '../../typings/types';
 import AdminStatsCard from './components/AdminStatsCard';
 import AllTutorialStatistics from './components/AllTutorialStatistics';
 import TutorialStatistics from './components/TutorialStatistics';
 
 export interface TutorialSummaryInfo {
   tutorial: Tutorial;
-  studentInfos: StudentScheinCriteriaSummaryMap;
+  studentInfos: ScheincriteriaSummaryByStudents;
 }
 
 function isAdmin(userData: LoggedInUser | undefined): boolean {

client/src/view/studentmanagement/AllStudentsAdminView.tsx

@@ -10,7 +10,7 @@ import { Attendance } from 'shared/dist/model/Attendance';
 import { PointMap } from 'shared/dist/model/Points';
 import { Tutorial } from 'shared/dist/model/Tutorial';
 import SubmitButton from '../../components/loading/SubmitButton';
-import { getScheinStatusPDF } from '../../hooks/fetching/Files';
+import { getScheinStatusPDF, getClearScheinStatusPDF } from '../../hooks/fetching/Files';
 import { getAllScheinExams } from '../../hooks/fetching/ScheinExam';
 import { getAllSheets } from '../../hooks/fetching/Sheet';
 import { getScheinCriteriaSummaryOfAllStudents } from '../../hooks/fetching/Student';
@@ -23,6 +23,7 @@ import {
 import { getPointsOfEntityAsString } from '../points-sheet/util/helper';
 import Studentoverview from './student-overview/Studentoverview';
 import StudentoverviewStoreProvider, { useStudentStore } from './student-store/StudentStore';
+import SplitButton from '../../components/SplitButton';
 
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({
@@ -70,6 +71,20 @@ function AdminStudentManagement(): JSX.Element {
     }
   }
 
+  async function printUnshortenedOverviewSheet() {
+    setCreatingScheinStatus(true);
+
+    try {
+      const blob = await getClearScheinStatusPDF();
+
+      saveBlob(blob, 'Scheinübersichtsliste_ungekürzt.pdf');
+    } catch {
+      enqueueSnackbar('Scheinübersichtsliste konnte nicht erstellt werden', { variant: 'error' });
+    } finally {
+      setCreatingScheinStatus(false);
+    }
+  }
+
   async function generateCSVFile() {
     setCreatingCSVFile(true);
 
@@ -139,16 +154,26 @@ function AdminStudentManagement(): JSX.Element {
       allowChangeTutorial
       additionalTopBarItem={
         <div className={classes.topBar}>
-          <SubmitButton
+          <SplitButton
             variant='contained'
             color='primary'
-            isSubmitting={isCreatingScheinStatus}
             className={classes.printButton}
-            onClick={printOverviewSheet}
-            disabled={students.length === 0}
-          >
-            Scheinliste ausdrucken
-          </SubmitButton>
+            disabled={students.length === 0 || isCreatingScheinStatus}
+            options={[
+              {
+                label: 'Scheinliste ausdrucken',
+                ButtonProps: {
+                  onClick: printOverviewSheet,
+                },
+              },
+              {
+                label: 'Ungek. Liste ausdrucken',
+                ButtonProps: {
+                  onClick: printUnshortenedOverviewSheet,
+                },
+              },
+            ]}
+          />
 
           <SubmitButton
             variant='contained'

client/src/view/studentmanagement/student-overview/Studentoverview.tsx

@@ -3,7 +3,6 @@ import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
 import { AccountSearch as SearchIcon } from 'mdi-material-ui';
 import { useSnackbar } from 'notistack';
 import React, { ChangeEvent, useState } from 'react';
-import { ScheinCriteriaSummary } from 'shared/dist/model/ScheinCriteria';
 import { Student } from 'shared/dist/model/Student';
 import { Tutorial } from 'shared/dist/model/Tutorial';
 import { getNameOfEntity } from 'shared/dist/util/helpers';
@@ -44,8 +43,6 @@ const useStyles = makeStyles((theme: Theme) =>
   })
 );
 
-type SummariesByStudent = { [studentId: string]: ScheinCriteriaSummary };
-
 interface Props {
   tutorials?: Tutorial[];
   allowChangeTutorial?: boolean;
@@ -63,7 +60,7 @@ function Studentoverview({
   const [sortOption, setSortOption] = useState<StudentSortOption>(StudentSortOption.ALPHABETICAL);
 
   const dialog = useDialog();
-  const [{ students, teams, tutorialId, isInitialized }, dispatch] = useStudentStore();
+  const [{ students, teams, tutorialId, isInitialized, summaries }, dispatch] = useStudentStore();
   const { enqueueSnackbar } = useSnackbar();
 
   const handlerParams: HandlerParams = { tutorialId, dispatch, enqueueSnackbar };
@@ -187,6 +184,7 @@ function Studentoverview({
     <StudentRow
       className={classes.studentRow}
       student={student}
+      scheinStatus={summaries[student.id]}
       onEdit={openEditDialog}
       onDelete={openDeleteDialog}
       onChangeTutorial={allowChangeTutorial ? openChangeTutorialDialog : undefined}

client/src/view/studentmanagement/student-overview/components/StudentRow.tsx

@@ -7,13 +7,15 @@ import {
 } from 'mdi-material-ui';
 import React from 'react';
 import { Link } from 'react-router-dom';
+import { ScheinCriteriaSummary } from 'shared/dist/model/ScheinCriteria';
 import { Student, TeamInStudent } from 'shared/dist/model/Student';
 import { getNameOfEntity } from 'shared/dist/util/helpers';
 import EntityListItemMenu from '../../../../components/list-item-menu/EntityListItemMenu';
 import { ListItem } from '../../../../components/list-item-menu/ListItemMenu';
 import PaperTableRow, { PaperTableRowProps } from '../../../../components/PaperTableRow';
 import StudentAvatar from '../../../../components/student-icon/StudentAvatar';
 import { getStudentInfoPath } from '../../../../routes/Routing.helpers';
+import ScheinStatusBox from '../../student-info/components/ScheinStatusBox';
 import { useStudentStore } from '../../student-store/StudentStore';
 
 const useStyles = makeStyles(theme =>
@@ -39,6 +41,7 @@ interface Props extends PaperTableRowProps {
   onDelete: StudentCallback;
   onChangeTutorial?: StudentCallback;
   subtextPrefix?: string;
+  scheinStatus?: ScheinCriteriaSummary;
 }
 
 interface GetSubtextParams {
@@ -63,6 +66,7 @@ function StudentRow({
   onEdit,
   onDelete,
   onChangeTutorial,
+  scheinStatus,
   ...props
 }: Props): JSX.Element {
   const classes = useStyles();
@@ -102,6 +106,10 @@ function StudentRow({
         />
       }
     >
+      <TableCell align='right' className={classes.infoButton}>
+        <ScheinStatusBox scheinStatus={scheinStatus} />
+      </TableCell>
+
       <TableCell align='right' className={classes.infoButton}>
         <Button
           variant='outlined'

client/src/view/studentmanagement/student-store/StudentStore.reducers.ts

@@ -6,9 +6,13 @@ import {
   deleteStudent,
   editStudent,
   getAllStudents,
+  getScheinCriteriaSummaryOfAllStudents,
 } from '../../../hooks/fetching/Student';
 import { createTeam, getTeamsOfTutorial } from '../../../hooks/fetching/Team';
-import { getStudentsOfTutorial } from '../../../hooks/fetching/Tutorial';
+import {
+  getStudentsOfTutorial,
+  getScheinCriteriaSummariesOfAllStudentsOfTutorial,
+} from '../../../hooks/fetching/Tutorial';
 import { AsyncDispatch } from '../../../util/AsyncReducer';
 import { StudentStore } from './StudentStore';
 import {
@@ -109,20 +113,31 @@ async function reduceReinitializeStore(
   }
 
   if (!!tutorialId) {
-    const [students, teams] = await Promise.all([
+    const [students, teams, summaries] = await Promise.all([
       getStudentsOfTutorial(tutorialId),
       getTeamsOfTutorial(tutorialId),
+      getScheinCriteriaSummariesOfAllStudentsOfTutorial(tutorialId),
     ]);
 
     students.sort(sortByName);
 
-    return { ...state, students, teams, isInitialized: true, tutorialId };
+    return { ...state, students, teams, isInitialized: true, tutorialId, summaries };
   } else {
-    const students = await getAllStudents();
+    const [students, summaries] = await Promise.all([
+      getAllStudents(),
+      getScheinCriteriaSummaryOfAllStudents(),
+    ]);
 
     students.sort(sortByName);
 
-    return { ...state, students, teams: undefined, tutorialId: undefined, isInitialized: true };
+    return {
+      ...state,
+      students,
+      teams: undefined,
+      tutorialId: undefined,
+      isInitialized: true,
+      summaries,
+    };
   }
 }
 

client/src/view/studentmanagement/student-store/StudentStore.tsx

@@ -4,12 +4,14 @@ import { useAsyncReducer, AsyncDispatch } from '../../../util/AsyncReducer';
 import { StudentStoreAction, StudentStoreActionType } from './StudentStore.actions';
 import { Team } from 'shared/dist/model/Team';
 import studentStoreReducer from './StudentStore.reducers';
+import { ScheincriteriaSummaryByStudents } from 'shared/dist/model/ScheinCriteria';
 
 export interface StudentStore {
   students: Student[];
   teams?: Team[];
   tutorialId?: string;
   isInitialized: boolean;
+  summaries: ScheincriteriaSummaryByStudents;
 }
 
 interface StudentContext {
@@ -22,6 +24,7 @@ const initialState: StudentStore = {
   teams: undefined,
   tutorialId: 'NOT_INITIALIZED',
   isInitialized: false,
+  summaries: {},
 };
 
 const StudentStoreContext = createContext<StudentContext>({

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "1.7.3",
+  "version": "1.7.5",
   "workspaces": [
     "client",
     "server",

server/src/services/pdf-service/PdfService.class.ts

@@ -37,13 +37,25 @@ class PdfService {
     return this.attendancePDFModule.generatePDF({ tutorial, date });
   }
 
-  public async generateStudentScheinOverviewPDF(): Promise<Buffer> {
+  public async getCensoredStudentScheinOverviewPDF(): Promise<Buffer> {
+    return this.generateStudentScheinOverviewPDF(true);
+  }
+
+  public async getClearTextStudentScheinOverviewPDF(): Promise<Buffer> {
+    return this.generateStudentScheinOverviewPDF(false);
+  }
+
+  private async generateStudentScheinOverviewPDF(shortMatriculationNo: boolean): Promise<Buffer> {
     const [students, summaries] = await Promise.all([
       studentService.getAllStudentsAsDocuments(),
       scheincriteriaService.getCriteriaResultsOfAllStudents(),
     ]);
 
-    return this.scheinResultsPDFModule.generatePDF({ students, summaries });
+    return this.scheinResultsPDFModule.generatePDF({
+      students,
+      summaries,
+      enableShortMatriculatinNo: shortMatriculationNo,
+    });
   }
 
   public async generateCredentialsPDF(): Promise<Buffer> {

server/src/services/pdf-service/PdfService.routes.ts

@@ -34,8 +34,15 @@ pdfRouter.get(
   }
 );
 
-pdfRouter.get('/scheinstatus', ...checkRoleAccess(Role.ADMIN), async (_, res) => {
-  const pdfBuffer = await pdfService.generateStudentScheinOverviewPDF();
+pdfRouter.get('/scheinstatus', ...checkRoleAccess(Role.ADMIN), async (req, res) => {
+  const pdfBuffer = await pdfService.getCensoredStudentScheinOverviewPDF();
+
+  res.contentType('pdf');
+  res.send(pdfBuffer);
+});
+
+pdfRouter.get('/scheinoverview', ...checkRoleAccess(Role.ADMIN), async (req, res) => {
+  const pdfBuffer = await pdfService.getClearTextStudentScheinOverviewPDF();
 
   res.contentType('pdf');
   res.send(pdfBuffer);