From 4bf316d78ae5a163731e5f26401cafbbbcc4faee Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Tue, 13 Jun 2023 22:32:44 +0200 Subject: [PATCH] Make more fields optional as required by some OSC files --- src/model/data_form.rs | 18 ++++++++++++------ src/model/unterformular.rs | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/model/data_form.rs b/src/model/data_form.rs index 8c29eb7..541b5b4 100644 --- a/src/model/data_form.rs +++ b/src/model/data_form.rs @@ -56,7 +56,8 @@ pub struct DataForm { #[serde(rename = "Aktenbereich")] aktenbereich: String, #[serde(rename = "BefragungRelevant")] - befragung_relevant: bool, + #[serde(skip_serializing_if = "Option::is_none")] + befragung_relevant: Option, #[serde(rename = "Hotkey")] #[serde(skip_serializing_if = "Option::is_none")] hotkey: Option, @@ -94,7 +95,8 @@ pub struct DataForm { #[serde(rename = "Datenbankexport")] datenbankexport: bool, #[serde(rename = "DatenschutzRelevant")] - datenschutz_relevant: bool, + #[serde(skip_serializing_if = "Option::is_none")] + datenschutz_relevant: Option, #[serde(rename = "KonferenzRelevant")] konferenz_relevant: bool, #[serde(rename = "hatUnterformulare")] @@ -127,7 +129,8 @@ pub struct DataForm { #[serde(rename = "Revision")] revision: u16, #[serde(rename = "SeitenzahlSichtbar")] - seitenanzahl_sichtbar: bool, + #[serde(skip_serializing_if = "Option::is_none")] + seitenanzahl_sichtbar: Option, #[serde(rename = "Entries")] entries: Entries, #[serde(rename = "PlausibilityRules")] @@ -341,7 +344,8 @@ pub struct Entry { #[serde(rename = "Resizable")] resizable: bool, #[serde(rename = "Verschluesselt")] - verschluesselt: bool, + #[serde(skip_serializing_if = "Option::is_none")] + verschluesselt: Option, #[serde(rename = "MemoWidth")] #[serde(skip_serializing_if = "Option::is_none")] memo_width: Option, @@ -382,9 +386,11 @@ pub struct Entry { #[serde(rename = "Revision")] revision: u16, #[serde(rename = "vorherigeWerte")] - vorherige_werte: String, + #[serde(skip_serializing_if = "Option::is_none")] + vorherige_werte: Option, #[serde(rename = "EinfuegenVerhindern")] - einfuegen_verhindern: String, + #[serde(skip_serializing_if = "Option::is_none")] + einfuegen_verhindern: Option, } #[derive(Serialize, Deserialize, Debug)] diff --git a/src/model/unterformular.rs b/src/model/unterformular.rs index d392775..3315629 100644 --- a/src/model/unterformular.rs +++ b/src/model/unterformular.rs @@ -57,7 +57,8 @@ pub struct Unterformular { #[serde(rename = "Aktenbereich")] aktenbereich: String, #[serde(rename = "BefragungRelevant")] - befragung_relevant: bool, + #[serde(skip_serializing_if = "Option::is_none")] + befragung_relevant: Option, #[serde(rename = "Hotkey")] #[serde(skip_serializing_if = "Option::is_none")] hotkey: Option, @@ -100,7 +101,8 @@ pub struct Unterformular { #[serde(rename = "Datenbankexport")] datenbankexport: bool, #[serde(rename = "DatenschutzRelevant")] - datenschutz_relevant: bool, + #[serde(skip_serializing_if = "Option::is_none")] + datenschutz_relevant: Option, #[serde(rename = "KonferenzRelevant")] konferenz_relevant: bool, #[serde(rename = "hatUnterformulare")] @@ -139,7 +141,8 @@ pub struct Unterformular { #[serde(skip_serializing_if = "Option::is_none")] verknuepft_guid: Option, #[serde(rename = "SeitenzahlSichtbar")] - seitenanzahl_sichtbar: bool, + #[serde(skip_serializing_if = "Option::is_none")] + seitenanzahl_sichtbar: Option, #[serde(rename = "Entries")] entries: Entries, #[serde(rename = "PlausibilityRules")] @@ -365,7 +368,8 @@ pub struct Entry { #[serde(rename = "Resizable")] resizable: bool, #[serde(rename = "Verschluesselt")] - verschluesselt: bool, + #[serde(skip_serializing_if = "Option::is_none")] + verschluesselt: Option, #[serde(rename = "MemoWidth")] #[serde(skip_serializing_if = "Option::is_none")] memo_width: Option, @@ -406,9 +410,11 @@ pub struct Entry { #[serde(rename = "Revision")] revision: u16, #[serde(rename = "vorherigeWerte")] - vorherige_werte: String, + #[serde(skip_serializing_if = "Option::is_none")] + vorherige_werte: Option, #[serde(rename = "EinfuegenVerhindern")] - einfuegen_verhindern: String, + #[serde(skip_serializing_if = "Option::is_none")] + einfuegen_verhindern: Option, } #[derive(Serialize, Deserialize, Debug)]