diff options
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/form/mod.rs (renamed from src/app/form.rs) | 55 | ||||
| -rw-r--r-- | src/app/form/repetition.rs | 151 | ||||
| -rw-r--r-- | src/app/style.css | 4 | ||||
| -rw-r--r-- | src/app/update.rs | 14 |
4 files changed, 200 insertions, 24 deletions
diff --git a/src/app/form.rs b/src/app/form/mod.rs index 7f75db0..5c60bc5 100644 --- a/src/app/form.rs +++ b/src/app/form/mod.rs @@ -1,3 +1,5 @@ +mod repetition; + use gtk4 as gtk; use gtk::glib; @@ -19,19 +21,32 @@ pub async fn show(app: &App, event: Event, is_new: bool) { let content_area = dialog.content_area(); - let vbox = gtk::Box::builder() + let lines = gtk::Box::builder() + .orientation(gtk::Orientation::Vertical) + .build(); + content_area.append(&lines); + + let columns = gtk::Box::builder() + .orientation(gtk::Orientation::Horizontal) + .build(); + columns.add_css_class("g-Form__Columns"); + lines.append(&columns); + + // First column + + let column1 = gtk::Box::builder() .orientation(gtk::Orientation::Vertical) .build(); - vbox.add_css_class("g-Form__Inputs"); - content_area.append(&vbox); + column1.add_css_class("g-Form__Inputs"); + columns.append(&column1); let name = entry(&event.name); - vbox.append(&label("Événement")); - vbox.append(&name); + column1.append(&label("Événement")); + column1.append(&name); let date = entry(&event.date.format(event::DATE_FORMAT).to_string()); - vbox.append(&label("Jour")); - vbox.append(&date); + column1.append(&label("Jour")); + column1.append(&date); let start = entry( &event @@ -39,22 +54,30 @@ pub async fn show(app: &App, event: Event, is_new: bool) { .map(event::pprint_time) .unwrap_or("".to_string()), ); - vbox.append(&label("Début")); - vbox.append(&start); + column1.append(&label("Début")); + column1.append(&start); let end = entry(&event.end.map(event::pprint_time).unwrap_or("".to_string())); - vbox.append(&label("Fin")); - vbox.append(&end); + column1.append(&label("Fin")); + column1.append(&end); + + // Second column + + let repetition_model = repetition::view(&event); + columns.append(&repetition_model.view); + + // Buttons let button = gtk::Button::builder() .label(if is_new { "Créer" } else { "Modifier" }) .margin_bottom(10) .build(); - vbox.append(&button); + lines.append(&button); let conn = app.conn.clone(); let tx = app.tx.clone(); button.connect_clicked(glib::clone!(@weak dialog, @strong event => move |_| { - match event::validate(event.id, date.buffer().text(), name.buffer().text(), start.buffer().text(), end.buffer().text()) { + let repetition = repetition::validate(&repetition_model).clone(); + match event::validate(event.id, date.buffer().text(), name.buffer().text(), start.buffer().text(), end.buffer().text(), repetition) { Some(new) => { match if is_new { db::insert(&conn, &new) } else { db::update(&conn, &new) } { Ok(_) => { @@ -62,16 +85,16 @@ pub async fn show(app: &App, event: Event, is_new: bool) { update::send(tx.clone(), msg); dialog.close() }, - Err(_) => () + Err(err) => println!("Error when upserting event: {err}") } }, - None => () + None => println!("Event is not valid: {event:?}") } })); if !is_new { let button = gtk::Button::builder().label("Supprimer").build(); - vbox.append(&button); + lines.append(&button); let conn = app.conn.clone(); let tx = app.tx.clone(); button.connect_clicked(glib::clone!(@weak dialog => move |_| { diff --git a/src/app/form/repetition.rs b/src/app/form/repetition.rs new file mode 100644 index 0000000..ac56479 --- /dev/null +++ b/src/app/form/repetition.rs @@ -0,0 +1,151 @@ +use gtk4 as gtk; + +use chrono::{Weekday, Weekday::*}; +use gtk::prelude::*; + +use crate::{ + model::event::Event, + model::{ + repetition, + repetition::{MonthFrequency, Repetition}, + }, +}; + +static WEEKDAYS_STR: [&str; 7] = [ + "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche", +]; + +static WEEKDAYS: [Weekday; 7] = [Mon, Tue, Wed, Thu, Fri, Sat, Sun]; + +pub struct Model { + pub view: gtk::Box, + pub no_radio: gtk::CheckButton, + pub day_interval_radio: gtk::CheckButton, + pub day_interval_entry: gtk::Entry, + pub monthly_radio: gtk::CheckButton, + pub monthly_entry: gtk::Entry, + pub first_day_radio: gtk::CheckButton, + pub first_day_dropdown: gtk::DropDown, + pub yearly_radio: gtk::CheckButton, +} + +pub fn view(event: &Event) -> Model { + let view = gtk::Box::builder() + .orientation(gtk::Orientation::Vertical) + .build(); + view.add_css_class("g-Form__Inputs"); + + view.append(&label("Répétition")); + + let no_radio = gtk::CheckButton::builder() + .label("Non") + .active(event.repetition.is_none()) + .build(); + view.append(&no_radio); + + let default = match event.repetition { + Some(Repetition::Daily { frequency }) => frequency.to_string(), + _ => "".to_string(), + }; + let day_interval_entry = gtk::Entry::builder().text(&default).build(); + let (day_interval_box, day_interval_radio) = radio_input( + &no_radio, + !default.is_empty(), + &day_interval_entry, + "Interval de jours", + ); + view.append(&day_interval_box); + + let default = match event.repetition { + Some(Repetition::Monthly { + frequency: MonthFrequency::Day { day }, + }) => day.to_string(), + _ => "".to_string(), + }; + let monthly_entry = gtk::Entry::builder().text(&default).build(); + let (monthly_box, monthly_radio) = + radio_input(&no_radio, !default.is_empty(), &monthly_entry, "Mensuel"); + view.append(&monthly_box); + + let (active, default) = match event.repetition { + Some(Repetition::Monthly { + frequency: MonthFrequency::FirstDay { day }, + }) => (true, day), + _ => (false, Mon), + }; + let first_day_dropdown = gtk::DropDown::from_strings(&WEEKDAYS_STR); + first_day_dropdown + .set_selected(WEEKDAYS.iter().position(|d| d == &default).unwrap_or(0) as u32); + let (first_day_of_month_box, first_day_radio) = + radio_input(&no_radio, active, &first_day_dropdown, "1er jour du mois"); + view.append(&first_day_of_month_box); + + let yearly_radio = gtk::CheckButton::builder() + .group(&no_radio) + .label("Annuel") + .active(event.repetition == Some(Repetition::Yearly)) + .build(); + view.append(&yearly_radio); + + Model { + view, + no_radio, + day_interval_radio, + day_interval_entry, + monthly_radio, + monthly_entry, + first_day_radio, + first_day_dropdown, + yearly_radio, + } +} + +fn radio_input( + radio_group: &impl IsA<gtk::CheckButton>, + active: bool, + input: &impl IsA<gtk::Widget>, + text: &str, +) -> (gtk::Box, gtk::CheckButton) { + let radio_box = gtk::Box::builder().build(); + let radio = gtk::CheckButton::builder() + .group(radio_group) + .label(text) + .active(active) + .build(); + radio_box.append(&radio); + input.add_css_class("g-Form__RadioInput"); + radio_box.append(input); + (radio_box, radio) +} + +fn label(text: &str) -> gtk::Label { + gtk::Label::builder() + .label(text) + .halign(gtk::Align::Start) + .margin_bottom(5) + .build() +} + +pub fn validate(model: &Model) -> Option<Repetition> { + if model.no_radio.is_active() { + None + } else if model.day_interval_radio.is_active() { + repetition::validate_day(&model.day_interval_entry.buffer().text()) + .map(|d| Repetition::Daily { frequency: d }) + } else if model.monthly_radio.is_active() { + repetition::validate_day(&model.monthly_entry.buffer().text()).map(|d| { + Repetition::Monthly { + frequency: MonthFrequency::Day { day: d }, + } + }) + } else if model.first_day_radio.is_active() { + let day = WEEKDAYS[model.first_day_dropdown.selected() as usize]; + Some(Repetition::Monthly { + frequency: MonthFrequency::FirstDay { day }, + }) + } else if model.yearly_radio.is_active() { + Some(Repetition::Yearly) + } else { + None + } +} diff --git a/src/app/style.css b/src/app/style.css index 5cd1394..4828e41 100644 --- a/src/app/style.css +++ b/src/app/style.css @@ -43,3 +43,7 @@ .g-Form__Input { text-align: left; } + +.g-Form__RadioInput { + width: 20px; +} diff --git a/src/app/update.rs b/src/app/update.rs index baf4651..4e21050 100644 --- a/src/app/update.rs +++ b/src/app/update.rs @@ -48,15 +48,13 @@ pub async fn event_handler(rx: Receiver<Msg>, mut app: App) { None => println!("Event not found when updating from {:?} to {:?}", old, new), } } - Msg::DeleteEvent { event } => { - match app.events.iter().position(|e| e.id == event.id) { - Some(index) => { - app.events.remove(index); - calendar::refresh_date(&app, event.date); - } - None => println!("Event not found when trying to delete {:?}", event), + Msg::DeleteEvent { event } => match app.events.iter().position(|e| e.id == event.id) { + Some(index) => { + app.events.remove(index); + calendar::refresh_date(&app, event.date); } - } + None => println!("Event not found when trying to delete {:?}", event), + }, } } } |