Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions client/src/data/types/Trainee.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ export enum TestType {
NodeJS = 'nodejs',
ReactInterview = 'react-interview',
FinalProjectInterview = 'final-project-interview',
CoreMidTermInterview = 'core-mid-term-interview',
CoreEndInterview = 'core-end-interview',
FrontEndMidTermInterview = 'frontend-mid-term-interview',
BackEndMidTermInterview = 'backend-mid-term-interview',
CloudMidTermInterview = 'cloud-mid-term-interview',
DataMidTermInterview = 'data-mid-term-interview',
TesterMidTermInterview = 'tester-mid-term-interview',
}

// interfaces
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@ export const TestDetailsModal = ({

const isEditMode = Boolean(initialTest);

const legacyTestTypes: TestType[] = [
TestType.Presentation,
TestType.JavaScript,
TestType.BrowsersInterview,
TestType.UsingApisInterview,
TestType.NodeJS,
TestType.ReactInterview,
TestType.FinalProjectInterview,
];

const isLegacyTest = isEditMode && initialTest?.type !== undefined && legacyTestTypes.includes(initialTest.type);

const handleClose = () => {
onClose();
};
Expand Down Expand Up @@ -134,13 +146,25 @@ export const TestDetailsModal = ({
value={testFields.type ?? ''}
onChange={handleTestSelectChange}
>
<MenuItem value={TestType.Presentation}>Presentation</MenuItem>
<MenuItem value={TestType.JavaScript}>JavaScript</MenuItem>
<MenuItem value={TestType.BrowsersInterview}>Browsers interview</MenuItem>
<MenuItem value={TestType.UsingApisInterview}>Using APIs interview</MenuItem>
<MenuItem value={TestType.NodeJS}>Node.js</MenuItem>
<MenuItem value={TestType.ReactInterview}>React interview</MenuItem>
<MenuItem value={TestType.FinalProjectInterview}>Final project interview</MenuItem>
{isLegacyTest
? [
<MenuItem key={TestType.Presentation} value={TestType.Presentation}>Presentation</MenuItem>,
<MenuItem key={TestType.JavaScript} value={TestType.JavaScript}>JavaScript</MenuItem>,
<MenuItem key={TestType.BrowsersInterview} value={TestType.BrowsersInterview}>Browsers interview</MenuItem>,
<MenuItem key={TestType.UsingApisInterview} value={TestType.UsingApisInterview}>Using APIs interview</MenuItem>,
<MenuItem key={TestType.NodeJS} value={TestType.NodeJS}>Node.js</MenuItem>,
<MenuItem key={TestType.ReactInterview} value={TestType.ReactInterview}>React interview</MenuItem>,
<MenuItem key={TestType.FinalProjectInterview} value={TestType.FinalProjectInterview}>Final project interview</MenuItem>,
]
: [
<MenuItem key={TestType.CoreMidTermInterview} value={TestType.CoreMidTermInterview}>Core mid-term interview</MenuItem>,
<MenuItem key={TestType.CoreEndInterview} value={TestType.CoreEndInterview}>Core end interview</MenuItem>,
<MenuItem key={TestType.FrontEndMidTermInterview} value={TestType.FrontEndMidTermInterview}>Frontend mid-term interview</MenuItem>,
<MenuItem key={TestType.BackEndMidTermInterview} value={TestType.BackEndMidTermInterview}>Backend mid-term interview</MenuItem>,
<MenuItem key={TestType.CloudMidTermInterview} value={TestType.CloudMidTermInterview}>Cloud mid-term interview</MenuItem>,
<MenuItem key={TestType.DataMidTermInterview} value={TestType.DataMidTermInterview}>Data mid-term interview</MenuItem>,
<MenuItem key={TestType.TesterMidTermInterview} value={TestType.TesterMidTermInterview}>Tester mid-term interview</MenuItem>,
]}
</Select>
{typeError && <FormHelperText>Type is required</FormHelperText>}
</FormControl>
Expand Down
9 changes: 8 additions & 1 deletion server/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1652,12 +1652,19 @@ components:
type: string
enum:
- presentation
- javaScript
- javascript
- browsers-interview
- using-apis-interview
- nodejs
- react-interview
- final-project-interview
- core-mid-term-interview
- core-end-interview
- frontend-mid-term-interview
- backend-mid-term-interview
- cloud-mid-term-interview
- data-mid-term-interview
- tester-mid-term-interview
score:
type: number
example: 8.6
Expand Down
7 changes: 7 additions & 0 deletions server/src/models/Trainee.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,13 @@ export enum TestType {
NodeJS = 'nodejs',
ReactInterview = 'react-interview',
FinalProjectInterview = 'final-project-interview',
CoreMidTermInterview = 'core-mid-term-interview',
CoreEndInterview = 'core-end-interview',
FrontEndMidTermInterview = 'frontend-mid-term-interview',
BackEndMidTermInterview = 'backend-mid-term-interview',
CloudMidTermInterview = 'cloud-mid-term-interview',
DataMidTermInterview = 'data-mid-term-interview',
TesterMidTermInterview = 'tester-mid-term-interview',
}

export interface Trainee {
Expand Down