pcvolkmer/osc-variant
1
0
Fork 0
mirror of https://github.com/pcvolkmer/osc-variant.git synced 2025-04-19 19:56:50 +00:00
Code Issues

Make more fields optional as required by some OSC files

Browse Source
This commit is contained in:
Paul-Christian Volkmer 2023-06-13 22:32:44 +02:00
parent 5693711072
commit 4bf316d78a
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/model/data_form.rs
View File

@ -56,7 +56,8 @@ pub struct DataForm {
#[serde(rename = "Aktenbereich")] #[serde(rename = "Aktenbereich")]
aktenbereich: String, aktenbereich: String,
#[serde(rename = "BefragungRelevant")] #[serde(rename = "BefragungRelevant")]
befragung_relevant: bool, #[serde(skip_serializing_if = "Option::is_none")]
befragung_relevant: Option<bool>,
#[serde(rename = "Hotkey")] #[serde(rename = "Hotkey")]
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
hotkey: Option<String>, hotkey: Option<String>,
@ -94,7 +95,8 @@ pub struct DataForm {
#[serde(rename = "Datenbankexport")] #[serde(rename = "Datenbankexport")]
datenbankexport: bool, datenbankexport: bool,
#[serde(rename = "DatenschutzRelevant")] #[serde(rename = "DatenschutzRelevant")]
datenschutz_relevant: bool, #[serde(skip_serializing_if = "Option::is_none")]
datenschutz_relevant: Option<bool>,
#[serde(rename = "KonferenzRelevant")] #[serde(rename = "KonferenzRelevant")]
konferenz_relevant: bool, konferenz_relevant: bool,
#[serde(rename = "hatUnterformulare")] #[serde(rename = "hatUnterformulare")]
@ -127,7 +129,8 @@ pub struct DataForm {
#[serde(rename = "Revision")] #[serde(rename = "Revision")]
revision: u16, revision: u16,
#[serde(rename = "SeitenzahlSichtbar")] #[serde(rename = "SeitenzahlSichtbar")]
seitenanzahl_sichtbar: bool, #[serde(skip_serializing_if = "Option::is_none")]
seitenanzahl_sichtbar: Option<bool>,
#[serde(rename = "Entries")] #[serde(rename = "Entries")]
entries: Entries<Entry>, entries: Entries<Entry>,
#[serde(rename = "PlausibilityRules")] #[serde(rename = "PlausibilityRules")]
@ -341,7 +344,8 @@ pub struct Entry {
#[serde(rename = "Resizable")] #[serde(rename = "Resizable")]
resizable: bool, resizable: bool,
#[serde(rename = "Verschluesselt")] #[serde(rename = "Verschluesselt")]
verschluesselt: bool, #[serde(skip_serializing_if = "Option::is_none")]
verschluesselt: Option<bool>,
#[serde(rename = "MemoWidth")] #[serde(rename = "MemoWidth")]
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
memo_width: Option<u32>, memo_width: Option<u32>,
@ -382,9 +386,11 @@ pub struct Entry {
#[serde(rename = "Revision")] #[serde(rename = "Revision")]
revision: u16, revision: u16,
#[serde(rename = "vorherigeWerte")] #[serde(rename = "vorherigeWerte")]
vorherige_werte: String, #[serde(skip_serializing_if = "Option::is_none")]
vorherige_werte: Option<String>,
#[serde(rename = "EinfuegenVerhindern")] #[serde(rename = "EinfuegenVerhindern")]
einfuegen_verhindern: String, #[serde(skip_serializing_if = "Option::is_none")]
einfuegen_verhindern: Option<String>,
} }
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]

18
src/model/unterformular.rs
View File

@ -57,7 +57,8 @@ pub struct Unterformular {
#[serde(rename = "Aktenbereich")] #[serde(rename = "Aktenbereich")]
aktenbereich: String, aktenbereich: String,
#[serde(rename = "BefragungRelevant")] #[serde(rename = "BefragungRelevant")]
befragung_relevant: bool, #[serde(skip_serializing_if = "Option::is_none")]
befragung_relevant: Option<bool>,
#[serde(rename = "Hotkey")] #[serde(rename = "Hotkey")]
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
hotkey: Option<String>, hotkey: Option<String>,
@ -100,7 +101,8 @@ pub struct Unterformular {
#[serde(rename = "Datenbankexport")] #[serde(rename = "Datenbankexport")]
datenbankexport: bool, datenbankexport: bool,
#[serde(rename = "DatenschutzRelevant")] #[serde(rename = "DatenschutzRelevant")]
datenschutz_relevant: bool, #[serde(skip_serializing_if = "Option::is_none")]
datenschutz_relevant: Option<bool>,
#[serde(rename = "KonferenzRelevant")] #[serde(rename = "KonferenzRelevant")]
konferenz_relevant: bool, konferenz_relevant: bool,
#[serde(rename = "hatUnterformulare")] #[serde(rename = "hatUnterformulare")]
@ -139,7 +141,8 @@ pub struct Unterformular {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
verknuepft_guid: Option<String>, verknuepft_guid: Option<String>,
#[serde(rename = "SeitenzahlSichtbar")] #[serde(rename = "SeitenzahlSichtbar")]
seitenanzahl_sichtbar: bool, #[serde(skip_serializing_if = "Option::is_none")]
seitenanzahl_sichtbar: Option<bool>,
#[serde(rename = "Entries")] #[serde(rename = "Entries")]
entries: Entries<Entry>, entries: Entries<Entry>,
#[serde(rename = "PlausibilityRules")] #[serde(rename = "PlausibilityRules")]
@ -365,7 +368,8 @@ pub struct Entry {
#[serde(rename = "Resizable")] #[serde(rename = "Resizable")]
resizable: bool, resizable: bool,
#[serde(rename = "Verschluesselt")] #[serde(rename = "Verschluesselt")]
verschluesselt: bool, #[serde(skip_serializing_if = "Option::is_none")]
verschluesselt: Option<bool>,
#[serde(rename = "MemoWidth")] #[serde(rename = "MemoWidth")]
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
memo_width: Option<u32>, memo_width: Option<u32>,
@ -406,9 +410,11 @@ pub struct Entry {
#[serde(rename = "Revision")] #[serde(rename = "Revision")]
revision: u16, revision: u16,
#[serde(rename = "vorherigeWerte")] #[serde(rename = "vorherigeWerte")]
vorherige_werte: String, #[serde(skip_serializing_if = "Option::is_none")]
vorherige_werte: Option<String>,
#[serde(rename = "EinfuegenVerhindern")] #[serde(rename = "EinfuegenVerhindern")]
einfuegen_verhindern: String, #[serde(skip_serializing_if = "Option::is_none")]
einfuegen_verhindern: Option<String>,
} }
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]