Merge pull request #43 from Pear-Trading/finn/trailchange

Added Esta
This commit is contained in:
Finn 2017-12-08 14:20:08 +00:00 committed by GitHub
commit 0829f8d71b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 20 additions and 10 deletions

View file

@ -66,7 +66,7 @@ const routes: Routes = [
{
path: 'story-trail',
component: TrailMapComponent,
data: { title: 'Lancaster Independent Story' },
data: { title: 'Story Trail' },
},
{
path: 'payroll-log',

View file

@ -3,8 +3,12 @@
<div class="col-lg-12">
<div class="card">
<div class="card-header">
<strong>Lancaster Independent Story</strong>
<strong>Story Trail</strong>
<small>Required Data marked in <strong>bold</strong>.</small>
<select type="text" [(ngModel)]="assocMap" (ngModelChange)="viewBoundsChanged()">
<option value="lis" selected>Lancaster Independent Story</option>
<option value="esta">Esta</option>
</select>
</div>
<div class="modal fade" bsModal #statusModal="bs-modal" [config]="{backdrop: false, animated: false}"
tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
@ -45,7 +49,7 @@
<agm-marker-cluster maxZoom="13" imagePath="https://raw.githubusercontent.com/googlemaps/v3-utility-library/master/markerclustererplus/images/m">
<agm-marker
*ngFor="let m of markers"
[iconUrl]="'/assets/img/map-pin-lis.png'"
[iconUrl]="'/assets/img/association/' + assocMap + '-map-pin.png'"
[latitude]="m.latitude"
[longitude]="m.longitude"
[openInfoWindow]="false"
@ -55,7 +59,7 @@
</agm-map>
<ng-template #template>
<div class="modal-header d-flex justify-content-between">
<img src="assets/img/lis_logo.png" class="w-15" alt="lis logo"><h4 class="modal-title">{{clickedMarker.name}}</h4>
<img src="{{assocLogo}}" class="w-15" alt="lis logo"><h4 class="modal-title">{{clickedMarker.name}}</h4>
<button type="button" class="close pull-right" aria-label="Close" (click)="modalRef.hide()">
<span aria-hidden="true">&times;</span>
</button>

View file

@ -15,6 +15,8 @@ export class TrailMapComponent implements OnInit, AfterViewInit {
zoom: number = 12;
public modalRef: BsModalRef;
clickedMarker: any;
assocMap = 'lis';
assocLogo: string;
dataReceived: string = 'loading';
@ -25,7 +27,9 @@ export class TrailMapComponent implements OnInit, AfterViewInit {
constructor(
private api: ApiService,
private modalService: BsModalService,
) {}
) {
this.assocLogo = 'assets/img/association/' + this.assocMap + '-logo.png';
}
ngOnInit(): void { }
@ -44,6 +48,7 @@ export class TrailMapComponent implements OnInit, AfterViewInit {
public onMarkerClick(clickedMarker, template: TemplateRef<any>) {
console.log(clickedMarker);
this.clickedMarker = clickedMarker;
this.assocLogo = 'assets/img/association/' + this.assocMap + '-logo.png';
this.openModal(template);
}
@ -64,8 +69,9 @@ export class TrailMapComponent implements OnInit, AfterViewInit {
latitude: resp.getSouthWest().lat(),
longitude: resp.getSouthWest().lng()
},
association: this.assocMap,
}
this.api.getLisData(mapData).subscribe(
this.api.getAssocData(mapData).subscribe(
result => {
this.myStatusModal.hide();
this.markers = result.locations;

View file

@ -61,7 +61,7 @@
<a class="nav-link" routerLinkActive="active" [routerLink]="['/story-trail']">
<div class="row no-gutters align-items-center">
<div class="col-2"><i class="icon-map"></i></div>
<div class="col-10">Lancaster Independent Story</div>
<div class="col-10">Story Trail</div>
</div>
</a>
</li>

View file

@ -276,11 +276,11 @@ export class ApiService {
);
}
// Load LIS Data
public getLisData(data) {
// Load Association Data
public getAssocData(data) {
data.session_key = this.sessionKey;
return this.http.post<any>(
this.apiUrl + '/v1/supplier/location/lis',
this.apiUrl + '/v1/supplier/location/trail',
data
);
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

View file

Before

Width:  |  Height:  |  Size: 260 KiB

After

Width:  |  Height:  |  Size: 260 KiB

View file

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB