+
-
-
- {{d.name}}
- {{d.address}}
- {{d.postalCode}} {{ d.city }}
- {{ d.tel }}
- MAP.WEBSITE
- {{ 'MAP.DESCRIPTION' | translate }} : {{ d.description }}
-
+
+
{{d.name}}
+
+
{{d.address}}
+ {{d.postalCode}} {{ d.city }}
+
{{ d.tel }}
+
MAP.WEBSITE
+
{{ 'MAP.DESCRIPTION' | translate }} : {{ d.description }}
+
diff --git a/src/app/maps/maps.component.ts b/src/app/maps/maps.component.ts
index 2686e8ae4326771bbdb131f73a80d4bf86437cb3..61202568ca5f10bd0ecfac5c253bf9c42340264a 100644
--- a/src/app/maps/maps.component.ts
+++ b/src/app/maps/maps.component.ts
@@ -6,6 +6,7 @@ import { LangService } from '../services/lang.service';
import { TranslateService } from '@ngx-translate/core';
import { FirebaseDataService } from '../services/firebase-data.service';
import { MapPoint } from '../interfaces/map-point';
+import { ActivatedRoute } from '@angular/router';
@Component({
selector: 'app-maps',
@@ -18,10 +19,11 @@ export class MapsComponent implements OnInit {
geocoder: any;
cantonCenter: Location = { lat: 46.9479222, lng: 7.4446085 };
translate: TranslateService;
+ private sub: any;
typeMap: {};
- cantonSelected = '';
+ cantonSelected = null;
cantons = this.firebaseDB.getCantons();
cantonData: MapPoint[] = [];
@@ -31,7 +33,8 @@ export class MapsComponent implements OnInit {
private geocodeService: GeocodeService,
private ref: ChangeDetectorRef,
public lang: LangService,
- private firebaseDB: FirebaseDataService) {
+ private firebaseDB: FirebaseDataService,
+ private route: ActivatedRoute) {
this.translate = lang.getTranslateService();
this.mapsAPI.load().then(() => { });
}
@@ -68,7 +71,8 @@ export class MapsComponent implements OnInit {
}
async onSelect(value: string) {
- this.cantonSelected = this.cantons[value];
+ console.log(value);
+ this.cantonSelected = value;
if (this.cantonSelected.match(this.regex) !== null) {
const abbr = this.cantonSelected.match(this.regex)[0].substring(1, 3);
this.cantonData = await this.firebaseDB.getCantonData(abbr);
@@ -81,5 +85,9 @@ export class MapsComponent implements OnInit {
this.getPosition();
}
- ngOnInit(): void { }
+ ngOnInit(): void {
+ this.sub = this.route.params.subscribe(params => {
+ console.log(params['canton']); this.onSelect(params['canton']); // (+) converts string 'id' to a number
+ });
+ }
}
diff --git a/src/app/sub-components/cantonbox/cantonbox.component.css b/src/app/sub-components/cantonbox/cantonbox.component.css
new file mode 100644
index 0000000000000000000000000000000000000000..f9e3fe7cb5c6ff50a1cfe5f776f3171bc0a2efe1
--- /dev/null
+++ b/src/app/sub-components/cantonbox/cantonbox.component.css
@@ -0,0 +1,72 @@
+.filter-wrapper,
+.keyword-wrapper {
+ display: flex;
+ justify-content: center;
+}
+.filter-wrapper {
+ min-height: 100%;
+ flex-flow: column wrap;
+ position: relative;
+}
+.keyword-wrapper {
+ width: 100%;
+ position: relative;
+}
+#keyword {
+ border: 1px solid #ccc;
+ box-sizing: border-box;
+ border-radius: 30px;
+ padding: .5vw;
+ font-family: 'Montserrat', sans-serif;
+ font-style: normal;
+ font-weight: normal;
+ font-size: 1.25vw;
+ text-align: center;
+ width: 50%;
+ outline: none;
+ transition: border 0.5s ease-in-out
+}
+#keyword:focus {
+ border-color : rgba(81, 203, 238, 1);
+}
+
+.filter-select {
+ width: 50%;
+ margin-top: 0.3%;
+ font-family: 'Montserrat', sans-serif;
+ font-style: normal;
+ font-weight: normal;
+ text-align: center;
+ color: rgb(105, 105, 105);
+ border: 1px solid #ccc;
+ box-sizing: border-box;
+ border-radius: 50;
+
+ position: absolute;
+ z-index: 99;
+ left: 25%;
+ top: calc(50% + 25px);
+ max-height: 400%;
+ overflow-y: auto;
+ background: #fff;
+ padding-inline-start: 0;
+ }
+
+
+ .filter-select-list:hover .tags {
+ color: #fff;
+ }
+ .filter-select-list {
+ cursor: pointer;
+ padding: 10px 10px;
+ }
+
+ .filter-select-list:hover {
+ background: #C0C0C0;
+ color: #fff;
+ }
+ .list-highlight,
+ .list-highlight:hover {
+ background: rgb(55, 55, 55);
+ color: #fff;
+ }
\ No newline at end of file
diff --git a/src/app/sub-components/cantonbox/cantonbox.component.html b/src/app/sub-components/cantonbox/cantonbox.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..d01f9b4965693aeca3270d0d69c65b561ec87110
--- /dev/null
+++ b/src/app/sub-components/cantonbox/cantonbox.component.html
@@ -0,0 +1,9 @@
+
diff --git a/src/app/sub-components/cantonbox/cantonbox.component.spec.ts b/src/app/sub-components/cantonbox/cantonbox.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..8ba026c10d4e96eea7a9b49dff3af856e6d138e5
--- /dev/null
+++ b/src/app/sub-components/cantonbox/cantonbox.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CantonboxComponent } from './cantonbox.component';
+
+describe('CantonboxComponent', () => {
+ let component: CantonboxComponent;
+ let fixture: ComponentFixture
;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ CantonboxComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(CantonboxComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/sub-components/cantonbox/cantonbox.component.ts b/src/app/sub-components/cantonbox/cantonbox.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..35b071eb7fcb21952f007098c3341aa5b4e40014
--- /dev/null
+++ b/src/app/sub-components/cantonbox/cantonbox.component.ts
@@ -0,0 +1,48 @@
+import { Component, OnInit, Output, EventEmitter } from '@angular/core';
+import { FormControl } from '@angular/forms';
+import { FirebaseDataService } from '../../services/firebase-data.service';
+
+
+@Component({
+ selector: 'app-cantonbox',
+ templateUrl: './cantonbox.component.html',
+ styleUrls: ['./cantonbox.component.css']
+})
+export class CantonboxComponent implements OnInit {
+
+ cantonSelector: string = null;
+ queryField: FormControl = new FormControl();
+ show: boolean = false;
+ results: any[] = [];
+ cantons: String[] =this.firebaseDB.getCantons();
+
+ @Output() messageEvent = new EventEmitter();
+
+ constructor(private firebaseDB: FirebaseDataService) { }
+
+ suggest(data : string){
+ var newArr = this.cantons.filter(canton => canton.toLowerCase().includes(data.toLowerCase()));
+ return newArr;
+ }
+
+ change(result){
+ this.cantonSelector = result;
+ this.queryField.setValue(result);
+ this.show = false;
+ this.messageEvent.emit(this.cantonSelector)
+ }
+
+ /*checks if empty and shows all cantons in that case*/
+ send(){
+ if(this.queryField.value == null){
+ this.results = this.cantons;
+ this.show = true;
+ }
+ }
+
+ ngOnInit(): void {
+ this.queryField.valueChanges
+ .subscribe(query => this.results = this.suggest(query));
+ }
+
+}
diff --git a/src/app/sub-components/emergency-box/emergency-box.component.css b/src/app/sub-components/emergency-box/emergency-box.component.css
new file mode 100644
index 0000000000000000000000000000000000000000..9c79eb0914c2eda6f5df1009f6348001d089e959
--- /dev/null
+++ b/src/app/sub-components/emergency-box/emergency-box.component.css
@@ -0,0 +1,33 @@
+div {
+ position: relative;
+
+ padding: 1%;
+ margin-bottom: 5%;
+ margin-top: 2%;
+
+ border: .2vw solid #FF9848;
+ box-sizing: border-box;
+ border-radius: 10vw;
+
+ font-family: 'Montserrat', sans-serif;
+ font-style: normal;
+ font-weight: normal;
+ font-size: 1vw;
+ align-items: center;
+ text-align: center;
+
+ color: #FF9848;
+}
+
+div > a{
+ color: #FF9848;
+ font-size: 1vw;
+}
+
+#number{
+ font-weight: bold;
+}
+
+#maplink{
+ text-decoration: underline;
+}
\ No newline at end of file
diff --git a/src/app/sub-components/emergency-box/emergency-box.component.html b/src/app/sub-components/emergency-box/emergency-box.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..319963c58c7ccabc162bf490489b06c0395d7388
--- /dev/null
+++ b/src/app/sub-components/emergency-box/emergency-box.component.html
@@ -0,0 +1 @@
+Are you in an emergency ? Call
147 or find help
near you