Compare commits

..

2 Commits

Author SHA1 Message Date
Zynh0722 2afe17f1c0 add estimated_end to show data 2023-11-14 21:55:18 -08:00
Zynh0722 b03ea80e8e relocate newdrink 2023-11-14 21:54:43 -08:00
3 changed files with 12 additions and 9 deletions

View File

@ -4,6 +4,7 @@ CREATE TABLE
id INT UNSIGNED PRIMARY KEY AUTO_INCREMENT, id INT UNSIGNED PRIMARY KEY AUTO_INCREMENT,
dancer INT UNSIGNED NOT NULL, dancer INT UNSIGNED NOT NULL,
start DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL, start DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
estimated_end DATETIME NOT NULL,
end DATETIME DEFAULT NULL, end DATETIME DEFAULT NULL,
FOREIGN KEY (dancer) REFERENCES dancers (id) ON DELETE RESTRICT FOREIGN KEY (dancer) REFERENCES dancers (id) ON DELETE RESTRICT
) )

View File

@ -22,6 +22,15 @@ pub struct Drink {
pub time: chrono::NaiveDateTime, pub time: chrono::NaiveDateTime,
} }
#[derive(Insertable, Deserialize, Debug)]
#[diesel(table_name = crate::schema::drinks)]
#[diesel(check_for_backend(diesel::mysql::Mysql))]
pub struct NewDrink {
pub price: u32,
pub quantity: u32,
pub shift: u32,
}
#[derive(Identifiable, Queryable, Selectable, Debug, Clone)] #[derive(Identifiable, Queryable, Selectable, Debug, Clone)]
#[diesel(table_name = crate::schema::dancers)] #[diesel(table_name = crate::schema::dancers)]
#[diesel(check_for_backend(diesel::mysql::Mysql))] #[diesel(check_for_backend(diesel::mysql::Mysql))]
@ -47,14 +56,6 @@ pub struct Show {
pub id: u32, pub id: u32,
pub dancer: u32, pub dancer: u32,
pub start: chrono::NaiveDateTime, pub start: chrono::NaiveDateTime,
pub estimated_end: chrono::NaiveDateTime,
pub end: Option<chrono::NaiveDateTime>, pub end: Option<chrono::NaiveDateTime>,
} }
#[derive(Insertable, Deserialize, Debug)]
#[diesel(table_name = crate::schema::drinks)]
#[diesel(check_for_backend(diesel::mysql::Mysql))]
pub struct NewDrink {
pub price: u32,
pub quantity: u32,
pub shift: u32,
}

View File

@ -31,6 +31,7 @@ diesel::table! {
id -> Unsigned<Integer>, id -> Unsigned<Integer>,
dancer -> Unsigned<Integer>, dancer -> Unsigned<Integer>,
start -> Datetime, start -> Datetime,
estimated_end -> Datetime,
end -> Nullable<Datetime>, end -> Nullable<Datetime>,
} }
} }