replace-main-with-fix #1136

Merged
philipp merged 3 commits from replace-main-with-fix into main 2025-10-02 00:32:27 +02:00
Showing only changes of commit 433c914c4a - Show all commits

View File

@@ -2,7 +2,7 @@ use std::{fs::OpenOptions, io::Write};
use chrono::{Datelike, Local}; use chrono::{Datelike, Local};
use rocket::{ use rocket::{
Build, Data, FromForm, Request, Rocket, State, catch, catchers, catch, catchers,
fairing::{AdHoc, Fairing, Info, Kind}, fairing::{AdHoc, Fairing, Info, Kind},
form::Form, form::Form,
fs::FileServer, fs::FileServer,
@@ -13,6 +13,7 @@ use rocket::{
response::{Flash, Redirect}, response::{Flash, Redirect},
routes, routes,
time::{Duration, OffsetDateTime}, time::{Duration, OffsetDateTime},
Build, Data, FromForm, Request, Rocket, State,
}; };
use rocket_dyn_templates::Template; use rocket_dyn_templates::Template;
use serde::Deserialize; use serde::Deserialize;
@@ -20,7 +21,6 @@ use sqlx::SqlitePool;
use tera::Context; use tera::Context;
use crate::{ use crate::{
SCHECKBUCH,
model::{ model::{
logbook::Logbook, logbook::Logbook,
notification::Notification, notification::Notification,
@@ -28,6 +28,7 @@ use crate::{
role::Role, role::Role,
user::{User, UserWithDetails}, user::{User, UserWithDetails},
}, },
SCHECKBUCH,
}; };
pub(crate) mod admin; pub(crate) mod admin;
@@ -64,7 +65,7 @@ async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_
let date = chrono::Utc::now(); let date = chrono::Utc::now();
if date.month() <= 3 || date.month() >= 10 { if date.month() <= 3 || date.month() >= 10 {
context.insert("show_quick_ergo_button", "yes"); // context.insert("show_quick_ergo_button", "yes");
} }
context.insert("achievements", &Achievements::for_user(db, &user).await); context.insert("achievements", &Achievements::for_user(db, &user).await);
@@ -330,13 +331,11 @@ mod test {
assert_eq!(response.status(), Status::Ok); assert_eq!(response.status(), Status::Ok);
assert!( assert!(response
response .into_string()
.into_string() .await
.await .unwrap()
.unwrap() .contains("Ruderassistent"));
.contains("Ruderassistent")
);
} }
#[sqlx::test] #[sqlx::test]