+
diff --git a/src/app/centre/liste-centre/liste-centre.component.scss b/src/app/centre/liste-centre/liste-centre.component.scss
index e69de29..ad691ce 100644
--- a/src/app/centre/liste-centre/liste-centre.component.scss
+++ b/src/app/centre/liste-centre/liste-centre.component.scss
@@ -0,0 +1,104 @@
+.contain {
+ width: 80%;
+ margin: 0 auto;
+}
+.container {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-around;
+}
+* {
+ font-family: "Poppins", sans-serif;
+}
+.title {
+ padding: 1em;
+}
+
+.title h1 {
+ font-size: 2em;
+ font-weight: bold;
+ color: #040608;
+ font-family: "Poppins", sans-serif;
+ margin: 0;
+}
+
+.title span {
+ color: #5d5f66;
+}
+
+.detailLieuPart {
+ width: 45%;
+ background-color: #f6f6f6;
+ padding: 1em;
+ border-radius: 5px;
+}
+
+.actionPart {
+ display: flex;
+ justify-content: flex-end;
+ margin-bottom: 1em;
+}
+
+.actionPart button {
+ background-color: transparent;
+ border: 1px solid #e3e3e3;
+ border-radius: 5px;
+ cursor: pointer;
+}
+
+.actionPart .icoAction {
+ width: 20px;
+ height: 20px;
+ filter: invert(12%) sepia(14%) saturate(177%) hue-rotate(181deg)
+ brightness(96%) contrast(97%);
+ margin: 0 0.5em;
+}
+
+.detailLieuPart .titre {
+ font-size: 1.1em;
+ color: #040608;
+}
+
+.detailLieuPart .adresse {
+ font-size: 0.9em;
+ color: #828282;
+ margin-bottom: 1em;
+}
+
+.detailsPart {
+ display: flex;
+ align-items: center;
+}
+
+.detailsPart span {
+ margin-right: 1em;
+}
+
+.detailsPart .icoDetails {
+ width: 20px;
+ height: 20px;
+ filter: invert(42%) sepia(0%) saturate(7040%) hue-rotate(280deg)
+ brightness(99%) contrast(92%);
+ margin-right: 0.5em;
+}
+
+hr {
+ border: 2px dotted #e3e3e3;
+ margin: 2em 0;
+}
+
+.qrcode {
+ display: flex;
+ justify-content: center;
+}
+
+:host ::ng-deep {
+ .qrcode,
+ .qrcodeshadow,
+ .qrcodeshadow img {
+ // width: 100%;
+ height: 200px;
+ margin-top: 0.5em;
+ margin-bottom: 3em;
+ }
+}
diff --git a/src/app/centre/liste-centre/liste-centre.component.ts b/src/app/centre/liste-centre/liste-centre.component.ts
index 8340324..292d3a2 100644
--- a/src/app/centre/liste-centre/liste-centre.component.ts
+++ b/src/app/centre/liste-centre/liste-centre.component.ts
@@ -1,4 +1,5 @@
import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
import { Centre } from 'src/app/models/centre';
import { CentreService } from 'src/app/services/centre.service';
@@ -10,11 +11,18 @@ import { CentreService } from 'src/app/services/centre.service';
export class ListeCentreComponent implements OnInit {
centres: Centre[] = [];
- constructor(private centreService: CentreService) {}
+ constructor(
+ private centreService: CentreService,
+ private route: ActivatedRoute,
+ private router: Router
+ ) {}
ngOnInit(): void {
this.centreService.getCentres().subscribe((data: any) => {
this.centres = data.docs;
});
}
+ update(id: String) {
+ this.router.navigate(['/centre/details/update', id]);
+ }
}
diff --git a/src/app/centre/update-centre/update-centre.component.html b/src/app/centre/update-centre/update-centre.component.html
new file mode 100644
index 0000000..49160db
--- /dev/null
+++ b/src/app/centre/update-centre/update-centre.component.html
@@ -0,0 +1,46 @@
+
+
+ Liste des centres
+ {{ centres.length }} centre +
+
+
+ + +
+
+
+
+
+ {{ item.nom_centre }}
+
+
+ {{ item.adresse_centre }}
+
+
+ 
+ {{ item.coordonnees_centre }}
+
+
+ {{ item.coordonnees_centre }}
+ + + +
+
+
+
+
diff --git a/src/app/centre/update-centre/update-centre.component.scss b/src/app/centre/update-centre/update-centre.component.scss
new file mode 100644
index 0000000..ff98f95
--- /dev/null
+++ b/src/app/centre/update-centre/update-centre.component.scss
@@ -0,0 +1,127 @@
+.conteuneurFormulaire {
+ width: 80%;
+ margin: 0 auto;
+}
+
+.title h1 {
+ font-family: "General Sans", sans-serif;
+ font-weight: 600;
+ font-size: 2.75em;
+}
+
+.formGroupItem {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ gap: 1em;
+}
+.formGroupItem div {
+ width: 100%;
+}
+
+.formItem {
+ font-family: "Poppins", sans-serif;
+ font-weight: 600;
+ display: flex;
+ flex-direction: column;
+ margin-top: 1em;
+}
+
+.formItem input,
+select {
+ font-family: "Poppins", sans-serif;
+ font-weight: 600;
+ font-size: 1em;
+ height: 45px;
+ border: 1px solid rgb(163, 163, 163);
+ padding: 0 1em 0 1em;
+ margin-top: -0.6em;
+ width: 100%;
+ border-radius: 5px;
+ box-sizing: border-box;
+ align-items: baseline;
+ letter-spacing: normal;
+ position: relative;
+ z-index: 1;
+ color: rgb(39, 39, 39);
+ background-color: white;
+}
+
+.formItem input:focus,
+select:focus {
+ outline: none;
+ border: 2px solid #3f51b5;
+}
+.formItem input:focus ~ label,
+select:focus ~ label {
+ color: #3f51b5;
+}
+
+.formItem label {
+ z-index: 2;
+ width: fit-content;
+ background-color: white;
+ margin-left: 0.8em;
+ padding: 0 0.5em;
+ color: rgb(49, 49, 49);
+}
+
+.formButton {
+ display: flex;
+ justify-content: flex-end;
+}
+
+.formButton button {
+ display: flex;
+ justify-content: flex-end;
+ font-family: "General Sans", sans-serif;
+ font-weight: 900;
+ font-size: 1em;
+ color: #b38f65;
+ gap: 1em;
+ background-color: #ffefdd;
+ padding: 1em 2em;
+ border-radius: 30px;
+ border: none;
+ cursor: pointer;
+}
+
+.formButton span {
+ width: 1.3em;
+ height: 1.3em;
+ display: block;
+ background-size: cover;
+ background-repeat: no-repeat;
+ background-image: url("../../../assets/img/icon/add-alter.png");
+}
+
+input:disabled {
+ background-color: #e0e0e0;
+}
+.map-container {
+ margin-top: 2em;
+ margin: 0 auto;
+ width: 80%;
+ height: 50%;
+}
+.formulaire {
+ margin-bottom: 2em;
+}
+.title {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+.coordinates {
+ background: rgba(0, 0, 0, 0.5);
+ color: #fff;
+ position: absolute;
+ bottom: 40px;
+ left: 10px;
+ padding: 5px 10px;
+ margin: 0;
+ font-size: 11px;
+ line-height: 18px;
+ border-radius: 3px;
+ display: none;
+}
diff --git a/src/app/centre/update-centre/update-centre.component.ts b/src/app/centre/update-centre/update-centre.component.ts
new file mode 100644
index 0000000..f659f88
--- /dev/null
+++ b/src/app/centre/update-centre/update-centre.component.ts
@@ -0,0 +1,102 @@
+import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { Centre, CentreToInsert } from 'src/app/models/centre';
+import { CentreService } from 'src/app/services/centre.service';
+import * as maplibregl from 'maplibre-gl';
+import { Map, NavigationControl } from 'maplibre-gl';
+import { ActivatedRoute, Router } from '@angular/router';
+
+@Component({
+ selector: 'app-update-centre',
+ templateUrl: './update-centre.component.html',
+ styleUrls: ['./update-centre.component.scss'],
+})
+export class UpdateCentreComponent implements OnInit {
+ centre: Centre = {
+ _id: '',
+ nom_centre: '',
+ id_centre: '',
+ adresse_centre: '',
+ coordonnees_centre: '',
+ };
+ centreToInsert: CentreToInsert | undefined;
+
+ map: Map | undefined;
+
+ @ViewChild('map')
+ private mapContainer!: ElementRef
+
+ Mis à jour centre
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ lieux!.nom_lieu }}
+
+
+ {{ lieux!.adresse_lieu }}
+
+
+ 
+ {{ histoToDisp.length }} passages
+
+
+ {{ lieux!.coordonnees_lieu }}
+
+
+ QR Code
+
+
+
+ Historique des passages
+
+
+ Date de passage
+ Nom & prénoms
+
+
+ {{ item.date_passage | date: "dd/MM/yyyy" }}
+ {{ item.personne.nom }} {{ item.personne.prenom }}
+
+
+
+
diff --git a/src/app/lieu/detail-lieu/detail-lieu.component.scss b/src/app/lieu/detail-lieu/detail-lieu.component.scss
index e69de29..dfd5a60 100644
--- a/src/app/lieu/detail-lieu/detail-lieu.component.scss
+++ b/src/app/lieu/detail-lieu/detail-lieu.component.scss
@@ -0,0 +1,136 @@
+.navigation {
+ display: flex;
+ align-items: center;
+ margin-bottom: 20px;
+ font-size: 14px;
+ color: #828282;
+}
+
+.navigation img {
+ width: 15px;
+ height: 15px;
+ filter: invert(47%) sepia(8%) saturate(676%) hue-rotate(188deg)
+ brightness(94%) contrast(86%);
+ margin: 0 0.5em;
+}
+
+.navigation a {
+ text-decoration: none;
+ color: #828282;
+}
+
+.navigation a:hover {
+ color: #05664f;
+}
+
+.navigation .nomL {
+ color: #05664f;
+}
+
+.detailLieuPart {
+ width: 25%;
+ background-color: #f6f6f6;
+ padding: 1em;
+ border-radius: 5px;
+}
+
+.actionPart {
+ display: flex;
+ justify-content: flex-end;
+ margin-bottom: 1em;
+}
+
+.actionPart button {
+ background-color: transparent;
+ border: 1px solid #e3e3e3;
+ border-radius: 5px;
+ cursor: pointer;
+}
+
+.actionPart .icoAction {
+ width: 20px;
+ height: 20px;
+ filter: invert(12%) sepia(14%) saturate(177%) hue-rotate(181deg)
+ brightness(96%) contrast(97%);
+ margin: 0 0.5em;
+}
+
+.detailLieuPart .titre {
+ font-size: 1.1em;
+ color: #040608;
+}
+
+.detailLieuPart .adresse {
+ font-size: 0.9em;
+ color: #828282;
+ margin-bottom: 1em;
+}
+
+.detailsPart {
+ display: flex;
+ align-items: center;
+}
+
+.detailsPart span {
+ margin-right: 1em;
+}
+
+.detailsPart .icoDetails {
+ width: 20px;
+ height: 20px;
+ filter: invert(42%) sepia(0%) saturate(7040%) hue-rotate(280deg)
+ brightness(99%) contrast(92%);
+ margin-right: 0.5em;
+}
+
+hr {
+ border: 2px dotted #e3e3e3;
+ margin: 2em 0;
+}
+
+.qrcode {
+ display: flex;
+ justify-content: center;
+}
+
+:host ::ng-deep {
+ .qrcode,
+ .qrcodeshadow,
+ .qrcodeshadow img {
+ // width: 100%;
+ height: 200px;
+ margin-top: 0.5em;
+ margin-bottom: 3em;
+ }
+}
+
+.container {
+ display: flex;
+}
+
+.historiqueListe {
+ width: 70%;
+ padding: 1em;
+}
+
+.historiqueListe table {
+ border: 1px solid #ddd;
+ width: 100%;
+}
+
+.historiqueListe table th,
+.historiqueListe table td {
+ // font-size: 1.3em;
+ // font-weight: normal;
+ margin: 0.5em;
+ padding: 0.5em;
+ border: 1px solid #ddd;
+}
+
+.historiqueListe table .head th {
+ text-align: left;
+}
+
+.chart {
+ margin-top: 1em;
+}
diff --git a/src/app/lieu/detail-lieu/detail-lieu.component.ts b/src/app/lieu/detail-lieu/detail-lieu.component.ts
index 98ef030..8fe1788 100644
--- a/src/app/lieu/detail-lieu/detail-lieu.component.ts
+++ b/src/app/lieu/detail-lieu/detail-lieu.component.ts
@@ -17,30 +17,43 @@ export class DetailLieuComponent implements OnInit {
historiques: Historique[] = [];
histoToDisp: HistoriqueToDisplay[] = [];
- constructor(private lieuService: LieuxService,private activatedRoute: ActivatedRoute,private router: Router,private historiqueService: HistoriqueService, private personneService: PersonneServiceService) {}
+ constructor(
+ private lieuService: LieuxService,
+ private activatedRoute: ActivatedRoute,
+ private router: Router,
+ private historiqueService: HistoriqueService,
+ private personneService: PersonneServiceService
+ ) {}
ngOnInit(): void {
- this.activatedRoute.params.subscribe(params => {
+ this.activatedRoute.params.subscribe((params) => {
let id = params['id'];
this.lieuService.getLieu(id).subscribe((data: any) => {
this.lieux = data;
console.log(data);
- this.historiqueService.getHistoriqueByLieux(this.lieux!._id).subscribe((data: any) => {
- this.historiques = data;
- this.historiques.forEach(element => {
- this.personneService.getPersonne(element.personne_id).subscribe((data: Personne) => {
- var histo: HistoriqueToDisplay = {
- personne: data,
- _id: element._id,
- date_passage: element.date_passage,
- lieu_id: element.lieu_id,
- }
- this.histoToDisp.push(histo);
+ this.historiqueService
+ .getHistoriqueByLieux(this.lieux!._id)
+ .subscribe((data: any) => {
+ this.historiques = data;
+ this.historiques.forEach((element) => {
+ this.personneService
+ .getPersonne(element.personne_id)
+ .subscribe((data: Personne) => {
+ var histo: HistoriqueToDisplay = {
+ personne: data,
+ _id: element._id,
+ date_passage: element.date_passage,
+ lieu_id: element.lieu_id,
+ };
+ this.histoToDisp.push(histo);
+ });
});
+ console.log(data);
});
- console.log(data);
- });
});
});
}
+ update(lieu_id: String) {
+ this.router.navigate(['lieux/details/update', lieu_id]);
+ }
}
diff --git a/src/app/lieu/update-lieu/update-lieu.component.html b/src/app/lieu/update-lieu/update-lieu.component.html
new file mode 100644
index 0000000..3e2e690
--- /dev/null
+++ b/src/app/lieu/update-lieu/update-lieu.component.html
@@ -0,0 +1,48 @@
+
+
+ Mettre à jour le lieu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/lieu/update-lieu/update-lieu.component.scss b/src/app/lieu/update-lieu/update-lieu.component.scss
new file mode 100644
index 0000000..ff98f95
--- /dev/null
+++ b/src/app/lieu/update-lieu/update-lieu.component.scss
@@ -0,0 +1,127 @@
+.conteuneurFormulaire {
+ width: 80%;
+ margin: 0 auto;
+}
+
+.title h1 {
+ font-family: "General Sans", sans-serif;
+ font-weight: 600;
+ font-size: 2.75em;
+}
+
+.formGroupItem {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ gap: 1em;
+}
+.formGroupItem div {
+ width: 100%;
+}
+
+.formItem {
+ font-family: "Poppins", sans-serif;
+ font-weight: 600;
+ display: flex;
+ flex-direction: column;
+ margin-top: 1em;
+}
+
+.formItem input,
+select {
+ font-family: "Poppins", sans-serif;
+ font-weight: 600;
+ font-size: 1em;
+ height: 45px;
+ border: 1px solid rgb(163, 163, 163);
+ padding: 0 1em 0 1em;
+ margin-top: -0.6em;
+ width: 100%;
+ border-radius: 5px;
+ box-sizing: border-box;
+ align-items: baseline;
+ letter-spacing: normal;
+ position: relative;
+ z-index: 1;
+ color: rgb(39, 39, 39);
+ background-color: white;
+}
+
+.formItem input:focus,
+select:focus {
+ outline: none;
+ border: 2px solid #3f51b5;
+}
+.formItem input:focus ~ label,
+select:focus ~ label {
+ color: #3f51b5;
+}
+
+.formItem label {
+ z-index: 2;
+ width: fit-content;
+ background-color: white;
+ margin-left: 0.8em;
+ padding: 0 0.5em;
+ color: rgb(49, 49, 49);
+}
+
+.formButton {
+ display: flex;
+ justify-content: flex-end;
+}
+
+.formButton button {
+ display: flex;
+ justify-content: flex-end;
+ font-family: "General Sans", sans-serif;
+ font-weight: 900;
+ font-size: 1em;
+ color: #b38f65;
+ gap: 1em;
+ background-color: #ffefdd;
+ padding: 1em 2em;
+ border-radius: 30px;
+ border: none;
+ cursor: pointer;
+}
+
+.formButton span {
+ width: 1.3em;
+ height: 1.3em;
+ display: block;
+ background-size: cover;
+ background-repeat: no-repeat;
+ background-image: url("../../../assets/img/icon/add-alter.png");
+}
+
+input:disabled {
+ background-color: #e0e0e0;
+}
+.map-container {
+ margin-top: 2em;
+ margin: 0 auto;
+ width: 80%;
+ height: 50%;
+}
+.formulaire {
+ margin-bottom: 2em;
+}
+.title {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+.coordinates {
+ background: rgba(0, 0, 0, 0.5);
+ color: #fff;
+ position: absolute;
+ bottom: 40px;
+ left: 10px;
+ padding: 5px 10px;
+ margin: 0;
+ font-size: 11px;
+ line-height: 18px;
+ border-radius: 3px;
+ display: none;
+}
diff --git a/src/app/lieu/update-lieu/update-lieu.component.ts b/src/app/lieu/update-lieu/update-lieu.component.ts
new file mode 100644
index 0000000..5869adc
--- /dev/null
+++ b/src/app/lieu/update-lieu/update-lieu.component.ts
@@ -0,0 +1,148 @@
+import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import * as maplibregl from 'maplibre-gl';
+import { Map, NavigationControl } from 'maplibre-gl';
+import { Lieu, LieuToInsert } from 'src/app/models/lieux';
+import { LieuxService } from 'src/app/services/lieux.service';
+
+@Component({
+ selector: 'app-update-lieu',
+ templateUrl: './update-lieu.component.html',
+ styleUrls: ['./update-lieu.component.scss'],
+})
+export class UpdateLieuComponent implements OnInit {
+ map: Map | undefined;
+ @ViewChild('map')
+ private mapContainer!: ElementRef;
+
+ lieu: Lieu = {
+ _id: '',
+ nom_lieu: '',
+ adresse_lieu: '',
+ statut_lieu: -1,
+ coordonnees_lieu: '',
+ };
+
+ lieuToInsert: LieuToInsert | undefined;
+
+ constructor(
+ private lieuService: LieuxService,
+ private activatedRoute: ActivatedRoute,
+ private router: Router
+ ) {}
+
+ ngOnInit(): void {
+ const myAPIKey = 'f4040400dcfc4a43808745beaec78557';
+ const mapStyle = 'https://maps.geoapify.com/v1/styles/positron/style.json';
+ this.activatedRoute.params.subscribe((params) => {
+ let id = params['id'];
+ this.lieuService.getLieu(id).subscribe((data: any) => {
+ this.lieu = data;
+ console.log(data);
+ var lng = +this.lieu.coordonnees_lieu.split(',')[0];
+ var lat = +this.lieu.coordonnees_lieu.split(',')[1];
+
+ const initialState = { lng: lng, lat: lat, zoom: 15 };
+
+ const map = new Map({
+ container: this.mapContainer.nativeElement,
+ style: `${mapStyle}?apiKey=${myAPIKey}`,
+ center: [initialState.lng, initialState.lat],
+ zoom: initialState.zoom,
+ });
+
+ this.map = map;
+
+ var monument: [number, number] = [lng, lat];
+ var el = document.createElement('div');
+ el.id = 'marker';
+ el.style.backgroundImage = 'url(../../../assets/img/icon/marker.png)';
+ el.style.backgroundSize = 'cover';
+ el.style.width = '25px';
+ el.style.height = '25px';
+ el.style.borderRadius = '50%';
+ el.style.cursor = 'pointer';
+ el.classList.add('markerIcon');
+ new maplibregl.Marker(el).setLngLat(monument).addTo(this.map!);
+
+ this.map.on('click', (e) => {
+ const { lng, lat } = e.lngLat;
+ this.lieu.coordonnees_lieu = `${lng}, ${lat}`;
+ var monument: [number, number] = [lng, lat];
+
+ // create DOM element for the marker
+ var markers = document.getElementsByClassName('markerIcon');
+ for (var i = 0; i < markers.length; i++) {
+ markers[i].remove();
+ }
+
+ var el = document.createElement('div');
+ el.id = 'marker';
+ el.style.backgroundImage = 'url(../../../assets/img/icon/marker.png)';
+ el.style.backgroundSize = 'cover';
+ el.style.width = '25px';
+ el.style.height = '25px';
+ el.style.borderRadius = '50%';
+ el.style.cursor = 'pointer';
+ el.classList.add('markerIcon');
+
+ // create the marker
+ new maplibregl.Marker(el).setLngLat(monument).addTo(map);
+ this.map = map;
+ });
+ });
+ });
+ }
+
+ ngAfterViewInit() {
+ const myAPIKey = 'f4040400dcfc4a43808745beaec78557';
+ const mapStyle = 'https://maps.geoapify.com/v1/styles/positron/style.json';
+
+ const initialState = { lng: 47.516667, lat: -18.933333, zoom: 12 };
+
+ const map = new Map({
+ container: this.mapContainer.nativeElement,
+ style: `${mapStyle}?apiKey=${myAPIKey}`,
+ center: [initialState.lng, initialState.lat],
+ zoom: initialState.zoom,
+ });
+
+ this.map = map;
+ this.map.addControl(new NavigationControl());
+
+ this.map.on('click', (e) => {
+ const { lng, lat } = e.lngLat;
+ this.lieu.coordonnees_lieu = `${lng}, ${lat}`;
+ var monument: [number, number] = [lng, lat];
+
+ // create DOM element for the marker
+ var markers = document.getElementsByClassName('markerIcon');
+ for (var i = 0; i < markers.length; i++) {
+ markers[i].remove();
+ }
+
+ var el = document.createElement('div');
+ el.id = 'marker';
+ el.style.backgroundImage = 'url(../../../assets/img/icon/marker.png)';
+ el.style.backgroundSize = 'cover';
+ el.style.width = '25px';
+ el.style.height = '25px';
+ el.style.borderRadius = '50%';
+ el.style.cursor = 'pointer';
+ el.classList.add('markerIcon');
+
+ // create the marker
+ new maplibregl.Marker(el).setLngLat(monument).addTo(map);
+ this.map = map;
+ });
+ }
+ ngOnDestroy() {
+ this.map?.remove();
+ }
+
+ updateLieu() {
+ this.lieuService.updateLieu(this.lieu).subscribe((data) => {
+ this.router.navigate(['/places']);
+ });
+ }
+}
diff --git a/src/app/services/centre.service.ts b/src/app/services/centre.service.ts
index 1f74a6f..a7e84c5 100644
--- a/src/app/services/centre.service.ts
+++ b/src/app/services/centre.service.ts
@@ -27,6 +27,14 @@ export class CentreService {
headers: headers,
});
}
+ updateCentre(lieu: CentreToInsert): Observable {
+ const headers = { 'content-type': 'application/json' };
+ const body = JSON.stringify(lieu);
+ console.log(body);
+ return this.http.put(this.configUrl + 'centre', body, {
+ headers: headers,
+ });
+ }
}
// export const FAKE_CENTRE: Centre[] = [
diff --git a/src/app/services/lieux.service.ts b/src/app/services/lieux.service.ts
index bef6ba3..5d17ce7 100644
--- a/src/app/services/lieux.service.ts
+++ b/src/app/services/lieux.service.ts
@@ -28,6 +28,15 @@ export class LieuxService {
headers: headers,
});
}
+
+ updateLieu(lieu: LieuToInsert): Observable {
+ const headers = { 'content-type': 'application/json' };
+ const body = JSON.stringify(lieu);
+ console.log(body);
+ return this.http.put(this.configUrl + 'lieu', body, {
+ headers: headers,
+ });
+ }
}
// export const ELEMENT_DATA: Lieu[] = [
diff --git a/src/app/testCovid/liste-test/liste-test.component.html b/src/app/testCovid/liste-test/liste-test.component.html
index d24a6f1..2c56768 100644
--- a/src/app/testCovid/liste-test/liste-test.component.html
+++ b/src/app/testCovid/liste-test/liste-test.component.html
@@ -1,12 +1,16 @@
Resultat test
+ {{ test.length }} tests
Personne
-
+
{{ element.personne.nom }} {{ element.personne.prenom }}
@@ -14,14 +18,19 @@ Resultat test
Date
-
+
{{ element.date_test | date: "dd/MM/yyyy" }}
Statuts
-
+
+
{{ getStatuts(element.etat_test) }}
diff --git a/src/app/testCovid/liste-test/liste-test.component.scss b/src/app/testCovid/liste-test/liste-test.component.scss
index f2db458..e353369 100644
--- a/src/app/testCovid/liste-test/liste-test.component.scss
+++ b/src/app/testCovid/liste-test/liste-test.component.scss
@@ -1,8 +1,55 @@
-table{
- width: 100%;
+table {
+ width: 100%;
+ color: #b1b1b4;
+ font-size: 0.9em;
}
.mat-form-field {
- font-size: 14px;
- width: 100%;
- }
\ No newline at end of file
+ font-size: 14px;
+ width: 100%;
+}
+
+* {
+ font-family: "Poppins", sans-serif;
+}
+
+.title h1 {
+ font-size: 2em;
+ font-weight: bold;
+ color: #040608;
+ font-family: "Poppins", sans-serif;
+ margin: 0;
+}
+
+.title span {
+ color: #5d5f66;
+}
+
+// .boutons {
+// width: 5px;
+// height: 5px;
+// background-color: #040608;
+// border-radius: 50%;
+// display: inline-block;
+// }
+
+.Positif {
+ color: green;
+}
+
+.Negatif {
+ color: red;
+}
+.details {
+ background-color: transparent;
+ border: none;
+ cursor: pointer;
+}
+
+.icoDetails {
+ width: 20px;
+ height: 20px;
+ filter: invert(42%) sepia(0%) saturate(7040%) hue-rotate(280deg)
+ brightness(99%) contrast(92%);
+ margin-right: 0.5em;
+}
diff --git a/src/app/testCovid/liste-test/liste-test.component.ts b/src/app/testCovid/liste-test/liste-test.component.ts
index 6feb0fb..3975a24 100644
--- a/src/app/testCovid/liste-test/liste-test.component.ts
+++ b/src/app/testCovid/liste-test/liste-test.component.ts
@@ -23,12 +23,12 @@ export class ListeTestComponent implements OnInit {
testToDisplay: TestToDisplay[] = [];
displayedColumns: string[] = [
'personne',
- 'date_test',
- 'etat_test',
- 'centre',
'mail',
'adresse',
'sexe',
+ 'etat_test',
+ 'centre',
+ 'date_test',
];
dataSource: any;
diff --git a/src/assets/img/icon/chevron-forward-outline.svg b/src/assets/img/icon/chevron-forward-outline.svg
new file mode 100644
index 0000000..931da0c
--- /dev/null
+++ b/src/assets/img/icon/chevron-forward-outline.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/img/icon/create-outline.svg b/src/assets/img/icon/create-outline.svg
new file mode 100644
index 0000000..d23c6ac
--- /dev/null
+++ b/src/assets/img/icon/create-outline.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/img/icon/eye-outline.svg b/src/assets/img/icon/eye-outline.svg
new file mode 100644
index 0000000..e823055
--- /dev/null
+++ b/src/assets/img/icon/eye-outline.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/img/icon/information-circle-outline.svg b/src/assets/img/icon/information-circle-outline.svg
new file mode 100644
index 0000000..15d7547
--- /dev/null
+++ b/src/assets/img/icon/information-circle-outline.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/img/icon/navigate-outline.svg b/src/assets/img/icon/navigate-outline.svg
new file mode 100644
index 0000000..69a25a9
--- /dev/null
+++ b/src/assets/img/icon/navigate-outline.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
+
+
+
+
+
+
+
+
+ {{ lieux!.nom_lieu }}
+
+
+ {{ lieux!.adresse_lieu }}
+
+
+
+ {{ histoToDisp.length }} passages
+
+
+ {{ lieux!.coordonnees_lieu }}
+
+
+ {{ histoToDisp.length }} passages
+
+
+ {{ lieux!.coordonnees_lieu }}
+ +
QR Code
+
+
+
+
+
+
+
+
+
+| Historique des passages | +|
|---|---|
| Date de passage | +Nom & prénoms | +
| {{ item.date_passage | date: "dd/MM/yyyy" }} | +{{ item.personne.nom }} {{ item.personne.prenom }} | +
+
+ Mettre à jour le lieu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Resultat test
+ {{ test.length }} tests| Personne | - + {{ element.personne.nom }} {{ element.personne.prenom }} | @@ -14,14 +18,19 @@Date | -+ | {{ element.date_test | date: "dd/MM/yyyy" }} | Statuts | -+ | + {{ getStatuts(element.etat_test) }} |
|---|