ITsolved/rezervovator
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cancel approved booking is now possible.

Browse Source
This commit is contained in:
Josef Rokos
2024-04-27 21:05:50 +02:00
parent cb1071c243
commit 084911c992
3 changed files with 64 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/all_reservations.rs
+34 -4
View File
@@ -1,18 +1,25 @@
use chrono::{Datelike, Local};
use leptos::*;
use crate::backend::data::{ApiResponse, ResSumWithItems};
use crate::backend::data::{ApiResponse, ReservationState, ResSumWithItems};
use crate::backend::reservation::{month_chart, reservations_in_month, year_chart, years};
use crate::components::modal_box::{DialogOpener, ModalBody, ModalDialog};
use crate::components::user_menu::MenuOpener;
use crate::locales::{loc_date, show_day, trl};
use crate::pages::new_reservations::CancelDialog;
#[component]
fn booking_detail(reservation: ReadSignal<ResSumWithItems>, opener: DialogOpener) -> impl IntoView {
let menu = MenuOpener::new();
let cancel_opener = DialogOpener::new();
let menu_visible = create_rw_signal(false);
view! {
<CancelDialog opener=cancel_opener reservation=reservation/>
<ModalDialog title="Booking detail" opener=opener>
<ModalBody>
<p>
{move || {
let detail = reservation.get();
menu_visible.set(detail.summary.state != ReservationState::Canceled);
view! {
<b>{show_day(&detail.summary.date.weekday())}" - "{loc_date(detail.summary.date)}</b><br/>
<For each=move || detail.reservations.clone()
@@ -30,10 +37,33 @@ fn booking_detail(reservation: ReadSignal<ResSumWithItems>, opener: DialogOpener
</Show>
}
}
{trl("Price: ")}{detail.summary.price.to_string()}<br/>
{trl("Price: ")}{detail.summary.price.to_string()}
}
}}
</p>
<Show when=move || menu_visible.get()>
<table width="100%">
<tr>
<td width="100%"></td>
<td>
<div class="dropdown">
<button type="button" class="btn p-0 dropdown-toggle hide-arrow"
on:click=move |_| menu.toggle()>
<i class="bx bx-dots-vertical-rounded"></i>
</button>
<div class={move || if menu.visible() {"dropdown-menu show"} else {"dropdown-menu"} }
style="position: absolute; insert: 0px 0px auto; margin: 0px; transform: translate3d(-160px, 0px, 0px);"
on:mouseleave=move |_| menu.toggle()>
<a class="dropdown-item text-danger" href="javascript:void(0);" on:click=move |_| {
cancel_opener.show();
}>
<i class="bx bx-trash me-1"></i> {trl("Cancel")}</a>
</div>
</div>
</td>
</tr>
</table>
</Show>
</ModalBody>
</ModalDialog>
}
@@ -46,10 +76,10 @@ pub fn bookings() -> impl IntoView {
let year = create_rw_signal(Local::now().year());
let month = create_rw_signal(Local::now().month());
let chart = create_blocking_resource(move || year.get(),move |y| month_chart(y));
let reservations = create_blocking_resource(move || (year.get(), month.get()), move |p| reservations_in_month(p.0, p.1));
let detail_dlg = DialogOpener::new();
let reservations = create_blocking_resource(move || (year.get(), month.get(), detail_dlg.visible()), move |p| reservations_in_month(p.0, p.1));
let all_months: Vec<u32> = vec![1,2,3,4,5,6,7,8,9,10,11,12];
let res_detail = create_rw_signal(ResSumWithItems::default());
let detail_dlg = DialogOpener::new();
view! {
<h1>{trl("Booking overview")}</h1>
src/pages/new_reservations.rs
+1 -1
View File
@@ -26,7 +26,7 @@ fn approve_dialog(reservation: ReadSignal<ResSumWithItems>, opener: DialogOpener
}
#[component]
fn cancel_dialog(reservation: ReadSignal<ResSumWithItems>, opener: DialogOpener) -> impl IntoView {
pub fn cancel_dialog(reservation: ReadSignal<ResSumWithItems>, opener: DialogOpener) -> impl IntoView {
let cancel = create_server_action::<Cancel>();
view! {
src/pages/today_reservations.rs
+29 -1
View File
@@ -1,15 +1,20 @@
use leptos::*;
use crate::backend::data::ApiResponse;
use crate::backend::data::{ApiResponse, ResSumWithItems};
use crate::backend::reservation::get_next_reservations;
use crate::components::modal_box::DialogOpener;
use crate::locales::{loc_date, show_day, trl};
use chrono::Datelike;
use crate::components::user_menu::MenuOpener;
use crate::pages::new_reservations::CancelDialog;
#[component]
pub fn next_reservations(app_opener: DialogOpener, cancel_opener: DialogOpener) -> impl IntoView {
let res = create_blocking_resource( move || app_opener.visible() || cancel_opener.visible(), move |_| get_next_reservations());
let menu = MenuOpener::new();
let reservation = create_rw_signal(ResSumWithItems::default());
view! {
<CancelDialog opener=cancel_opener reservation=reservation.read_only()/>
<div class="card mb-3">
<div class="card-body">
<h5 class="card-title"><i class="bx bx-basket"></i>" "{trl("Next approved bookings")}</h5>
@@ -27,6 +32,7 @@ pub fn next_reservations(app_opener: DialogOpener, cancel_opener: DialogOpener)
let:data>
{move || {
let data = data.clone();
let cancel_data = data.clone();
view! {
<b>{show_day(&data.summary.date.weekday())}" - "{loc_date(data.summary.date)}</b><br/>
<For each=move || data.reservations.clone()
@@ -45,6 +51,28 @@ pub fn next_reservations(app_opener: DialogOpener, cancel_opener: DialogOpener)
}
}}
{trl("Price: ")}{data.summary.price.to_string()}<br/>
<table width="100%">
<tr>
<td width="100%"></td>
<td>
<div class="dropdown">
<button type="button" class="btn p-0 dropdown-toggle hide-arrow"
on:click=move |_| menu.toggle()>
<i class="bx bx-dots-vertical-rounded"></i>
</button>
<div class={move || if menu.visible() {"dropdown-menu show"} else {"dropdown-menu"} }
style="position: absolute; insert: 0px 0px auto; margin: 0px; transform: translate3d(-160px, 0px, 0px);"
on:mouseleave=move |_| menu.toggle()>
<a class="dropdown-item text-danger" href="javascript:void(0);" on:click=move |_| {
reservation.set(cancel_data.clone());
cancel_opener.show();
}>
<i class="bx bx-trash me-1"></i> {trl("Cancel")}</a>
</div>
</div>
</td>
</tr>
</table>
<hr/>
}
}}