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

feat: show vehicles in overview

Browse Source
This commit is contained in:
Max Hohlfeld 2025-01-23 20:02:47 +01:00
parent 90d6175d6c
commit 760e19522b
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/src/endpoints/availability/get_overview.rs
View File

@ -1,7 +1,7 @@
use crate::{ use crate::{
filters, filters,
models::{Assignment, Function}, models::{Assignment, Function, Vehicle},
utils::ApplicationError, utils::{event_planning_template::generate_vehicles_assigned_and_available, ApplicationError},
}; };
use actix_web::{web, HttpResponse, Responder}; use actix_web::{web, HttpResponse, Responder};
use chrono::{NaiveDate, Utc}; use chrono::{NaiveDate, Utc};
@ -24,7 +24,7 @@ struct CalendarTemplate {
date: NaiveDate, date: NaiveDate,
selected_area: Option<i32>, selected_area: Option<i32>,
areas: Vec<Area>, areas: Vec<Area>,
events_and_assignments: Vec<(Event, Vec<String>, Option<String>, Option<String>)>, events_and_assignments: Vec<(Event, Vec<String>, Option<String>, Option<String>, Vec<Vehicle>)>,
availabillities: Vec<Availabillity>, availabillities: Vec<Availabillity>,
} }
@ -76,6 +76,8 @@ async fn get(
.into_iter() .into_iter()
.partition(|a| a.function == Function::Wachhabender); .partition(|a| a.function == Function::Wachhabender);
let (assigned_vehicle, _) = generate_vehicles_assigned_and_available(&pool, &e).await?;
events_and_assignments.push(( events_and_assignments.push((
e, e,
posten posten
@ -118,6 +120,7 @@ async fn get(
.clone(), .clone(),
) )
}), }),
assigned_vehicle
)); ));
} }

10
web/templates/index.html
View File

@ -74,7 +74,7 @@
<h5 class="subtitle is-5">keine Events geplant</h5> <h5 class="subtitle is-5">keine Events geplant</h5>
</div> </div>
{% else %} {% else %}
{% for (event, posten, fuehrungsassistent, wachhabender) in events_and_assignments %} {% for (event, posten, fuehrungsassistent, wachhabender, vehicle) in events_and_assignments %}
<div class="box"> <div class="box">
<div class="fixed-grid has-1-cols-mobile"> <div class="fixed-grid has-1-cols-mobile">
<div class="grid content"> <div class="grid content">
@ -157,6 +157,14 @@
</div> </div>
{% endif %} {% endif %}
{% if vehicle.len() > 0 %}
<div class="cell is-col-span-2">
<b>Fahrzeuge:</b>
{% for v in vehicle %}
<span class="tag is-link"> {{ v.radio_call_name }} - {{ v.station }}</span>
{% endfor %}
</div>
{% endif %}
</div> </div>
</div> </div>
</div> </div>