widget:global_state: remove usage of navigate

* this needs to be adopted to use event handler code

Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>

advotracker/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "advotracker"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["Ralf Zerres <ralf.zerres@networkx.de>"]
 description = "Frontend component that supports lawyers to capture relevant data encountered during an online legal advice."
 readme = "README.md"
@@ -24,14 +24,14 @@ clap = { version = "~2.33", features = ["suggestions", "color"] }
 csv = { version = "~1.1" }
 dotenv = { version = "~0.15.0" }
 envy = { version = "~0.4" }
-lettre = "0.10.0-alpha.4"
+lettre = "0.10.0-beta.1"
 lazy_static = { version = "~1.4.0" }
 log = { version = "~0.4.8" }
 locales = { version = "~0.1" }
+maud = { version = "~0.22.1" }
 #orbtk = { version = "~0.3.1-alpha4" }
 #orbtk = { git = "https://github.com/redox-os/orbtk.git", branch = "develop" }
 orbtk = { path = "../../orbtk" }
-#regex = { version = "~1" }
 serde = { version = "~1.0", features = ["derive"] }
 substring = { version = "~1" }
 #tokio = { version = "~0.2", features = ["macros", "rt-threaded", "stream", "time"] }
@@ -39,8 +39,9 @@ tracing = { version = "~0.1" }
 tracing-subscriber = { version = "~0.2.0", features = ["tracing-log"] }
 viperus =  { git = "https://github.com/maurocordioli/viperus", features = ["cache", "fmt-clap", "fmt-env", "global", "watch"] }
 
+[dev-dependencies]
+
 [features]
-# no features by default
 default = []
 debug = ["orbtk/debug"]
 light = []

advotracker/assets/advotracker/advotracker_de_DE.ron

@@ -13,7 +13,8 @@ Dictionary (
 	// policycheck_view
 	"Validation policy number": "Prüfung Versicherungsnummer",
 	"Policy number": "Versicherungsnummer",
-	"Policy code": "Policen-Code",
+	"Policy code": "Vers.-Schein/Schadennummer",
+	"Policy holder": "Versicherungsnehmer",
 	"Checklist elements: ": "Prüflistenelemente: ",
 	"Check result": "Prüfungsergebnis",
 	"Importing data": "Importiere Datensätze",
@@ -31,11 +32,11 @@ Dictionary (
 
 	// ticketdata_view
 	"Callback number": "Rückrufnummer",
-	"Callback date": "Rückrufdatum",
+	"Callback date": "Erreichbarkeit",
 	"Clear": "Zurücksetzen",
 	"Deductible": "Selbstbehalt",
-	"Harm type": "Schadenstyp",
-	"IVR comment": "IVR Kommentar",
+	"Harm type": "Rechtsproblem",
+	"IVR comment": "Rechtsrat",
 	"Policy holder": "Versicherungsnehmer",
 	"Recipient (To)": "Empfänger (To)",
 	"Copie (CC)": "Kopie (CC)",

advotracker/examples/messages_test/main.rs

@@ -7,6 +7,7 @@
 
 use orbtk::prelude::*;
 
+mod data;
 mod main_view;
 mod receiver;
 mod sender;

advotracker/examples/messages_test/main_view.rs

@@ -12,10 +12,6 @@ use crate::{
     sender::sender_view::SenderView,
 };
 
-// constants
-pub static ID_SENDER_VIEW: &str = "sender_view";
-pub static ID_RECEIVER_VIEW: &str = "receiver_view";
-
 widget!(MainView {
     //sender_view: ,
     //receiver_view:
@@ -38,11 +34,5 @@ impl Template for MainView {
                     .child(receiver_view)
                     .build(ctx)
             )
-            // .child(
-            //      TabWidget::new()
-            //          .tab(ID_SENDER_VIEW, SenderView::new().build(ctx))
-            //          .tab(ID_RECEIVER_VIEW, ReceiverView::new().build(ctx))
-            //          .build(ctx),
-            // )
     }
 }

advotracker/examples/messages_test/receiver/receiver_state.rs

@@ -7,39 +7,46 @@
 
 use orbtk::prelude::*;
 
-use crate::sender::sender_state::{SenderAction, SenderState};
+use crate::{
+    data::constants::*,
+    sender::sender_state::SenderAction,
+};
 
-/// Enumeration of valid `action variants` that need to be handled as
+// /// Enumeration of valid `action variants` that need to be handled as
 /// state changes for the `SenderView` widget.
 pub enum TestMessageAction {
-    // Toggle visibility of a message TextBox.
-    ToggleMessageBox
+    // Toggle visibility of a message TextBlock.
+    ToggleMessageBlock
 }
 
 /// Valid `structure members` of the `ReceiverState` used to react on
 /// state changes inside the `ReceiverView` widget.
 #[derive(Default, AsAny)]
 pub struct ReceiverState {
-    message_box: Option<Entity>,
+    message_block: Option<Entity>,
     progress_bar: Entity
 }
 
 /// Method definitions, we provide inside the `ReceiverState`.
 impl ReceiverState {
-    fn toggle_message_box(&self, ctx: &mut Context) {
-        if let Some(message_box) = self.message_box {
-            ctx.get_widget(message_box)
+    fn toggle_message_block(&self, ctx: &mut Context) {
+        if let Some(message_block) = self.message_block {
+            ctx.get_widget(message_block)
                 .set("visibility", Visibility::Visible);
         }
     }
 }
 
-/// Trait methods provided for the `SenderState`
+/// Trait methods provided for the `ReceiverState`
 impl State for ReceiverState {
     // initialize the view entities
     fn init(&mut self, _: &mut Registry, ctx: &mut Context) {
-        self.progress_bar = ctx.entity_of_child("progress_bar")
+        self.progress_bar = ctx
+            .entity_of_child(ID_RECEIVER_PROGRESS_BAR)
             .expect("Cannot find ProgressBar!");
+        //self.message_box = ctx
+        //     .entity_of_child(ID_RECEIVER_MESSAGE)
+        //     .expect("Cannot find 'ID_RECEIVER_MESSAGE'!");
     }
 
     // handle messages targeting the view
@@ -52,17 +59,26 @@ impl State for ReceiverState {
         for message in messages.read::<SenderAction>() {
             match message {
                 SenderAction::UpdateProgress(amount) => {
-                    println!("Message received");
+                    println!("UpdateProgress message received");
                     let mut progress_bar = ctx.get_widget(self.progress_bar);
                     let current_progress = progress_bar.clone::<f64>("val");
                     progress_bar.set::<f64>("val", current_progress + amount);
+                }
+                SenderAction::UpdateMessage(message) => {
+                    println!("UpdateMessage message received");
+                    //Reciever::text_set(&mut ctx.widget(), self.message.to_string());
+                    //Reciever::text_set(&mut ctx.widget(), self.message.to_string());
+                    TextBlock::text_set(&mut ctx.child(ID_RECEIVER_MESSAGE_BLOCK), String::from(message));
+
+
+
                 }
             }
         }
         for action in messages.read::<TestMessageAction>() {
             match action {
-                TestMessageAction::ToggleMessageBox => {
-                    self.toggle_message_box(ctx);
+                TestMessageAction::ToggleMessageBlock => {
+                    self.toggle_message_block(ctx);
                 }
             }
         }

advotracker/examples/messages_test/receiver/receiver_view.rs

@@ -7,31 +7,50 @@
 
 use orbtk::prelude::*;
 
-use crate::receiver::receiver_state::{TestMessageAction, ReceiverState};
+use crate::{
+    data::constants::*,
+    //receiver::receiver_state::{TestMessageAction, ReceiverState},
+    receiver::receiver_state::ReceiverState,
+};
 
 widget!(ReceiverView<ReceiverState>);
 
 impl Template for ReceiverView {
-    fn template(self, _id: Entity, bc: &mut BuildContext) -> Self {
-        self.name("ReceiverView")
+    fn template(self, _id: Entity, build_context: &mut BuildContext) -> Self {
+        self.id(ID_RECEIVER)
+            .name(ID_RECEIVER)
             .child(
-                Stack::new()
-                    .orientation("vertical")
-                    .spacing(16)
+                Container::new()
+                    .id(ID_RECEIVER_CONTAINER)
+                    .border_brush(COLOR_BOMBAY)
+                    .border_width(2)
+                    .name(ID_RECEIVER_CONTAINER)
+                    .padding(16)
                     .child(
-                        ProgressBar::new()
-                            .id("progress_bar")
-                            .build(bc)
+                        Stack::new()
+                            .orientation("vertical")
+                            .spacing(8)
+                            .child(
+                                TextBlock::new()
+                                    .id(ID_RECEIVER_TEXT_BLOCK)
+                                    .text(ID_RECEIVER)
+                                    .build(build_context)
+                            )
+                            .child(
+                                ProgressBar::new()
+                                    .id(ID_RECEIVER_PROGRESS_BAR)
+                                    .build(build_context)
+                            )
+                            .child(
+                                TextBlock::new()
+                                    .id(ID_RECEIVER_MESSAGE_BLOCK)
+                                    .text("")
+                                    .water_mark("here we expect the message updates.")
+                                    .build(build_context)
+                            )
+                            .build(build_context)
                     )
-                    .child(
-                        TextBox::new()
-                            .id("message_box")
-                            .h_align("center")
-                            .text("message received. Box toggled!")
-                            .visibility("hidden")
-                            .build(bc)
-                    )
-                    .build(bc)
+                    .build(build_context)
             )
     }
 }

advotracker/examples/messages_test/sender/sender_state.rs

@@ -7,11 +7,14 @@
 
 use orbtk::prelude::*;
 
+//use crate::data::constants::*;
+
 /// Enumeration of valid `action variants` that need to be handled as
 /// state changes for the `SenderView` widget.
 #[derive(Clone, Debug)]
 pub enum SenderAction {
     UpdateProgress(f64),
+    UpdateMessage(String),
 }
 
 /// Valid `structure members` of the `SenderState` used to react on
@@ -26,11 +29,17 @@ pub struct SenderState {
 
 /// Method definitions, we provide inside the `SenderState`.
 impl SenderState {
-    /// Sending message 'UpdateProgress'
-    pub fn send_message(&mut self) {
+    /// Sending message with type 'UpdateProgress'
+    pub fn send_update_progress(&mut self) {
         println!("Sender: push 'UpdateProgress' action");
         self.actions.push(SenderAction::UpdateProgress(0.1));
     }
+    /// Sending message with type 'UpdateMessage'
+    pub fn send_update_message(&mut self) {
+        println!("Sender: push 'UpdateMessage' action");
+        self.actions.push(SenderAction::UpdateMessage(String::from("Hey sender. I got your message. All fine.")));
+    }
+
 }
 
 /// Trait methods provided for the `SenderState`
@@ -46,12 +55,23 @@ impl State for SenderState {
     fn update(&mut self, _: &mut Registry, ctx: &mut Context) {
         let actions: Vec<SenderAction> = self.actions.drain(..).collect();
 
+        //let message = ctx.child(ID_SENDER_TEXT_BOX).get::<String>("text").to_string();
+        //println!("Child text: {:?}", message);
+
+        // create an explicit message_adapter context
+        let message_adapter = ctx.message_adapter();
+
         for action in actions {
             match action {
                 SenderAction::UpdateProgress(amount) => {
-                    ctx.send_message(SenderAction::UpdateProgress(amount), self.target);
+                    message_adapter.send_message(SenderAction::UpdateProgress(amount), self.target);
                     println!("Sender: send message 'SenderAction::UpdateProgress'");
                 }
+                SenderAction::UpdateMessage(message) => {
+                    //let message = ctx.child(ID_SENDER_TEXT_BOX).get::<String>("text").to_string();
+                    message_adapter.send_message(SenderAction::UpdateMessage(message), self.target);
+                    println!("Sender: send message 'SenderAction::UpdateMessage'");
+                }
             }
         }
     }

advotracker/examples/messages_test/sender/sender_view.rs

@@ -5,9 +5,16 @@
  * SPDX-License-Identifier: (0BSD or MIT)
  */
 
-use orbtk::prelude::*;
+use orbtk::{
+    prelude::*,
+    shell::event::Key,
+};
 
-use crate::sender::sender_state::{SenderAction, SenderState};
+use crate::{
+    data::constants::*,
+    sender::sender_state::SenderState,
+    //sender::sender_state::{SenderAction, SenderState},
+};
 
 widget!(SenderView<SenderState> {
     // the Entity of the widget that will receive the messages
@@ -15,20 +22,79 @@ widget!(SenderView<SenderState> {
 });
 
 impl Template for SenderView {
-    fn template(self, id: Entity, bc: &mut BuildContext) -> Self {
-        self.name("SenderView")
+    fn template(self, id: Entity, build_context: &mut BuildContext) -> Self {
+        let sender_header = TextBlock::new()
+            .attach(Grid::row(0))
+            .text(ID_SENDER)
+            .build(build_context);
+
+        let sender_message = TextBox::new()
+            .attach(Grid::row(2))
+            .attach(Grid::column(0))
+            .name(ID_SENDER_TEXT_BOX)
+            .text("")
+            .water_mark("Message text to be send via MessageHandler.")
+            .on_key_down(move | states, key_event | {
+                match key_event.key {
+                    Key::Tab | Key::S(..) => {
+                        println!("KeyHandler: got Tab");
+                        states.get_mut::<SenderState>(id).send_update_progress();
+                        states.get_mut::<SenderState>(id).send_update_message();
+                    },
+                    _ => {
+                        println!("KeyHandler: got {:?}", key_event.key);
+                    },
+                };
+                true
+            })
+            .build(build_context);
+
+        let sender_button = Button::new()
+            .attach(Grid::row(2))
+            .attach(Grid::column(2))
+            .name(ID_SENDER_BUTTON)
+            .text("send")
+            .icon(material_icons_font::MD_SEND)
+            .on_click(move |states, _entity| {
+                states.get_mut::<SenderState>(id).send_update_progress();
+                false
+            })
+            .build(build_context);
+
+        //let sender_content =
+
+        self.id(ID_SENDER)
+            .name(ID_SENDER)
             .child(
-                Button::new()
-                    .text("Click me to send a message!")
-                    .v_align("center")
-                    .h_align("center")
-                    .on_click(move |states, _entity| {
-                        states.get_mut::<SenderState>(id).send_message();
-                        //states.send_message(SenderAction::UpdateProgress, id);
-                        //ctx.send_message(TestMessageAction::ToggleMessageBox, id);
-                        false
-                    })
-                    .build(bc)
+                Container::new()
+                    .id(ID_SENDER_CONTAINER)
+                    .border_brush(COLOR_BOMBAY)
+                    .border_width(2)
+                    .padding(16)
+                    .child(
+                        Grid::new()
+                            .id(ID_SENDER_GRID)
+                            .columns(
+                                Columns::create()
+                                    .push("stretch") // Message
+                                    .push(16)        // Delimiter
+                                    .push("auto")    // Button
+                            )
+                            .rows(
+                                Rows::create()
+                                    .push("auto")    // Header
+                                    .push(6)         // Delimiter
+                                    .push("auto")    // Message
+                                    .push(6)         // Delimiter
+                            )
+
+                            .child(sender_header)    // row 0
+                            .child(sender_message)   // row 2
+                            .child(sender_button)    // row 3
+                            .build(build_context)
+                    )
+                    .build(build_context)
             )
+
     }
 }

advotracker/src/data/constants.rs

@@ -8,16 +8,17 @@
 // Component Values (Properties)
 pub static PROP_ADVOTRACKER: &str = "advotracker";
 
-pub static PROP_MAIL_CC_1: &str = "advotracker@hiedemann.de";
+pub static PROP_MAIL_CC_1: &str = "info@hiedemann.de";
 pub static PROP_MAIL_CC_2: &str = "service@hiedemann.de";
-pub static PROP_MAIL_BCC_1: &str = "schloemer@hiedemann.de";
-pub static PROP_MAIL_BCC_2: &str = "support@networkx.de";
+pub static PROP_MAIL_BCC_1: &str = "Networkx Support <support@networkx.de>";
+pub static PROP_MAIL_BCC_2: &str = "knoche@hiedemann.de";
+pub static PROP_MAIL_FROM: &str = "Kanzlei Hiedemann <info@heidemann.de>";
+pub static PROP_MAIL_REPLY: &str = "Kanzlei Hiedemann <info@heidemann.de>";
+pub static PROP_MAIL_SUBJECT: &str = "ZMB Allianz - neues Mandat";
 pub static PROP_MAIL_TO_1: &str = "allianz@ponschab-partner.com";
 pub static PROP_MAIL_TO_2: &str = "kontakt@chevalier.law";
 pub static PROP_MAIL_TO_3: &str = "kontakt@metamedlaw.de";
 pub static PROP_MAIL_TO_4: &str = "sekretariat@m2-mediation.de";
-pub static PROP_MAIL_FROM: &str = "advotracker@heidemann.de";
-pub static PROP_MAIL_SUBJECT: &str = "ZMB Allianz - neues Mandat";
 
 pub static PROP_POLICY_CHECK: &str = "policy_check";
 pub static PROP_POLICY_PROGRESS_COUNT: &str = "policy_progress_count";
@@ -128,6 +129,8 @@ pub static ID_TICKET_DATA_BUTTON_MENU: &str = "ticket_data_button_menu";
 pub static ID_TICKET_DATA_BUTTON_RESULT: &str = "ticket_data_button_result";
 pub static ID_TICKET_DATA_CALLBACK_DATE: &str = "ticket_data_label_callback_date";
 pub static ID_TICKET_DATA_CALLBACK_NUMBER: &str = "ticket_data_label_callback_number";
+pub static ID_TICKET_DATA_COMBO_BOX_MAIL_CC: &str = "ticket_data_combo_box_mail_cc";
+pub static ID_TICKET_DATA_COMBO_BOX_MAIL_TO: &str = "ticket_data_combo_box_mail_to";
 pub static ID_TICKET_DATA_CONTAINER_MAIL: &str = "ticket_data_container_mail";
 pub static ID_TICKET_DATA_COUNT_BLOCK: &str = "ticket_data_count_block";
 pub static ID_TICKET_DATA_DEDUCTIBLE: &str = "ticket_data_deductible";

advotracker/src/data/structures.rs

@@ -113,7 +113,7 @@ pub struct CsvExportRecord {
 /// Handel fields of an Email (header, body)
 #[derive(Default, Debug, Clone, Deserialize, Serialize)]
 pub struct Email {
-    /// recipient address
+    /// Recipient address
     pub mail_to: String,
     /// Carbon Copy recipient address
     pub mail_cc: String,
@@ -121,6 +121,8 @@ pub struct Email {
     pub mail_bcc: String,
     /// Sender address
     pub mail_from: String,
+    /// Replay to given address
+    pub mail_reply: String,
     /// Mail subject
     pub subject: String,
     /// Body policy code

advotracker/src/main.rs

@@ -172,6 +172,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
         // type conversion (viperus String -> u64)
         let test_policy_number = viperus.get::<String>("test_policy_number").unwrap().parse::<u64>().unwrap();
+        trace!(target: "advotracker", test_policy_number = ?test_policy_number);
 
         // main tasks
         res = t!("main.started", lang);

advotracker/src/services/exports/send_ticketdata.rs

@@ -36,37 +36,36 @@ pub fn sendticketdata(email: &Email, lang: &str) -> Result<(), Box<dyn Error>> {
         div style="display: flex; flex-direction: column; align-items: center;" {
             // compose with variables and strings
             h2 { (email.subject) " (" (email.policy_code) ")" }
-            p { "Policen-Code:  " (email.policy_code) }
-            p { "Policen-Code:  " (email.policy_code) }
-            p { "Versicherungsnehmer: " (email.policy_holder) }
-            p { "Selbstbehalt: "(email.deductible) }
-            p { "Rückrufnummer: " (email.callback_number) }
-            p { "Rückrufdatum: " (email.callback_date) }
-            p { "Schadenstyp: "(email.harm_type) }
-            p { "IVR Kommentar: "(email.ivr_comment) }
+            p { "Vers.-Schein/Schadennummer: " (email.policy_code) }
+            p { "Versicherungsnehmer:        " (email.policy_holder) }
+            p { "Selbstbehalt:               "(email.deductible) }
+            p { "Rückrufnummer:              " (email.callback_number) }
+            p { "Erreichbarkeit:             " (email.callback_date) }
+            p { "Rechtsproblem:              "(email.harm_type) }
+            p { "Rechtsrat:                  "(email.ivr_comment) }
         }
     };
 
     let ascii_body = String::new()
-        + &"Policen-Code: ".to_string() + &(email.policy_code) + &"\n"
+        + &"Vers.-Schein/Schadennummer".to_string() + &(email.policy_code) + &"\n"
         + &"Versicherungsnehmer: ".to_string() + &(email.policy_holder) + &"\n"
         + &"Selbstbehalt: ".to_string() + &(email.deductible) + &"\n"
         + &"Rückrufnummer: ".to_string()+  &(email.callback_number) + &"\n"
-        + &"Rückrufdatum: ".to_string() + &(email.callback_date) + &"\n"
-        + &"Schadenstyp: ".to_string() + &(email.harm_type) + &"\n"
-        + &"IVR Kommentar: ".to_string() + &(email.ivr_comment) + &"\n";
+        + &"Erreichbarkeit: ".to_string() + &(email.callback_date) + &"\n"
+        + &"Rechtsproblem: ".to_string() + &(email.harm_type) + &"\n"
+        + &"Rechtsrat: ".to_string() + &(email.ivr_comment) + &"\n";
 
     info!("email body: {:?}", ascii_body);
 
     let message = Message::builder()
-        .from((email.mail_from).parse().unwrap())
-        //.reply_to("Support <support@networkx.de>".parse().unwrap())
-        .to("Networkx-Info <info@networkx.de>".parse().unwrap())
-        .cc("Ralf Zerres <ralf.zerres@networkx.de>".parse().unwrap())
-        .reply_to((email.mail_from).parse().unwrap())
+        //.reply_to("Kanzlei Hiedemann <info@hiedemann.de>".parse().unwrap())
+        .to("Kanzlei Hiedemann <info@hiedemann.de>".parse().unwrap())
+        .cc(" <ralf.zerres@networkx.de>".parse().unwrap())
+        .reply_to((email.mail_reply).parse().unwrap())
         //.to((email.mail_to).parse().unwrap())
         //.cc((email.mail_cc).parse().unwrap())
         //.bcc((email.mail_bcc).parse().unwrap())
+        .from((email.mail_from).parse().unwrap())
         .subject(String::new()
                  + &email.subject.to_string()
                  + &" (".to_string()
@@ -96,11 +95,14 @@ pub fn sendticketdata(email: &Email, lang: &str) -> Result<(), Box<dyn Error>> {
     info!("message: {:?}", message);
 
     // Create credential for remote authentication (username, password)
-    // WIP: get credentials from config file / environment
-    let creds = Credentials::new("ralf.zerres.de@gmail.com".to_string(), "20jacara03".to_string());
+    // WIP: get credentials from config file / cli
+    let creds = Credentials::new("info@kanzlei.hiedemann.de".to_string(), "17info67$".to_string());
 
-    // Open a remote connection to relay server
-    let mailer = SmtpTransport::relay("smtp.gmail.com")
+
+
+    // Open a remote connection to relay server (port 2525)
+    // WIP: get relay address from config file / cli
+    let mailer = SmtpTransport::relay("hiedemannsbs.kanzlei.hiedemann.de")
         .unwrap()
         .credentials(creds)
         .build();

advotracker/src/widgets/global_state.rs

@@ -61,14 +61,14 @@ pub trait GlobalState {
         Some(text)
     }
 
-    /// Navigates to the given entity.
-    fn navigate(&self, to: Entity, ctx: &mut Context<'_>) {
-        if let Some(old_focused_element) = *Window::focus_state_ref(&ctx.window()).focused_entity() {
-            ctx.push_event_by_window(FocusEvent::RemoveFocus(old_focused_element));
-        }
-        ctx.widget().set("visibility", Visibility::Collapsed);
-        ctx.get_widget(to).set("visibility", Visibility::Visible);
-    }
+    // /// Navigates to the given entity.
+    // fn navigate(&self, to: Entity, ctx: &mut Context<'_>) {
+    //     if let Some(old_focused_element) = *Window::focus_state_ref(&ctx.window()).focused_entity() {
+    //         ctx.push_event_by_window(FocusEvent::RemoveFocus(old_focused_element));
+    //     }
+    //     ctx.widget().set("visibility", Visibility::Collapsed);
+    //     ctx.get_widget(to).set("visibility", Visibility::Visible);
+    // }
 
     /// Save the our data structure and convert it to `ron` file format.
     /// The cargo package identifier (here: 'nwx.advotracker') is taken to create the app directory.

advotracker/src/widgets/main_view.rs

@@ -15,7 +15,7 @@ use crate::{
     widgets::configuration::configuration_view::ConfigurationView,
     widgets::policycheck::policycheck_view::PolicycheckView,
     widgets::localization::localization_view::LocalizationView,
-    widgets::menu::menu_view::MenuView,
+    //widgets::menu::menu_view::MenuView,
     widgets::ticketdata::ticketdata_view::TicketdataView,
 };
 
@@ -68,7 +68,7 @@ impl Template for MainView {
                     .tab(ID_TICKET_DATA_VIEW, ticketdata_view)
                     .tab(ID_LOCALIZATION_VIEW, LocalizationView::new().build(ctx))
                     .tab(ID_CONFIGURATION_VIEW, ConfigurationView::new().build(ctx))
-                    .tab(ID_MENU_VIEW, MenuView::new().build(ctx))
+                    //.tab(ID_MENU_VIEW, MenuView::new().build(ctx))
                     .build(ctx),
             )
             //.child(policycheck_view)

advotracker/src/widgets/policycheck/policycheck_state.rs

@@ -70,7 +70,7 @@ pub struct PolicycheckState {
     label_result: Entity,
     lang: String,
     policy_data_count: u64,
-    policy_number: Entity,
+    //policy_number: Entity,
     policy_numbers: HashMap<u64, PolicyCode>,
     progress_bar: Entity,
     progress_count: f64,
@@ -181,7 +181,7 @@ impl PolicycheckState {
     /// Create new ticket
     pub fn new_ticket(&mut self, ctx: &mut Context<'_>) {
         println!("WIP: new ticket.");
-        self.navigate(self.ticketdata, ctx);
+        self(ticketdata_view.0);
         //ctx.widget().get_mut::<TicketdataView>(0).
         //ctx.get_widget(self.ticketdata_view);
     }
@@ -421,7 +421,7 @@ impl PolicycheckState {
     }
 
     /// Update the policy code  policy data list.
-    fn update_policy_code(&self, ctx: &mut Context<'_>) {
+    fn update_policy_code(&self, _ctx: &mut Context<'_>) {
         println!("update internal: policy_code");
         //let policy_code = ctx.widget().get::<PolicycheckState>(ID_POLICY_CHECK_POLICY_CODE);
         //ctx.widget().set(PROP_POLICY_DATA_COUNT, policy_code);

advotracker/src/widgets/ticketdata/ticketdata_state.rs

@@ -18,7 +18,8 @@ use crate::{
     data::{constants::*, structures::Email},
     widgets::global_state::GlobalState,
     services::exports::send_ticketdata::sendticketdata,
-    widgets::policycheck::policycheck_state::{PolicycheckAction, PolicycheckState},
+    widgets::ticketdata::ticketdata_view::TicketdataView,
+    widgets::policycheck::policycheck_state::PolicycheckAction,
 };
 
 /// Valid `actions` that are handled as state changes in the `Ticketdata` widget.
@@ -28,12 +29,15 @@ pub enum TicketdataAction {
     /// Clear text in the form
     ClearForm(),
     ChangeTheme(),
+    //ChangeMailCc(),
+    //ChangeMailTo(),
     InputTextChanged(Entity),
     ParseEntry(Entity),
     RemoveFocus(Entity),
+    SendForm(),
     SetToggleTheme(Entity),
     SetEntry(Entity),
-    SendForm(),    SetVisibility(Entity),
+    SetVisibility(Entity),
     TextChanged(Entity, usize),
     UpdatePolicyCode(String)
 }
@@ -52,6 +56,10 @@ struct Environment {
 pub struct TicketdataState {
     actions: Vec<TicketdataAction>,
     button_menu: Entity,
+    // ComboBox item of mail_cc has been changed
+    //pub change_mail_cc: bool,
+    //ComboBox item of mail_to has been changed
+    //pub change_mail_to: bool,
     //duration: Duration,
     lang: String,
     target: Entity
@@ -68,7 +76,7 @@ impl TicketdataState {
             info!("Widget id: {:?}", ctx.get_widget(entity).get::<String>("id"));
         }
 
-        // identify the form by its id
+        // form is identified by its id
         if let form_entity = ctx.child(ID_TICKET_DATA_GRID).entity() {
             info!("Form id: {:?}", ctx.get_widget(form_entity).get::<String>("id"));
             info!("Form node name: {:?}", ctx.get_widget(form_entity).get::<String>("name"));
@@ -81,27 +89,16 @@ impl TicketdataState {
                 }
             }
         }
-        // let Some(count) = ctx.child(ID_TICKET_DATA_GRID).entitry().children_count() {
-        //             for c in 1..=count {
-        //         println!("WIP clear entry of child {:?}", c);
-        //     }
-        // }
-            //let mut children = vec![];
-            //get_all_children(&mut children, entity, ecm.entity_store());
-            //trace!("Children {:?}: {:?}", children.len(), children);
-            //println!("Child name: {:?}", ctx.try_child("ticket_data_form"));
-            //TextBlock::text_set(&mut ctx.child(ID_TICKET_DATA_POLICY_HOLDER), "");
-            //println!("Number of childs: {:?}", count);
-            //for c in 1..=count {
-             //   println!("WIP clear entry of child {:?}", c);
-                // children = get_all_children()
-                //println!("Child {:?}: Entity: {:?}", c, ctx.child_from_index(c));
-                //println!("Text: {:?}", ctx.get_widget(entity).entity_of_child(entity));
-                //TextBlock::text_set(&mut ctx.child(ID_TICKET_DATA_POLICY_HOLDER), "");
-            //}
-        //TextBox::text_set(&mut ctx.widget(entity), String::from(""));
     }
 
+    // pub fn change_mail_cc(&mut self) {
+    //   self.actions.push(TicketdataAction::ChangeMailCc());
+    // }
+
+    // pub fn change_mail_to(&mut self) {
+    //     self.actions.push(TicketdataAction::ChangeMailTo());
+    // }
+
     pub fn send_form(entity: Entity, ctx: &mut Context<'_>, lang: &str) {
 
         // type conversion (String -> u64)
@@ -109,7 +106,7 @@ impl TicketdataState {
 
         // WIP: get selected items ComboBox'es
         //let mail_cc_index = *TicketdataView::selected_index_ref(&ctx.widget()) as usize;
-        //let mail_cc_selected = TicketdataView::mail_cc_ref(&ctx.widget())[mail_cc_index].clone();
+        //let mail_cc_selected = TicketdataView::items_mail_cc_ref(&ctx.widget(id))[mail_cc_index].clone();
 
         // create Email structures
         let email = Email {
@@ -117,10 +114,12 @@ impl TicketdataState {
             //mail_to: ctx.child(ID_TICKET_DATA_MAIL_TO).get::<String>("text").to_string(),
             // WIP: mail_cc -> selected index auslesen
             //mail_cc: ctx.child(ID_TICKET_DATA_MAIL_CC).get::<String>("text").to_string(),
+
             mail_to: PROP_MAIL_TO_1.to_string(),
             mail_cc: PROP_MAIL_CC_1.to_string(),
             mail_bcc: PROP_MAIL_BCC_1.to_string(),
             mail_from: PROP_MAIL_FROM.to_string(),
+            mail_reply: PROP_MAIL_REPLY.to_string(),
             subject: PROP_MAIL_SUBJECT.to_string(),
             policy_code: ctx.child(ID_TICKET_DATA_POLICY_CODE).get::<String>("text").to_string(),
             policy_holder: ctx.child(ID_TICKET_DATA_POLICY_HOLDER).get::<String>("text").to_string(),
@@ -133,7 +132,11 @@ impl TicketdataState {
 
         info!("WIP: Sending form to construct eMail to {:?}", email);
         // send email via service
-        let _ = sendticketdata(&email, &lang);
+        if let Err(_e) = sendticketdata(&email, &lang) {
+            Button::icon_brush_set(&mut ctx.child(ID_TICKET_DATA_ACTION_BUTTON_SEND), String::from("#FF0000"));
+            Button::foreground_set(&mut ctx.child(ID_TICKET_DATA_ACTION_BUTTON_SEND), String::from("#FF0000"));
+            Button::icon_set(&mut ctx.child(ID_TICKET_DATA_ACTION_BUTTON_SEND), material_icons_font::MD_CLEAR);
+        };
     }
 }
 
@@ -145,13 +148,14 @@ impl State for TicketdataState {
 
         trace!(target: "advotracker",  ticketdata_state = "init", status = "started");
 
-        // Initialize required entities
+        // Initialize required menu button entity
         self.button_menu = ctx
             .entity_of_child(ID_TICKET_DATA_BUTTON_MENU)
             .expect("TicketState.init: Can't find resource entity 'ID_TICKET_DATA_BUTTON_MENU'.");
 
+        // initialize the entity object, that will receive messages
         self.target = Entity::from(ctx.widget().try_clone::<u32>("target")
-            .expect("TicketState.init: Can't find resource entity 'target'."));
+                                   .expect("TicketState.init: Can't find resource entity 'target'."));
 
         // Get language from environment
         self.lang = TicketdataState::get_lang();
@@ -162,6 +166,7 @@ impl State for TicketdataState {
         trace!(target: "advotracker",  ticketdata_state = "init", status = "finished", duration = ?duration);
     }
 
+    /// The reader component of the message system handing `TicketdataState``
     fn messages(
         &mut self,
         mut messages: MessageReader,
@@ -181,6 +186,7 @@ impl State for TicketdataState {
                 _ => { println!("messages: action not implemented!"); }
             }
         }
+
         for message in messages.read::<PolicycheckAction>() {
             match message {
                 PolicycheckAction::UpdatePolicyCode => {
@@ -192,11 +198,16 @@ impl State for TicketdataState {
         }
     }
 
-    fn update(&mut self, _: &mut Registry, ctx: &mut Context<'_>) {
+    fn update(&mut self, _registry: &mut Registry, ctx: &mut Context<'_>) {
         let actions: Vec<TicketdataAction> = self.actions.drain(..).collect();
 
         for action in actions {
             match action {
+                // TicketdataAction::ChangeMailCc() => {
+                //     let index = *TicketdataView::items_ref(&ctx.widget()) as usize;
+                //     let selected_index = TicketdataView::items_ref(&ctx.widget())[index].clone();
+                //     info!("new selection for mail index: {:?}", selected_index);
+                // }
                 TicketdataAction::ClearForm() => {
                     info!("update: send_message {:?}", action);
                     ctx.send_message(TicketdataAction::ClearForm(), self.target);

advotracker/src/widgets/ticketdata/ticketdata_view.rs

@@ -5,10 +5,7 @@
  * SPDX-License-Identifier: (0BSD or MIT)
  */
 
-use orbtk::{
-    prelude::*,
-    //shell::event::Key,
-};
+use orbtk::prelude::*;
 
 use crate::{
     data::constants::*,
@@ -127,7 +124,7 @@ impl Template for TicketdataView {
                             .build(ctx),
                     )
                     .child(
-                        TextBlock::new()
+                        TextBox::new()
                             .id(ID_TICKET_DATA_POLICY_CODE)
                             .attach(Grid::row(0))
                             .attach(Grid::column(2))
@@ -228,7 +225,7 @@ impl Template for TicketdataView {
                             .attach(Grid::row(10))
                             .attach(Grid::column(2))
                             .text("")
-                            .water_mark("Rechtsproblem/Schadenstyp")
+                            .water_mark("Schadenstyp")
                             .build(ctx),
                     )
                     .child(
@@ -247,7 +244,7 @@ impl Template for TicketdataView {
                             .attach(Grid::row(12))
                             .attach(Grid::column(2))
                             .text("")
-                            .water_mark("Rechtsrat / Kommentar zu Haftungs, bzw. Deckung")
+                            .water_mark("Kommentar zur Haftung, bzw. zur Deckung")
                             //.height(48.0)
                             .build(ctx),
                     )
@@ -319,7 +316,7 @@ impl Template for TicketdataView {
                     )
                     .child(
                         TextBlock::new()
-                            .id(ID_TICKET_DATA_MAIL_TO)
+                            .id(ID_TICKET_DATA_LABEL_MAIL_TO)
                             .attach(Grid::row(0))
                             .attach(Grid::column(1))
                             .style(STYLE_MAIL_LABEL)
@@ -328,7 +325,7 @@ impl Template for TicketdataView {
                     )
                     .child(
                         ComboBox::new()
-                            .id(ID_TICKET_DATA_MAIL_TO)
+                            .id(ID_TICKET_DATA_COMBO_BOX_MAIL_TO)
                             .attach(Grid::row(0))
                             .attach(Grid::column(3))
                             .style(STYLE_MAIL_TO)