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

show notification badge in menu
Some checks are pending
CI/CD Pipeline / test (push) Waiting to run
Details
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
Details
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
philipp
2024-04-17 13:51:47 +02:00
parent e2746d5105
commit 7c71ce59bd
17 changed files with 101 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tera/log.rs
View File

@ -24,7 +24,9 @@ use crate::model::{
LogbookUpdateError,
},
logtype::LogType,
user::{AdminUser, DonauLinzUser, User, UserWithRoles, UserWithWaterStatus},
user::{
AdminUser, DonauLinzUser, User, UserWithRolesAndNotificationCount, UserWithWaterStatus,
},
};
pub struct KioskCookie(String);
@ -84,7 +86,7 @@ async fn index(
context.insert("logtypes", &logtypes);
context.insert(
"loggedin_user",
&UserWithRoles::from_user(user.into(), db).await,
&UserWithRolesAndNotificationCount::from_user(user.into(), db).await,
);
context.insert("on_water", &on_water);
context.insert("distances", &distances);
@ -98,7 +100,7 @@ async fn show(db: &State<SqlitePool>, user: DonauLinzUser) -> Template {
Template::render(
"log.completed",
context!(logs, loggedin_user: &UserWithRoles::from_user(user.into(), db).await),
context!(logs, loggedin_user: &UserWithRolesAndNotificationCount::from_user(user.into(), db).await),
)
}
@ -108,7 +110,7 @@ async fn show_for_year(db: &State<SqlitePool>, user: AdminUser, year: i32) -> Te
Template::render(
"log.completed",
context!(logs, loggedin_user: &UserWithRoles::from_user(user.user, db).await),
context!(logs, loggedin_user: &UserWithRolesAndNotificationCount::from_user(user.user, db).await),
)
}