From 84b2947175df32e34601889a5a073e574929c4a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= <sebastien.andre@arolla.fr>
Date: Tue, 31 Mar 2020 13:30:51 +0200
Subject: [PATCH] Style des formulaires d'ajout

---
 .../list-of-aircrafts.component.ts            |  6 ++
 .../app/list-of-dzs/list-of-dzs.component.ts  |  6 ++
 .../list-of-gears/list-of-gears.component.ts  |  1 -
 .../list-of-jump-types.component.ts           |  6 ++
 .../new-aircraft/new-aircraft.component.html  |  6 +-
 .../new-aircraft/new-aircraft.component.ts    | 29 +++++-----
 .../new-drop-zone.component.html              | 36 ++++++------
 .../new-drop-zone/new-drop-zone.component.ts  | 34 ++++++-----
 .../src/app/new-gear/new-gear.component.html  | 42 +++++++-------
 .../src/app/new-gear/new-gear.component.ts    | 56 ++++++++++++-------
 .../new-jump-type.component.html              |  6 +-
 .../new-jump-type/new-jump-type.component.ts  | 22 ++++----
 12 files changed, 148 insertions(+), 102 deletions(-)

diff --git a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts
index 5449659..be5bbb0 100644
--- a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts
+++ b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts
@@ -7,6 +7,7 @@ import { AircraftResp } from "../../models/aircraft";
 import { AircraftService } from "../../services/aircraft.service";
 import { ServiceComm } from "../../services/service-comm.service";
 import { NewAircraftComponent } from "../new-aircraft/new-aircraft.component";
+import { AddAction } from "../../models/add-action.enum";
 
 @Component({
   selector: "app-list-of-aircrafts",
@@ -26,6 +27,11 @@ export class ListOfAircraftsComponent implements OnInit {
   ) {}
 
   ngOnInit() {
+    this.serviceComm.refreshRequest.subscribe(action => {
+      if (action === AddAction.Gear) {
+        this.getListOfAircrafts();
+      }
+    });
     this.serviceComm.UpdatedComponentTitle("List of aircrafts");
     this.getListOfAircrafts();
   }
diff --git a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts
index 070ad4b..d5a78e4 100644
--- a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts
+++ b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts
@@ -3,6 +3,7 @@ import { MatPaginator } from "@angular/material/paginator";
 import { MatTableDataSource } from "@angular/material/table";
 import { MatDialog } from "@angular/material/dialog";
 
+import { AddAction } from "../../models/add-action.enum";
 import { DropZoneResp } from "../../models/dropzone";
 import { DropzoneService } from "../../services/dropzone.service";
 import { ServiceComm } from "../../services/service-comm.service";
@@ -35,6 +36,11 @@ export class ListOfDzsComponent implements OnInit {
   ) {}
 
   ngOnInit() {
+    this.serviceComm.refreshRequest.subscribe(action => {
+      if (action === AddAction.Gear) {
+        this.getListOfDropZones();
+      }
+    });
     this.serviceComm.UpdatedComponentTitle("List of DZs");
     this.getListOfDropZones();
   }
diff --git a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.ts b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.ts
index b02f545..87b4946 100644
--- a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.ts
+++ b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.ts
@@ -41,7 +41,6 @@ export class ListOfGearsComponent implements OnInit {
       }
     });
     this.serviceComm.UpdatedComponentTitle("List of gears");
-
     this.getListOfGears();
   }
 
diff --git a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts
index 10486b1..7d2c77c 100644
--- a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts
+++ b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts
@@ -3,6 +3,7 @@ import { MatPaginator } from "@angular/material/paginator";
 import { MatTableDataSource } from "@angular/material/table";
 import { MatDialog } from "@angular/material/dialog";
 
+import { AddAction } from "../../models/add-action.enum";
 import { JumpTypeResp } from "../../models/jumpType";
 import { JumpTypeService } from "../../services/jump-type.service";
 import { ServiceComm } from "../../services/service-comm.service";
@@ -26,6 +27,11 @@ export class ListOfJumpTypesComponent implements OnInit {
   ) {}
 
   ngOnInit() {
+    this.serviceComm.refreshRequest.subscribe(action => {
+      if (action === AddAction.Gear) {
+        this.getListOfJumpTypes();
+      }
+    });
     this.serviceComm.UpdatedComponentTitle("List of jump types");
     this.getListOfJumpTypes();
   }
diff --git a/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.html b/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.html
index 314f523..51cdc59 100644
--- a/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.html
+++ b/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="addForm" (ngSubmit)="onSubmit(addForm.value)">
-  <div>
+  <p class="form-group">
     <label for="aircraftName">Aircraft name</label>
-    <input id="aircraftName" type="text" formControlName="aircraftName">
-  </div>
+    <input id="aircraftName" type="text" formControlName="aircraftName" class="form-control">
+  </p>
   <button class="button" type="submit" class="btn btn-primary">Add</button>
 </form>
diff --git a/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.ts b/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.ts
index fc31948..39ff807 100644
--- a/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.ts
+++ b/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.ts
@@ -1,32 +1,33 @@
-import { Component, OnInit } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { AircraftService } from '../../services/aircraft.service';
-import { ServiceComm } from '../../services/service-comm.service';
-import { AddAction } from '../../models/add-action.enum';
-
+import { Component, OnInit } from "@angular/core";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { AircraftService } from "../../services/aircraft.service";
+import { ServiceComm } from "../../services/service-comm.service";
+import { AddAction } from "../../models/add-action.enum";
 
 @Component({
-  selector: 'app-new-aircraft',
-  templateUrl: './new-aircraft.component.html',
-  styleUrls: ['./new-aircraft.component.css']
+  selector: "app-new-aircraft",
+  templateUrl: "./new-aircraft.component.html",
+  styleUrls: ["./new-aircraft.component.css"]
 })
 export class NewAircraftComponent implements OnInit {
   public addForm: FormGroup;
 
-  constructor(private serviceComm: ServiceComm,
-    private serviceApi: AircraftService) {
+  constructor(
+    private serviceComm: ServiceComm,
+    private serviceApi: AircraftService
+  ) {
     this.addForm = new FormGroup({
-      aircraftName: new FormControl('', Validators.required)
+      aircraftName: new FormControl("", Validators.required)
     });
   }
 
-  ngOnInit() {
-  }
+  ngOnInit() {}
 
   onSubmit(formData) {
     this.serviceApi.AddAircraft(formData.value.aircraftName);
     this.serviceComm.RefreshData(AddAction.Aircraft);
 
+    this.serviceComm.RefreshData(AddAction.Aircraft);
     this.addForm.reset();
   }
 }
diff --git a/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.html b/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.html
index 18cf45d..3875882 100644
--- a/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.html
+++ b/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.html
@@ -1,23 +1,27 @@
 <form [formGroup]="addForm" (ngSubmit)="onSubmit(addForm.value)">
-  <div>
+  <p class="form-group">
     <label for="dzName">Dropzone name</label>
-    <input id="dzName" type="text" formControlName="dzName">
-  </div>
-  <div>
+    <input id="dzName" type="text" formControlName="dzName" class="form-control">
+  </p>
+  <p class="form-group">
     <label for="gps">GPS</label>
-    <input id="gps" type="text" formControlName="gps">
-  </div>
-  <div>
+    <input id="gps" type="text" formControlName="gps" class="form-control">
+  </p>
+  <p class="form-group">
     <label for="address">Address</label>
-    <textarea id="address" formControlName="address" placeholder="Address of the DZ"></textarea>
-  </div>
-  <div>
+    <textarea id="address" formControlName="address" placeholder="Address of the DZ" class="form-control"></textarea>
+  </p>
+  <p class="form-group">
     <label for="contactMail">Mail of contact</label>
-    <input id="contactMail" type="email" formControlName="contactMail">
-  </div>
-  <div>
-    <label for="type">DZ or/and tunnel</label>
-    <input id="type" type="text" formControlName="type">
-  </div>
+    <input id="contactMail" type="text" formControlName="contactMail" class="form-control">
+  </p>
+  <p class="form-group">
+    <label for="isDz">Is a dropzone</label>
+    <input id="isDz" type="checkbox" formControlName="isDz" class="form-control">
+  </p>
+  <p class="form-group">
+    <label for="isTunnel">Is a tunnel</label>
+    <input id="isTunnel" type="checkbox" formControlName="isTunnel" class="form-control">
+  </p>
   <button class="button" type="submit" class="btn btn-primary">Add</button>
 </form>
diff --git a/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.ts b/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.ts
index 0f6d067..eb12f15 100644
--- a/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.ts
+++ b/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.ts
@@ -1,31 +1,37 @@
-import { Component, OnInit } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { Component, OnInit } from "@angular/core";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { AddAction } from "../../models/add-action.enum";
+import { ServiceComm } from "../../services/service-comm.service";
 
 @Component({
-  selector: 'app-new-drop-zone',
-  templateUrl: './new-drop-zone.component.html',
-  styleUrls: ['./new-drop-zone.component.css']
+  selector: "app-new-drop-zone",
+  templateUrl: "./new-drop-zone.component.html",
+  styleUrls: ["./new-drop-zone.component.css"]
 })
 export class NewDropZoneComponent implements OnInit {
   public addForm: FormGroup;
 
-  constructor() {
+  constructor(private serviceComm: ServiceComm) {
     this.addForm = new FormGroup({
-      dzName: new FormControl('', Validators.required),
-      gps: new FormControl('x.x,y.y', Validators.required),
-      address: new FormControl('', Validators.required),
-      contactMail: new FormControl('tot@toto.fr', [Validators.required, Validators.pattern('\\w+@\\w+\.\\w+')]),
-      type: new FormControl('dz, tunel', Validators.required)
+      dzName: new FormControl("", Validators.required),
+      gps: new FormControl("x.x,y.y", [
+        Validators.required,
+        Validators.pattern("d+.d+,d+.d+")
+      ]),
+      address: new FormControl("", Validators.required),
+      contactMail: new FormControl("", [Validators.required, Validators.email]),
+      isDz: new FormControl(true),
+      isTunnel: new FormControl(false)
     });
   }
 
-  ngOnInit() {
-  }
+  ngOnInit() {}
 
   onSubmit(formData) {
     console.log(formData.status);
-    console.warn('New data : ', formData);
+    console.warn("New data : ", formData);
 
+    this.serviceComm.RefreshData(AddAction.Gear);
     this.addForm.reset();
   }
 }
diff --git a/Front/skydivelogs-app/src/app/new-gear/new-gear.component.html b/Front/skydivelogs-app/src/app/new-gear/new-gear.component.html
index 947bcc9..227521b 100644
--- a/Front/skydivelogs-app/src/app/new-gear/new-gear.component.html
+++ b/Front/skydivelogs-app/src/app/new-gear/new-gear.component.html
@@ -1,32 +1,32 @@
 <form [formGroup]="addForm" (ngSubmit)="onSubmit(addForm.value)">
-  <div>
+  <p class="form-group">
     <label for="name">Name of gear</label>
-    <input id="name" type="text" formControlName="name">
-  </div>
-  <div>
+    <input id="name" type="text" formControlName="name" class="form-control">
+  </p>
+  <p class="form-group">
     <label for="manufacturer">Manufacturer</label>
-    <input id="manufacturer" type="text" formControlName="manufacturer">
-  </div>
-  <div>
+    <input id="manufacturer" type="text" formControlName="manufacturer" class="form-control">
+  </p>
+  <p class="form-group">
     <label for="minSize">Min size of canopy</label>
-    <input id="minSize" type="text" formControlName="minSize">
-  </div>
-  <div>
+    <input id="minSize" type="text" formControlName="minSize" class="form-control">
+  </p>
+  <p class="form-group">
     <label for="maxSize">Max size of canopy</label>
-    <input id="maxSize" type="text" formControlName="maxSize">
-  </div>
-  <div>
+    <input id="maxSize" type="text" formControlName="maxSize" class="form-control">
+  </p>
+  <p class="form-group">
     <label for="aad">AAD system</label>
-    <input id="aad" type="text" formControlName="aad">
-  </div>
-  <div>
+    <input id="aad" type="text" formControlName="aad" class="form-control">
+  </p>
+  <p class="form-group">
     <label for="mainCanopy">Main Canopy</label>
-    <input id="mainCanopy" type="text" formControlName="mainCanopy">
-  </div>
-  <div>
+    <input id="mainCanopy" type="text" formControlName="mainCanopy" class="form-control">
+  </p>
+  <p class="form-group">
     <label for="reserveCanopy">Reserve canopy</label>
-    <input id="reserveCanopy" type="text" formControlName="reserveCanopy">
-  </div>
+    <input id="reserveCanopy" type="text" formControlName="reserveCanopy" class="form-control">
+  </p>
 
   <button class="button" type="submit" class="btn btn-primary">Add</button>
 </form>
diff --git a/Front/skydivelogs-app/src/app/new-gear/new-gear.component.ts b/Front/skydivelogs-app/src/app/new-gear/new-gear.component.ts
index 15d09a0..f9f9664 100644
--- a/Front/skydivelogs-app/src/app/new-gear/new-gear.component.ts
+++ b/Front/skydivelogs-app/src/app/new-gear/new-gear.component.ts
@@ -1,33 +1,50 @@
-import { Component, OnInit } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
-
-import { ServiceComm } from '../../services/service-comm.service';
-import { GearService } from '../../services/gear.service';
-import { AddAction } from '../../models/add-action.enum';
+import { Component, OnInit } from "@angular/core";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
 
+import { ServiceComm } from "../../services/service-comm.service";
+import { GearService } from "../../services/gear.service";
+import { AddAction } from "../../models/add-action.enum";
 
 @Component({
-  selector: 'app-new-gear',
-  templateUrl: './new-gear.component.html',
-  styleUrls: ['./new-gear.component.css']
+  selector: "app-new-gear",
+  templateUrl: "./new-gear.component.html",
+  styleUrls: ["./new-gear.component.css"]
 })
 export class NewGearComponent implements OnInit {
   public addForm: FormGroup;
 
-  constructor(private serviceComm: ServiceComm, private serviceApi: GearService) {
+  constructor(
+    private serviceComm: ServiceComm,
+    private serviceApi: GearService
+  ) {
     this.addForm = new FormGroup({
-      name: new FormControl('', Validators.required),
-      manufacturer: new FormControl('', Validators.required),
-      minSize: new FormControl('', Validators.required),
-      maxSize: new FormControl('', Validators.required),
-      aad: new FormControl('', Validators.required),
-      mainCanopy: new FormControl('', Validators.required),
-      reserveCanopy: new FormControl('', Validators.required),
+      name: new FormControl("", Validators.required),
+      manufacturer: new FormControl("", Validators.required),
+      minSize: new FormControl("", [
+        Validators.required,
+        Validators.min(60),
+        Validators.max(320)
+      ]),
+      maxSize: new FormControl("", [
+        Validators.required,
+        Validators.min(60),
+        Validators.max(320)
+      ]),
+      aad: new FormControl("", Validators.required),
+      mainCanopy: new FormControl("", [
+        Validators.required,
+        Validators.min(60),
+        Validators.max(320)
+      ]),
+      reserveCanopy: new FormControl("", [
+        Validators.required,
+        Validators.min(60),
+        Validators.max(320)
+      ])
     });
   }
 
-  ngOnInit() {
-  }
+  ngOnInit() {}
 
   onSubmit(formData) {
     this.serviceApi.AddGear(
@@ -41,7 +58,6 @@ export class NewGearComponent implements OnInit {
     );
 
     this.serviceComm.RefreshData(AddAction.Gear);
-
     this.addForm.reset();
   }
 }
diff --git a/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.html b/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.html
index adb3727..c701755 100644
--- a/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.html
+++ b/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="addForm" (ngSubmit)="onSubmit(addForm.value)">
-  <div>
+  <p class="form-group">
     <label for="jumptypeName">Jump type name</label>
-    <input id="jumptypeName" type="text" formControlName="jumptypeName">
-  </div>
+    <input id="jumptypeName" type="text" formControlName="jumptypeName" class="form-control">
+  </p>
   <button class="button" type="submit" class="btn btn-primary">Add</button>
 </form>
diff --git a/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.ts b/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.ts
index fbf3a21..2d53ebb 100644
--- a/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.ts
+++ b/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.ts
@@ -1,27 +1,29 @@
-import { Component, OnInit } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { Component, OnInit } from "@angular/core";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { AddAction } from "../../models/add-action.enum";
+import { ServiceComm } from "../../services/service-comm.service";
 
 @Component({
-  selector: 'app-new-jump-type',
-  templateUrl: './new-jump-type.component.html',
-  styleUrls: ['./new-jump-type.component.css']
+  selector: "app-new-jump-type",
+  templateUrl: "./new-jump-type.component.html",
+  styleUrls: ["./new-jump-type.component.css"]
 })
 export class NewJumpTypeComponent implements OnInit {
   public addForm: FormGroup;
 
-  constructor() {
+  constructor(private serviceComm: ServiceComm) {
     this.addForm = new FormGroup({
-      jumptypeName: new FormControl('', Validators.required)
+      jumptypeName: new FormControl("", Validators.required)
     });
   }
 
-  ngOnInit() {
-  }
+  ngOnInit() {}
 
   onSubmit(formData) {
     console.log(formData.status);
-    console.warn('New data : ', formData);
+    console.warn("New data : ", formData);
 
+    this.serviceComm.RefreshData(AddAction.Gear);
     this.addForm.reset();
   }
 }