Compare commits

..

No commits in common. "8408148eadb3988e90d353ab1bbae238b3976080" and "1da94129049b2c09be746bde122f6dd999993b14" have entirely different histories.

4 changed files with 8 additions and 17 deletions

View File

@ -171,16 +171,6 @@ AND date('now') BETWEEN start_date AND end_date;",
.is_some() .is_some()
} }
pub(crate) fn cat(&self) -> String {
if self.external {
"Vereinsfremde Boote".to_string()
} else if self.default_shipmaster_only_steering {
format!("{}+", self.amount_seats - 1)
} else {
format!("{}x", self.amount_seats)
}
}
async fn boats_to_details(db: &SqlitePool, boats: Vec<Boat>) -> Vec<BoatWithDetails> { async fn boats_to_details(db: &SqlitePool, boats: Vec<Boat>) -> Vec<BoatWithDetails> {
let mut res = Vec::new(); let mut res = Vec::new();
for boat in boats { for boat in boats {
@ -191,7 +181,13 @@ AND date('now') BETWEEN start_date AND end_date;",
if boat.is_locked(db).await { if boat.is_locked(db).await {
damage = BoatDamage::Locked; damage = BoatDamage::Locked;
} }
let cat = boat.cat(); let cat = if boat.external {
"Vereinsfremde Boote".to_string()
} else if boat.default_shipmaster_only_steering {
format!("{}+", boat.amount_seats - 1)
} else {
format!("{}x", boat.amount_seats)
};
res.push(BoatWithDetails { res.push(BoatWithDetails {
damage, damage,

View File

@ -16,7 +16,6 @@ pub struct BoatStat {
#[derive(Serialize, Clone)] #[derive(Serialize, Clone)]
pub struct SingleBoatStat { pub struct SingleBoatStat {
name: String, name: String,
cat: String,
location: String, location: String,
owner: String, owner: String,
years: HashMap<String, i32>, years: HashMap<String, i32>,
@ -72,7 +71,6 @@ ORDER BY
} }
let year: String = format!("{year}"); let year: String = format!("{year}");
let cat = boat.cat();
let rowed_km: i32 = row.get("rowed_km"); let rowed_km: i32 = row.get("rowed_km");
@ -82,7 +80,6 @@ ORDER BY
name, name,
location, location,
owner, owner,
cat,
years: HashMap::new(), years: HashMap::new(),
}); });
boat_stat.years.insert(year, rowed_km); boat_stat.years.insert(year, rowed_km);

View File

@ -103,7 +103,7 @@
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5" <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert"> role="alert">
<h2 class="h2"> <h2 class="h2">
Deine Ruderkarriere Deine Ruderkarriere
<span class="text-xl" <span class="text-xl"
onclick="document.getElementById('call-for-action').showModal()">💡</span> onclick="document.getElementById('call-for-action').showModal()">💡</span>
</h2> </h2>

View File

@ -9,7 +9,6 @@
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
<th>Art</th>
<th>Eigentümer</th> <th>Eigentümer</th>
<th>Ort</th> <th>Ort</th>
{% for year in stat.pot_years | sort | reverse %}<th>{{ year }}</th>{% endfor %} {% for year in stat.pot_years | sort | reverse %}<th>{{ year }}</th>{% endfor %}
@ -19,7 +18,6 @@
{% for boat in stat.boats %} {% for boat in stat.boats %}
<tr> <tr>
<td>{{ boat.name }}</td> <td>{{ boat.name }}</td>
<td>{{ boat.cat }}</td>
<td>{{ boat.owner }}</td> <td>{{ boat.owner }}</td>
<td>{{ boat.location }}</td> <td>{{ boat.location }}</td>
{% for year in stat.pot_years | sort | reverse %} {% for year in stat.pot_years | sort | reverse %}