give frontend stuff to be able to update logbook entriese
This commit is contained in:
		@@ -1,7 +1,6 @@
 | 
				
			|||||||
use std::net::IpAddr;
 | 
					use std::net::IpAddr;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
use rocket::{
 | 
					use rocket::{
 | 
				
			||||||
    Request, Route, State,
 | 
					 | 
				
			||||||
    form::Form,
 | 
					    form::Form,
 | 
				
			||||||
    get,
 | 
					    get,
 | 
				
			||||||
    http::{Cookie, CookieJar},
 | 
					    http::{Cookie, CookieJar},
 | 
				
			||||||
@@ -10,8 +9,9 @@ use rocket::{
 | 
				
			|||||||
    response::{Flash, Redirect},
 | 
					    response::{Flash, Redirect},
 | 
				
			||||||
    routes,
 | 
					    routes,
 | 
				
			||||||
    time::{Duration, OffsetDateTime},
 | 
					    time::{Duration, OffsetDateTime},
 | 
				
			||||||
 | 
					    Request, Route, State,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
use rocket_dyn_templates::{Template, context};
 | 
					use rocket_dyn_templates::{context, Template};
 | 
				
			||||||
use sqlx::SqlitePool;
 | 
					use sqlx::SqlitePool;
 | 
				
			||||||
use tera::Context;
 | 
					use tera::Context;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -110,10 +110,13 @@ async fn index(
 | 
				
			|||||||
#[get("/show", rank = 3)]
 | 
					#[get("/show", rank = 3)]
 | 
				
			||||||
async fn show(db: &State<SqlitePool>, user: DonauLinzUser) -> Template {
 | 
					async fn show(db: &State<SqlitePool>, user: DonauLinzUser) -> Template {
 | 
				
			||||||
    let logs = Logbook::completed(db).await;
 | 
					    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(
 | 
					    Template::render(
 | 
				
			||||||
        "log.completed",
 | 
					        "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 sqlx::SqlitePool;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    use crate::model::logbook::Logbook;
 | 
					    use crate::model::logbook::Logbook;
 | 
				
			||||||
    use crate::tera::{User, log::Boat};
 | 
					    use crate::tera::{log::Boat, User};
 | 
				
			||||||
    use crate::testdb;
 | 
					    use crate::testdb;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    #[sqlx::test]
 | 
					    #[sqlx::test]
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user