From 8cb2ec92b75609c864a855b84df20ae1448a1b61 Mon Sep 17 00:00:00 2001 From: ultrageese Date: Fri, 19 Jun 2026 23:24:08 +1000 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D1=87?= =?UTF-8?q?=D1=83=D1=82=D1=8C=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D1=88=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/src/app.rs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/code/src/app.rs b/code/src/app.rs index 70dc855..f5ca150 100644 --- a/code/src/app.rs +++ b/code/src/app.rs @@ -504,6 +504,7 @@ impl MainTabViewer { self.salary_modal_state .data .insert("comment".to_owned(), String::new()); + self.salary_modal_state.workers.clear(); self.salary_modal_state.is_open = true; self.salary_modal_state.status = ModalStatus::Add; } @@ -601,6 +602,7 @@ impl MainTabViewer { "{} выбран(-о)", self.salary_modal_state.workers.len() )) + .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside) .show_ui(ui, |ui| { for wrkr in self.workers.read().clone().iter() { let mut checked = @@ -639,8 +641,26 @@ impl MainTabViewer { 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(){ + + } }); } /*