Merged 'develop' into 'develop-G7'.

Author: github-actions[bot]

back-end/src/base/groups/groups.service.ts

@@ -33,7 +33,10 @@ export class GroupsService {
 
 		//TODO: Waiting for the trello part
 		const retro = createRetroGroup(course, user);
-		course.groups.forEach(async (groups, index) => {
+		await this.deleteCourseRetro(courseId);
+		await this.emptyCourseProjects(courseId);
+		for (const groups of course.groups) {
+			const index = course.groups.indexOf(groups);
 			const projectDocument: CanvasRoom = {
 				owner: userId,
 				meta: {
@@ -57,12 +60,24 @@ export class GroupsService {
 				{ _id: new ObjectId(courseId) },
 				{ $push: { projects: canvas.insertedId } },
 			);
-		});
+		}
 
 		const newRetro = await this.retrospectiveRepository.createRetrospective(retro);
 		await this.coursesRepository.updateOneCourse(
 			{ _id: new ObjectId(courseId) },
 			{ $set: { retro: newRetro.insertedId, isLocked: true } },
 		);
 	}
+	async emptyCourseProjects(courseId: string) {
+		await this.coursesRepository.updateOneCourse(
+			{ _id: new ObjectId(courseId) },
+			{ $set: { projects: [] } },
+		);
+	}
+	async deleteCourseRetro(courseId: string) {
+		await this.coursesRepository.updateOneCourse(
+			{ _id: new ObjectId(courseId) },
+			{ $set: { retro: null } },
+		);
+	}
 }

front-end/src/components/RollCallComponents/GroupsComponent.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="grid grid-cols-3 gap-8 mx-auto w-3/4 max-w-2x h-100">
+	<div class="grid grid-cols-3 gap-8 mx-auto w-3/4 max-w-2x mb-4 h-100">
 		<div
 			v-for="(group, index) in groups"
 			:key="group.id"

front-end/src/components/RollCallComponents/MakeGroupsComponent.vue

@@ -1,7 +1,7 @@
 <template>
 	<div
 		v-if="studentList && courseId"
-		class="w-7/12 flex mx-auto md:w-6/12 mt-2.5 align-left justify-start"
+		class="w-7/12 flex mx-auto md:w-6/12 mt-2.5 mb-4 align-left justify-start"
 	>
 		<table class="text-center w-full">
 			<caption hidden>

front-end/src/components/RollCallComponents/ReturnButtonComponent.vue

@@ -68,7 +68,15 @@
 									<SvgQrCode
 										:class="{
 											'fill-selected-icon dark:fill-selected-icon':
-												route.path.startsWith('/app/rollcall'),
+												route.path.endsWith('/app/rollcall'),
+										}"
+									/>
+								</DrawerRouterOption>
+								<DrawerRouterOption to="/app/rollcall/groups" name="Groups" :fold="!active">
+									<SvgGroup
+										:class="{
+											'fill-selected-icon dark:fill-selected-icon':
+												route.path.endsWith('/app/rollcall/groups'),
 										}"
 									/>
 								</DrawerRouterOption>
@@ -136,6 +144,7 @@ import SvgInventory from '@/components/common/svg/Inventory.vue';
 import SvgBlog from '@/components/common/svg/Blog.vue';
 import SvgResource from '@/components/common/svg/Resource.vue';
 import SvgQrCode from '@/components/common/svg/QrCode.vue';
+import SvgGroup from '@/components/common/svg/Group.vue';
 import SvgNote from '@/components/common/svg/Note.vue';
 import SvgDark from '@/components/common/svg/Dark.vue';
 import SvgLight from '@/components/common/svg/Light.vue';

front-end/src/components/RollCallComponents/StudentListComponent.vue

@@ -2,11 +2,9 @@
 import StudentListComponent from '@/components/RollCallComponents/StudentListComponent.vue';
 import GroupsComponent from '@/components/RollCallComponents/GroupsComponent.vue';
 import Chat from '@/components/RollCallComponents/Chat.vue';
-import ReturnButtonComponent from "@/components/RollCallComponents/ReturnButtonComponent.vue";
 
 export default {
 	components: {
-		ReturnButtonComponent,
 		Chat,
 		StudentListComponent,
 		GroupsComponent,
@@ -21,7 +19,6 @@ export default {
 // and pass it to the QrCode component
 </script>
 <template>
-	<ReturnButtonComponent />
 	<StudentListComponent />
 	<GroupsComponent />
 	<Chat room-id="1" />

front-end/src/layout/app/DrawerLayout.vue

@@ -1,13 +1,11 @@
 <script lang="ts">
 import CallsComponent from '@/components/RollCallComponents/CallsComponent.vue';
 import StudentListComponent from '@/components/RollCallComponents/StudentListComponent.vue';
-import MakeGroupsComponent from '@/components/RollCallComponents/MakeGroupsComponent.vue';
 import Chat from '@/components/RollCallComponents/Chat.vue';
 export default {
 	components: {
 		CallsComponent,
 		StudentListComponent,
-		MakeGroupsComponent,
 		Chat,
 	},
 	data() {
@@ -22,6 +20,5 @@ export default {
 <template>
 	<CallsComponent />
 	<StudentListComponent />
-	<MakeGroupsComponent />
 	<Chat room-id="1" />
 </template>