@@ -109,9 +112,9 @@ snapshot_kind: text
@@ -128,9 +131,9 @@ snapshot_kind: text
diff --git a/web/src/endpoints/assignment/delete.rs b/web/src/endpoints/assignment/delete.rs
index 5cb62374..ace222e0 100644
--- a/web/src/endpoints/assignment/delete.rs
+++ b/web/src/endpoints/assignment/delete.rs
@@ -7,7 +7,7 @@ use crate::{
models::{Assignment, Event, Role, User},
utils::{
event_planning_template::{
- generate_availabillity_assignment_list, generate_status_whether_staff_is_required,
+ generate_availability_assignment_list, generate_status_whether_staff_is_required,
},
ApplicationError, TemplateResponse,
},
@@ -15,7 +15,7 @@ use crate::{
#[derive(Deserialize)]
struct AssignmentDeleteQuery {
- availabillity: i32,
+ availability: i32,
event: i32,
}
@@ -38,14 +38,14 @@ pub async fn delete(
return Err(ApplicationError::Unauthorized);
}
- let Some(assignment) = Assignment::read(pool.get_ref(), event.id, query.availabillity).await?
+ let Some(assignment) = Assignment::read(pool.get_ref(), event.id, query.availability).await?
else {
return Ok(HttpResponse::NotFound().finish());
};
- Assignment::delete(pool.get_ref(), event.id, assignment.availabillity_id).await?;
+ Assignment::delete(pool.get_ref(), event.id, assignment.availability_id).await?;
- let availabillities = generate_availabillity_assignment_list(pool.get_ref(), &event).await?;
+ let availabilities = generate_availability_assignment_list(pool.get_ref(), &event).await?;
let (
further_posten_required,
further_fuehrungsassistent_required,
@@ -54,7 +54,7 @@ pub async fn delete(
let template = PlanEventPersonalTablePartialTemplate {
event,
- availabillities,
+ availabilities,
further_posten_required,
further_fuehrungsassistent_required,
further_wachhabender_required,
@@ -115,7 +115,7 @@ mod tests {
let app = context.app().await;
let config = RequestConfig {
- uri: "/assignments/delete?availabillity=1&event=1".to_string(),
+ uri: "/assignments/delete?availability=1&event=1".to_string(),
role: Role::AreaManager,
function: vec![Function::Posten],
user_area: 1,
@@ -139,7 +139,7 @@ mod tests {
let app = context.app().await;
let config = RequestConfig {
- uri: "/assignments/delete?availabillity=1&event=1".to_string(),
+ uri: "/assignments/delete?availability=1&event=1".to_string(),
role: Role::Staff,
function: vec![Function::Posten],
user_area: 1,
@@ -154,7 +154,7 @@ mod tests {
async fn doesnt_work_when_event_does_not_exist(context: &DbTestContext) {
let app = context.app().await;
let config = RequestConfig {
- uri: "/assignments/delete?availabillity=1&event=1".to_string(),
+ uri: "/assignments/delete?availability=1&event=1".to_string(),
role: Role::AreaManager,
function: vec![Function::Posten],
user_area: 1,
@@ -171,7 +171,7 @@ mod tests {
let app = context.app().await;
let config = RequestConfig {
- uri: "/assignments/delete?availabillity=2&event=1".to_string(),
+ uri: "/assignments/delete?availability=2&event=1".to_string(),
role: Role::AreaManager,
function: vec![Function::Posten],
user_area: 1,
diff --git a/web/src/endpoints/assignment/mod.rs b/web/src/endpoints/assignment/mod.rs
index 34b82821..7b1bf106 100644
--- a/web/src/endpoints/assignment/mod.rs
+++ b/web/src/endpoints/assignment/mod.rs
@@ -2,7 +2,7 @@ use askama::Template;
use crate::{
filters,
- models::{Availability, AvailabillityAssignmentState, Event},
+ models::{Availability, AvailabilityAssignmentState, Event},
};
pub mod delete;
@@ -12,7 +12,7 @@ pub mod post_new;
#[template(path = "events/plan_personal_table.html")]
pub struct PlanEventPersonalTablePartialTemplate {
event: Event,
- availabillities: Vec<(Availability, AvailabillityAssignmentState)>,
+ availabilities: Vec<(Availability, AvailabilityAssignmentState)>,
further_posten_required: bool,
further_fuehrungsassistent_required: bool,
further_wachhabender_required: bool,
diff --git a/web/src/endpoints/assignment/post_new.rs b/web/src/endpoints/assignment/post_new.rs
index 6353ea2d..646a6a46 100644
--- a/web/src/endpoints/assignment/post_new.rs
+++ b/web/src/endpoints/assignment/post_new.rs
@@ -11,7 +11,7 @@ use crate::{
},
utils::{
event_planning_template::{
- generate_availabillity_assignment_list, generate_status_whether_staff_is_required,
+ generate_availability_assignment_list, generate_status_whether_staff_is_required,
},
ApplicationError, TemplateResponse,
},
@@ -19,7 +19,7 @@ use crate::{
#[derive(Deserialize)]
pub struct AssignmentQuery {
- availabillity: i32,
+ availability: i32,
function: u8,
event: i32,
}
@@ -43,14 +43,14 @@ pub async fn post(
return Err(ApplicationError::Unauthorized);
}
- let Some(availabillity) =
- Availability::read_by_id_including_user(pool.get_ref(), query.availabillity).await?
+ let Some(availability) =
+ Availability::read_by_id_including_user(pool.get_ref(), query.availability).await?
else {
return Ok(HttpResponse::NotFound().finish());
};
let availability_user_not_in_event_location_area =
- availabillity.user.as_ref().unwrap().area_id != event.location.as_ref().unwrap().area_id;
+ availability.user.as_ref().unwrap().area_id != event.location.as_ref().unwrap().area_id;
if availability_user_not_in_event_location_area {
return Ok(HttpResponse::BadRequest()
@@ -65,23 +65,23 @@ pub async fn post(
};
let assignments_for_event = Assignment::read_all_by_event(pool.get_ref(), event.id).await?;
- let assignments_for_availabillity =
- Assignment::read_all_by_availabillity(pool.get_ref(), availabillity.id).await?;
+ let assignments_for_availability =
+ Assignment::read_all_by_availability(pool.get_ref(), availability.id).await?;
let context = AssignmentContext {
event: event.clone(),
- availabillity: availabillity.clone(),
- user_function: availabillity.user.as_ref().unwrap().function.clone(),
+ availability: availability.clone(),
+ user_function: availability.user.as_ref().unwrap().function.clone(),
assignments_for_event,
- assignments_for_availabillity,
+ assignments_for_availability,
};
if let Err(e) = changeset.validate_with(&context) {
return Ok(HttpResponse::BadRequest().body(e.to_string()));
};
- Assignment::create(pool.get_ref(), event.id, availabillity.id, changeset).await?;
+ Assignment::create(pool.get_ref(), event.id, availability.id, changeset).await?;
- let availabillities = generate_availabillity_assignment_list(pool.get_ref(), &event).await?;
+ let availabilities = generate_availability_assignment_list(pool.get_ref(), &event).await?;
let (
further_posten_required,
@@ -91,7 +91,7 @@ pub async fn post(
let template = PlanEventPersonalTablePartialTemplate {
event,
- availabillities,
+ availabilities,
further_posten_required,
further_fuehrungsassistent_required,
further_wachhabender_required,
diff --git a/web/src/endpoints/availability/delete.rs b/web/src/endpoints/availability/delete.rs
index 295a01ce..96198765 100644
--- a/web/src/endpoints/availability/delete.rs
+++ b/web/src/endpoints/availability/delete.rs
@@ -6,21 +6,21 @@ use crate::{
models::{Availability, User}, utils::ApplicationError,
};
-#[actix_web::delete("/availabillity/delete/{id}")]
+#[actix_web::delete("/availability/delete/{id}")]
pub async fn delete(
user: web::ReqData
,
pool: web::Data,
path: web::Path,
) -> Result {
- let Some(availabillity) = Availability::read_by_id(pool.get_ref(), path.id).await? else {
+ let Some(availability) = Availability::read_by_id(pool.get_ref(), path.id).await? else {
return Ok(HttpResponse::NotFound().finish());
};
- if availabillity.user_id != user.id {
+ if availability.user_id != user.id {
return Err(ApplicationError::Unauthorized);
}
- Availability::delete(pool.get_ref(), availabillity.id).await?;
+ Availability::delete(pool.get_ref(), availability.id).await?;
Ok(HttpResponse::Ok().finish())
}
diff --git a/web/src/endpoints/availability/get_new.rs b/web/src/endpoints/availability/get_new.rs
index 6a5c5142..276e425e 100644
--- a/web/src/endpoints/availability/get_new.rs
+++ b/web/src/endpoints/availability/get_new.rs
@@ -12,7 +12,7 @@ struct AvailabilityNewQuery {
date: NaiveDate,
}
-#[actix_web::get("/availabillity/new")]
+#[actix_web::get("/availability/new")]
pub async fn get(
user: web::ReqData,
pool: web::Data,
@@ -22,10 +22,10 @@ pub async fn get(
Availability::read_by_user_and_date(pool.get_ref(), user.id, &query.date).await?;
let slot_suggestions = find_free_date_time_slots(&availabilities_from_user);
- let user_can_create_availabillity =
+ let user_can_create_availability =
availabilities_from_user.is_empty() || !slot_suggestions.is_empty();
- if !user_can_create_availabillity {
+ if !user_can_create_availability {
return Ok(HttpResponse::BadRequest().finish());
}
diff --git a/web/src/endpoints/availability/get_overview.rs b/web/src/endpoints/availability/get_overview.rs
index 42d95561..f6ff33f2 100644
--- a/web/src/endpoints/availability/get_overview.rs
+++ b/web/src/endpoints/availability/get_overview.rs
@@ -24,7 +24,7 @@ pub struct CalendarQuery {
#[template(path = "index.html")]
struct CalendarTemplate {
user: User,
- user_can_create_availabillity: bool,
+ user_can_create_availability: bool,
date: NaiveDate,
selected_area: Option,
areas: Vec,
@@ -35,7 +35,7 @@ struct CalendarTemplate {
Option,
Vec,
)>,
- availabillities: Vec,
+ availabilities: Vec,
}
#[actix_web::get("/")]
@@ -62,7 +62,7 @@ async fn get(
None => None,
};
- let availabillities = Availability::read_by_date_and_area_including_user(
+ let availabilities = Availability::read_by_date_and_area_including_user(
pool.get_ref(),
date,
query.area.unwrap_or(user.area_id),
@@ -73,10 +73,10 @@ async fn get(
Availability::read_by_user_and_date(pool.get_ref(), user.id, &date).await?;
//println!("{availabilities_from_user:#?}");
- let user_can_create_availabillity = availabilities_from_user.is_empty()
+ let user_can_create_availability = availabilities_from_user.is_empty()
|| !find_free_date_time_slots(&availabilities_from_user).is_empty();
- //println!("{} || {} || {} = {user_can_create_availabillity}", availabilities_from_user.is_empty(),
+ //println!("{} || {} || {} = {user_can_create_availability}", availabilities_from_user.is_empty(),
// !only_one_availability_exists_and_is_whole_day(&availabilities_from_user),
// !find_free_time_slots(&availabilities_from_user).is_empty());
@@ -104,9 +104,9 @@ async fn get(
posten
.into_iter()
.map(|p| {
- availabillities
+ availabilities
.iter()
- .find(|a| a.id == p.availabillity_id)
+ .find(|a| a.id == p.availability_id)
.unwrap()
.user
.as_ref()
@@ -116,9 +116,9 @@ async fn get(
})
.collect(),
fuehrungsassistent.first().map(|fa| {
- availabillities
+ availabilities
.iter()
- .find(|a| a.id == fa.availabillity_id)
+ .find(|a| a.id == fa.availability_id)
.unwrap()
.user
.as_ref()
@@ -127,9 +127,9 @@ async fn get(
.clone()
}),
wachhabender.first().map(|wh| {
- availabillities
+ availabilities
.iter()
- .find(|a| a.id == wh.availabillity_id)
+ .find(|a| a.id == wh.availability_id)
.unwrap()
.user
.as_ref()
@@ -143,12 +143,12 @@ async fn get(
let template = CalendarTemplate {
user: user.into_inner(),
- user_can_create_availabillity,
+ user_can_create_availability,
date,
selected_area,
areas,
events_and_assignments,
- availabillities,
+ availabilities,
};
Ok(template.to_response()?)
diff --git a/web/src/endpoints/availability/get_update.rs b/web/src/endpoints/availability/get_update.rs
index a394a9b1..44c1a1d8 100644
--- a/web/src/endpoints/availability/get_update.rs
+++ b/web/src/endpoints/availability/get_update.rs
@@ -8,7 +8,7 @@ use crate::{
utils::{ApplicationError, TemplateResponse},
};
-#[actix_web::get("/availabillity/edit/{id}")]
+#[actix_web::get("/availability/edit/{id}")]
pub async fn get(
user: web::ReqData,
pool: web::Data,
diff --git a/web/src/endpoints/availability/mod.rs b/web/src/endpoints/availability/mod.rs
index f5a26726..224b3e9c 100644
--- a/web/src/endpoints/availability/mod.rs
+++ b/web/src/endpoints/availability/mod.rs
@@ -27,7 +27,7 @@ struct NewOrEditAvailabilityTemplate<'a> {
}
#[derive(Deserialize)]
-pub struct AvailabillityForm {
+pub struct AvailabilityForm {
pub startdate: NaiveDate,
pub enddate: NaiveDate,
pub starttime: NaiveTime,
diff --git a/web/src/endpoints/availability/post_new.rs b/web/src/endpoints/availability/post_new.rs
index 7915e4df..cd251aee 100644
--- a/web/src/endpoints/availability/post_new.rs
+++ b/web/src/endpoints/availability/post_new.rs
@@ -3,16 +3,16 @@ use garde::Validate;
use sqlx::PgPool;
use crate::{
- endpoints::availability::{find_adjacend_availability, AvailabillityForm},
+ endpoints::availability::{find_adjacend_availability, AvailabilityForm},
models::{Availability, AvailabilityChangeset, AvailabilityContext, User},
utils::{self, ApplicationError},
};
-#[actix_web::post("/availabillity/new")]
+#[actix_web::post("/availability/new")]
pub async fn post(
user: web::ReqData,
pool: web::Data,
- form: web::Form,
+ form: web::Form,
) -> Result {
let existing_availabilities =
Availability::read_by_user_and_date(pool.get_ref(), user.id, &form.startdate).await?;
diff --git a/web/src/endpoints/availability/post_update.rs b/web/src/endpoints/availability/post_update.rs
index 0129f27b..236b792a 100644
--- a/web/src/endpoints/availability/post_update.rs
+++ b/web/src/endpoints/availability/post_update.rs
@@ -4,19 +4,19 @@ use sqlx::PgPool;
use crate::{
endpoints::{
- availability::{find_adjacend_availability, AvailabillityForm},
+ availability::{find_adjacend_availability, AvailabilityForm},
IdPath,
},
models::{Availability, AvailabilityChangeset, AvailabilityContext, User},
utils::{self, ApplicationError},
};
-#[actix_web::post("/availabillity/edit/{id}")]
+#[actix_web::post("/availability/edit/{id}")]
pub async fn post(
user: web::ReqData,
pool: web::Data,
path: web::Path,
- form: web::Form,
+ form: web::Form,
) -> Result {
let Some(availability) = Availability::read_by_id(pool.get_ref(), path.id).await? else {
return Ok(HttpResponse::NotFound().finish());
diff --git a/web/src/endpoints/events/get_plan.rs b/web/src/endpoints/events/get_plan.rs
index a45bba15..cf22c6f2 100644
--- a/web/src/endpoints/events/get_plan.rs
+++ b/web/src/endpoints/events/get_plan.rs
@@ -5,10 +5,10 @@ use sqlx::PgPool;
use crate::{
endpoints::IdPath,
filters,
- models::{Availability, AvailabillityAssignmentState, Event, Role, User, Vehicle},
+ models::{Availability, AvailabilityAssignmentState, Event, Role, User, Vehicle},
utils::{
event_planning_template::{
- generate_availabillity_assignment_list, generate_status_whether_staff_is_required,
+ generate_availability_assignment_list, generate_status_whether_staff_is_required,
generate_vehicles_assigned_and_available,
},
ApplicationError, TemplateResponse,
@@ -20,7 +20,7 @@ use crate::{
pub struct PlanEventTemplate {
user: User,
event: Event,
- availabillities: Vec<(Availability, AvailabillityAssignmentState)>,
+ availabilities: Vec<(Availability, AvailabilityAssignmentState)>,
further_posten_required: bool,
further_fuehrungsassistent_required: bool,
further_wachhabender_required: bool,
@@ -46,7 +46,7 @@ pub async fn get(
return Err(ApplicationError::Unauthorized);
}
- let availabillities = generate_availabillity_assignment_list(pool.get_ref(), &event).await?;
+ let availabilities = generate_availability_assignment_list(pool.get_ref(), &event).await?;
let (
further_posten_required,
@@ -60,7 +60,7 @@ pub async fn get(
let template = PlanEventTemplate {
user: user.into_inner(),
event,
- availabillities,
+ availabilities,
further_posten_required,
further_fuehrungsassistent_required,
further_wachhabender_required,
diff --git a/web/src/endpoints/events/post_edit.rs b/web/src/endpoints/events/post_edit.rs
index f50c6221..0a6a7866 100644
--- a/web/src/endpoints/events/post_edit.rs
+++ b/web/src/endpoints/events/post_edit.rs
@@ -64,11 +64,11 @@ pub async fn post(
let mut common_time = (start.and_time(START_OF_DAY), end.and_time(END_OF_DAY));
for assignment in &assignments_for_event {
- let availability = Availability::read_by_id(pool.get_ref(), assignment.availabillity_id)
+ let availability = Availability::read_by_id(pool.get_ref(), assignment.availability_id)
.await?
.unwrap();
let all_assignments =
- Assignment::read_all_by_availabillity(pool.get_ref(), assignment.availabillity_id)
+ Assignment::read_all_by_availability(pool.get_ref(), assignment.availability_id)
.await?;
if all_assignments.len() == 1 {
@@ -141,7 +141,7 @@ pub async fn post(
function: a.function,
time: changeset.time,
};
- Assignment::update(pool.get_ref(), a.event_id, a.availabillity_id, c).await?;
+ Assignment::update(pool.get_ref(), a.event_id, a.availability_id, c).await?;
}
}
diff --git a/web/src/endpoints/export/get_availability_data.rs b/web/src/endpoints/export/get_availability_data.rs
index d2b10ec4..905f3392 100644
--- a/web/src/endpoints/export/get_availability_data.rs
+++ b/web/src/endpoints/export/get_availability_data.rs
@@ -25,11 +25,11 @@ struct Export {
year: u16,
month: u8,
area: String,
- availabillities: Vec,
+ availabilities: Vec,
}
#[derive(Serialize)]
-struct ExportAvailabillity {
+struct ExportAvailability {
name: String,
area: String,
function: UserFunction,
@@ -63,12 +63,12 @@ pub async fn get(
user.area_id
};
- let availabillities =
+ let availabilities =
Availability::read_for_export(pool.get_ref(), (start_date, end_date), area_id).await?;
- let export_availabillities = availabillities
+ let export_availabilities = availabilities
.into_iter()
- .map(|a| ExportAvailabillity {
+ .map(|a| ExportAvailability {
name: a.user.as_ref().unwrap().name.clone(),
area: a.user.as_ref().unwrap().area.as_ref().unwrap().name.clone(),
function: a.user.unwrap().function,
@@ -88,7 +88,7 @@ pub async fn get(
year: query.year,
month: query.month,
area,
- availabillities: export_availabillities,
+ availabilities: export_availabilities,
};
let (out, content_type) = match query.format.as_str() {
diff --git a/web/src/endpoints/vehicle_assignment/delete.rs b/web/src/endpoints/vehicle_assignment/delete.rs
index 3999ea96..74db8c24 100644
--- a/web/src/endpoints/vehicle_assignment/delete.rs
+++ b/web/src/endpoints/vehicle_assignment/delete.rs
@@ -4,7 +4,7 @@ use sqlx::PgPool;
use crate::{
endpoints::vehicle_assignment::PlanVehiclesPartialTemplate,
- models::{Event, Role, User, VehicleAssignement},
+ models::{Event, Role, User, VehicleAssignment},
utils::{
event_planning_template::generate_vehicles_assigned_and_available, ApplicationError,
TemplateResponse,
@@ -37,12 +37,12 @@ pub async fn delete(
}
let Some(vehicle_assignment) =
- VehicleAssignement::read(pool.get_ref(), event.id, query.vehicle).await?
+ VehicleAssignment::read(pool.get_ref(), event.id, query.vehicle).await?
else {
return Ok(HttpResponse::NotFound().finish());
};
- VehicleAssignement::delete(
+ VehicleAssignment::delete(
pool.get_ref(),
vehicle_assignment.event_id,
vehicle_assignment.vehicle_id,
diff --git a/web/src/endpoints/vehicle_assignment/post_new.rs b/web/src/endpoints/vehicle_assignment/post_new.rs
index a609ca4d..12476a08 100644
--- a/web/src/endpoints/vehicle_assignment/post_new.rs
+++ b/web/src/endpoints/vehicle_assignment/post_new.rs
@@ -4,7 +4,7 @@ use sqlx::PgPool;
use crate::{
endpoints::vehicle_assignment::PlanVehiclesPartialTemplate,
- models::{Event, Role, User, Vehicle, VehicleAssignement},
+ models::{Event, Role, User, Vehicle, VehicleAssignment},
utils::{
event_planning_template::generate_vehicles_assigned_and_available, ApplicationError,
TemplateResponse,
@@ -45,16 +45,16 @@ pub async fn post(
return Ok(HttpResponse::NotFound().finish());
};
- let existing_assignments_for_vehicle = VehicleAssignement::read_all_by_vehicle_and_date(
+ let existing_assignments_for_vehicle = VehicleAssignment::read_all_by_vehicle_and_date(
pool.get_ref(),
vehicle.id,
event.start.date(),
)
.await?;
let has_start_time_during_event =
- |a: &VehicleAssignement| a.start >= event.start && a.start <= event.end;
+ |a: &VehicleAssignment| a.start >= event.start && a.start <= event.end;
let has_end_time_during_event =
- |a: &VehicleAssignement| a.end >= event.start && a.end <= event.end;
+ |a: &VehicleAssignment| a.end >= event.start && a.end <= event.end;
let availability_already_assigned = existing_assignments_for_vehicle
.iter()
@@ -65,7 +65,7 @@ pub async fn post(
.body("Vehicle already assigned to a timely conflicting event."));
}
- VehicleAssignement::create(pool.get_ref(), event.id, vehicle.id, event.start, event.end)
+ VehicleAssignment::create(pool.get_ref(), event.id, vehicle.id, event.start, event.end)
.await?;
let (vehicles_assigned, vehicles_available) =
diff --git a/web/src/models/assignement.rs b/web/src/models/assignment.rs
similarity index 75%
rename from web/src/models/assignement.rs
rename to web/src/models/assignment.rs
index fc215f59..8168da08 100644
--- a/web/src/models/assignement.rs
+++ b/web/src/models/assignment.rs
@@ -5,7 +5,7 @@ use super::{assignment_changeset::AssignmentChangeset, Function, Result};
pub struct Assignment {
pub event_id: i32,
- pub availabillity_id: i32,
+ pub availability_id: i32,
pub function: Function,
pub start: NaiveDateTime,
pub end: NaiveDateTime,
@@ -15,16 +15,16 @@ impl Assignment {
pub async fn create(
pool: &PgPool,
event_id: i32,
- availabillity_id: i32,
+ availability_id: i32,
changeset: AssignmentChangeset,
) -> Result<()> {
query!(
r##"
- INSERT INTO assignment (eventId, availabillityId, function, startTimestamp, endTimestamp)
+ INSERT INTO assignment (eventId, availabilityId, function, startTimestamp, endTimestamp)
VALUES ($1, $2, $3, $4, $5);
"##,
event_id,
- availabillity_id,
+ availability_id,
changeset.function as Function,
changeset.time.0.and_utc(),
changeset.time.1.and_utc()
@@ -35,22 +35,22 @@ impl Assignment {
Ok(())
}
- pub async fn read_all_by_availabillity(
+ pub async fn read_all_by_availability(
pool: &PgPool,
- availabillity_id: i32,
+ availability_id: i32,
) -> Result> {
let records = query!(
r##"
SELECT
assignment.eventId,
- assignment.availabillityId,
+ assignment.availabilityId,
assignment.function AS "function: Function",
assignment.startTimestamp,
assignment.endTimestamp
FROM assignment
- WHERE assignment.AvailabillityId = $1;
+ WHERE assignment.AvailabilityId = $1;
"##,
- availabillity_id
+ availability_id
)
.fetch_all(pool)
.await?;
@@ -59,7 +59,7 @@ impl Assignment {
.iter()
.map(|r| Assignment {
event_id: r.eventid,
- availabillity_id: r.availabillityid,
+ availability_id: r.availabilityid,
function: r.function,
start: r.starttimestamp.naive_utc(),
end: r.endtimestamp.naive_utc(),
@@ -74,7 +74,7 @@ impl Assignment {
r##"
SELECT
assignment.eventId,
- assignment.availabillityId,
+ assignment.availabilityId,
assignment.function AS "function: Function",
assignment.startTimestamp,
assignment.endTimestamp
@@ -90,7 +90,7 @@ impl Assignment {
.iter()
.map(|r| Assignment {
event_id: r.eventid,
- availabillity_id: r.availabillityid,
+ availability_id: r.availabilityid,
function: r.function,
start: r.starttimestamp.naive_utc(),
end: r.endtimestamp.naive_utc(),
@@ -103,30 +103,30 @@ impl Assignment {
pub async fn read(
pool: &PgPool,
event_id: i32,
- availabillity_id: i32,
+ availability_id: i32,
) -> Result> {
let record = query!(
r##"
SELECT
assignment.eventId,
- assignment.availabillityId,
+ assignment.availabilityId,
assignment.function AS "function: Function",
assignment.startTimestamp,
assignment.endTimestamp
FROM assignment
WHERE
assignment.eventId = $1 AND
- assignment.availabillityId = $2;
+ assignment.availabilityId = $2;
"##,
event_id,
- availabillity_id
+ availability_id
)
.fetch_optional(pool)
.await?;
let assignemnet = record.map(|r| Assignment {
event_id: r.eventid,
- availabillity_id: r.availabillityid,
+ availability_id: r.availabilityid,
function: r.function,
start: r.starttimestamp.naive_utc(),
end: r.endtimestamp.naive_utc(),
@@ -138,18 +138,18 @@ impl Assignment {
pub async fn update(
pool: &PgPool,
event_id: i32,
- availabillity_id: i32,
+ availability_id: i32,
changeset: AssignmentChangeset,
) -> Result<()> {
- query!("UPDATE assignment SET function = $1, startTimestamp = $2, endTimestamp = $3 WHERE eventId = $4 AND availabillityId = $5;", changeset.function as Function, changeset.time.0.and_utc(), changeset.time.1.and_utc(), event_id, availabillity_id).execute(pool).await?;
+ query!("UPDATE assignment SET function = $1, startTimestamp = $2, endTimestamp = $3 WHERE eventId = $4 AND availabilityId = $5;", changeset.function as Function, changeset.time.0.and_utc(), changeset.time.1.and_utc(), event_id, availability_id).execute(pool).await?;
Ok(())
}
- pub async fn delete(pool: &PgPool, event_id: i32, availabillity_id: i32) -> Result<()> {
- query!("DELETE FROM assignment WHERE assignment.eventId = $1 AND assignment.availabillityId = $2;",
+ pub async fn delete(pool: &PgPool, event_id: i32, availability_id: i32) -> Result<()> {
+ query!("DELETE FROM assignment WHERE assignment.eventId = $1 AND assignment.availabilityId = $2;",
event_id,
- availabillity_id
+ availability_id
)
.execute(pool)
.await?;
diff --git a/web/src/models/assignment_changeset.rs b/web/src/models/assignment_changeset.rs
index e11944cc..5dfac144 100644
--- a/web/src/models/assignment_changeset.rs
+++ b/web/src/models/assignment_changeset.rs
@@ -8,7 +8,7 @@ use super::{
#[derive(Validate)]
#[garde(allow_unvalidated)]
#[garde(context(AssignmentContext as ctx))]
-/// check before: event and availabillity and must exist and user of availabillity is in event location
+/// check before: event and availability and must exist and user of availability is in event location
pub struct AssignmentChangeset {
#[garde(
custom(user_of_availability_has_function),
@@ -18,24 +18,24 @@ pub struct AssignmentChangeset {
#[garde(
custom(available_time_fits),
custom(start_date_time_lies_before_end_date_time),
- custom(availabillity_not_already_assigned)
+ custom(availability_not_already_assigned)
)]
pub time: (NaiveDateTime, NaiveDateTime),
}
pub struct AssignmentContext {
pub event: Event,
- pub availabillity: Availability,
+ pub availability: Availability,
pub user_function: UserFunction,
pub assignments_for_event: Vec,
- pub assignments_for_availabillity: Vec,
+ pub assignments_for_availability: Vec,
}
fn available_time_fits(
value: &(NaiveDateTime, NaiveDateTime),
context: &AssignmentContext,
) -> garde::Result {
- if value.0 < context.availabillity.start || value.1 > context.availabillity.end {
+ if value.0 < context.availability.start || value.1 > context.availability.end {
return Err(garde::Error::new(
"time not made available can't be assigned",
));
@@ -65,7 +65,7 @@ fn event_has_free_slot_for_function(
.assignments_for_event
.iter()
.filter(|a| {
- a.availabillity_id != context.availabillity.id && a.event_id != context.event.id
+ a.availability_id != context.availability.id && a.event_id != context.event.id
})
.collect();
@@ -86,15 +86,15 @@ fn event_has_free_slot_for_function(
Ok(())
}
-fn availabillity_not_already_assigned(
+fn availability_not_already_assigned(
value: &(NaiveDateTime, NaiveDateTime),
context: &AssignmentContext,
) -> garde::Result {
let list: Vec<&Assignment> = context
- .assignments_for_availabillity
+ .assignments_for_availability
.iter()
.filter(|a| {
- a.availabillity_id != context.availabillity.id && a.event_id != context.event.id
+ a.availability_id != context.availability.id && a.event_id != context.event.id
})
.collect();
@@ -107,7 +107,7 @@ fn availabillity_not_already_assigned(
.any(|a| has_start_time_during_assignment(a) || has_end_time_during_assignment(a))
{
return Err(garde::Error::new(
- "availabillity is already assigned for that time",
+ "availability is already assigned for that time",
));
}
diff --git a/web/src/models/availabillity.rs b/web/src/models/availability.rs
similarity index 73%
rename from web/src/models/availabillity.rs
rename to web/src/models/availability.rs
index d3f00429..d679cb77 100644
--- a/web/src/models/availabillity.rs
+++ b/web/src/models/availability.rs
@@ -14,7 +14,6 @@ pub struct Availability {
}
impl Availability {
- // TODO: fix db name
pub async fn create(
pool: &PgPool,
user_id: i32,
@@ -22,7 +21,7 @@ impl Availability {
) -> Result<()> {
query!(
r#"
- INSERT INTO availabillity (userId, startTimestamp, endTimestamp, comment)
+ INSERT INTO availability (userId, startTimestamp, endTimestamp, comment)
VALUES ($1, $2, $3, $4);
"#,
user_id,
@@ -44,11 +43,11 @@ impl Availability {
let records = query!(
r##"
SELECT
- availabillity.id,
- availabillity.userId,
- availabillity.startTimestamp,
- availabillity.endTimestamp,
- availabillity.comment,
+ availability.id,
+ availability.userId,
+ availability.startTimestamp,
+ availability.endTimestamp,
+ availability.comment,
user_.name,
user_.email,
user_.password,
@@ -59,9 +58,9 @@ impl Availability {
user_.locked,
user_.lastLogin,
user_.receiveNotifications
- FROM availabillity
- JOIN user_ ON availabillity.userId = user_.id
- WHERE availabillity.startTimestamp::date = $1
+ FROM availability
+ JOIN user_ ON availability.userId = user_.id
+ WHERE availability.startTimestamp::date = $1
AND user_.areaId = $2;
"##,
date,
@@ -70,7 +69,7 @@ impl Availability {
.fetch_all(pool)
.await?;
- let availabillities = records
+ let availabilities = records
.iter()
.map(|r| Availability {
id: r.id,
@@ -95,7 +94,7 @@ impl Availability {
})
.collect();
- Ok(availabillities)
+ Ok(availabilities)
}
pub async fn read_by_date_time_area_including_user(
@@ -107,11 +106,11 @@ impl Availability {
let records = query!(
r##"
SELECT
- availabillity.id,
- availabillity.userId,
- availabillity.startTimestamp,
- availabillity.endTimestamp,
- availabillity.comment,
+ availability.id,
+ availability.userId,
+ availability.startTimestamp,
+ availability.endTimestamp,
+ availability.comment,
user_.name,
user_.email,
user_.password,
@@ -122,11 +121,11 @@ impl Availability {
user_.locked,
user_.lastLogin,
user_.receiveNotifications
- FROM availabillity
- JOIN user_ ON availabillity.userId = user_.id
- WHERE availabillity.starttimestamp::date = $1
+ FROM availability
+ JOIN user_ ON availability.userId = user_.id
+ WHERE availability.starttimestamp::date = $1
AND user_.areaId = $2
- AND availabillity.startTimestamp <= $3 AND availabillity.endTimestamp >= $4;
+ AND availability.startTimestamp <= $3 AND availability.endTimestamp >= $4;
"##,
date,
area_id,
@@ -136,7 +135,7 @@ impl Availability {
.fetch_all(pool)
.await?;
- let availabillities = records
+ let availabilities = records
.iter()
.map(|r| Availability {
id: r.id,
@@ -161,18 +160,18 @@ impl Availability {
})
.collect();
- Ok(availabillities)
+ Ok(availabilities)
}
pub async fn read_by_id_including_user(pool: &PgPool, id: i32) -> Result> {
let record = query!(
r##"
SELECT
- availabillity.id,
- availabillity.userId,
- availabillity.startTimestamp,
- availabillity.endTimestamp,
- availabillity.comment,
+ availability.id,
+ availability.userId,
+ availability.startTimestamp,
+ availability.endTimestamp,
+ availability.comment,
user_.name,
user_.email,
user_.password,
@@ -183,17 +182,17 @@ impl Availability {
user_.locked,
user_.lastLogin,
user_.receiveNotifications
- FROM availabillity
- LEFT JOIN assignment ON availabillity.Id = assignment.availabillityId
- JOIN user_ ON availabillity.userId = user_.id
- WHERE availabillity.id = $1;
+ FROM availability
+ LEFT JOIN assignment ON availability.Id = assignment.availabilityId
+ JOIN user_ ON availability.userId = user_.id
+ WHERE availability.id = $1;
"##,
id
)
.fetch_optional(pool)
.await?;
- let availabillity = record.map(|r| Availability {
+ let availability = record.map(|r| Availability {
id: r.id,
user_id: r.userid,
user: Some(User {
@@ -215,15 +214,15 @@ impl Availability {
comment: r.comment.clone(),
});
- Ok(availabillity)
+ Ok(availability)
}
pub async fn read_by_id(pool: &PgPool, id: i32) -> Result> {
- let record = query!("SELECT * FROM availabillity WHERE id = $1", id)
+ let record = query!("SELECT * FROM availability WHERE id = $1", id)
.fetch_optional(pool)
.await?;
- let availabillity = record.map(|record| Availability {
+ let availability = record.map(|record| Availability {
id: record.id,
user_id: record.userid,
user: None,
@@ -232,7 +231,7 @@ impl Availability {
comment: record.comment.clone(),
});
- Ok(availabillity)
+ Ok(availability)
}
pub async fn read_for_export(
@@ -243,11 +242,11 @@ impl Availability {
let records = query!(
r##"
SELECT
- availabillity.id,
- availabillity.userId,
- availabillity.startTimestamp,
- availabillity.endTimestamp,
- availabillity.comment,
+ availability.id,
+ availability.userId,
+ availability.startTimestamp,
+ availability.endTimestamp,
+ availability.comment,
user_.name,
user_.email,
user_.password,
@@ -259,12 +258,12 @@ impl Availability {
user_.lastLogin,
user_.receiveNotifications,
area.name AS areaName
- FROM availabillity
- JOIN user_ ON availabillity.userId = user_.id
+ FROM availability
+ JOIN user_ ON availability.userId = user_.id
JOIN area ON user_.areaId = area.id
WHERE user_.areaId = $1 AND
- availabillity.starttimestamp::date >= $2 AND
- availabillity.starttimestamp::date <= $3;
+ availability.starttimestamp::date >= $2 AND
+ availability.starttimestamp::date <= $3;
"##,
area_id,
date_range.0,
@@ -273,7 +272,7 @@ impl Availability {
.fetch_all(pool)
.await?;
- let availabillities = records
+ let availabilities = records
.iter()
.map(|r| Availability {
id: r.id,
@@ -301,7 +300,7 @@ impl Availability {
})
.collect();
- Ok(availabillities)
+ Ok(availabilities)
}
pub async fn read_by_user_and_date(
@@ -312,14 +311,14 @@ impl Availability {
let records = query!(
r##"
SELECT
- availabillity.id,
- availabillity.userId,
- availabillity.startTimestamp,
- availabillity.endTimestamp,
- availabillity.comment
- FROM availabillity
- WHERE availabillity.userId = $1
- AND availabillity.starttimestamp::date = $2;
+ availability.id,
+ availability.userId,
+ availability.startTimestamp,
+ availability.endTimestamp,
+ availability.comment
+ FROM availability
+ WHERE availability.userId = $1
+ AND availability.starttimestamp::date = $2;
"##,
user_id,
date
@@ -327,7 +326,7 @@ impl Availability {
.fetch_all(pool)
.await?;
- let availabillities = records
+ let availabilities = records
.iter()
.map(|r| Availability {
id: r.id,
@@ -339,12 +338,12 @@ impl Availability {
})
.collect();
- Ok(availabillities)
+ Ok(availabilities)
}
pub async fn update(pool: &PgPool, id: i32, changeset: AvailabilityChangeset) -> Result<()> {
query!(
- "UPDATE availabillity SET startTimestamp = $1, endTimestamp = $2, comment = $3 WHERE id = $4",
+ "UPDATE availability SET startTimestamp = $1, endTimestamp = $2, comment = $3 WHERE id = $4",
changeset.time.0.and_utc(),
changeset.time.1.and_utc(),
changeset.comment,
@@ -357,7 +356,7 @@ impl Availability {
}
pub async fn delete(pool: &PgPool, id: i32) -> Result<()> {
- query!("DELETE FROM availabillity WHERE id = $1", id)
+ query!("DELETE FROM availability WHERE id = $1", id)
.execute(pool)
.await?;
Ok(())
diff --git a/web/src/models/availability_assignment_state.rs b/web/src/models/availability_assignment_state.rs
new file mode 100644
index 00000000..01c9ecb2
--- /dev/null
+++ b/web/src/models/availability_assignment_state.rs
@@ -0,0 +1,14 @@
+#[derive(PartialEq, Eq, Debug)]
+pub enum AvailabilityAssignmentState {
+ // availability is not assigned at all or at least not timely conflicting
+ Unassigned,
+ // availability is assigned for another event that is timely conflicting
+ Conflicting,
+ // availability is assigned to this event as Posten
+ AssignedPosten(i32),
+ // availability is assigned to this event as Führungsassistent
+ AssignedFührungsassistent(i32),
+ // availability is assigned to this event as Wachhabender
+ AssignedWachhabender(i32),
+}
+
diff --git a/web/src/models/availabillity_assignment_state.rs b/web/src/models/availabillity_assignment_state.rs
deleted file mode 100644
index f8050b9f..00000000
--- a/web/src/models/availabillity_assignment_state.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#[derive(PartialEq, Eq, Debug)]
-pub enum AvailabillityAssignmentState {
- // availabillity is not assigned at all or at least not timely conflicting
- Unassigned,
- // availabillity is assigned for another event that is timely conflicting
- Conflicting,
- // availabillity is assigned to this event as Posten
- AssignedPosten(i32),
- // availabillity is assigned to this event as Führungsassistent
- AssignedFührungsassistent(i32),
- // availabillity is assigned to this event as Wachhabender
- AssignedWachhabender(i32),
-}
-
diff --git a/web/src/models/mod.rs b/web/src/models/mod.rs
index 005f6c69..b86490d7 100644
--- a/web/src/models/mod.rs
+++ b/web/src/models/mod.rs
@@ -1,9 +1,9 @@
mod area;
-mod assignement;
+mod assignment;
mod assignment_changeset;
+mod availability;
+mod availability_assignment_state;
mod availability_changeset;
-mod availabillity;
-mod availabillity_assignment_state;
mod event;
mod event_changeset;
mod function;
@@ -15,17 +15,16 @@ mod user;
mod user_changeset;
mod user_funtion;
mod vehicle;
-mod vehicle_assignement;
+mod vehicle_assignment;
pub use area::Area;
-pub use assignement::Assignment;
+pub use assignment::Assignment;
pub use assignment_changeset::{AssignmentChangeset, AssignmentContext};
+pub use availability::Availability;
+pub use availability_assignment_state::AvailabilityAssignmentState;
pub use availability_changeset::{
find_free_date_time_slots, AvailabilityChangeset, AvailabilityContext,
};
-pub use availabillity::Availability;
-pub use availabillity_assignment_state::AvailabillityAssignmentState;
-use chrono::NaiveDateTime;
pub use event::Event;
pub use event_changeset::{EventChangeset, EventContext};
pub use function::Function;
@@ -37,7 +36,9 @@ pub use user::User;
pub use user_changeset::UserChangeset;
pub use user_funtion::UserFunction;
pub use vehicle::Vehicle;
-pub use vehicle_assignement::VehicleAssignement;
+pub use vehicle_assignment::VehicleAssignment;
+
+use chrono::NaiveDateTime;
type Result = std::result::Result;
diff --git a/web/src/models/vehicle_assignement.rs b/web/src/models/vehicle_assignment.rs
similarity index 66%
rename from web/src/models/vehicle_assignement.rs
rename to web/src/models/vehicle_assignment.rs
index aa09e105..7c563eef 100644
--- a/web/src/models/vehicle_assignement.rs
+++ b/web/src/models/vehicle_assignment.rs
@@ -3,14 +3,14 @@ use sqlx::{query, PgPool};
use super::Result;
-pub struct VehicleAssignement {
+pub struct VehicleAssignment {
pub event_id: i32,
pub vehicle_id: i32,
pub start: NaiveDateTime,
pub end: NaiveDateTime,
}
-impl VehicleAssignement {
+impl VehicleAssignment {
pub async fn create(
pool: &PgPool,
event_id: i32,
@@ -19,7 +19,7 @@ impl VehicleAssignement {
end: NaiveDateTime,
) -> Result<()> {
query!(
- "INSERT INTO vehicleassignement (eventId, vehicleId, startTimestamp, endTimestamp) VALUES ($1, $2, $3, $4);",
+ "INSERT INTO vehicleassignment (eventId, vehicleId, startTimestamp, endTimestamp) VALUES ($1, $2, $3, $4);",
event_id,
vehicle_id,
start.and_utc(),
@@ -35,11 +35,11 @@ impl VehicleAssignement {
pool: &PgPool,
event_id: i32,
vehicle_id: i32,
- ) -> Result> {
- let record = query!("SELECT * FROM vehicleAssignement WHERE vehicleAssignement.eventId = $1 AND vehicleAssignement.vehicleId = $2;", event_id, vehicle_id).fetch_optional(pool)
+ ) -> Result> {
+ let record = query!("SELECT * FROM vehicleassignment WHERE vehicleassignment.eventId = $1 AND vehicleassignment.vehicleId = $2;", event_id, vehicle_id).fetch_optional(pool)
.await?;
- let vehicle_assignment = record.map(|r| VehicleAssignement {
+ let vehicle_assignment = record.map(|r| VehicleAssignment {
event_id: r.eventid,
vehicle_id: r.vehicleid,
start: r.starttimestamp.naive_utc(),
@@ -52,9 +52,9 @@ impl VehicleAssignement {
pub async fn read_all_by_event(
pool: &PgPool,
event_id: i32,
- ) -> Result> {
+ ) -> Result> {
let records = query!(
- "SELECT * FROM vehicleAssignement WHERE vehicleAssignement.eventId = $1;",
+ "SELECT * FROM vehicleassignment WHERE vehicleassignment.eventId = $1;",
event_id
)
.fetch_all(pool)
@@ -62,7 +62,7 @@ impl VehicleAssignement {
let vehicle_assignments = records
.iter()
- .map(|r| VehicleAssignement {
+ .map(|r| VehicleAssignment {
event_id: r.eventid,
vehicle_id: r.vehicleid,
start: r.starttimestamp.naive_utc(),
@@ -77,17 +77,17 @@ impl VehicleAssignement {
pool: &PgPool,
vehicle_id: i32,
date: NaiveDate,
- ) -> Result> {
+ ) -> Result> {
let records = query!(
r#"
SELECT
- vehicleAssignement.eventId,
- vehicleAssignement.vehicleId,
- vehicleAssignement.starttimestamp,
- vehicleAssignement.endtimestamp
- FROM vehicleAssignement
- JOIN event ON vehicleAssignement.eventId = event.id
- WHERE vehicleAssignement.vehicleid = $1
+ vehicleassignment.eventId,
+ vehicleassignment.vehicleId,
+ vehicleassignment.starttimestamp,
+ vehicleassignment.endtimestamp
+ FROM vehicleassignment
+ JOIN event ON vehicleassignment.eventId = event.id
+ WHERE vehicleassignment.vehicleid = $1
AND event.starttimestamp::date = $2;
"#,
vehicle_id,
@@ -98,7 +98,7 @@ impl VehicleAssignement {
let vehicle_assignments = records
.iter()
- .map(|r| VehicleAssignement {
+ .map(|r| VehicleAssignment {
event_id: r.eventid,
vehicle_id: r.vehicleid,
start: r.starttimestamp.naive_utc(),
@@ -111,7 +111,7 @@ impl VehicleAssignement {
pub async fn delete(pool: &PgPool, event_id: i32, vehicle_id: i32) -> Result<()> {
query!(
- "DELETE FROM vehicleassignement WHERE eventId = $1 AND vehicleId = $2;",
+ "DELETE FROM vehicleassignment WHERE eventId = $1 AND vehicleId = $2;",
event_id,
vehicle_id
)
diff --git a/web/src/utils/event_planning_template.rs b/web/src/utils/event_planning_template.rs
index 61f7ee0c..199399d9 100644
--- a/web/src/utils/event_planning_template.rs
+++ b/web/src/utils/event_planning_template.rs
@@ -1,17 +1,17 @@
use sqlx::PgPool;
use crate::models::{
- Assignment, Availability, AvailabillityAssignmentState, Event, Function, Vehicle,
- VehicleAssignement,
+ Assignment, Availability, AvailabilityAssignmentState, Event, Function, Vehicle,
+ VehicleAssignment,
};
use super::ApplicationError;
-pub async fn generate_availabillity_assignment_list(
+pub async fn generate_availability_assignment_list(
pool: &PgPool,
event: &Event,
-) -> Result, ApplicationError> {
- let availabillities_in_db = Availability::read_by_date_time_area_including_user(
+) -> Result, ApplicationError> {
+ let availabilities_in_db = Availability::read_by_date_time_area_including_user(
pool,
event.start.date(),
(event.start, event.end),
@@ -19,9 +19,9 @@ pub async fn generate_availabillity_assignment_list(
)
.await?;
- let mut availabillities = Vec::new();
- for availabillity in availabillities_in_db {
- let assignments = Assignment::read_all_by_availabillity(pool, availabillity.id).await?;
+ let mut availabilities = Vec::new();
+ for availability in availabilities_in_db {
+ let assignments = Assignment::read_all_by_availability(pool, availability.id).await?;
if let Some(assignment) = assignments
.iter()
@@ -29,19 +29,19 @@ pub async fn generate_availabillity_assignment_list(
{
let state = match assignment.function {
Function::Posten => {
- AvailabillityAssignmentState::AssignedPosten(assignment.availabillity_id)
+ AvailabilityAssignmentState::AssignedPosten(assignment.availability_id)
}
Function::Fuehrungsassistent => {
- AvailabillityAssignmentState::AssignedFührungsassistent(
- assignment.availabillity_id,
+ AvailabilityAssignmentState::AssignedFührungsassistent(
+ assignment.availability_id,
)
}
Function::Wachhabender => {
- AvailabillityAssignmentState::AssignedWachhabender(assignment.availabillity_id)
+ AvailabilityAssignmentState::AssignedWachhabender(assignment.availability_id)
}
};
- availabillities.push((availabillity, state));
+ availabilities.push((availability, state));
continue;
}
@@ -53,15 +53,15 @@ pub async fn generate_availabillity_assignment_list(
.iter()
.any(|a| has_start_time_during_event(a) || has_end_time_during_event(a))
{
- availabillities.push((availabillity, AvailabillityAssignmentState::Conflicting));
+ availabilities.push((availability, AvailabilityAssignmentState::Conflicting));
continue;
}
- availabillities.push((availabillity, AvailabillityAssignmentState::Unassigned));
+ availabilities.push((availability, AvailabilityAssignmentState::Unassigned));
}
- //println!(" {availabillities:#?}");
- Ok(availabillities)
+ //println!(" {availabilities:#?}");
+ Ok(availabilities)
}
pub async fn generate_status_whether_staff_is_required(
@@ -100,7 +100,7 @@ pub async fn generate_vehicles_assigned_and_available(
) -> Result<(Vec, Vec), ApplicationError> {
let all_vehicles = Vehicle::read_all(pool).await?;
let existing_vehicle_assignments_for_event =
- VehicleAssignement::read_all_by_event(pool, event.id).await?;
+ VehicleAssignment::read_all_by_event(pool, event.id).await?;
let (vehicles_assigned, vehicles_available): (Vec, Vec) =
all_vehicles.into_iter().partition(|v| {
existing_vehicle_assignments_for_event
diff --git a/web/templates/availability/new_or_edit.html b/web/templates/availability/new_or_edit.html
index 3f673b31..c137b672 100644
--- a/web/templates/availability/new_or_edit.html
+++ b/web/templates/availability/new_or_edit.html
@@ -4,7 +4,7 @@
{% let is_edit = id.is_some() %}
-