-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #35 from ls1intum/mail-service
Fix the application assessment form
- Loading branch information
Showing
33 changed files
with
998 additions
and
648 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,222 @@ | ||
| import { useForm } from '@mantine/form' | ||
| import { type ApplicationAssessment } from '../redux/applicationsSlice/applicationsSlice' | ||
| import { Button, Checkbox, Divider, Group, Text, TextInput, Textarea } from '@mantine/core' | ||
| import { StudentApplicationComment } from './StudentApplicationComment' | ||
| import { | ||
| createInstructorCommentForCoachApplication, | ||
| createInstructorCommentForDeveloperApplication, | ||
| createInstructorCommentForTutorApplication, | ||
| } from '../redux/applicationsSlice/thunks/createInstructorComment' | ||
| import { useDispatch } from 'react-redux' | ||
| import { useAppSelector, type AppDispatch } from '../redux/store' | ||
| import { useState } from 'react' | ||
| import { IconSend } from '@tabler/icons-react' | ||
| import { type Patch } from '../service/configService' | ||
| import { | ||
| updateCoachApplicationAssessment, | ||
| updateDeveloperApplicationAssessment, | ||
| updateTutorApplicationAssessment, | ||
| } from '../redux/applicationsSlice/thunks/updateApplicationAssessment' | ||
|
|
||
| interface ApplicationAssessmentFormProps { | ||
| applicationId: string | ||
| applicationType: 'developer' | 'coach' | 'tutor' | ||
| assessment?: ApplicationAssessment | ||
| } | ||
|
|
||
| export const ApplicationAssessmentForm = ({ | ||
| applicationId, | ||
| assessment, | ||
| applicationType, | ||
| }: ApplicationAssessmentFormProps): JSX.Element => { | ||
| const dispatch = useDispatch<AppDispatch>() | ||
| const auth = useAppSelector((state) => state.auth) | ||
| const [comment, setComment] = useState('') | ||
| const assessmentForm = useForm<ApplicationAssessment>({ | ||
| initialValues: { | ||
| instructorComments: assessment?.instructorComments ?? [], | ||
| suggestedAsCoach: assessment?.suggestedAsCoach ?? false, | ||
| suggestedAsTutor: assessment?.suggestedAsTutor ?? false, | ||
| blockedByPM: assessment?.blockedByPM ?? false, | ||
| reasonForBlockedByPM: assessment?.reasonForBlockedByPM ?? '', | ||
| assessmentScore: assessment?.assessmentScore ?? 0, | ||
| accepted: assessment?.accepted ?? false, | ||
| assessed: assessment?.accepted ?? false, | ||
| }, | ||
| }) | ||
|
|
||
| return ( | ||
| <div style={{ display: 'flex', flexDirection: 'column', gap: '2vh' }}> | ||
| <Divider /> | ||
| <Group grow> | ||
| <Checkbox | ||
| mt='md' | ||
| label='Suggested as Coach' | ||
| {...assessmentForm.getInputProps('suggestedAsCoach', { | ||
| type: 'checkbox', | ||
| })} | ||
| /> | ||
| <Checkbox | ||
| mt='md' | ||
| label='Suggested as Tutor' | ||
| {...assessmentForm.getInputProps('suggestedAsTutor', { | ||
| type: 'checkbox', | ||
| })} | ||
| /> | ||
| <Checkbox | ||
| mt='md' | ||
| label='Blocked by PM' | ||
| {...assessmentForm.getInputProps('blockedByPM', { | ||
| type: 'checkbox', | ||
| })} | ||
| /> | ||
| </Group> | ||
| {assessmentForm.values.blockedByPM && ( | ||
| <Textarea | ||
| autosize | ||
| label='Reason for Blocked by PM' | ||
| placeholder='Reason for blocked by PM' | ||
| minRows={5} | ||
| {...assessmentForm.getInputProps('reasonForBlockedByPM')} | ||
| /> | ||
| )} | ||
| <TextInput | ||
| withAsterisk | ||
| type='number' | ||
| label='Assessment Score' | ||
| placeholder='Assessment Score' | ||
| {...assessmentForm.getInputProps('assessmentScore')} | ||
| /> | ||
| <Group grow style={{ alignItems: 'center' }}> | ||
| <Checkbox | ||
| mt='md' | ||
| label='Accepted for the Course' | ||
| {...assessmentForm.getInputProps('accepted', { | ||
| type: 'checkbox', | ||
| })} | ||
| /> | ||
| <Checkbox | ||
| mt='md' | ||
| label='Application Assessed' | ||
| {...assessmentForm.getInputProps('assessed', { | ||
| type: 'checkbox', | ||
| })} | ||
| /> | ||
| </Group> | ||
| <Group position='right'> | ||
| <Button | ||
| disabled={!assessmentForm.isDirty()} | ||
| onClick={() => { | ||
| const assessmentPatchObjectArray: Patch[] = [] | ||
| Object.keys(assessmentForm.values).forEach((key) => { | ||
| if (assessmentForm.isTouched(key)) { | ||
| const assessmentPatchObject = new Map() | ||
| assessmentPatchObject.set('op', 'replace') | ||
| assessmentPatchObject.set('path', '/' + key) | ||
| assessmentPatchObject.set('value', assessmentForm.getInputProps(key).value) | ||
| const obj = Object.fromEntries(assessmentPatchObject) | ||
| assessmentPatchObjectArray.push(obj) | ||
| } | ||
| }) | ||
|
|
||
| if (applicationType === 'developer') { | ||
| void dispatch( | ||
| updateDeveloperApplicationAssessment({ | ||
| applicationId, | ||
| applicationAssessmentPatch: assessmentPatchObjectArray, | ||
| }), | ||
| ) | ||
| } else if (applicationType === 'coach') { | ||
| void dispatch( | ||
| updateCoachApplicationAssessment({ | ||
| applicationId, | ||
| applicationAssessmentPatch: assessmentPatchObjectArray, | ||
| }), | ||
| ) | ||
| } else if (applicationType === 'tutor') { | ||
| void dispatch( | ||
| updateTutorApplicationAssessment({ | ||
| applicationId, | ||
| applicationAssessmentPatch: assessmentPatchObjectArray, | ||
| }), | ||
| ) | ||
| } | ||
| }} | ||
| > | ||
| Submit | ||
| </Button> | ||
| </Group> | ||
| <Divider /> | ||
| <div style={{ display: 'flex', flexDirection: 'column', gap: '2vh' }}> | ||
| <Text fz='sm' weight={500}> | ||
| Additional Notes | ||
| </Text> | ||
| {assessmentForm.values.instructorComments.map((comment, idx) => ( | ||
| <div key={`${comment.id ?? idx} ${comment.timestamp ?? ''}`}> | ||
| <StudentApplicationComment instructorComment={comment} /> | ||
| </div> | ||
| ))} | ||
| </div> | ||
| <Group position='left' style={{ alignItems: 'center' }}> | ||
| <Textarea | ||
| placeholder='Comment' | ||
| value={comment} | ||
| onChange={(e) => { | ||
| setComment(e.target.value) | ||
| }} | ||
| /> | ||
| <Button | ||
| leftIcon={<IconSend />} | ||
| onClick={() => { | ||
| if (comment && comment.length !== 0 && assessmentForm.values) { | ||
| assessmentForm.setValues({ | ||
| ...assessmentForm.values, | ||
| instructorComments: [ | ||
| ...assessmentForm.values.instructorComments, | ||
| { | ||
| author: auth ? `${auth.firstName} ${auth.lastName}` : '', | ||
| text: comment, | ||
| }, | ||
| ], | ||
| }) | ||
| setComment('') | ||
| if (applicationType === 'developer') { | ||
| void dispatch( | ||
| createInstructorCommentForDeveloperApplication({ | ||
| applicationId, | ||
| instructorComment: { | ||
| author: auth ? `${auth.firstName} ${auth.lastName}` : '', | ||
| text: comment, | ||
| }, | ||
| }), | ||
| ) | ||
| } else if (applicationType === 'coach') { | ||
| void dispatch( | ||
| createInstructorCommentForCoachApplication({ | ||
| applicationId, | ||
| instructorComment: { | ||
| author: auth ? `${auth.firstName} ${auth.lastName}` : '', | ||
| text: comment, | ||
| }, | ||
| }), | ||
| ) | ||
| } else if (applicationType === 'tutor') { | ||
| void dispatch( | ||
| createInstructorCommentForTutorApplication({ | ||
| applicationId, | ||
| instructorComment: { | ||
| author: auth ? `${auth.firstName} ${auth.lastName}` : '', | ||
| text: comment, | ||
| }, | ||
| }), | ||
| ) | ||
| } | ||
| } | ||
| }} | ||
| > | ||
| Send | ||
| </Button> | ||
| </Group> | ||
| </div> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.