jane413/paket
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: ui tweaks for advices

Browse source
This commit is contained in:
jane400 2024-08-28 15:07:32 +02:00 committed by jane400
parent cd2bc321cd
commit f3732051af
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libpaket/src/tracking.rs
View file

@ -82,9 +82,9 @@ struct SendungsInfo {
sendungsliste: Option<String>, sendungsliste: Option<String>,
} }
#[derive(Deserialize)] #[derive(Deserialize, Debug)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
struct SendungsVerlaufEvent { pub struct SendungsVerlaufEvent {
pub datum: String, pub datum: String,
ort: Option<String>, ort: Option<String>,
pub ruecksendung: bool, pub ruecksendung: bool,
@ -102,18 +102,18 @@ impl SendungsVerlaufEvent {
} }
} }
#[derive(Deserialize)] #[derive(Deserialize, Debug)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
struct SendungsVerlauf { pub struct SendungsVerlauf {
kurz_status: Option<String>, kurz_status: Option<String>,
icon_id: Option<String>, icon_id: Option<String>,
datum_aktueller_status: Option<String>, datum_aktueller_status: Option<String>,
aktueller_status: Option<String>, aktueller_status: Option<String>,
events: Option<Vec<SendungsVerlaufEvent>>, pub events: Option<Vec<SendungsVerlaufEvent>>,
farbe: u32, farbe: u32,
fortschritt: u32, pub fortschritt: u32,
maximal_fortschritt: u32, pub maximal_fortschritt: u32,
} }
#[derive(Deserialize)] #[derive(Deserialize)]
@ -321,6 +321,7 @@ pub struct Shipment {
pub special: ShipmentSpecialDetails, pub special: ShipmentSpecialDetails,
pub history: SendungsVerlauf,
pub error: Option<ShipmentNotFoundError>, pub error: Option<ShipmentNotFoundError>,
} }
@ -367,6 +368,7 @@ impl From<Sendung> for Shipment {
None None
} }
}, },
history: value.sendungsdetails.sendungsverlauf,
special: ShipmentSpecialDetails { special: ShipmentSpecialDetails {
abholcode_available, abholcode_available,
benachrichtigt_in_filiale, benachrichtigt_in_filiale,

3
paket/src/advices.rs
View file

@ -49,6 +49,7 @@ impl FactoryComponent for AppAdvice {
add_overlay = &gtk::Box { add_overlay = &gtk::Box {
add_css_class: relm4::css::OSD, add_css_class: relm4::css::OSD,
add_css_class: relm4::css::TOOLBAR,
add_css_class: relm4::css::NUMERIC, add_css_class: relm4::css::NUMERIC,
set_valign: gtk::Align::End, set_valign: gtk::Align::End,
@ -57,8 +58,6 @@ impl FactoryComponent for AppAdvice {
set_margin_all: 8, set_margin_all: 8,
gtk::Label { gtk::Label {
set_margin_all: 4,
set_label: self.metadata.date.as_str(), set_label: self.metadata.date.as_str(),
}, },
}, },