Merge branch 'develop' into feature/#582-unit-visibility-toggle-2

CHANGELOG.md

@@ -13,7 +13,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added new course & user API unit tests. [#654](https://github.com/h-da/geli/issues/654) [#691](https://github.com/h-da/geli/issues/691)
 - Added details of courseAdmin and teacher to course detail view. on click profiles are shown.[#598] (https://github.com/h-da/geli/issues/598)
 - Added small auto linting scripts to package.json [#688](https://github.com/h-da/geli/issues/688)
-- Added changed size of drop down arrows for better usability. [#686] (https://github.com/h-da/geli/issues/686)
+- Added changed size of drop down arrows for better usability. [#686](https://github.com/h-da/geli/issues/686)
+- Added icon for access key [#547](https://github.com/h-da/geli/issues/574)
 
 ### Changed
 - Refactored or slightly altered various course & user related APIs. [#654](https://github.com/h-da/geli/issues/654) [#691](https://github.com/h-da/geli/issues/691)

app/webFrontend/src/app/course/course.component.html

@@ -8,7 +8,20 @@
       {{course.description}}
     </p>
   </mat-card-content>
-  <mat-card-actions >
+  <mat-card-actions>
+    <span class="course-admin-actions" *ngIf="this.course.userCanEditCourse">
+      <button mat-icon-button (click)="editCourse(course._id)">
+        <mat-icon>mode_edit</mat-icon>
+      </button>
+
+      <button mat-icon-button (click)="showReport(course._id)">
+        <mat-icon>show_chart</mat-icon>
+      </button>
+
+      <button mat-icon-button *ngIf="!course.active" disabled>
+        <mat-icon color="warn">visibility_off</mat-icon>
+      </button>
+    </span>
     <span class="course-admin-actions" *ngIf="course.userCanEditCourse">
       <button mat-icon-button (click)="editCourse(course._id)">
         <mat-icon>mode_edit</mat-icon>
@@ -23,17 +36,23 @@
       </button>
     </span>
     <span class="course-student-actions" *ngIf="this.userService.isStudent()">
+      <div style="float:left">
+        <i class="material-icons" style="margin-top: 8px;"
+           matTooltip="Key Required"
+           *ngIf="course.enrollType === 'accesskey'">lock</i>
+        <i class="material-icons" style="margin-top: 8px;"
+           matTooltip="No Key Required"
+           *ngIf="course.enrollType !== 'accesskey'">lock_open</i>
+      </div>
       <button mat-icon-button *ngIf="!course.userIsCourseMember"
               (click)="enroll()" matTooltip="Enroll">
       <mat-icon>add_circle_outline</mat-icon>
     </button>
-
     <button mat-icon-button *ngIf="course.userIsCourseMember"
             (click)="leave()" matTooltip="Leave">
       <mat-icon>remove_circle_outline</mat-icon>
     </button>
     </span>
-
     <button mat-mini-fab *ngIf="course.userCanViewCourse"
             color="primary" class="details-button" [routerLink]="['course', course._id]">
       <mat-icon>arrow_forward</mat-icon>