Merge remote-tracking branch 'origin/dev' into feat/indieningen-kunnen-posten-en-bekijken-#194
# Conflicts: # backend/tests/setup-tests.ts
This commit is contained in:
		
						commit
						dd2cdf3fe9
					
				
					 46 changed files with 1670 additions and 123 deletions
				
			
		|  | @ -1,8 +1,8 @@ | |||
| import { StudentDTO } from './student'; | ||||
| import { ClassJoinRequestStatus } from '../util/class-join-request'; | ||||
| import { ClassStatus } from '../util/class-join-request'; | ||||
| 
 | ||||
| export interface ClassJoinRequestDTO { | ||||
|     requester: StudentDTO; | ||||
|     class: string; | ||||
|     status: ClassJoinRequestStatus; | ||||
|     status: ClassStatus; | ||||
| } | ||||
|  |  | |||
|  | @ -1,8 +1,16 @@ | |||
| import { UserDTO } from './user'; | ||||
| import { ClassDTO } from './class'; | ||||
| import { ClassStatus } from '../util/class-join-request'; | ||||
| 
 | ||||
| export interface TeacherInvitationDTO { | ||||
|     sender: string | UserDTO; | ||||
|     receiver: string | UserDTO; | ||||
|     class: string | ClassDTO; | ||||
|     classId: string; | ||||
|     status: ClassStatus; | ||||
| } | ||||
| 
 | ||||
| export interface TeacherInvitationData { | ||||
|     sender: string; | ||||
|     receiver: string; | ||||
|     class: string; | ||||
|     accepted?: boolean; // Use for put requests, else skip
 | ||||
| } | ||||
|  |  | |||
|  | @ -1,4 +1,4 @@ | |||
| export enum ClassJoinRequestStatus { | ||||
| export enum ClassStatus { | ||||
|     Open = 'open', | ||||
|     Accepted = 'accepted', | ||||
|     Declined = 'declined', | ||||
|  |  | |||
		Reference in a new issue
	
	 Gerald Schmittinger
						Gerald Schmittinger