Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes
# Conflicts: # backend/src/controllers/students.ts # backend/src/controllers/teachers.ts # backend/src/interfaces/question.ts # backend/src/services/classes.ts # backend/src/services/students.ts # backend/src/services/teachers.ts
This commit is contained in:
commit
7d8a0fcbb2
96 changed files with 205 additions and 153 deletions
|
@ -1,5 +1,5 @@
|
|||
import { UserDTO } from './user';
|
||||
import { QuestionDTO } from './question';
|
||||
import { QuestionDTO, QuestionId } from './question';
|
||||
|
||||
export interface AnswerDTO {
|
||||
author: UserDTO;
|
|
@ -1,4 +1,5 @@
|
|||
import { AssignmentDTO } from './assignment';
|
||||
import { StudentDTO } from './student';
|
||||
|
||||
export interface GroupDTO {
|
||||
assignment: number | AssignmentDTO;
|
|
@ -1,4 +1,4 @@
|
|||
import { Language } from 'dwengo-1-backend/src/entities/content/language.js';
|
||||
import { Language } from "../util/language";
|
||||
|
||||
export interface Transition {
|
||||
default: boolean;
|
|
@ -1,3 +1,4 @@
|
|||
import { LearningObjectIdentifier } from './learning-content';
|
||||
import { StudentDTO } from './student';
|
||||
|
||||
export interface QuestionDTO {
|
|
@ -1,4 +1,7 @@
|
|||
import { GroupDTO } from './group';
|
||||
import { LearningObjectIdentifier } from './learning-content';
|
||||
import { StudentDTO } from './student';
|
||||
import { Language } from '../util/language';
|
||||
|
||||
export interface SubmissionDTO {
|
||||
learningObjectIdentifier: LearningObjectIdentifier;
|
Loading…
Add table
Add a link
Reference in a new issue