Merge remote-tracking branch 'origin/feature/#582-unit-visibility-tog…

…gle-2' into feature/#582-unit-visibility-toggle-2

CHANGELOG.md

@@ -11,15 +11,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added an account activation resend feature. [#601](https://github.com/h-da/geli/issues/601)
 - Added `SnackBarService` as wrapper for `MatSnackBar`. [#574](https://github.com/h-da/geli/issues/574)
 - 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 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)
 - Refactored the unitCreator with a forsafe user object. [#717](https://github.com/h-da/geli/pull/717)
-- Removed firstname from resend activation feature and change button positioning. [#711] (https://github.com/h-da/geli/issues/711)
-- Refactored register and resend activation to use geli email validator with top level domain check. [#713] (https://github.com/h-da/geli/issues/713)
+- Removed firstname from resend activation feature and change button positioning. [#711](https://github.com/h-da/geli/issues/711)
+- Refactored register and resend activation to use geli email validator with top level domain check. [#713](https://github.com/h-da/geli/issues/713)
 
 ### Fixed
 - Fixed Course progress mechanism
@@ -35,6 +36,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Repair Angular CLI code generation. [#701](https://github.com/h-da/geli/pull/701)
 - Fixed `tsconfig.spec.ts` for `ng test`. [#656](https://github.com/h-da/geli/pull/656)
 - Fixed `.travis.yml`. [#706](https://github.com/h-da/geli/pull/706)
+- Fixed wording of progress display on profile page. [#715](https://github.com/h-da/geli/issues/715)
+- Fixed form validator in create task [#579](https://github.com/h-da/geli/issues/579)
 
 ### Added
 - Unit visibility toggle [#582](https://github.com/h-da/geli/issues/582)

api/src/controllers/ReportController.ts

@@ -577,9 +577,9 @@ export class ReportController {
       .map(({courseObj, progressableUnitCount}: any) => {
         const progressStats = this.calculateProgress(userProgressData, progressableUnitCount, courseObj);
         courseObj.progressData = [
-          { name: 'nothing', value: progressStats.nothing },
+          { name: 'not tried', value: progressStats.nothing },
           { name: 'tried', value: progressStats.tried },
-          { name: 'done', value: progressStats.done }
+          { name: 'solved', value: progressStats.done }
         ];
         return courseObj;
       })

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>

app/webFrontend/src/app/unit/unit-form/task-unit-edit/task-unit-edit.component.html

@@ -9,7 +9,7 @@
 
   <div *ngFor="let task of model.tasks" class="question-answer">
     <mat-form-field matLine class="question">
-      <textarea matInput id="name" placeholder="Enter question here" [(ngModel)]="task.name"></textarea>
+      <textarea matInput id="name" placeholder="Enter question here *" [(ngModel)]="task.name"></textarea>
     </mat-form-field>
 
     <button mat-button class="remove" (click)="removeTask(task)">
@@ -21,7 +21,7 @@
         <div class="check-answer">
           <mat-checkbox [(ngModel)]="answer.value" name="value_{{idx}}"></mat-checkbox>
           <mat-form-field>
-            <input matInput placeholder="Enter answer here" [(ngModel)]="answer.text">
+            <input matInput placeholder="Enter answer here *" [(ngModel)]="answer.text">
           </mat-form-field>
           <button mat-button class="remove" (click)="removeAnswer(task, idx)" matTooltip="Remove answer">
             <mat-icon>delete</mat-icon>

app/webFrontend/src/app/unit/unit-form/unit-general-info-form/unit-general-info-form.component.ts

@@ -22,7 +22,7 @@ export class UnitGeneralInfoFormComponent implements OnInit {
     }
     this.form = this.formBuilder.group({
       name: [this.model ? this.model.name : '', Validators.required],
-      description: [this.model ? this.model.description : '', Validators.required],
+      description: [this.model ? this.model.description : ''],
       deadline: [this.model ? this.model.deadline : ''],
       visible: [this.model ? this.model.visible : false]
     });