diff --git a/frontend/src/app/academics/academics-admin/course/admin-course.component.html b/frontend/src/app/academics/academics-admin/course/admin-course.component.html index 27e832f3c..4d6c86a5e 100644 --- a/frontend/src/app/academics/academics-admin/course/admin-course.component.html +++ b/frontend/src/app/academics/academics-admin/course/admin-course.component.html @@ -9,12 +9,12 @@ -
-

+

+

{{ element.subject_code }}{{ element.number }}: {{ element.title }}

-
diff --git a/frontend/src/app/academics/academics-admin/course/admin-course.component.ts b/frontend/src/app/academics/academics-admin/course/admin-course.component.ts index 53536fa64..2812a6f1a 100644 --- a/frontend/src/app/academics/academics-admin/course/admin-course.component.ts +++ b/frontend/src/app/academics/academics-admin/course/admin-course.component.ts @@ -61,9 +61,11 @@ export class AdminCourseComponent { /** Delete a course object from the backend database table using the backend HTTP delete request. * @param course: course to delete + * @param event: event to stop propagation * @returns void */ - deleteCourse(course: Course): void { + deleteCourse(course: Course, event: Event): void { + event.stopPropagation(); let confirmDelete = this.snackBar.open( 'Are you sure you want to delete this course?', 'Delete' diff --git a/frontend/src/app/academics/academics-admin/room/admin-room.component.html b/frontend/src/app/academics/academics-admin/room/admin-room.component.html index 2105b8d2e..b938148df 100644 --- a/frontend/src/app/academics/academics-admin/room/admin-room.component.html +++ b/frontend/src/app/academics/academics-admin/room/admin-room.component.html @@ -9,12 +9,12 @@
-
-

+

+

{{ element.nickname }}

-
diff --git a/frontend/src/app/academics/academics-admin/room/admin-room.component.ts b/frontend/src/app/academics/academics-admin/room/admin-room.component.ts index 2704a8406..dc2542c56 100644 --- a/frontend/src/app/academics/academics-admin/room/admin-room.component.ts +++ b/frontend/src/app/academics/academics-admin/room/admin-room.component.ts @@ -61,9 +61,11 @@ export class AdminRoomComponent { /** Delete a room object from the backend database table using the backend HTTP delete request. * @param room: room to delete + * @param event: event to stop propagation * @returns void */ - deleteRoom(room: Room): void { + deleteRoom(room: Room, event: Event): void { + event.stopPropagation(); let confirmDelete = this.snackBar.open( 'Are you sure you want to delete this room?', 'Delete' diff --git a/frontend/src/app/academics/academics-admin/section/admin-section.component.html b/frontend/src/app/academics/academics-admin/section/admin-section.component.html index b64297412..9b6213a2e 100644 --- a/frontend/src/app/academics/academics-admin/section/admin-section.component.html +++ b/frontend/src/app/academics/academics-admin/section/admin-section.component.html @@ -20,8 +20,8 @@
-
-

+

+

{{ courseFromId(element.course_id)?.subject_code }} {{ courseFromId(element.course_id)?.number }} - {{ element.number }}: @@ -32,7 +32,7 @@ }}

-
diff --git a/frontend/src/app/academics/academics-admin/section/admin-section.component.ts b/frontend/src/app/academics/academics-admin/section/admin-section.component.ts index 23eb94b4f..d5d33d40c 100644 --- a/frontend/src/app/academics/academics-admin/section/admin-section.component.ts +++ b/frontend/src/app/academics/academics-admin/section/admin-section.component.ts @@ -97,9 +97,11 @@ export class AdminSectionComponent { /** Delete a section object from the backend database table using the backend HTTP delete request. * @param section: section to delete + * @param event: event to stop progagation * @returns void */ - deleteSection(section: Section): void { + deleteSection(section: Section, event: Event): void { + event.stopPropagation(); let confirmDelete = this.snackBar.open( 'Are you sure you want to delete this section?', 'Delete' diff --git a/frontend/src/app/academics/academics-admin/term/admin-term.component.html b/frontend/src/app/academics/academics-admin/term/admin-term.component.html index 86f13d7d6..844ef7afe 100644 --- a/frontend/src/app/academics/academics-admin/term/admin-term.component.html +++ b/frontend/src/app/academics/academics-admin/term/admin-term.component.html @@ -9,12 +9,12 @@
-
-

+

+

{{ element.name }}

-
diff --git a/frontend/src/app/academics/academics-admin/term/admin-term.component.ts b/frontend/src/app/academics/academics-admin/term/admin-term.component.ts index d15217a9a..3cf6986e2 100644 --- a/frontend/src/app/academics/academics-admin/term/admin-term.component.ts +++ b/frontend/src/app/academics/academics-admin/term/admin-term.component.ts @@ -61,9 +61,11 @@ export class AdminTermComponent { /** Delete a temr object from the backend database table using the backend HTTP delete request. * @param term: term to delete + * @param event: event to stop progagation * @returns void */ - deleteTerm(term: Term): void { + deleteTerm(term: Term, event: Event): void { + event.stopPropagation(); let confirmDelete = this.snackBar.open( 'Are you sure you want to delete this term?', 'Delete'