Schwarztee/brass
1
0
Fork 0
Code Issues 19 Pull Requests Packages Projects 1 Releases Wiki Activity

refactor: rework index

Browse Source
This commit is contained in:
Max Hohlfeld 2024-11-11 20:27:01 +01:00
parent ec96b3b039
commit 5740248b96
3 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/filters.rs
View File

@ -1,3 +1,5 @@
use crate::models::Function;
pub fn show_area_query(a: &Option<i32>, first: bool) -> ::askama::Result<String> { pub fn show_area_query(a: &Option<i32>, first: bool) -> ::askama::Result<String> {
let char = if first { '?' } else { '&' }; let char = if first { '?' } else { '&' };
@ -27,7 +29,7 @@ pub fn insert_value(option: &Option<String>) -> askama::Result<String> {
pub fn is_some_and_eq<T>(option: &Option<T>, other: &T) -> askama::Result<bool> pub fn is_some_and_eq<T>(option: &Option<T>, other: &T) -> askama::Result<bool>
where where
T: Eq T: Eq,
{ {
Ok(option.as_ref().is_some_and(|x| x == other)) Ok(option.as_ref().is_some_and(|x| x == other))
} }
@ -35,3 +37,14 @@ where
pub fn invert(b: &bool) -> askama::Result<bool> { pub fn invert(b: &bool) -> askama::Result<bool> {
return Ok(!b); return Ok(!b);
} }
pub fn show_tree(f: &Function) -> askama::Result<String> {
let tags = match f {
Function::Posten => r#"<span class="tag is-info is-light">Posten</span>"#,
Function::Wachhabender => {
r#"<span class="tag is-info is-light">Posten</span><span class="tag is-info">Wachhabender</span>"#
}
};
Ok(format!(r#"<div class="tags">{tags}</div>"#))
}

18
templates/availability/new_or_edit.html
View File

@ -79,14 +79,26 @@
<div class="field-body"> <div class="field-body">
<div class="field is-grouped"> <div class="field is-grouped">
<div class="control"> <div class="control">
<button class="button is-success">
<svg class="icon">
<use href="/static/feather-sprite.svg#check-circle" />
</svg>
<span>
{% if id.is_some() %} {% if id.is_some() %}
<input class="button is-link" type="submit" value="Bearbeiten"> Speichern
{% else %} {% else %}
<input class="button is-link" type="submit" value="Erstellen"> Erstellen
{% endif %} {% endif %}
</span>
</button>
</div> </div>
<div class="control"> <div class="control">
<a class="button is-link is-light" href="/?date={{ date }}" hx-boost="true">Zurück</a> <a class="button is-link is-light" hx-boost="true" href="/?date={{ date }}">
<svg class="icon">
<use href="/static/feather-sprite.svg#arrow-left" />
</svg>
<span>Zurück</span>
</a>
</div> </div>
</div> </div>
</div> </div>

26
templates/index.html
View File

@ -141,13 +141,7 @@
<tr> <tr>
<td>{{ u.name }}</td> <td>{{ u.name }}</td>
<td> <td>
{% match u.function %} {{ u.function|show_tree|safe }}
{% when Function::Posten %}
<span class="tag is-info is-light">Posten</span>
{% when Function::Wachhabender %}
<span class="tag is-info">Wachhabender</span>
{% else %}
{% endmatch %}
</td> </td>
<td> <td>
{% if availabillity.start_time.is_some() && availabillity.end_time.is_some() %} {% if availabillity.start_time.is_some() && availabillity.end_time.is_some() %}
@ -163,10 +157,20 @@
<td> <td>
{% if availabillity.user_id == user.id %} {% if availabillity.user_id == user.id %}
<div class="buttons is-right"> <div class="buttons is-right">
<a class="button is-link" hx-boost="true" <a class="button is-primary is-light" hx-boost="true"
href="/availabillity/edit/{{ availabillity.id }}">Bearbeiten</a> href="/availabillity/edit/{{ availabillity.id }}">
<button class="button is-danger" hx-delete="/availabillity/delete/{{ availabillity.id }}" <svg class="icon">
hx-target="closest tr" hx-swap="delete">Löschen</button> <use href="/static/feather-sprite.svg#edit" />
</svg>
<span>Bearbeiten</span>
</a>
<button class="button is-danger is-light" hx-delete="/availabillity/delete/{{ availabillity.id }}"
hx-target="closest tr" hx-swap="delete" hx-trigger="confirmed">
<svg class="icon">
<use href="/static/feather-sprite.svg#x-circle" />
</svg>
<span>Löschen</span>
</button>
</div> </div>
{% endif %} {% endif %}
</td> </td>