Old code clean up

packages/labextension/grader_labextension/handlers/grading.py

@@ -92,7 +92,7 @@ async def put(self, lecture_id: int, assignment_id: int):
 class GradingAutoHandler(ExtensionBaseHandler):
     """
     Tornado Handler class for http requests to
-    /lectures/{lecture_id}/assignments/{assignment_id}/submissions/{submission_id}/auto.
+    /lectures/{lecture_id}/assignments/{assignment_id}/grading/{submission_id}/auto.
     """
 
     @authenticated
@@ -124,7 +124,7 @@ async def get(self, lecture_id: int, assignment_id: int, sub_id: int):
 class GradingManualHandler(ExtensionBaseHandler):
     """
     Tornado Handler class for http requests to
-    /lectures/{lecture_id}/assignments/{assignment_id}/submissions/{submission_id}/manual.
+    /lectures/{lecture_id}/assignments/{assignment_id}/grading/{submission_id}/manual.
     """
 
     @authenticated
@@ -215,7 +215,7 @@ async def get(self, lecture_id: int, assignment_id: int, sub_id: int):
 class GenerateFeedbackHandler(ExtensionBaseHandler):
     """
     Tornado Handler class for http requests to
-    /lectures/{lecture_id}/assignments/{assignment_id}/submissions/{submission_id}/feedback.
+    /lectures/{lecture_id}/assignments/{assignment_id}/grading/{submission_id}/feedback.
     """
 
     @authenticated
@@ -248,7 +248,7 @@ async def get(self, lecture_id: int, assignment_id: int, sub_id: int):
 class PullFeedbackHandler(ExtensionBaseHandler):
     """
     Tornado Handler class for http requests to
-    /lectures/{lecture_id}/assignments/{assignment_id}/submissions/{submission_id}/pull/feedback.
+    /lectures/{lecture_id}/assignments/{assignment_id}/grading/{submission_id}/pull/feedback.
     """
 
     @authenticated

packages/labextension/grader_labextension/handlers/submissions.py

@@ -324,3 +324,31 @@ async def get(self, lecture_id: int, assignment_id: int):
             self.log.error(e)
             raise HTTPError(e.code, reason=e.message)
         self.write(json.dumps(response))
+
+
+@register_handler(path=r"api\/users\/(?P<username>[^/]+)\/submissions\/?")
+class SubmissionUserHandler(ExtensionBaseHandler):
+    """
+    Tornado Handler class for http requests to /users/{username}/submissions.
+    """
+
+    @authenticated
+    async def get(self, username: str):
+        """Return the submissions of a specific user.
+
+        :param username: username of the user
+        :type username: str
+        """
+
+        try:
+            response = await self.request_service.request(
+                method="GET",
+                endpoint=f"{self.service_base_url}api/users/{username}/submissions",
+                header=self.grader_authentication_header,
+                response_callback=self.set_service_headers,
+            )
+            self.log.info(f"{response}")
+        except RequestServiceError as e:
+            self.log.error(e)
+            raise HTTPError(e.code, reason=e.message)
+        self.write(json.dumps(response))

packages/labextension/src/app/components/grader-service/assignments/assignment-card.tsx

@@ -167,7 +167,7 @@ export const AssignmentCard = (props: IAssignment) => {
         </CardContent>
         <CardFooter
           className={
-            'items-start flex-col justify-end gap-4 self-stretch bg-[#EBEBEB] p-4'
+            'items-start flex-col justify-end gap-4 self-stretch bg-[#EBEBEB] dark:bg-[#2B2B2B] p-4'
           }
         >
           <Button className={'w-full cursor-pointer'}>

packages/labextension/src/app/components/grader-service/assignments/assignment-create-edit-dialog.tsx

@@ -52,11 +52,7 @@ import {
   LATE_SUBMISSIONS,
   WHITELIST_FILE_PATTERNS
 } from './static/assignment-metadata-explainations';
-import {
-  calculateDaysDifference,
-  determineDisplayText,
-  buildPeriod
-} from '../../utils/utils';
+import { pluralize, buildPeriod } from '../../utils/utils';
 import moment from 'moment';
 import { useGroups } from '../../../pages/instructor-view/lecture';
 import { Checkbox } from '../../../shadcn-components/ui/checkbox';
@@ -136,6 +132,9 @@ export const AssignmentCreateEditDialog = (props: IAssignmentSettingsForm) => {
   const [deadlineOpen, setDeadlineOpen] = React.useState<boolean>(false);
   const [createAnother, setCreateAnother] = useState(false);
   const [whitelistPatternsInput, setWhitelistPatternsInput] = useState('');
+  const [timeDiff, setTimeDiff] = useState<Record<string, number> | undefined>(
+    undefined
+  );
   const handleAddAllowedFilePattern = (field: AnyFieldApi) => {
     if (
       whitelistPatternsInput.trim().length > 0 &&
@@ -170,6 +169,32 @@ export const AssignmentCreateEditDialog = (props: IAssignmentSettingsForm) => {
     addCustomGroup(label);
   }
 
+  const timeDiffText = () => {
+    if (!timeDiff) {
+      return '';
+    }
+    const daysDiff = timeDiff.daysDiff;
+    const hoursDiff = timeDiff.hoursDiff;
+    const minutesDiff = timeDiff.minutesDiff;
+    const parts: string[] = [];
+    if (daysDiff > 0) {
+      parts.push(
+        `${daysDiff} ${pluralize({ text: 'day', data: daysDiff })}`
+      );
+    }
+    if (hoursDiff > 0) {
+      parts.push(
+        `${hoursDiff} ${pluralize({ text: 'hour', data: hoursDiff })}`
+      );
+    }
+    if (minutesDiff > 0) {
+      parts.push(
+        `${minutesDiff} ${pluralize({ text: 'minute', data: minutesDiff })}`
+      );
+    }
+    return parts.length > 0 ? parts.join(', ') : 'less than a minute';
+  };
+
   return (
     <Dialog open={props.openDialog} onOpenChange={props.setOpenDialog}>
       <DialogContent className={'overflow-y-auto'}>
@@ -300,26 +325,19 @@ export const AssignmentCreateEditDialog = (props: IAssignmentSettingsForm) => {
                 }
               }}
               children={field => {
-                let dayDiff;
                 return (
                   <div className={'flex flex-col w-full'}>
                     <DatePickerTime
                       open={deadlineOpen}
                       setOpen={setDeadlineOpen}
                       field={field}
+                      setTimeDiff={setTimeDiff}
                     />
                     {field.state.value &&
                       field.state.meta.isTouched &&
                       field.state.meta.isValid && (
                         <p className={'text-base text-green-700 italic'}>
-                          Deadline is in{' '}
-                          {
-                            (dayDiff = calculateDaysDifference({
-                              startDate: new Date(field.state.value),
-                              endDate: new Date()
-                            }))
-                          }{' '}
-                          {determineDisplayText({ text: 'day', data: dayDiff })}
+                          Deadline is in {timeDiffText()}.
                         </p>
                       )}
                     {!field.state.meta.isValid && (

packages/labextension/src/app/components/grader-service/assignments/export-grades-dialog.tsx

@@ -15,10 +15,14 @@ import {
   SelectValue
 } from '../../../shadcn-components/ui/select';
 import { Button } from '../../../shadcn-components/ui/button';
-import { exportGrades } from '../../../../services/lectures.service';
-import { lectureBasePath, openFile } from '../../../../services/file.service';
+import { exportGrades } from '../../../../services/submissions.service';
+import {
+  lectureBasePath,
+  openInFileBrowser,
+  openInNewTab
+} from '../../../../services/local-file.service';
 import { Lecture } from '../../../../model/lecture';
-import { goToPath } from '../../../../services/file-browser.service';
+import { useMutationStatus } from '../../../../widget';
 
 interface IExportGradesDialogProps {
   lecture: Lecture;
@@ -29,18 +33,20 @@ interface IExportGradesDialogProps {
 export const ExportGradesDialog = (props: IExportGradesDialogProps) => {
   const [format, setFormat] = React.useState<'csv' | 'json'>('csv');
   const [filter, setFilter] = React.useState<'best' | 'latest'>('best');
+  const { setStatus } = useMutationStatus();
 
   const handleExport = async () => {
     try {
       await exportGrades(props.lecture.id, filter, format);
-      // open file in new tab
-      await openFile(
+      await openInNewTab(
         `${lectureBasePath}${props.lecture.code}/${props.lecture.name}_${filter}_submissions.${format}`
       );
-      // go into correct directory
-      await goToPath(`${lectureBasePath}${props.lecture.code}`);
+      await openInFileBrowser(`${lectureBasePath}${props.lecture.code}`);
     } catch (error: any) {
-      console.error('Error exporting grades:', error);
+      setStatus({
+        status: 'error',
+        message: error?.message || 'Failed to export grades'
+      });
     } finally {
       props.setIsOpen(false);
     }

packages/labextension/src/app/components/grader-service/lectures/edit-lecture-dialog.tsx

@@ -67,7 +67,7 @@ export const EditLectureDialog = (props: IEditLectureDialog) => {
     <Dialog open={openDialog} onOpenChange={setOpenDialog}>
       <Tooltip>
         <DialogTrigger render={<TooltipTrigger />}>
-          <Pencil className={'size-4 fill-primary text-primary!'} />
+          <Pencil className={'size-5 fill-primary text-card!'} />
         </DialogTrigger>
         <TooltipContent>
           <p>Edit course</p>

packages/labextension/src/app/components/grader-service/lectures/lecture-card.tsx

@@ -11,10 +11,10 @@ import { Link } from 'react-router';
 import React from 'react';
 import { Lecture } from '../../../../model/lecture';
 import { useQuery } from '@tanstack/react-query';
-import { getUsers } from '../../../../services/lectures.service';
+import { getLectureUsers } from '../../../../services/lectures.service';
 import { getAllAssignments } from '../../../../services/assignments.service';
 import { IconTextInfo } from '../../ui/icon-text-info';
-import { determineDisplayText, highlightText } from '../../utils/utils';
+import { pluralize, highlightText } from '../../utils/utils';
 import { User } from '../../../../model/user';
 import { EditLectureDialog } from './edit-lecture-dialog';
 import {
@@ -32,7 +32,7 @@ export const LectureCard = (props: ILectureCard) => {
   const lecture = props.lecture;
   const { data: users, isPending: isPendingUsers } = useQuery({
     queryKey: ['users', lecture.id],
-    queryFn: async () => getUsers(lecture.id, false)
+    queryFn: async () => getLectureUsers(lecture.id, false)
   });
 
   const { data: assignments, isPending: isPendingAssignments } = useQuery({
@@ -80,10 +80,10 @@ export const LectureCard = (props: ILectureCard) => {
           <IconTextInfo
             icon={
               <FileText
-                className={'fill-foreground size-5 text-white! self-center'}
+                className={'fill-foreground size-5 text-card! self-center'}
               />
             }
-            text={`${assignments.length.toString()} ${determineDisplayText({
+            text={`${assignments.length.toString()} ${pluralize({
               text: 'Assignment',
               data: assignments
             })}`}
@@ -92,10 +92,10 @@ export const LectureCard = (props: ILectureCard) => {
         <IconTextInfo
           icon={
             <UserIcon
-              className={'fill-foreground text-foreground! size-5 self-center'}
+              className={'fill-foreground text-card! size-5 self-center'}
             />
           }
-          text={`${students.length.toString()} ${determineDisplayText({
+          text={`${students.length.toString()} ${pluralize({
             text: 'Student',
             data: students
           })}`}

packages/labextension/src/app/components/grader-service/lectures/lecture-row.tsx

@@ -5,7 +5,7 @@ import { FileText, UserIcon } from 'lucide-react';
 import { Link } from 'react-router';
 import React from 'react';
 import { useQuery } from '@tanstack/react-query';
-import { getUsers } from '../../../../services/lectures.service';
+import { getLectureUsers } from '../../../../services/lectures.service';
 import { getAllAssignments } from '../../../../services/assignments.service';
 import { IconTextInfo } from '../../ui/icon-text-info';
 import { User } from '../../../../model/user';
@@ -27,7 +27,7 @@ export const LectureRow = (props: ILectureRow) => {
 
   const { data: users, isPending: isPendingUsers } = useQuery({
     queryKey: ['users', lecture.id],
-    queryFn: async () => getUsers(lecture.id, false)
+    queryFn: async () => getLectureUsers(lecture.id, false)
   });
 
   const { data: assignments, isPending: isPendingAssignments } = useQuery({