tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

merge: fixed merge conflicts on local branch

Browse source
This commit is contained in:
Adriaan Jacquet 2025-04-03 11:44:21 +02:00
commit 7f7df53d79
4 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/controllers/assignments.ts
View file

@ -44,4 +44,4 @@ export class AssignmentController extends BaseController {
getGroups(assignmentNumber: number, full = true) { getGroups(assignmentNumber: number, full = true) {
return this.get<GroupsResponse>(`/${assignmentNumber}/groups`, { full }); return this.get<GroupsResponse>(`/${assignmentNumber}/groups`, { full });
} }
} }

16
frontend/src/controllers/classes.ts
View file

@ -10,31 +10,31 @@ export class ClassController extends BaseController {
super("class"); super("class");
} }
getAll(full = true) { async getAll(full = true) {
return this.get<{ classes: any[] }>(`/`, { full }); return this.get<{ classes: any[] }>(`/`, { full });
} }
getById(id: string) { async getById(id: string) {
return this.get<{ class: any }>(`/${id}`); return this.get<{ class: any }>(`/${id}`);
} }
createClass(data: any) { async createClass(data: any) {
return this.post<{ class: any }>(`/`, data); return this.post<{ class: any }>(`/`, data);
} }
deleteClass(id: string) { async deleteClass(id: string) {
return this.delete<{ class: any }>(`/${id}`); return this.delete<{ class: any }>(`/${id}`);
} }
getStudents(id: string, full = true) { async getStudents(id: string, full = true) {
return this.get<{ students: any[] }>(`/${id}/students`, { full }); return this.get<{ students: any[] }>(`/${id}/students`, { full });
} }
getTeacherInvitations(id: string, full = true) { async getTeacherInvitations(id: string, full = true) {
return this.get<{ invitations: any[] }>(`/${id}/teacher-invitations`, { full }); return this.get<{ invitations: any[] }>(`/${id}/teacher-invitations`, { full });
} }
getAssignments(id: string, full = true) { async getAssignments(id: string, full = true) {
return this.get<{ assignments: any[] }>(`/${id}/assignments`, { full }); return this.get<{ assignments: any[] }>(`/${id}/assignments`, { full });
} }
} }

12
frontend/src/controllers/groups.ts
View file

@ -10,27 +10,27 @@ export class GroupController extends BaseController {
super(`class/${classid}/assignments/${assignmentNumber}/groups`); super(`class/${classid}/assignments/${assignmentNumber}/groups`);
} }
getAll(full = true) { async getAll(full = true) {
return this.get<{ groups: any[] }>(`/`, { full }); return this.get<{ groups: any[] }>(`/`, { full });
} }
getByNumber(num: number) { async getByNumber(num: number) {
return this.get<{ group: any }>(`/${num}`); return this.get<{ group: any }>(`/${num}`);
} }
createGroup(data: any) { async createGroup(data: any) {
return this.post<{ group: any }>(`/`, data); return this.post<{ group: any }>(`/`, data);
} }
deleteClass(num: number) { async deleteClass(num: number) {
return this.delete<{ group: any }>(`/${num}`); return this.delete<{ group: any }>(`/${num}`);
} }
getSubmissions(groupNumber: number, full = true) { async getSubmissions(groupNumber: number, full = true) {
return this.get<{ groups: any[] }>(`/${groupNumber}/submissions`, { full }); return this.get<{ groups: any[] }>(`/${groupNumber}/submissions`, { full });
} }
getQuestions(groupNumber: number, full = true) { async getQuestions(groupNumber: number, full = true) {
return this.get<{ questions: any[] }>(`/${groupNumber}/questions`, { full }); return this.get<{ questions: any[] }>(`/${groupNumber}/questions`, { full });
} }
} }

8
frontend/src/controllers/submission.ts
View file

@ -5,19 +5,19 @@ export class SubmissionController extends BaseController {
super(`class/${classid}/assignments/${assignmentNumber}/groups/${groupNumber}`); super(`class/${classid}/assignments/${assignmentNumber}/groups/${groupNumber}`);
} }
getAll(full = true) { async getAll(full = true) {
return this.get<any>(`/`, { full }); return this.get<any>(`/`, { full });
} }
getByNumber(submissionNumber: number) { async getByNumber(submissionNumber: number) {
return this.get<any>(`/${submissionNumber}`); return this.get<any>(`/${submissionNumber}`);
} }
createSubmission(data: any) { async createSubmission(data: any) {
return this.post<any>(`/`, data); return this.post<any>(`/`, data);
} }
deleteSubmission(submissionNumber: number) { async deleteSubmission(submissionNumber: number) {
return this.delete<any>(`/${submissionNumber}`); return this.delete<any>(`/${submissionNumber}`);
} }
} }