Commit 7b116931 authored by Thomas Frion's avatar Thomas Frion

[FIX] Bug with foms inside of the left side bar

parent bfbe9fef
......@@ -15,6 +15,12 @@ import { environment } from '../../environments/environment'
})
export class MapComponent implements OnInit {
private readonly attributions = {
ign: 'Choucas | <a href="http://www.ign.fr/" target="_blank">'+'<img style="height: 25px; width: 25px;" title="Institut national de l\'information géographique et forestière" src="http://wxs.ign.fr/static/logos/IGN/IGN.gif"></a>',
osm: '&copy; <a href="http://www.openstreetmap.org/copyright" target="_blank"> OpenStreetMap</a> contributors | Choucas',
otm: '&copy; <a href="http://garmin.opentopomap.org/#right">OpentTopoMap</a> | Choucas'
};
private map;
private unit : UnitModel;
private tiles;
......@@ -27,7 +33,7 @@ export class MapComponent implements OnInit {
// https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png
this.tiles = L.tileLayer('https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png', {
maxZoom: 19,
attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, &copy; <a href="http://garmin.opentopomap.org/#right">OpentTopoMap</a>',
attribution: this.attributions.osm + ' | ' + this.attributions.otm,
});
}
......@@ -37,6 +43,8 @@ export class MapComponent implements OnInit {
this.map = L.map('map', {
center: this.getCoor(this.unit.geom),
zoom: this.unit.getSetting(UnitSetting.SettingName.Zoom).value, //unit.settings[0].value,
minZoom: 4,
maxZoom: 17,
worldCopyJump: true
});
marker.bindPopup("<b>" + this.unit.code + "</b> <br>" + this.unit.name);
......
......@@ -39,7 +39,7 @@
<h1>Géolocalisation</h1>
<form [formGroup]="mapMarkerForm" (ngSubmit)="sendSms()" method="post">
<!-- TODO: connect with the code for the telephone number -->
<input id="phone" type="tel" name="phone" formControlName=""/><br/>
<input id="phone" type="tel" name="phone" formControlName="phone"/><br/>
<label for="typeMsg">Type du message :</label>
<select name="message" name="messageType" formControlName="messageType">
......@@ -59,9 +59,9 @@
</select><br/>
<p>Temps :<br/>
<input type="radio" name="val" value="1" formControlName="time" checked/><label for="2H">2 HEURES</label><br/>
<input type="radio" name="val" value="2" formControlName="time"/><label for="24H">24 HEURES</label><br/>
<input type="radio" name="val" value="3" formControlName="time" disabled/><label for="DEF">DEFINITIF</label><br/>
<input type="radio" name="time" value="1" formControlName="time" checked/><label for="2H">2 HEURES</label><br/>
<input type="radio" name="time" value="2" formControlName="time"/><label for="24H">24 HEURES</label><br/>
<input type="radio" name="time" value="3" formControlName="time" disabled/><label for="DEF">DEFINITIF</label><br/>
</p><br/>
<button type="submit">Evoyer SMS</button>
......@@ -82,11 +82,8 @@
<h1>Mon compte</h1>
<div>
<div>
<b>{{user.name}}</b><br>
<div class="logoutContainer"><b>{{user.name}}</b> <a [routerLink]="'/logout'" class="logout-link"> <i class="fa fa-power-off"></i> Se déconnecter</a> </div>
< {{user.email}} >
<p class="logout">
<a [routerLink]="'/logout'"> <i class="fa fa-power-off"></i> Se déconnecter</a>
</p>
</div>
<div>
<h2>Unité</h2>
......
......@@ -37,10 +37,25 @@
.tab {
display: none;
padding: 10px 20px;
font-size: 11pt;
border-left: none;
width: 350px;
height: 100%;
background-color: #E5DDDB;
overflow-y: auto;
overflow-x: hidden;
}
\ No newline at end of file
}
.logoutContainer{
margin-bottom: 5px;
.logout-link {
margin-left: 10px;
}
.logout-link:visited {
color: blue;
}
}
......@@ -65,7 +65,7 @@ export class SidebarLeftComponent implements OnInit {
ngOnInit(): void {
this.searchForm = this.fb.group({
keyword: [],
search: [],
});
this.mapMarkerForm = this.fb.group({
......
......@@ -12,6 +12,6 @@ body
html, body, #map
{
height: 100%;
font-family: Verdana, Arial, sans-serif;
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment