Merge pull request #140 from marc101101/feature/feedback-course

Feature/feedback course

Author: hmSchuller

client/app/components/home/contact/contact.component.html

@@ -3,7 +3,7 @@
   <div class="columns is-mobile">
     <div class="column is-12" style="z-index: 0; padding: 2rem; padding-left: 5rem; padding-bottom: 0rem;">
       <div style="font-size: 1.5rem; color:white;">
-        Kontakt
+        {{headerText}}
       </div>
     </div>
     <div class="columns is-mobile">

client/app/components/home/contact/contact.component.ts

@@ -1,15 +1,20 @@
 import { Component, OnInit, ViewChild, Renderer2, ElementRef } from '@angular/core';
-import { Router } from '@angular/router';
+import { Router, ActivatedRoute, Params } from '@angular/router';
 import { ContactService } from '../shared/contact.service';
+import { log } from 'util';
+import { CoursesService } from '../shared/courses.service';
 
 @Component({
   selector: 'contact',
   templateUrl: './contact.component.html',
   styleUrls: ['./contact.component.scss']
 })
-export class ContactComponent {
+export class ContactComponent implements OnInit{
   public dataIsAvailable: boolean = false;
-  public button_text: string = "Feedback senden"
+  public button_text: string = "Feedback senden";
+  public headerText: string = "Kontakt";
+  public course_feedback: boolean = false;
+  public single_course;
   public contactMessage: any = {
     text: "",
     bewertung: null,
@@ -20,14 +25,39 @@ export class ContactComponent {
   constructor(
     private router: Router, 
     private renderer: Renderer2,
-    private contactService: ContactService) { }
+    private contactService: ContactService,
+    private activatedRoute: ActivatedRoute,
+    private coursesService:CoursesService) { }
 
-  submit():void{
-    this.contactService.postContactFeedback(this.contactMessage).subscribe(response => {
-      if(response.name != "HttpResponseError"){
-        this.renderer.addClass(this.sendButton.nativeElement, 'is-primary-save');
-        this.button_text = 'Senden erfolgreich';
-      }  
+  ngOnInit(){
+    this.activatedRoute.params.subscribe((params: Params) => {                
+      if(params.id){
+        this.coursesService.getCoursesByCourseId(params.id).subscribe(response =>{
+          this.single_course = response;
+          this.course_feedback = true;
+          this.headerText = "Bewertung: " + this.single_course.KURS_NAME;          
+        });
+      }      
     });
   }
+
+  submit():void{
+    if(this.course_feedback){
+      this.coursesService.postFeedbackByCourse(this.contactMessage, this.single_course.KURS_ID).subscribe(response => {
+        console.log(response);
+        if(response.name != "HttpResponseError"){
+          this.renderer.addClass(this.sendButton.nativeElement, 'is-primary-save');
+          this.button_text = 'Senden erfolgreich';
+        } 
+      });
+    }
+    else{
+      this.contactService.postContactFeedback(this.contactMessage).subscribe(response => {
+        if(response.name != "HttpResponseError"){
+          this.renderer.addClass(this.sendButton.nativeElement, 'is-primary-save');
+          this.button_text = 'Senden erfolgreich';
+        }  
+      });
+    }
+  }
 }

client/app/components/home/home-routing.module.ts

@@ -38,6 +38,10 @@ const routes: Routes = [
         path: 'kontakt',
         component: ContactComponent
       },
+      {
+        path: 'kontakt/:id',
+        component: ContactComponent
+      },
       {
         path: 'profil',
         component: ProfilComponent

client/app/components/home/shared/courses.service.ts

@@ -58,5 +58,19 @@ export class CoursesService {
       })
     )
   }
+
+  postFeedbackByCourse(feedback: any, courseId:string): Observable<any>{   
+    return this.http.post(this.url + "/courses/" + courseId + "/feedback" ,feedback, this.httpOptions).pipe(
+      map((res: Response) => {
+        return res;
+      }),
+      catchError((err: HttpErrorResponse) => {
+        this.alertService.push(err);
+        return of(err);
+      })
+    )
+  }
+
+
 
 }

client/app/components/home/singlecourse/singlecourse.component.html

@@ -34,6 +34,9 @@
     + singleCourse.location.ORT_PLZ">
       <i class="fa fa-location-arrow" aria-hidden="true"></i>
     </a>
+    <a class="button is-fullwidth is-warning nav-button" [routerLink]="['/home/kontakt/' + singleCourse.KURS_ID]" >
+      <i class="fa fa-star" aria-hidden="true"></i>
+    </a>
   </section>
 
   <div class="column is-12" *ngIf="showButton" style="padding: 1rem; padding-top: 1.5rem; padding-bottom: 1.5rem;">