From 13034643460fb8a3412ea06dbf1692ffd46cabca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Thu, 12 Sep 2019 09:00:27 +0200
Subject: [PATCH] Better logbook container

---
 app/templates/device_detail.html | 59 +++++++++++++++++---------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/app/templates/device_detail.html b/app/templates/device_detail.html
index 6cd859e..20ba186 100644
--- a/app/templates/device_detail.html
+++ b/app/templates/device_detail.html
@@ -44,34 +44,37 @@
 <div class="panel panel-success">
 <div class="panel-heading"><h3 class="panel-title">Logbook</h3></div>
 <table class="datatable table table-striped table-bordered">
-	<tr>
-		<th>Nr.</th>
-        <th>Aircraft</th>
-        <th>Type</th>
-        <th colspan="2">Takeoff</th>
-        <th colspan="2">Landing</th>
-        <th>Time</th>
-        <th>AGL</th>
-        <th>Remark</th>
-	</tr>
-	{% for entry in device.logbook %}
-	<tr>
-		<td>{{ loop.index }}</td>
-        <td><a href="{{ url_for('device_detail', id=entry.device.id) }}">{% if entry.device.info is not none and entry.device.info.registration|length %}{{ entry.device.info.registration }}{% else %}[{{ entry.device.address }}]{% endif %}</a></td>
-        <td>{% if entry.device.info is not none and entry.device.info.aircraft|length %}{{ entry.device.info.aircraft }}{% else %}-{% endif %}</td>
-        <td>{% if entry.takeoff_timestamp is not none and entry.takeoff_airport.id == sel_airport %} {{ entry.takeoff_timestamp.strftime('%H:%M') }} {% endif %}</td>
-        <td>{% if entry.takeoff_track is not none and entry.takeoff_airport.id == sel_airport %} {{ '%02d' | format(entry.takeoff_track/10) }} {% endif %}</td>
-        <td>{% if entry.landing_timestamp is not none and entry.landing_airport.id == sel_airport %} {{ entry.landing_timestamp.strftime('%H:%M') }} {% endif %}</td>
-        <td>{% if entry.landing_track is not none and entry.landing_airport.id == sel_airport %} {{ '%02d' | format(entry.landing_track/10) }} {% endif %}</td>
-        <td>{% if entry.duration is not none %}{{ entry.duration }}{% endif %}</td>
-        <td>{% if entry.max_altitude is not none %}{{ '%0.1f'|format(entry.max_altitude - entry.takeoff_airport.altitude) }} m{% endif %}</td>
-        <td>
-        	{% if entry.takeoff_airport is not none and entry.takeoff_airport.id != sel_airport %}Take Off: <img src="{{ url_for('static', filename='img/Transparent.gif') }}" class="flag flag-{{ entry.takeoff_airport.country_code|lower }}" alt="{{ entry.takeoff_airport.country_code }}"/> <a href="{{ url_for('logbook', country=entry.takeoff_airport.country_code, airport=entry.takeoff_airport.id, date=sel_date) }}">{{ entry.takeoff_airport.name }}</a>
-	        {% elif entry.landing_airport is not none and entry.landing_airport.id != sel_airport %}Landing: <img src="{{ url_for('static', filename='img/Transparent.gif') }}" class="flag flag-{{ entry.landing_airport.country_code|lower }}" alt="{{ entry.landing_airport.country_code }}"/> <a href="{{ url_for('logbook', country=entry.takeoff_airport.country_code, airport=entry.landing_airport.id, date=sel_date) }}">{{ entry.landing_airport.name }}</a>
-	        {% endif %}
-	    </td>
-	</tr>
-	{% endfor %}
+	<theader>
+		<tr>
+			<th>Nr.</th>
+	        <th colspan="2">Airport</th>
+	        <th colspan="2">Time UTC</th>
+	        <th>Duration</th>
+	        <th>AGL</th>
+		</tr>
+		<tr>
+			<th></th>
+	        <th>Takeoff</th>
+	        <th>Landing</th>
+	        <th>Takeoff</th>
+	        <th>Landing</th>
+	        <th></th>
+	        <th></th>
+		</tr>
+	</theader>
+	<tbody>
+		{% for entry in device.logbook %}
+		<tr>
+			<td>{{ loop.index }}</td>
+	        <td>{% if entry.takeoff_airport is not none %} {{ entry.takeoff_airport.name }} {% endif %}</td>
+	        <td>{% if entry.landing_airport is not none %} {{ entry.landing_airport.name }} {% endif %}</td>
+	        <td>{% if entry.takeoff_timestamp is not none %} {{ entry.takeoff_timestamp.strftime('%H:%M') }} {% endif %}</td>
+	        <td>{% if entry.landing_timestamp is not none %} {{ entry.landing_timestamp.strftime('%H:%M') }} {% endif %}</td>
+	        <td>{% if entry.duration is not none %}{{ entry.duration }}{% endif %}</td>
+	        <td>{% if entry.max_altitude is not none %}{{ '%0.1f'|format(entry.max_altitude - entry.takeoff_airport.altitude) }} m{% endif %}</td>
+		</tr>
+		{% endfor %}
+	</tbody>
 </table>
 </div>