Merge pull request 'hide reservations if there are none; clean code' (#330) from reservations into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m12s
CI/CD Pipeline / deploy-staging (push) Successful in 6m16s
CI/CD Pipeline / deploy-main (push) Has been skipped

Reviewed-on: #330
This commit is contained in:
philipp 2024-03-30 09:17:59 +01:00
commit 4466c9f018
3 changed files with 17 additions and 17 deletions

View File

@ -2,7 +2,6 @@ use crate::model::{boat::Boat, user::User};
use chrono::NaiveDate;
use chrono::NaiveDateTime;
use rocket::serde::{Deserialize, Serialize};
use rocket::FromForm;
use sqlx::{FromRow, SqlitePool};
use super::log::Log;

View File

@ -13,9 +13,8 @@ use tera::Context;
use crate::{
model::{
boat::Boat,
boatdamage::{BoatDamage, BoatDamageFixed, BoatDamageToAdd, BoatDamageVerified},
boatreservation::{BoatReservation, BoatReservationToAdd},
user::{AdminUser, CoxUser, DonauLinzUser, TechUser, User, UserWithRoles},
user::{DonauLinzUser, User, UserWithRoles},
},
tera::log::KioskCookie,
};

View File

@ -1,4 +1,5 @@
{% macro boatreservation() %}
{% if reservations %}
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow grid gap-3"
style="margin-top: 10px">
<h2 class="h2">Bootsreservierungen</h2>
@ -14,6 +15,7 @@
</ul>
</div>
</div>
{% endif %}
{% endmacro boatreservation %}
{% macro header(loggedin_user) %}
<header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10">