UltraGoose
/
BreweryControlSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

сделал чуть получше

master
Алексей Алексей 2026-06-19 23:24:08 +10:00
parent 307b54dafc
commit 8cb2ec92b7
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
code/src/app.rs
View File

@ -504,6 +504,7 @@ impl MainTabViewer {
self.salary_modal_state self.salary_modal_state
.data .data
.insert("comment".to_owned(), String::new()); .insert("comment".to_owned(), String::new());
self.salary_modal_state.workers.clear();
self.salary_modal_state.is_open = true; self.salary_modal_state.is_open = true;
self.salary_modal_state.status = ModalStatus::Add; self.salary_modal_state.status = ModalStatus::Add;
} }
@ -601,6 +602,7 @@ impl MainTabViewer {
"{} выбран(-о)", "{} выбран(-о)",
self.salary_modal_state.workers.len() self.salary_modal_state.workers.len()
)) ))
.close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
.show_ui(ui, |ui| { .show_ui(ui, |ui| {
for wrkr in self.workers.read().clone().iter() { for wrkr in self.workers.read().clone().iter() {
let mut checked = let mut checked =
@ -639,8 +641,26 @@ impl MainTabViewer {
self.salary_modal_state.data.get_mut("salary_date").unwrap(), self.salary_modal_state.data.get_mut("salary_date").unwrap(),
), ),
); );
ui.end_row();
ui.label("Примечание:");
ui.add_sized(size,
egui::TextEdit::singleline(self.salary_modal_state.data.get_mut("comment").unwrap()));
ui.end_row();
}); });
}else{
let wname = self.workers.read().clone().iter().find(|w| w.id.to_string() == self.salary_modal_state.data.get("worker_id").unwrap()).unwrap().full_name;
ui.label("Вы уверены, что хотите удалить запись о выплате:");
ui.label(format!("{}: {} | ${}", self.salary_modal_state.data.get("salary_date").unwrap(), wname, self.salary_modal_state.data.get("salary_size").unwrap()));
} }
let btext = match self.salary_modal_state.status{
ModalStatus::Add => "Добавить",
ModalStatus::Edit => "Сохранить",
ModalStatus::Remove => "Удалить"
};
if ui.button(btext).clicked(){
}
}); });
} }
/* /*