Ruderverein-Donau-Linz/rowt
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Wiki Activity

improvements, styling, additional infos #731

Merged
philipp merged 1 commits from aequatorpreis into staging 2024-09-04 18:42:12 +02:00
Conversation 0 Commits 1 Files Changed 6 +192 -107
6 changed files with 192 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b40850626b - Show all commits

44
src/model/logbook.rs
View File

@ -299,6 +299,50 @@ ORDER BY departure DESC
ret
}
pub async fn year_first_logbook_entry(db: &SqlitePool, user: &User) -> Option<i32> {
let log: Option<Self> = sqlx::query_as(
&format!("
SELECT id, boat_id, shipmaster, steering_person, shipmaster_only_steering, departure, arrival, destination, distance_in_km, comments, logtype
FROM logbook
JOIN rower ON logbook.id = rower.logbook_id
WHERE arrival is not null AND rower_id = {}
ORDER BY arrival
LIMIT 1
", user.id)
)
.fetch_optional(db)
.await
.unwrap(); //TODO: fixme
if let Some(log) = log {
Some(log.arrival.unwrap().year())
} else {
None
}
}
pub async fn year_last_logbook_entry(db: &SqlitePool, user: &User) -> Option<i32> {
let log: Option<Self> = sqlx::query_as(
&format!("
SELECT id, boat_id, shipmaster, steering_person, shipmaster_only_steering, departure, arrival, destination, distance_in_km, comments, logtype
FROM logbook
JOIN rower ON logbook.id = rower.logbook_id
WHERE arrival is not null AND rower_id = {}
ORDER BY arrival DESC
LIMIT 1
", user.id)
)
.fetch_optional(db)
.await
.unwrap(); //TODO: fixme
if let Some(log) = log {
Some(log.arrival.unwrap().year())
} else {
None
}
}
pub(crate) async fn completed_wanderfahrten_with_user_over_km_in_year(
db: &SqlitePool,
user: &User,

3
src/model/personal/equatorprice.rs
View File

@ -1,5 +1,4 @@
use serde::Serialize;
use sqlx::SqlitePool;
#[derive(Serialize, PartialEq, Debug)]
pub(crate) enum Level {
@ -31,7 +30,7 @@ impl Level {
} else if km < Level::GOLD.required_km() {
Level::GOLD
} else if km < Level::DIAMOND.required_km() {
Level::BRONZE
Level::DIAMOND
} else {
Level::DONE
}

20
src/model/personal/mod.rs
View File

@ -3,7 +3,7 @@ use equatorprice::Level;
use serde::Serialize;
use sqlx::SqlitePool;
use super::{stat::Stat, user::User};
use super::{logbook::Logbook, stat::Stat, user::User};
pub(crate) mod equatorprice;
pub(crate) mod rowingbadge;
@ -14,6 +14,9 @@ pub(crate) struct Achievements {
pub(crate) curr_equatorprice_name: String,
pub(crate) new_equatorprice_this_season: bool,
pub(crate) rowingbadge: Option<rowingbadge::Status>,
pub(crate) all_time_km: i32,
pub(crate) year_first_mentioned: Option<i32>,
pub(crate) year_last_mentioned: Option<i32>,
}
impl Achievements {
@ -31,25 +34,18 @@ impl Achievements {
.await
.rowed_km
};
println!(
"old: {}; new: {}",
rowed_km,
rowed_km - rowed_km_this_season
);
println!(
"old: {:?}; new: {:?}",
Level::curr_level(rowed_km),
Level::curr_level(rowed_km - rowed_km_this_season)
);
let new_equatorprice_this_season =
Level::curr_level(rowed_km) != Level::curr_level(rowed_km - rowed_km_this_season);
println!("{new_equatorprice_this_season:?}");
Self {
equatorprice: equatorprice::Next::new(rowed_km),
curr_equatorprice_name: equatorprice::Level::curr_level(rowed_km).desc().to_string(),
new_equatorprice_this_season,
rowingbadge: rowingbadge::Status::for_user(db, user).await,
all_time_km: rowed_km,
year_first_mentioned: Logbook::year_first_logbook_entry(db, user).await,
year_last_mentioned: Logbook::year_last_logbook_entry(db, user).await,
}
}
}

13
src/model/personal/rowingbadge.rs
View File

@ -69,9 +69,15 @@ impl TryFrom<&User> for AgeBracket {
type Error = String;
fn try_from(value: &User) -> Result<Self, Self::Error> {
if let Some(birthdate) = value.birthdate.clone() {
let Some(birthdate) = value.birthdate.clone() else {
return Err("User has no birthdate".to_string());
};
let Ok(birthdate) = NaiveDate::parse_from_str(&birthdate, "%Y-%m-%d") else {
return Err("Birthdate in wrong format...".to_string());
};
let today = Local::now().date_naive();
let birthdate = NaiveDate::parse_from_str(&birthdate, "%Y-%m-%d").unwrap();
let age = today.year() - birthdate.year();
if age <= 14 {
@ -87,9 +93,6 @@ impl TryFrom<&User> for AgeBracket {
} else {
Ok(AgeBracket::From76)
}
} else {
Err("User has no birthdate".to_string())
}
}
}

30
templates/achievement.html.tera
View File

@ -3,15 +3,19 @@
{% extends "base" %}
{% block content %}
<link rel="stylesheet" href="/public/table.css" />
<div class="max-w-screen-lg w-full">
<div class="w-full">
<h1 class="h1">Abzeichen für {{ rowingbadge_year }}</h1>
<div class="text-black dark:text-white">
<table id="basic">
<thead>
<tr>
<th>Name</th>
<th>Äquatorpreis</th>
<th>Fahrtenabzeichen (FA) geschafft</th>
<th>Erster Log</th>
<th>Letzter Log</th>
<th>Gesamt-KM</th>
<th>Äquatorpreis (ÄP)</th>
<th>ÄP diese<br>Saison bekommen</th>
<th>Fahrtenabzeichen (FA)<br>geschafft</th>
<th>FA - KM</th>
<th>FA - fehlende KM</th>
<th>Eintagesausfahrten</th>
@ -24,7 +28,15 @@
{% set achievement = person.1 %}
<tr>
<td>{{ user.name }}</td>
<td>{% if achievement.new_equatorprice_this_season %}(NEU!) {% endif %}{{ achievement.curr_equatorprice_name }} </td>
<td>{% if achievement.year_first_mentioned %}{{ achievement.year_first_mentioned }}{% endif %}</td>
<td>{% if achievement.year_last_mentioned %}{{ achievement.year_last_mentioned }}{% endif %}</td>
<td>{{ achievement.all_time_km }}</td>
<td>
{{ achievement.curr_equatorprice_name }}
</td>
<td>
{% if achievement.new_equatorprice_this_season %}🎉{% else %}-{% endif %}
</td>
{% if achievement.rowingbadge %}
{% set badge = achievement.rowingbadge %}
<td>
@ -57,11 +69,11 @@
</details>
</td>
{% else %}
<td>no birthdate of this person</td>
<td>no birthdate of this person</td>
<td>no birthdate of this person</td>
<td>no birthdate of this person</td>
<td>no birthdate of this person</td>
<td>Geb.datum fehlt 👻</td>
<td>Geb.datum fehlt 👻</td>
<td>Geb.datum fehlt 👻</td>
<td>Geb.datum fehlt 👻</td>
<td>Geb.datum fehlt 👻</td>
{% endif %}
</tr>
{% endfor %}

45
templates/index.html.tera
View File

@ -79,14 +79,23 @@
<h2 class="h2">Persönliches</h2>
<div class="mx-2 divide-y divide-gray-200 dark:divide-primary-600">
<div class="py-3">
<h3 class="font-bold text-xl">
{% if achievements.rowingbadge and achievements.rowingbadge.achieved %}&#127881;{% endif %}
<details>
<summary>
<h3 class="inline">
<span class="text-xl">
{% if achievements.rowingbadge and achievements.rowingbadge.achieved %}
&#127881;
{% else %}
📋
{% endif %}
</span>
Fahrtenabzeichen
{% if achievements.rowingbadge %}{{ achievements.rowingbadge.year }}{% endif %}
<span><a href="http://www.rudern.at/OFFICE/Downloads/Ausschreibungen/2022/Wanderfahrten//Fahrtenabzeichen%20%C3%84quatorpreis%20und%20Danubius%202022.pdf"
target="_blank"
class="w-7 h-7 inline-flex align-center justify-center rounded-full bg-primary-500 ml-2">?</a></span>
class="w-6 h-6 inline-flex align-center justify-center rounded-full bg-primary-500 ml-2">?</a></span>
</h3>
</summary>
{% if achievements.rowingbadge %}
{% set badge = achievements.rowingbadge %}
<div class="mb-3">{{ badge.category }}</div>
@ -127,17 +136,37 @@
</div>
</details>
{% else %}
<div class="mt-3">
Wir haben leider kein Geburtsdatum von dir und können dir leider deinen heurigen Status für das Fahrtenabzeichen nicht anzeigen. Wenn du dein Geburtsdatum an <a href="mailto:it@rudernlinz.at" class="underline">it@rudernlinz.at</a> schreibst, lässt sich das ändern :-)
</div>
{% endif %}
</details>
</div>
<div class="py-3">
<h3 class="font-bold text-xl mb-3">
<details>
<summary>
<h3 class="mb-3 inline">
{% set price = achievements.equatorprice %}
<span class="text-xl">
{% if achievements.curr_equatorprice_name == "-" %}
📋
{% elif achievements.curr_equatorprice_name == "Bronze" %}
🥉
{% elif achievements.curr_equatorprice_name == "Silber" %}
🥈
{% elif achievements.curr_equatorprice_name == "Gold" %}
🥇
{% elif achievements.curr_equatorprice_name == "Diamant" %}
💍
{% endif %}
</span>
Äquatorpreis
<span><a href="http://www.rudern.at/OFFICE/Downloads/Ausschreibungen/2022/Wanderfahrten//Fahrtenabzeichen%20%C3%84quatorpreis%20und%20Danubius%202022.pdf"
target="_blank"
class="w-7 h-7 inline-flex align-center justify-center rounded-full bg-primary-500 ml-2">?</a></span>
class="w-6 h-6 inline-flex align-center justify-center rounded-full bg-primary-500 ml-2">?</a></span>
</h3>
{% set price = achievements.equatorprice %}
</summary>
<div class="mt-3">
{% if price.level == "DONE" %}
Gratuliere, du hast alles in deinem Rudererleben erreicht, was es (beim Äquatorpreis) zu erreichen gibt.
{% else %}
@ -148,10 +177,12 @@
max="{{ price.required_km }}"></progress>
<details>
<summary>Details</summary>
Du bist insgesamt {{ price.rowed_km }} km gerudert. Um den Äquatorpreis in {{ price.level }} zu erhalten, benötigst du noch {{ price.missing_km }} km um die notwendigen {{ price.required_km }} km zu erreichen.
Du bist insgesamt {{ price.rowed_km }} km gerudert. Um den Äquatorpreis in {{ price.desc }} zu erhalten, benötigst du noch {{ price.missing_km }} km um die notwendigen {{ price.required_km }} km zu erreichen.
</details>
{% endif %}
</div>
</details>
</div>
</div>
</div>
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"