Compare commits

...

3 Commits

Author SHA1 Message Date
85a61dfdc0 Merge pull request 'fancier-boat-stats' (#340) from fancier-boat-stats into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m33s
CI/CD Pipeline / deploy-staging (push) Successful in 5m36s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #340
2024-04-06 17:54:42 +02:00
c094097af7 don't show boats which are still on the water
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2024-04-06 17:54:07 +02:00
39ba7d53dd make table readable
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-04-06 17:44:05 +02:00
2 changed files with 50 additions and 18 deletions

View File

@ -52,6 +52,10 @@ impl BoatStat {
let name: String = row.get("name");
let location: String = row.get("location");
let year: i32 = row.get("year");
if year == 0 {
continue; // Boat still on water
}
if !years.contains(&year) {
years.push(year);
}

View File

@ -1,24 +1,44 @@
{% import "includes/macros" as macros %}
{% extends "base" %}
{% block content %}
<style>
.dt-input {
color: black;
}
.dt-selector {
width: 70px;
}
.dt-table th{
min-width: 100px;
}
.dt-table td {
border: 1px gray solid;
}
}
</style>
<div class="max-w-screen-lg w-full">
<h1 class="h1">Bootsauswertung</h1>
<table id="basic">
<thead>
<tr>
<th>Name</th>
<th>Ort</th>
{% for year in stat.pot_years | sort | reverse %}<th>{{ year }}</th>{% endfor %}
</tr>
</thead>
<tbody>
{% for boat in stat.boats %}
<div class="text-black dark:text-white">
<table id="basic">
<thead>
<tr>
<td>{{ boat.name }}</td>
<td>{{ boat.location }}</td>
{% for year in stat.pot_years | sort | reverse %}
<td>
{% if year~'' in boat.years %}{{ boat.years[year] }}{% endif %}
<th>Name</th>
<th>Ort</th>
{% for year in stat.pot_years | sort | reverse %}<th>{{ year }}</th>{% endfor %}
</tr>
</thead>
<tbody>
{% for boat in stat.boats %}
<tr>
<td>{{ boat.name }}</td>
<td>{{ boat.location }}</td>
{% for year in stat.pot_years | sort | reverse %}
<td>
{% if year~'' in boat.years %}
{{ boat.years[year] }}
{% else %}
0
{% endif %}
</td>
{% endfor %}
</tr>
@ -26,6 +46,14 @@
</tbody>
</table>
</div>
<script src="/public/jstable.min.js"></script>
<script>new JSTable("#basic");</script>
{% endblock content %}
</div>
<script src="/public/jstable.min.js"></script>
<script>new JSTable("#basic", {
perPage: 100,
perPageSelect: [10,100],
labels: {
placeholder: 'Suchen (zB "Linz")'
}
});
</script>
{% endblock content %}