From 1445e23a26c6581ad0c3f5b5016e47e95d224e9f Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 20 Feb 2022 09:33:55 +0100 Subject: Save repetition in events But don’t show repetead events for now. --- src/model/event.rs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/model/event.rs') diff --git a/src/model/event.rs b/src/model/event.rs index 7ab0244..3765fec 100644 --- a/src/model/event.rs +++ b/src/model/event.rs @@ -2,6 +2,8 @@ use chrono::Timelike; use chrono::{NaiveDate, NaiveTime}; use uuid::Uuid; +use crate::model::repetition::Repetition; + pub static DATE_FORMAT: &str = "%d/%m/%Y"; #[derive(Debug, Clone)] @@ -11,6 +13,7 @@ pub struct Event { pub start: Option, pub end: Option, pub name: String, + pub repetition: Option, } pub fn init(date: NaiveDate) -> Event { @@ -20,6 +23,7 @@ pub fn init(date: NaiveDate) -> Event { start: None, end: None, name: "".to_string(), + repetition: None, } } @@ -62,7 +66,14 @@ fn parse_time(t: &str) -> Option { // Validation -pub fn validate(id: Uuid, date: String, name: String, start: String, end: String) -> Option { +pub fn validate( + id: Uuid, + date: String, + name: String, + start: String, + end: String, + repetition: Option, +) -> Option { let start = validate_time(start)?; let end = validate_time(end)?; @@ -77,6 +88,7 @@ pub fn validate(id: Uuid, date: String, name: String, start: String, end: String name: validate_name(name)?, start, end, + repetition, }) } -- cgit v1.2.3