From 166eb5b7dd5af838d577fa3e8bb3e74914cc44e4 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rschneider@ucs.at>
Date: Tue, 21 Sep 2021 22:12:56 +0200
Subject: [PATCH] customer design improvement

---
 .../pages/registration/registration.component.html   | 11 ++++++++++-
 .../app/pages/registration/registration.component.ts | 12 +++---------
 customer/app/src/app/services/event.service.ts       |  1 +
 .../controllers/EventRegistrationController.php      |  8 ++++----
 .../registrations/EventRegistrationAvailable.php     |  1 +
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/customer/app/src/app/pages/registration/registration.component.html b/customer/app/src/app/pages/registration/registration.component.html
index edba6ed..8f0a4fc 100644
--- a/customer/app/src/app/pages/registration/registration.component.html
+++ b/customer/app/src/app/pages/registration/registration.component.html
@@ -25,12 +25,21 @@
         <div class="col-lg-3 col-sm-12 app-font-weight-bold"><span class="title">Terem</span></div>
         <div class="col-lg-9 col-sm-12"><span>{{registration.event?.room?.name }}</span></div>
       </div>
+    <div class="row">
+      <div class="col-lg-3 col-sm-12 app-font-weight-bold"><span class="title">Státusz</span></div>
+      <div class="col-lg-9 col-sm-12">
+        <span *ngIf="registration.deleted_at">{{ "Lemondva" }}</span>
+        <span *ngIf="registration.deleted_at == null">{{ "Aktív" }}</span>
+      </div>
+    </div>
       <div class="row">
         <div class="col-lg-9  col-sm-12 pt-2">
           <a *ngIf="mayCancel(registration)" class="btn btn-primary d-lg-none w-100" (click)="cancel(registration)">Lemondás</a>
           <a *ngIf="mayCancel(registration)" class="btn btn-primary d-none d-lg-inline-block" (click)="cancel(registration)">Lemondás</a>
           <a class="btn btn-dark d-lg-none w-100 mt-2" (click)="goBack( )">Vissza</a>
-          <a class="btn btn-dark d-none d-lg-inline-block ms-2 " (click)="goBack( )">Vissza</a>
+          <a class="btn btn-dark d-none d-lg-inline-block "
+             [class.ms-2]="registration.deleted_at == null"
+             (click)="goBack( )">Vissza</a>
         </div>
       </div>
 
diff --git a/customer/app/src/app/pages/registration/registration.component.ts b/customer/app/src/app/pages/registration/registration.component.ts
index 074c8a1..a8f386d 100644
--- a/customer/app/src/app/pages/registration/registration.component.ts
+++ b/customer/app/src/app/pages/registration/registration.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import {Event, EventService, Registration} from "../../services/event.service";
-import {Observable} from "rxjs";
+import { EventService, Registration} from "../../services/event.service";
 import {ActivatedRoute, Router} from "@angular/router";
 import {tap} from "rxjs/operators";
 import {NavigationService} from "../../services/navigation.service";
@@ -23,11 +22,6 @@ export class RegistrationComponent implements OnInit {
     this.activeRoute.params.subscribe( value => {
       console.info("map: ", this.activeRoute.snapshot.paramMap);
      let registration =  this.eventService.findRegistration(+this.activeRoute.snapshot.paramMap.get('idRegistration'));
-      registration =     registration.pipe(
-        tap(x => {
-          console.info("reg",x);
-        })
-      );
 
       registration.subscribe(
         value1 => {
@@ -50,10 +44,10 @@ export class RegistrationComponent implements OnInit {
   }
 
   mayCancel(registration: Registration) {
-    return true;
+    return registration.deleted_at == null;
   }
 
   goBack() {
-    this.navigationService.navigateToHome();
+    this.navigationService.navigateRegistrations();
   }
 }
diff --git a/customer/app/src/app/services/event.service.ts b/customer/app/src/app/services/event.service.ts
index d92fd22..cf5a1a2 100644
--- a/customer/app/src/app/services/event.service.ts
+++ b/customer/app/src/app/services/event.service.ts
@@ -104,6 +104,7 @@ export interface EventsAvailableResponse {
 export interface Registration {
   id: number;
   created_at: number;
+  deleted_at: number;
   event?: Event
 }
 
diff --git a/customerapi/controllers/EventRegistrationController.php b/customerapi/controllers/EventRegistrationController.php
index 8c1455c..64134d1 100644
--- a/customerapi/controllers/EventRegistrationController.php
+++ b/customerapi/controllers/EventRegistrationController.php
@@ -74,11 +74,11 @@ class EventRegistrationController extends CustomerApiController
      * @throws Throwable
      * @return Response
      */
-    public function actionCancel($idRegistraton) {
-        $manager = new EventRegistrationManager();
-        $registration = $manager->loadRegistration($idRegistraton);
+    public function actionCancel($idRegistration) {
+        $manager = new \common\manager\EventRegistrationManager();
+        $registration = $manager->loadRegistration($idRegistration);
         $manager->deleteRegistration($registration);
-        $registration = $manager->loadRegistration($idRegistraton);
+        $registration = $manager->loadRegistration($idRegistration);
         return $this->asJson($registration);
     }
 
diff --git a/customerapi/models/registrations/EventRegistrationAvailable.php b/customerapi/models/registrations/EventRegistrationAvailable.php
index 60dbff5..757d3f4 100644
--- a/customerapi/models/registrations/EventRegistrationAvailable.php
+++ b/customerapi/models/registrations/EventRegistrationAvailable.php
@@ -17,6 +17,7 @@ class EventRegistrationAvailable extends EventRegistration
             "id" => "id",
             "created_at" => "created_at",
             "updated_at" => "updated_at",
+            "deleted_at" => "deleted_at",
         ];
         $fields['event'] = 'event';
         return $fields;