From 5ef4a6d085b586aeeebf244c8bbc53b6816efc96 Mon Sep 17 00:00:00 2001
From: Fanevarak <rakotoarivonyfaneva@gmail.com>
Date: Wed, 19 Apr 2023 22:42:07 -0400
Subject: [PATCH] Added members page to menu bar
---
client/src/app/app.module.ts | 4 +++-
.../comoponents/vehicle/vehicle.component.css | 0
.../vehicle/vehicle.component.html | 1 +
.../vehicle/vehicle.component.spec.ts | 23 +++++++++++++++++++
.../comoponents/vehicle/vehicle.component.ts | 10 ++++++++
.../reservation-individuel.component.html | 7 +++++-
.../reservation-individuel.component.ts | 16 +++++++++----
client/src/app/pages/app/app.component.html | 2 +-
.../list-reservations.component.html | 2 ++
9 files changed, 58 insertions(+), 7 deletions(-)
create mode 100644 client/src/app/comoponents/vehicle/vehicle.component.css
create mode 100644 client/src/app/comoponents/vehicle/vehicle.component.html
create mode 100644 client/src/app/comoponents/vehicle/vehicle.component.spec.ts
create mode 100644 client/src/app/comoponents/vehicle/vehicle.component.ts
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index b91f14b..787d483 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -13,7 +13,8 @@ import { CreateReservationComponent } from "./pages/create-reservation/create-re
import { MembresComponent } from "./pages/membres/membres.component";
import { CommunicationService } from "./services/communication.service";
import { ListReservationsComponent } from './pages/list-reservations/list-reservations.component';
-import { ReservationIndividuelComponent } from './components/reservation-individuel/reservation-individuel.component';
+import { ReservationIndividuelComponent } from './components/reservation-individuel/reservation-individuel.component';
+import { VehicleComponent } from './comoponents/vehicle/vehicle.component';
@NgModule({
declarations: [
@@ -24,6 +25,7 @@ import { ReservationIndividuelComponent } from './components/reservation-individ
DetailedMemberComponent,
ListReservationsComponent,
ReservationIndividuelComponent,
+ VehicleComponent,
],
imports: [
CommonModule,
diff --git a/client/src/app/comoponents/vehicle/vehicle.component.css b/client/src/app/comoponents/vehicle/vehicle.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/client/src/app/comoponents/vehicle/vehicle.component.html b/client/src/app/comoponents/vehicle/vehicle.component.html
new file mode 100644
index 0000000..73b99dc
--- /dev/null
+++ b/client/src/app/comoponents/vehicle/vehicle.component.html
@@ -0,0 +1 @@
+<p>vehicle works!</p>
diff --git a/client/src/app/comoponents/vehicle/vehicle.component.spec.ts b/client/src/app/comoponents/vehicle/vehicle.component.spec.ts
new file mode 100644
index 0000000..78439be
--- /dev/null
+++ b/client/src/app/comoponents/vehicle/vehicle.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { VehicleComponent } from './vehicle.component';
+
+describe('VehicleComponent', () => {
+ let component: VehicleComponent;
+ let fixture: ComponentFixture<VehicleComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [ VehicleComponent ]
+ })
+ .compileComponents();
+
+ fixture = TestBed.createComponent(VehicleComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/client/src/app/comoponents/vehicle/vehicle.component.ts b/client/src/app/comoponents/vehicle/vehicle.component.ts
new file mode 100644
index 0000000..0a4a12d
--- /dev/null
+++ b/client/src/app/comoponents/vehicle/vehicle.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'app-vehicle',
+ templateUrl: './vehicle.component.html',
+ styleUrls: ['./vehicle.component.css']
+})
+export class VehicleComponent {
+
+}
diff --git a/client/src/app/components/reservation-individuel/reservation-individuel.component.html b/client/src/app/components/reservation-individuel/reservation-individuel.component.html
index c3944ba..472b7fb 100644
--- a/client/src/app/components/reservation-individuel/reservation-individuel.component.html
+++ b/client/src/app/components/reservation-individuel/reservation-individuel.component.html
@@ -1 +1,6 @@
-<p>reservation-individuel works!</p>
+<p>Réservation pour {{ reservation.conducteur.nomComplet }}</p>
+
+<p> Date de début : {{ reservation.tempsDebut }}</p>
+<p> Date de fin : {{ reservation.tempsFin }}</p>
+<p> Durée : {{ duration }}</p>
+
diff --git a/client/src/app/components/reservation-individuel/reservation-individuel.component.ts b/client/src/app/components/reservation-individuel/reservation-individuel.component.ts
index 3dc8422..1a5dc0b 100644
--- a/client/src/app/components/reservation-individuel/reservation-individuel.component.ts
+++ b/client/src/app/components/reservation-individuel/reservation-individuel.component.ts
@@ -1,10 +1,18 @@
-import { Component } from '@angular/core';
+import { Component, Input } from "@angular/core";
+import { Reservation } from "@common/interfaces/reservation";
@Component({
- selector: 'app-reservation-individuel',
- templateUrl: './reservation-individuel.component.html',
- styleUrls: ['./reservation-individuel.component.css']
+ selector: "app-reservation-individuel",
+ templateUrl: "./reservation-individuel.component.html",
+ styleUrls: ["./reservation-individuel.component.css"],
})
export class ReservationIndividuelComponent {
+ @Input() reservation!: Reservation;
+ duration: string;
+ constructor() {
+ this.duration = (
+ this.reservation.tempsFin.getTime() - this.reservation.tempsFin.getTime()
+ ).toLocaleString();
+ }
}
diff --git a/client/src/app/pages/app/app.component.html b/client/src/app/pages/app/app.component.html
index cfabd28..686273a 100644
--- a/client/src/app/pages/app/app.component.html
+++ b/client/src/app/pages/app/app.component.html
@@ -5,7 +5,7 @@
<div class="navbar-nav">
<a class="nav-item nav-link active" routerLink="/">Accueil</a>
<a class="nav-item nav-link active" routerLink="/create-reservation">Créer réservation</a>
- <a class="nav-item nav-link active" routerLink="/ROUTEUR_À_IMPLÉMENTER">LIEN 3</a>
+ <a class="nav-item nav-link active" routerLink="/membre">Les Membres 3</a>
</div>
</div>
</nav>
diff --git a/client/src/app/pages/list-reservations/list-reservations.component.html b/client/src/app/pages/list-reservations/list-reservations.component.html
index ed66930..e4c7233 100644
--- a/client/src/app/pages/list-reservations/list-reservations.component.html
+++ b/client/src/app/pages/list-reservations/list-reservations.component.html
@@ -1,2 +1,4 @@
<h2>Réservations</h2>
+<app-reservation-individuel [reservation]="reservation"
+ *ngFor="let reservation of reservations"></app-reservation-individuel>
\ No newline at end of file
--
GitLab