Skip to content

Commit fe0c9dd

Browse files
marc101101marc101101
authored
Merge pull request #133 from marc101101/feature/view-on-map
Feature/view on map
2 parents ed8f8d1 + b689e27 commit fe0c9dd

8 files changed

Lines changed: 38 additions & 19 deletions

‎client/app/components/home/singlecourse/singlecourse.component.html‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,40 @@
1111
</div>
1212
</div>
1313

14-
<div class="column is-12" *ngIf="dataIsAvailable" style="z-index: 0; padding: 1rem;">
15-
<div>
16-
<i class="fa fa-clock-o info-icon"></i>
17-
<p style="color:white">Beginn: {{singleCourse.KURS_BEGINN_UHRZEIT}}</p>
18-
</div>
19-
<div>
20-
<i class="fa fa-map-marker info-icon"></i>
21-
<p style="color:white">Ort: {{singleCourse.location.ORT_STRASSE}}, {{singleCourse.location.ORT_PLZ}} {{singleCourse.location.ORT_ORTSNAME}}</p>
22-
</div>
23-
<div>
24-
<i class="fa fa-user info-icon"></i>
25-
<p style="color:white">Veranstalter: {{singleCourse.KURS_REFERENT_ID}}</p>
14+
<section style="padding: 1rem; margin-top: -2rem; padding-top: 1rem; padding-bottom: 0rem;" *ngIf="dataIsAvailable">
15+
<div class="card" style="padding:1rem;">
16+
<div>
17+
<i class="fa fa-clock-o info-icon" style="color:black"></i>
18+
<p>Beginn: {{singleCourse.KURS_BEGINN_UHRZEIT}}</p>
19+
</div>
20+
<div>
21+
<i class="fa fa-map-marker info-icon" style="color:black"></i>
22+
<p>Ort: {{singleCourse.location.ORT_STRASSE}}, {{singleCourse.location.ORT_PLZ}}
23+
{{singleCourse.location.ORT_ORTSNAME}}</p>
24+
</div>
25+
<div>
26+
<i class="fa fa-user info-icon" style="color:black"></i>
27+
<p>Veranstalter: {{singleCourse.KURS_REFERENT_ID}}</p>
28+
</div>
2629
</div>
27-
</div>
30+
<a class="button is-fullwidth is-primary nav-button"
31+
[attr.href]="'http://maps.google.com/?q= '
32+
+ singleCourse.location.ORT_STRASSE + ', '
33+
+ singleCourse.location.ORT_ORTSNAME + ', '
34+
+ singleCourse.location.ORT_PLZ">
35+
<i class="fa fa-location-arrow" aria-hidden="true"></i>
36+
</a>
37+
</section>
2838

29-
<div class="column is-12" *ngIf="showButton">
39+
<div class="column is-12" *ngIf="showButton" style="padding: 1rem; padding-top: 1.5rem; padding-bottom: 1.5rem;">
3040
<a #button class="button is-fullwidth is-primary" (click)="apply()" *ngIf="!alreadyApplied">{{button_text}}</a>
3141
<a #button class="button is-fullwidth is-danger" (click)="signOff()" *ngIf="alreadyApplied">{{button_text}}</a>
3242
</div>
3343

3444
<div class="column" style="margin-top: -2rem;padding: 1rem;">
3545
<alert></alert>
3646
</div>
37-
47+
3848

3949
<section style="padding: 1rem; margin-top: -2rem;" *ngIf="dataIsAvailable && moreInfo">
4050
<div class="card" style="padding:1rem;" (click)="moreInfo = false">

‎client/app/components/home/singlecourse/singlecourse.component.scss‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,13 @@
6969
color:white;
7070
margin-right: 0.7rem;
7171
margin-top: 0.2rem;
72+
}
73+
74+
.nav-button{
75+
border-radius: 3rem;
76+
width: 2.5rem;
77+
height: 2.5rem;
78+
float: right;
79+
margin-top: -1.5rem;
80+
margin-right: 1rem;
7281
}

‎dist/0.0f8ed547e1518cab73b0.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dist/0.7e6ff5be40f8a3a7a4d1.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515

1616
<body class="main" style="overflow: hidden;">
1717
<app-root>Loading...</app-root>
18-
<script type="text/javascript" src="runtime.28ada38bacfa56d35e43.js"></script><script type="text/javascript" src="polyfills.3e60cfe9b1313ccedf9e.js"></script><script type="text/javascript" src="main.94064c2254678f4618cf.js"></script></body>
18+
<script type="text/javascript" src="runtime.83c48b863315e5e9ed09.js"></script><script type="text/javascript" src="polyfills.3e60cfe9b1313ccedf9e.js"></script><script type="text/javascript" src="main.94064c2254678f4618cf.js"></script></body>
1919
</html>

‎dist/ngsw.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
"/assets/img/loading.gif": "cdc1627a1ff312a43d1700a3694da1050e0e026d",
111111
"/assets/js/idb.js": "6f82cc3f3c743e77b6931a0129d7afddd6cfe3c4",
112112
"/favicon.ico": "84161b857f5c547e3699ddfbffc6d8d737542e01",
113-
"/index.html": "d1adca56cbc3396bf595df8ef85fc46097466acb"
113+
"/index.html": "03eb209dd5570c5324be09681b2438acd2300697"
114114
},
115115
"navigationUrls": [
116116
{

‎dist/runtime.28ada38bacfa56d35e43.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dist/runtime.83c48b863315e5e9ed09.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)