Commit 850f8336 authored by Patrik Kotucek's avatar Patrik Kotucek
Browse files

fix: moved button to assignment

parent 14b55ce4

backend @ aac3fc30

Compare 385b4ad9 to aac3fc30
Original line number Diff line number Diff line 
Subproject commit 385b4ad92e88c98d467b68fe136417c45abcf3d6
 
Subproject commit aac3fc3002ca4ce278e76dc2baa6d6f8b5f1cc73

frontend/src/users/ExerciseAssignment/Teams.tsx

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ import AssignEqually from './AssignEqually' 
import { bodySection } from './classes'

import TeamComponent from './Team'

import UnassignAllExercise from './UnassignAllExercise'

import { DownloadTraineesButton } from './TraineesButton/DownloadTraineesButton'



const body = css`

  display: flex;
@@ -36,6 +37,8 @@ const Teams: FC<TeamsProps> = ({ teams, exerciseId }) => { 
            <AssignEqually exerciseId={exerciseId} teamCount={teams.length} />

            <Divider />

            <AssignByTags exerciseId={exerciseId} />

            <Divider />

            <DownloadTraineesButton exerciseId={exerciseId} />

          </ButtonGroup>

        }

      >

frontend/src/components/ExerciseList/ExerciseButtons/TraineesButton/DownloadTraineesButton.tsx→frontend/src/users/ExerciseAssignment/TraineesButton/DownloadTraineesButton.tsx

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ interface DownloadTraineesButtonProps { 
  buttonProps?: ButtonProps

}



//TODO: Add export also in .csv format, add option to choose between formats

export const DownloadTraineesButton: FC<DownloadTraineesButtonProps> = ({

  exerciseId,

}) => {

frontend/src/views/InstructorView/index.tsx

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import type { FC } from 'react' 
import { Suspense, useMemo } from 'react'

import { ExerciseStatus, ExitButton, MoveTimeButton } from '../../components'

import { AssessmentOverlay } from '../../components/Assessment/AssessmentOverlay'

import { DownloadTraineesButton } from '../../components/ExerciseList/ExerciseButtons/TraineesButton/DownloadTraineesButton'

import InstructorEmailFormOverlay from '../../email/EmailFormOverlay/InstructorEmailFormOverlay'

import useMailToRef from '../../hooks/useMailToRef'

import { EnableTraineeOverview } from '../../instructor/EnableTraineeOverview'
@@ -156,7 +155,6 @@ export const InstructorView: FC<InstructorViewProps> = ({ 
              params: { exerciseId },

            }}

          />

          <DownloadTraineesButton exerciseId={exerciseId} />

          <ExitButton

            exitRoute={{ to: RootRoute.to }}

            hideLabel={hideLeftBar}