Merge pull request 'allow changing title of planned-event; fixes #52' (#193) from staging into main
Some checks failed
CI/CD Pipeline / test (push) Failing after 3m29s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped

Reviewed-on: #193
This commit is contained in:
philipp 2024-01-24 22:48:18 +01:00
commit 24667e56a4
3 changed files with 6 additions and 1 deletions

View File

@ -210,6 +210,7 @@ INNER JOIN trip_details ON planned_event.trip_details_id = trip_details.id",
pub async fn update( pub async fn update(
&self, &self,
db: &SqlitePool, db: &SqlitePool,
name: &str,
planned_amount_cox: i32, planned_amount_cox: i32,
max_people: i32, max_people: i32,
notes: Option<&str>, notes: Option<&str>,
@ -217,7 +218,8 @@ INNER JOIN trip_details ON planned_event.trip_details_id = trip_details.id",
is_locked: bool, is_locked: bool,
) { ) {
sqlx::query!( sqlx::query!(
"UPDATE planned_event SET planned_amount_cox = ? WHERE id = ?", "UPDATE planned_event SET name = ?, planned_amount_cox = ? WHERE id = ?",
name,
planned_amount_cox, planned_amount_cox,
self.id self.id
) )

View File

@ -43,6 +43,7 @@ async fn create(
#[derive(FromForm)] #[derive(FromForm)]
struct UpdatePlannedEventForm<'r> { struct UpdatePlannedEventForm<'r> {
id: i64, id: i64,
name: &'r str,
planned_amount_cox: i32, planned_amount_cox: i32,
max_people: i32, max_people: i32,
notes: Option<&'r str>, notes: Option<&'r str>,
@ -61,6 +62,7 @@ async fn update(
planned_event planned_event
.update( .update(
db, db,
data.name,
data.planned_amount_cox, data.planned_amount_cox,
data.max_people, data.max_people,
data.notes, data.notes,

View File

@ -181,6 +181,7 @@
<form action="/admin/planned-event" method="post" class="grid gap-3"> <form action="/admin/planned-event" method="post" class="grid gap-3">
<input type="hidden" name="_method" value="put"/> <input type="hidden" name="_method" value="put"/>
<input type="hidden" name="id" value="{{ planned_event.id }}"/> <input type="hidden" name="id" value="{{ planned_event.id }}"/>
{{ macros::input(label='Titel', name='name', type='input', value=planned_event.name) }}
{{ macros::input(label='Anzahl Ruderer', name='max_people', type='number', required=true, value=planned_event.max_people, min='0') }} {{ macros::input(label='Anzahl Ruderer', name='max_people', type='number', required=true, value=planned_event.max_people, min='0') }}
{{ macros::input(label='Anzahl Steuerleute', name='planned_amount_cox', type='number', value=planned_event.planned_amount_cox, required=true, min='0') }} {{ macros::input(label='Anzahl Steuerleute', name='planned_amount_cox', type='number', value=planned_event.planned_amount_cox, required=true, min='0') }}
{{ macros::checkbox(label='Immer anzeigen', name='always_show', id=planned_event.id,checked=planned_event.always_show) }} {{ macros::checkbox(label='Immer anzeigen', name='always_show', id=planned_event.id,checked=planned_event.always_show) }}