From 3f30d2ea29db02b4e54b8ba42e189bb97f44e17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20St=C3=B6hr?= <johannes.stoehr@tum.de>
Date: Thu, 19 Oct 2023 16:54:15 +0200
Subject: [PATCH 1/3] Fix more button authorities

---
 .../course-management-tab-bar.component.html  | 10 +++----
 .../app/lecture/lecture-detail.component.html | 26 ++++++++++---------
 .../course-lecture-details.component.html     |  4 +--
 .../course-lecture-details.component.spec.ts  | 10 ++++++-
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html b/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html
index c5539405fadb..7f10e925d06f 100644
--- a/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html
+++ b/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html
@@ -13,21 +13,21 @@
             <fa-icon [icon]="faFilePdf"></fa-icon>
             <span class="tab-link-text" jhiTranslate="artemisApp.courseOverview.menu.lectures">Lectures</span>
         </a>
-        <a class="tab-link" *ngIf="course.isAtLeastTutor" [routerLink]="['/course-management', course.id, 'course-statistics']" routerLinkActive="active">
+        <a class="tab-link" [routerLink]="['/course-management', course.id, 'course-statistics']" routerLinkActive="active">
             <fa-icon [icon]="faChartBar"></fa-icon>
             <span class="tab-link-text" jhiTranslate="artemisApp.courseOverview.menu.statistics">Statistics</span>
         </a>
-        <a class="tab-link" *ngIf="isCommunicationEnabled(course) && course.isAtLeastTutor" [routerLink]="['/courses', course.id, 'discussion']" routerLinkActive="active">
+        <a class="tab-link" *ngIf="isCommunicationEnabled(course)" [routerLink]="['/courses', course.id, 'discussion']" routerLinkActive="active">
             <fa-icon [icon]="faComment"></fa-icon>
             <span class="tab-link-text" jhiTranslate="artemisApp.metis.communication.label">Communication</span>
             <fa-icon [icon]="faArrowUpRightFromSquare"></fa-icon>
         </a>
-        <a class="tab-link" *ngIf="course?.isAtLeastInstructor && irisEnabled" (click)="showIrisSettings()" routerLinkActive="active">
+        <a class="tab-link" *ngIf="course.isAtLeastInstructor && irisEnabled" (click)="showIrisSettings()" routerLinkActive="active">
             <fa-icon [icon]="faRobot"></fa-icon>
             <span jhiTranslate="artemisApp.iris.settings.button.course.title">Iris</span>
             <fa-icon [icon]="faArrowUpRightFromSquare"></fa-icon>
         </a>
-        <a class="tab-link" *ngIf="isMessagingEnabled(course) && course.isAtLeastTutor" [routerLink]="['/courses', course.id, 'messages']" routerLinkActive="active">
+        <a class="tab-link" *ngIf="isMessagingEnabled(course)" [routerLink]="['/courses', course.id, 'messages']" routerLinkActive="active">
             <fa-icon [icon]="faComments"></fa-icon>
             <span class="tab-link-text" jhiTranslate="artemisApp.courseOverview.menu.messages">Messages</span>
             <fa-icon [icon]="faArrowUpRightFromSquare"></fa-icon>
@@ -61,7 +61,7 @@
             <fa-icon [icon]="faUserCheck"></fa-icon>
             <span class="tab-link-text" jhiTranslate="entity.action.assessmentDashboard">Assessment</span>
         </a>
-        <a class="tab-link" [routerLink]="['/course-management', course.id, 'scores']" routerLinkActive="active">
+        <a class="tab-link" *ngIf="course.isAtLeastInstructor" [routerLink]="['/course-management', course.id, 'scores']" routerLinkActive="active">
             <fa-icon [icon]="faTable"></fa-icon>
             <span class="tab-link-text" jhiTranslate="entity.action.scores">Scores</span>
         </a>
diff --git a/src/main/webapp/app/lecture/lecture-detail.component.html b/src/main/webapp/app/lecture/lecture-detail.component.html
index 5b6f1771a8f1..0692cde78588 100644
--- a/src/main/webapp/app/lecture/lecture-detail.component.html
+++ b/src/main/webapp/app/lecture/lecture-detail.component.html
@@ -30,18 +30,20 @@ <h2><span jhiTranslate="artemisApp.lecture.detail.title">Lecture</span> {{ lectu
                 </dd>
             </dl>
 
-            <a [routerLink]="['/course-management', lecture.course?.id, 'lectures', lecture.id, 'edit']" class="btn btn-primary">
-                <fa-icon [icon]="faPencilAlt"></fa-icon>
-                <span jhiTranslate="entity.action.edit"> Edit</span>
-            </a>
-            <a [routerLink]="['attachments']" class="btn btn-primary">
-                <fa-icon [icon]="faFile"></fa-icon>
-                <span jhiTranslate="entity.action.attachments">Attachment</span>
-            </a>
-            <a [routerLink]="['unit-management']" class="btn btn-primary">
-                <fa-icon [icon]="faPuzzlePiece"></fa-icon>
-                <span jhiTranslate="entity.action.units">Units</span>
-            </a>
+            <ng-container *ngIf="lecture.course?.isAtLeastEditor">
+                <a [routerLink]="['/course-management', lecture.course?.id, 'lectures', lecture.id, 'edit']" class="btn btn-primary">
+                    <fa-icon [icon]="faPencilAlt"></fa-icon>
+                    <span jhiTranslate="entity.action.edit"> Edit</span>
+                </a>
+                <a [routerLink]="['attachments']" class="btn btn-primary">
+                    <fa-icon [icon]="faFile"></fa-icon>
+                    <span jhiTranslate="entity.action.attachments">Attachment</span>
+                </a>
+                <a [routerLink]="['unit-management']" class="btn btn-primary">
+                    <fa-icon [icon]="faPuzzlePiece"></fa-icon>
+                    <span jhiTranslate="entity.action.units">Units</span>
+                </a>
+            </ng-container>
         </div>
     </div>
 </div>
diff --git a/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html b/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html
index 39298761cb70..f191d337940e 100644
--- a/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html
+++ b/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html
@@ -13,13 +13,13 @@ <h3>
                     <span>{{ lecture!.title }}</span>
                 </h3>
                 <h4>
-                    <span class="me-2" *ngIf="lecture!.startDate && lecture!.endDate">
+                    <span class="me-2" *ngIf="lecture?.startDate && lecture?.endDate">
                         {{ 'artemisApp.courseOverview.lectureDetails.date' | artemisTranslate }} {{ lecture!.startDate | artemisDate }} -
                         {{ lecture!.endDate | artemisDate: 'time' }}
                     </span>
                 </h4>
             </div>
-            <div class="col-auto d-flex align-items-center" *ngIf="!!lecture?.course?.isAtLeastTutor">
+            <div class="col-auto d-flex align-items-center" *ngIf="lecture?.course?.isAtLeastEditor">
                 <button id="manageLectureButton" class="btn btn-secondary" (click)="redirectToLectureManagement()">
                     {{ 'artemisApp.courseOverview.manage' | artemisTranslate }}
                 </button>
diff --git a/src/test/javascript/spec/component/overview/course-lectures/course-lecture-details.component.spec.ts b/src/test/javascript/spec/component/overview/course-lectures/course-lecture-details.component.spec.ts
index 98ddca1042a5..7334ab188abd 100644
--- a/src/test/javascript/spec/component/overview/course-lectures/course-lecture-details.component.spec.ts
+++ b/src/test/javascript/spec/component/overview/course-lectures/course-lecture-details.component.spec.ts
@@ -174,10 +174,18 @@ describe('CourseLectureDetails', () => {
         expect(courseLecturesDetailsComponent.hasPdfLectureUnit).toBeFalse();
     }));
 
-    it('should display manage button when user is at least tutor', fakeAsync(() => {
+    it('should not display manage button when user is only tutor', fakeAsync(() => {
         lecture.course!.isAtLeastTutor = true;
         fixture.detectChanges();
 
+        const manageLectureButton = debugElement.query(By.css('#manageLectureButton'));
+        expect(manageLectureButton).toBeNull();
+    }));
+
+    it('should display manage button when user is at least editor', fakeAsync(() => {
+        lecture.course!.isAtLeastEditor = true;
+        fixture.detectChanges();
+
         const manageLectureButton = debugElement.query(By.css('#manageLectureButton'));
         expect(manageLectureButton).not.toBeNull();
     }));

From 2b7cc73fb6c6cccdfdc4989bc7ae1f3f535d57bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20St=C3=B6hr?= <johannes.stoehr@tum.de>
Date: Fri, 20 Oct 2023 20:04:56 +0200
Subject: [PATCH 2/3] Also show tutors the tutorial section

---
 .../course-management-tab-bar.component.html                     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html b/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html
index 7f10e925d06f..895b4649cf50 100644
--- a/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html
+++ b/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html
@@ -35,7 +35,6 @@
         <a
             class="tab-link"
             [jhiFeatureToggleLink]="FeatureToggle.TutorialGroups"
-            *ngIf="course.isAtLeastInstructor"
             [routerLink]="['/course-management', course.id, 'tutorial-groups']"
             routerLinkActive="active"
             [class.active]="shouldHighlightTutorialsLink()"

From fc1bd2a5d3ae65054cc320e6e6c94fe1f3380039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20St=C3=B6hr?= <johannes.stoehr@tum.de>
Date: Sat, 21 Oct 2023 11:03:15 +0200
Subject: [PATCH 3/3] Fix tutorial groups button

---
 .../course-management-tab-bar.component.html                    | 1 +
 .../manage/overview/course-management-card.component.html       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html b/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html
index 895b4649cf50..fed79b4d46c8 100644
--- a/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html
+++ b/src/main/webapp/app/course/manage/course-management-tab-bar/course-management-tab-bar.component.html
@@ -34,6 +34,7 @@
         </a>
         <a
             class="tab-link"
+            *ngIf="course.tutorialGroupsConfiguration || course.isAtLeastInstructor"
             [jhiFeatureToggleLink]="FeatureToggle.TutorialGroups"
             [routerLink]="['/course-management', course.id, 'tutorial-groups']"
             routerLinkActive="active"
diff --git a/src/main/webapp/app/course/manage/overview/course-management-card.component.html b/src/main/webapp/app/course/manage/overview/course-management-card.component.html
index 12812dab4310..f3bf0280a43e 100644
--- a/src/main/webapp/app/course/manage/overview/course-management-card.component.html
+++ b/src/main/webapp/app/course/manage/overview/course-management-card.component.html
@@ -254,7 +254,7 @@ <h4 class="text-center no-exercises mt-3 fw-medium">{{ 'artemisApp.course.noExer
             <span class="d-none d-xl-inline">{{ 'artemisApp.courseOverview.menu.messages' | artemisTranslate }}</span>
         </a>
         <a
-            *ngIf="course.isAtLeastTutor"
+            *ngIf="course.timeZone || course.isAtLeastInstructor"
             [routerLink]="['/course-management', course.id, 'tutorial-groups']"
             [jhiFeatureToggleLink]="FeatureToggle.TutorialGroups"
             class="btn btn-primary me-1 mb-1 hidden-if-mobile"