diff --git a/src/model/logbook.rs b/src/model/logbook.rs index e8c911d..a9a70ce 100644 --- a/src/model/logbook.rs +++ b/src/model/logbook.rs @@ -260,6 +260,10 @@ ORDER BY departure DESC pub async fn completed(db: &SqlitePool) -> Vec { let year = chrono::Local::now().year(); + Self::completed_in_year(db, year).await + } + + pub async fn completed_in_year(db: &SqlitePool, year: i32) -> Vec { let logs = sqlx::query_as( &format!(" SELECT id, boat_id, shipmaster, steering_person, shipmaster_only_steering, departure, arrival, destination, distance_in_km, comments, logtype diff --git a/src/model/user.rs b/src/model/user.rs index 00d66a6..9ae4a3d 100644 --- a/src/model/user.rs +++ b/src/model/user.rs @@ -753,7 +753,7 @@ impl<'r> FromRequest<'r> for AdminUser { if user.has_role(db, "admin").await { Outcome::Success(AdminUser { user }) } else { - Outcome::Error((Status::Forbidden, LoginError::NotACox)) + Outcome::Forward(Status::Forbidden) } } Outcome::Error(f) => Outcome::Error(f), diff --git a/src/tera/log.rs b/src/tera/log.rs index 2c47e71..e2dca51 100644 --- a/src/tera/log.rs +++ b/src/tera/log.rs @@ -23,7 +23,7 @@ use crate::model::{ LogbookUpdateError, }, logtype::LogType, - user::{DonauLinzUser, User, UserWithRoles, UserWithWaterStatus}, + user::{AdminUser, DonauLinzUser, User, UserWithRoles, UserWithWaterStatus}, }; pub struct KioskCookie(String); @@ -96,6 +96,16 @@ async fn show(db: &State, user: DonauLinzUser) -> Template { ) } +#[get("/show?")] +async fn show_for_year(db: &State, user: AdminUser, year: i32) -> Template { + let logs = Logbook::completed_in_year(db, year).await; + + Template::render( + "log.completed", + context!(logs, loggedin_user: &UserWithRoles::from_user(user.user, db).await), + ) +} + #[get("/show")] async fn show_kiosk(db: &State, _kiosk: KioskCookie) -> Template { let logs = Logbook::completed(db).await; @@ -378,6 +388,7 @@ pub fn routes() -> Vec { new_kiosk, show, show_kiosk, + show_for_year, delete, delete_kiosk ] diff --git a/templates/log.completed.html.tera b/templates/log.completed.html.tera index 2568f5d..1edaefa 100644 --- a/templates/log.completed.html.tera +++ b/templates/log.completed.html.tera @@ -3,7 +3,16 @@ {% extends "base" %} {% block content %}
-

Logbuch

+

+ Logbuch + {% if "admin" in loggedin_user.roles %} + + {% endif %} +

@@ -17,4 +26,32 @@ {% for log in logs %}{{ log::show_old(log=log, state="completed", only_ones=false, index=loop.index) }}{% endfor %}
+ {% endblock content %}