Commit b7451efc authored by Sebastian's avatar Sebastian

beispiel: tags auslesen zu den kategorien, bugfix: "suche zurücksetzen"

parent 795942ff
......@@ -240,7 +240,7 @@
</div>
<div id="collapseInfo" [ngbCollapse]="infoCollapsed">
<div class="card">
<div class="card-body infos">
<div class="card-body">
<div class="form-group row item-detail">
<label for="elementOsmid" class="col-sm-4 col-form-label">
<strong>OSM-ID</strong>
......@@ -284,7 +284,67 @@
</div>
</div>
<div class="elementtitle">
<div class="elementinfo">
<div class="form-group">
<div (click)="goodLifeCollapse= !goodLifeCollapse"
[attr.aria-expanded]="!infoCollapsed" aria-controls="collapseInfo"
class="collapseInfo">
<i class="_fa _fa-undo _fa-lg listicon info" aria-hidden="true">&nbsp;</i>Ort des Guten Lebens<i [ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!infoCollapsed,'fa-angle-right':infoCollapsed, 'fa-right':true}"
aria-hidden="true">&nbsp;</i>
</div>
</div>
<div id="collapseInfo" [ngbCollapse]="goodLifeCollapse">
<div class="card">
<div class="card-body">
<div class="elementbli">
<div class="form-group row item-detail">
<label for="elementBli" class="col-sm col-form-label">
<strong>Dimensionen des Guten Lebens</strong>
</label>
</div>
<br>
<app-bli class="bli-app" [node]="nodeService.detailView" [displayType]="'icons_and_labels'"></app-bli>
</div>
<div class="elementdescription">
<div class="form-group row item-detail">
<label for="description" class="col-sm col-form-label">
<strong>Beschreibung</strong>
</label>
</div>
<div name="description" class="col">{{nodeService.detailView.description}}</div>
</div>
</div>
</div>
</div>
</div>
<div class="elementtitle d-none">
<strong>Ein Ort des Guten Lebens in den Kategorien...</strong>
</div>
<div class="elementdiscription">
......@@ -301,25 +361,40 @@
<div class="card ">
<div class="card-body">
<div *ngIf="!authService.loggedIn"
class="form-group row item-detail">
<div class="col">{{nodeService.detailView.description}}</div>
<div class="form-group row item-detail">
<label for="rechtsform" class="col-sm-4 col-form-label">
<strong>Rechtsform</strong>
</label>
<div class="col">
<span class="form-control-plaintext" id="elementKey">{{nodeService.detailView.getOsmTagValue('operator:type')}}<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="listicon gp_osmlink"></i></a></span>
</div>
</div>
<div *ngIf="authService.loggedIn" class="form-group">
<textarea class="form-control" id="descriptionTextarea"
rows="15">{{nodeService.detailView.description}}</textarea>
<div class="form-group row item-detail">
<label for="welfare" class="col-sm-4 col-form-label">
<strong>Gemeinnützigkeit</strong>
</label>
<div class="col">
<span class="form-control-plaintext" id="elementKey">{{nodeService.detailView.getTagValue('_gpd:welfare')}}</span>
</div>
</div>
<div class="elementbli">
<div class="form-group row item-detail">
<label for="elementBli" class="col-sm col-form-label">
<strong>Dimensionen des Guten Lebens</strong>
</label>
<div class="form-group row item-detail">
<label for="start_date" class="col-sm-4 col-form-label">
<strong>Gründungsjahr</strong>
</label>
<div class="col">
<span class="form-control-plaintext" id="elementKey">{{nodeService.detailView.getOsmTagValue('start_date')}}<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="listicon gp_osmlink"></i></a></span>
</div>
<br>
<app-bli class="bli-app" [node]="nodeService.detailView"
[displayType]="'icons_and_labels'"></app-bli>
</div>
<div class="elementpartner">
<div class="form-group row item-detail">
<label for="elementPartner" class="col-sm col-form-label">
Netzwerkpartner </label>
......@@ -336,6 +411,18 @@
</div>
</div>
<div class="form-group row item-detail">
<label for="aktionsradius" class="col-sm-4 col-form-label">
<strong>Aktionsradius</strong>
</label>
<div class="col">
<span class="form-control-plaintext" id="elementKey">{{nodeService.detailView.getTagValue('_gpd:aktionsradius')}}</span>
</div>
</div>
</div>
</div>
</div>
......@@ -354,13 +441,58 @@
</div>
<div id="collapseSharing" [ngbCollapse]="sharingCollapsed">
<div class="card container">
<div class="card-body"></div>
<div class="card-body">
<div *ngIf="nodeService.detailView.hasTag('_gpd:sharing_offers')" class="form-group row item-detail">
<label for="elementKey" class="col-sm-4 col-form-label">
<strong>Angebote des Teilen und Schenkes</strong>
</label>
<div class="col">
<span class="form-control-plaintext"
id="elementKey">{{nodeService.detailView.getTagValue('_gpd:sharing_offers')}}</span>
</div>
</div>
<div class="form-group row item-detail">
<label for="elementKey" class="col-sm-4 col-form-label">
<strong>Organisator*in</strong>
</label>
<div class="col">
<span class="form-control-plaintext"
id="elementKey">{{nodeService.detailView.getTagValue('_gpd:sharing_organisator')}}</span>
</div>
</div>
<div class="form-group row item-detail">
<label for="elementKey" class="col-sm-4 col-form-label">
<strong>Kostenfreie Angebote</strong>
</label>
<div class="col">
<span class="form-control-plaintext"
id="elementKey">{{nodeService.detailView.getTagValue('_gpd:sharing_free_offers')}}</span>
</div>
</div>
<div class="form-group row item-detail">
<label for="elementKey" class="col-sm-4 col-form-label">
<strong>Kostenpflichtige Angebote</strong>
</label>
<div class="col">
<span class="form-control-plaintext"
id="elementKey">{{nodeService.detailView.getTagValue('_gpd:sharing_nonfree_offers')}}</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<br>
<div *ngIf="!nodeService.detailView.knownEntity()" class="list-group-item elementnew exclamation">
<div *ngIf="!nodeService.detailView.knownEntity()" class="elementnew exclamation">
<i class="gp_warning uiicon" aria-hidden="true">&nbsp;</i>
<p>Dieser Ort ist noch nicht Teil des GeoPortals des Guten Lebens. Wenn du ihn bearbeitest, wird er als Ort des Guten Lebens sichtbar.</p>
</div>
......@@ -371,7 +503,7 @@
<div *ngIf="authService.isLoggedIn()" class="elementeditbuttonwrap">
<button type="button" (click)="edit(nodeService.detailView)" class="btn btn-primary elementeditbutton">Diesen Ort bearbeiten</button>
</div>
<div *ngIf="!authService.isLoggedIn()" class="elementeditbuttonwrap">
<div *ngIf="!authService.isLoggedIn()" class="btn-primary elementeditbuttonwrap">
<button class="btn btn-primary" title="Du musst angemeldet sein um Orte zu bearbeiten." alt="Du musst angemeldet sein um Orte zu bearbeiten." type="button" (click)='edit(nodeService.detailView)' class="btn btn-primary elementeditbutton">Diesen Ort bearbeiten</button>
</div>
</div>
......
......@@ -375,6 +375,7 @@ clearResults(){
this.dataGroups.length = 0;
this.allOsmNodes.length = 0;
this.nominatimNodes.length = 0;
this.hasResults = false;
this.searched = false;
this.hasResults = (this.allOsmNodes.length > 0 || this.dataGroups.length > 0);
......
......@@ -51,10 +51,16 @@ export class AutosuggestComponent implements OnInit, ControlValueAccessor, OnCha
}
set model(val) {
if(val == null){
this._model = "";
this.onChange("");
return;
}
this._model = val;
if( typeof val == "string"){
this.onChange(this._model);
}else{
this.onChange(this._model.name);
}
}
......
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