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

feat: move export to own view

Browse Source
This commit is contained in:
Max Hohlfeld 2024-06-23 11:12:53 +02:00
parent 4c58ff867d
commit 33baf479b5
13 changed files with 316 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.editorconfig Normal file
View File

@ -0,0 +1,16 @@
# EditorConfig is awesome: https://EditorConfig.org
# top-most EditorConfig file
root = true
# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
trim_trailing_whitespace = true
max_line_length = off
[*.html]
indent_style = space
indent_size = 2

36
src/endpoints/export/get_availability.rs Normal file
View File

@ -0,0 +1,36 @@
use actix_web::{web, HttpResponse, Responder};
use askama::Template;
use askama_actix::TemplateToResponse;
use sqlx::PgPool;
use crate::models::{Area, User, Role};
#[derive(Template)]
#[template(path = "export/availabilityxml.html")]
struct AvailabilityExportTemplate {
user: User,
areas: Option<Vec<Area>>
}
#[actix_web::get("/export/availability")]
pub async fn get(
user: web::ReqData<User>,
pool: web::Data<PgPool>
) -> impl Responder {
if user.role != Role::Admin && user.role != Role::AreaManager {
return HttpResponse::Unauthorized().finish();
}
let areas = if user.role == Role::Admin {
Some(Area::read_all(pool.get_ref()).await.unwrap())
} else {
None
};
let template = AvailabilityExportTemplate {
user: user.into_inner(),
areas
};
return template.to_response();
}

4
src/endpoints/get_export.rs → src/endpoints/export/get_availability_data.rs
View File

@ -1,5 +1,5 @@
use actix_identity::Identity;
use actix_web::{http::header::{ContentDisposition, ContentType, Header, CONTENT_DISPOSITION}, web, HttpResponse, Responder};
use actix_web::{http::header::{ContentDisposition, ContentType, CONTENT_DISPOSITION}, web, HttpResponse, Responder};
use chrono::{Months, NaiveDate, NaiveTime, Utc};
use serde::{Deserialize, Serialize};
use sqlx::PgPool;
@ -33,7 +33,7 @@ struct ExportAvailabillityXml {
assigned: bool,
}
#[actix_web::get("/export-availabillities")]
#[actix_web::get("/export/availabilitydata")]
pub async fn get(
pool: web::Data<PgPool>,
user: Identity,

2
src/endpoints/export/mod.rs Normal file
View File

@ -0,0 +1,2 @@
pub mod get_availability;
pub mod get_availability_data;

9
src/endpoints/mod.rs
View File

@ -2,13 +2,13 @@ use actix_web::web::ServiceConfig;
use chrono::NaiveDate;
use serde::Deserialize;
mod area;
mod assignment;
mod availability;
mod events;
mod export;
mod location;
mod user;
mod assignment;
mod get_export;
mod area;
#[derive(Deserialize)]
pub struct IdPath {
@ -54,5 +54,6 @@ pub fn init(cfg: &mut ServiceConfig) {
cfg.service(area::get_new::get);
cfg.service(area::post_new::post);
cfg.service(get_export::get);
cfg.service(export::get_availability::get);
cfg.service(export::get_availability_data::get);
}

70
templates/area/new.html
View File

@ -7,44 +7,44 @@
<h1 class="title">Neuen Bereich anlegen</h1>
<div class="field is-horizontal">
<div class="field-label">
<label class="label">Name</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
<input class="input" type="text" name="name" required placeholder="Leipzig Ost"/>
</div>
</div>
</div>
<div class="field-label">
<label class="label">Name</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
<input class="input" type="text" name="name" required placeholder="Leipzig Ost" />
</div>
</div>
</div>
</div>
<div class="field is-horizontal">
<div class="field-label"></div>
<div class="field-body">
<div class="field is-grouped">
<div class="control">
<button class="button is-success">
<span class="icon">
<svg class="feather">
<use href="/static/feather-sprite.svg#check-circle" />
</svg>
</span>
<span>Speichern</span>
</button>
</div>
<div class="control">
<a class="button is-link is-light" hx-boost="true" href="/locations">
<span class="icon">
<svg class="feather">
<use href="/static/feather-sprite.svg#arrow-left" />
</svg>
</span>
<span>Zurück</span>
</a>
</div>
</div>
</div>
<div class="field-label"></div>
<div class="field-body">
<div class="field is-grouped">
<div class="control">
<button class="button is-success">
<span class="icon">
<svg class="feather">
<use href="/static/feather-sprite.svg#check-circle" />
</svg>
</span>
<span>Speichern</span>
</button>
</div>
<div class="control">
<a class="button is-link is-light" hx-boost="true" href="/locations">
<span class="icon">
<svg class="feather">
<use href="/static/feather-sprite.svg#arrow-left" />
</svg>
</span>
<span>Zurück</span>
</a>
</div>
</div>
</div>
</div>
</form>

64
templates/base.html
View File

@ -2,43 +2,43 @@
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Brass - Brasiwa Leipzig</title>
<link rel="stylesheet" href="/static/bulma.min.css">
<script src="/static/htmx.min.js"></script>
<script src="/static/response-targets.js"></script>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Brass - Brasiwa Leipzig</title>
<link rel="stylesheet" href="/static/bulma.min.css">
<script src="/static/htmx.min.js"></script>
<script src="/static/response-targets.js"></script>
<style>
.feather {
width: 24px;
height: 24px;
stroke: currentColor;
stroke-width: 2;
stroke-linecap: round;
stroke-linejoin: round;
fill: none;
}
<style>
.feather {
width: 24px;
height: 24px;
stroke: currentColor;
stroke-width: 2;
stroke-linecap: round;
stroke-linejoin: round;
fill: none;
}
[class*=" icon"],
[class^=icon] {
display: inline-block;
width: 1em;
height: 1em;
stroke-width: 0;
stroke: currentColor;
fill: currentColor;
line-height: 1;
position: relative;
top: -.05em;
vertical-align: middle;
}
</style>
[class*=" icon"],
[class^=icon] {
display: inline-block;
width: 1em;
height: 1em;
stroke-width: 0;
stroke: currentColor;
fill: currentColor;
line-height: 1;
position: relative;
top: -.05em;
vertical-align: middle;
}
</style>
</head>
<body hx-ext="response-targets">
{% block body %}
{% endblock %}
{% block body %}
{% endblock %}
</body>
</html>

42
templates/export/availabilityxml.html Normal file
View File

@ -0,0 +1,42 @@
{% extends "nav.html" %}
{% block content %}
<section class="section">
<div class="container">
<h3 class="title is-3">
Verfügbarkeiten nach XML exportieren
</h3>
<form action="/export/availabilitydata" target="_blank">
<div class="field">
<label class="label">Jahr</label>
<div class="control">
<input class="input" type="number" name="year" min="2024" max="9999" value="2024" />
</div>
</div>
<div class="field">
<label class="label">Monat</label>
<div class="control">
<input class="input" type="number" name="month" min="1" max="12" value="1" />
</div>
</div>
{% if user.role == Role::Admin %}
<div class="field">
<label class="label">Bereich</label>
<div class="control">
<div class="select is-fullwidth">
<select name="area">
{% for area in areas.as_ref().unwrap() %}
<option value="{{ area.id }}">{{ area.name }}</option>
{% endfor %}
</select>
</div>
</div>
</div>
{% endif %}
<input class="button is-primary" type="submit" value="Exportieren" />
</form>
</div>
</section>
{% endblock %}

66
templates/index.html
View File

@ -40,7 +40,7 @@
{% if event.canceled %}<b>Veranstaltung abgesagt!</b>{% endif %}
<div class="level">
<h5 class="title is-5 level-left">{{ event.name }}</h5>
<span class ="level-right">
<span class="level-right">
{% if user.role == Role::AreaManager || user.role == Role::Admin %}
<a href="/assignments/new?event={{ event.id }}" class="button is-primary level-item">Planen</a>
<a href="" class="button is-primary-light level-item">bearbeiten</a>
@ -89,24 +89,25 @@
</tr>
</thead>
<tbody>
{% for availabillity in availabillities %}
{% let u = availabillity.user.as_ref().unwrap() %}
<tr id="availabillity-{{ availabillity.id }}">
{% for availabillity in availabillities %}
{% let u = availabillity.user.as_ref().unwrap() %}
<tr id="availabillity-{{ availabillity.id }}">
<td>{{ u.name }}</td>
<td>
{% match u.function %}
{% when Function::Posten %}
<span class="tag is-info is-light">Posten</span>
{% when Function::Wachhabender %}
<span class="tag is-info">Wachhabender</span>
{% else %}
{% 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>
{% if availabillity.start_time.is_some() && availabillity.end_time.is_some() %}
{{ availabillity.start_time.as_ref().unwrap().format("%R") }} bis {{ availabillity.end_time.as_ref().unwrap().format("%R") }}
{{ availabillity.start_time.as_ref().unwrap().format("%R") }} bis {{
availabillity.end_time.as_ref().unwrap().format("%R") }}
{% else %}
ganztägig
ganztägig
{% endif %}
</td>
<td>
@ -121,7 +122,7 @@
{% endif %}
</td>
</tr>
{% endfor %}
{% endfor %}
</tbody>
</table>
</div>
@ -130,52 +131,13 @@
</div>
</section>
<section class="section">
<div class="container">
<h3 class="title is-3">
Verfügbarkeiten nach XML exportieren
</h3>
<form action="/export-availabillities" target="_blank">
<div class="field">
<label class="label">Jahr</label>
<div class="control">
<input class="input" type="number" name="year" min="2024" max="9999" value="2024" />
</div>
</div>
<div class="field">
<label class="label">Monat</label>
<div class="control">
<input class="input" type="number" name="month" min="1" max="12" value="1" />
</div>
</div>
{% if user.role == Role::Admin %}
<div class="field">
<label class="label">Bereich</label>
<div class="control">
<div class="select is-fullwidth">
<select name="area">
{% for area in areas %}
<option value="{{ area.id }}">{{ area.name }}</option>
{% endfor %}
</select>
</div>
</div>
</div>
{% endif %}
<input class="button is-primary" type="submit" value="Exportieren" />
</form>
</div>
</section>
<script>
document.getElementsByName("delete-availabillity")
.forEach(ele => ele.addEventListener("click", (event) => {
const id = event.target.closest("tr").id.split('-')[1];
event.target.classList.add("is-loading");
fetch(`/availabillity/delete/${id}`, { method: "DELETE"})
fetch(`/availabillity/delete/${id}`, {method: "DELETE"})
.then(response => {
if (response.status == 204) {
document.getElementById(`availabillity-${id}`).remove()

102
templates/location/new.html
View File

@ -7,65 +7,65 @@
<h1 class="title">Neuen Ort anlegen</h1>
<div class="field is-horizontal">
<div class="field-label">
<label class="label">Name</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
<input class="input" type="text" name="name" required placeholder="Zentralstadion"/>
</div>
</div>
</div>
<div class="field-label">
<label class="label">Name</label>
</div>
<div class="field-body">
<div class="field">
<div class="control">
<input class="input" type="text" name="name" required placeholder="Zentralstadion" />
</div>
</div>
</div>
</div>
{% if user.role == Role::Admin %}
<div class="field is-horizontal">
<div class="field-label">
<label class="label">Bereich</label>
</div>
<div class="field-body">
<div class="field is-narrow">
<div class="control">
<div class="select is-fullwidth">
<select required name="area">
{% for area in areas.as_ref().unwrap() %}
<option value="{{ area.id }}">{{ area.name }}</option>
{% endfor %}
</select>
</div>
</div>
</div>
</div>
<div class="field-label">
<label class="label">Bereich</label>
</div>
<div class="field-body">
<div class="field is-narrow">
<div class="control">
<div class="select is-fullwidth">
<select required name="area">
{% for area in areas.as_ref().unwrap() %}
<option value="{{ area.id }}">{{ area.name }}</option>
{% endfor %}
</select>
</div>
</div>
</div>
</div>
</div>
{% endif %}
<div class="field is-horizontal">
<div class="field-label"></div>
<div class="field-body">
<div class="field is-grouped">
<div class="control">
<button class="button is-success">
<span class="icon">
<svg class="feather">
<use href="/static/feather-sprite.svg#check-circle" />
</svg>
</span>
<span>Speichern</span>
</button>
</div>
<div class="control">
<a class="button is-link is-light" hx-boost="true" href="/locations">
<span class="icon">
<svg class="feather">
<use href="/static/feather-sprite.svg#arrow-left" />
</svg>
</span>
<span>Zurück</span>
</a>
</div>
</div>
</div>
<div class="field-label"></div>
<div class="field-body">
<div class="field is-grouped">
<div class="control">
<button class="button is-success">
<span class="icon">
<svg class="feather">
<use href="/static/feather-sprite.svg#check-circle" />
</svg>
</span>
<span>Speichern</span>
</button>
</div>
<div class="control">
<a class="button is-link is-light" hx-boost="true" href="/locations">
<span class="icon">
<svg class="feather">
<use href="/static/feather-sprite.svg#arrow-left" />
</svg>
</span>
<span>Zurück</span>
</a>
</div>
</div>
</div>
</div>
</form>

3
templates/location/overview.html
View File

@ -69,8 +69,5 @@
{% endif %}
</div>
</section>
</section>
<script>
</script>
{% endblock %}

80
templates/nav.html
View File

@ -4,7 +4,7 @@
<nav class="navbar" role="navigation" aria-label="main navigation">
<div class="navbar-brand">
<a class="navbar-item" href="/">
<img src="/static/brass.jpeg" height="240" />
<img src="/static/brass.jpeg" height="240" />
</a>
<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbarBasicExample">
@ -15,43 +15,64 @@
</div>
<div class="navbar-menu">
<div class="navbar-start">
<div hx-boost="true" class="navbar-start">
<a href="/" class="navbar-item">
Kalender
</a>
{% match user.role %}
{% when Role::Staff %}
{% when Role::AreaManager %}
<a class="navbar-item">
Planung
</a>
<a href="/locations" class="navbar-item">
Veranstaltungsorte
</a>
<a href="/users" class="navbar-item">
Nutzerverwaltung
</a>
{% when Role::Admin %}
<a class="navbar-item">
Planung
</a>
<a href="/locations" class="navbar-item">
Veranstaltungsorte
</a>
<a href="/users" class="navbar-item">
Nutzerverwaltung
</a>
{% when Role::Staff %}
{% when Role::AreaManager %}
<div class="navbar-item has-dropdown is-hoverable">
<div class="navbar-item">
Export
</div>
<div class="navbar-dropdown">
<a href="/export/availability" class="navbar-item">
Verfügbarkeiten
</a>
</div>
</div>
<a href="/locations" class="navbar-item">
Veranstaltungsorte
</a>
<a href="/users" class="navbar-item">
Nutzerverwaltung
</a>
{% when Role::Admin %}
<div class="navbar-item has-dropdown is-hoverable">
<div class="navbar-item">
Export
</div>
<div class="navbar-dropdown">
<a href="/export/availability" class="navbar-item">
Verfügbarkeiten
</a>
</div>
</div>
<a href="/locations" class="navbar-item">
Veranstaltungsorte
</a>
<a href="/users" class="navbar-item">
Nutzerverwaltung
</a>
{% endmatch %}
</div>
<div class="navbar-end">
<div class="navbar-item">
angemeldet als {{ user.name }}
angemeldet als {{ user.name }}
<div class="buttons ml-3">
<a class="button is-success">
Profil
<span class="icon">
<svg class="feather">
<use href="/static/feather-sprite.svg#check-circle" />
</svg>
</span>
<span>Profil</span>
</a>
<a href="/logout" class="button is-light">
Abmelden
@ -64,12 +85,13 @@
<noscript>
<section class="section">
<div class="notification is-danger is-light">
Dein Browser unterstützt kein JavaScript oder du hast es deaktiviert. Die Funktionalität ist daher auf nur-Lesen beschränkt.
<div class="notification is-danger is-light">
Dein Browser unterstützt kein JavaScript oder du hast es deaktiviert. Die Funktionalität ist daher auf
nur-Lesen beschränkt.
</div>
</section>
</noscript>
{% block content %}
{% endblock %}
{% block content %}
{% endblock %}
{% endblock %}

52
templates/user/login.html
View File

@ -2,30 +2,38 @@
{% block body %}
<section class="section">
<div class="container">
<h1 class="title">Brass - Anmeldung</h1>
<form class="box" action="/login" method="post" hx-boost="true" hx-target-400="#error-message" hx-on:change="document.getElementById('error-message').innerHTML = ''">
<div class="field">
<label class="label" for="email">E-Mail:</label>
<div class="control">
<input class="input" placeholder="max.mustermann@example.com" name="email" type="text" required>
</div>
</div>
<div class="container">
<h1 class="title">Brass - Anmeldung</h1>
<form class="box" action="/login" method="post" hx-boost="true" hx-target-400="#error-message"
hx-on:change="document.getElementById('error-message').innerHTML = ''">
<div class="field">
<label class="label" for="email">E-Mail:</label>
<div class="control">
<input class="input" placeholder="max.mustermann@example.com" name="email" type="text" required>
</div>
</div>
<div class="field">
<label class="label" for="password">Passwort:</label>
<div class="control">
<input class="input" placeholder="**********" name="password" type="password" required>
</div>
</div>
<div class="field">
<label class="label" for="password">Passwort:</label>
<div class="control">
<input class="input" placeholder="**********" name="password" type="password" required>
</div>
</div>
<div id="error-message" class="mb-3 help is-danger"></div>
<div id="error-message" class="mb-3 help is-danger"></div>
<div class="level">
<input class="button is-primary level-left" type="submit" value="Anmelden" />
<a class="button is-info is-light level-right" hx-boost="true" href="/reset-password" >Passwort vergessen</a>
</div>
</form>
</div>
<div class="level">
<button class="button is-primary level-left">
<span class="icon">
<svg class="feather">
<use href="/static/feather-sprite.svg#log-in" />
</svg>
</span>
<span>Anmelden</span>
</button>
<a class="button is-info is-light level-right" hx-boost="true" href="/reset-password">Passwort vergessen</a>
</div>
</form>
</div>
</section>
{% endblock %}