From 17513bbc386e849962157517d9a4496870b1a064 Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Mon, 5 May 2025 21:11:41 +0200 Subject: [PATCH] give frontend stuff to be able to update logbook entriese --- src/tera/log.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/tera/log.rs b/src/tera/log.rs index 390e285..ad8cfa6 100644 --- a/src/tera/log.rs +++ b/src/tera/log.rs @@ -1,7 +1,6 @@ use std::net::IpAddr; use rocket::{ - Request, Route, State, form::Form, get, http::{Cookie, CookieJar}, @@ -10,8 +9,9 @@ use rocket::{ response::{Flash, Redirect}, routes, time::{Duration, OffsetDateTime}, + Request, Route, State, }; -use rocket_dyn_templates::{Template, context}; +use rocket_dyn_templates::{context, Template}; use sqlx::SqlitePool; use tera::Context; @@ -110,10 +110,13 @@ async fn index( #[get("/show", rank = 3)] async fn show(db: &State, user: DonauLinzUser) -> Template { let logs = Logbook::completed(db).await; + let boats = Boat::all(db).await; + let users = User::all(db).await; + let logtypes = LogType::all(db).await; Template::render( "log.completed", - context!(logs, loggedin_user: &UserWithDetails::from_user(user.into_inner(), db).await), + context!(logs, boats, users, logtypes, loggedin_user: &UserWithDetails::from_user(user.into_inner(), db).await), ) } @@ -582,7 +585,7 @@ mod test { use sqlx::SqlitePool; use crate::model::logbook::Logbook; - use crate::tera::{User, log::Boat}; + use crate::tera::{log::Boat, User}; use crate::testdb; #[sqlx::test]