From 31a1dcb63e24a2bf305038f30943b231768a1576 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <volkmer_p@ukw.de>
Date: Fri, 2 Jun 2023 22:31:38 +0200
Subject: [PATCH] Move 'Ordner' and 'Bibliothek' into model/mod.rs

---
 src/model/data_catalogue.rs     |  26 ++++----
 src/model/data_form.rs          |  93 +++++++++++++--------------
 src/model/mod.rs                |  49 +++++++++-----
 src/model/onkostar_editor.rs    |  22 ++-----
 src/model/property_catalogue.rs |  46 +++++++-------
 src/model/unterformular.rs      | 109 ++++++++++++++++----------------
 6 files changed, 176 insertions(+), 169 deletions(-)

diff --git a/src/model/data_catalogue.rs b/src/model/data_catalogue.rs
index eca90be..ffe432d 100644
--- a/src/model/data_catalogue.rs
+++ b/src/model/data_catalogue.rs
@@ -24,7 +24,7 @@
 
 use serde::{Deserialize, Serialize};
 
-use crate::model::onkostar_editor::Ordner;
+use crate::model::Ordner;
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct DataCatalogue {
@@ -51,19 +51,19 @@ pub struct DataCatalogue {
     #[serde(rename = "Entries")]
     entries: Entries,
     #[serde(rename = "Ordner")]
-    ordner: Ordner
+    ordner: Ordner,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Entries {
     #[serde(rename = "Entry")]
-    entry: Vec<Entry>
+    entry: Vec<Entry>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Entry {
     #[serde(rename = "PropertyCatalogue")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     property_catalogue: Option<String>,
     #[serde(rename = "Name")]
     name: String,
@@ -88,10 +88,10 @@ pub struct Entry {
     #[serde(rename = "Filterable")]
     filterable: bool,
     #[serde(rename = "RangeFrom")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     range_from: Option<String>,
     #[serde(rename = "RangeUntil")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     range_until: Option<String>,
     #[serde(rename = "MultipleChoice")]
     multiple_choice: bool,
@@ -108,10 +108,10 @@ pub struct Entry {
     #[serde(rename = "Fachabteilungsbezug")]
     fachabteilungsbezug: bool,
     #[serde(rename = "Use")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     use_: Option<Use>,
     #[serde(rename = "FesteNachkommastellen")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     feste_nachkommastellen: Option<u16>,
     #[serde(rename = "SID")]
     sid: String,
@@ -124,13 +124,13 @@ pub struct Entry {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Use {
     #[serde(rename = "ProgramModule", default)]
-    program_module: Vec<ProgramModule>
+    program_module: Vec<ProgramModule>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct ProgramModule {
-    #[serde(rename="@program")]
+    #[serde(rename = "@program")]
     program: String,
-    #[serde(rename="@name")]
-    name: String
-}
\ No newline at end of file
+    #[serde(rename = "@name")]
+    name: String,
+}
diff --git a/src/model/data_form.rs b/src/model/data_form.rs
index bba9f33..037fa8d 100644
--- a/src/model/data_form.rs
+++ b/src/model/data_form.rs
@@ -24,8 +24,8 @@
 
 use serde::{Deserialize, Serialize};
 
+use crate::model::Ordner;
 use crate::model::{Ansichten, Entries, Filter, MenuCategory, PlausibilityRules, Script};
-use crate::model::onkostar_editor::Ordner;
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct DataForm {
@@ -56,7 +56,7 @@ pub struct DataForm {
     #[serde(rename = "BefragungRelevant")]
     befragung_relevant: bool,
     #[serde(rename = "Hotkey")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     hotkey: Option<String>,
     #[serde(rename = "Summary")]
     summary: String,
@@ -65,7 +65,7 @@ pub struct DataForm {
     #[serde(rename = "KalenderSchnipsel")]
     kalender_schnipsel: String,
     #[serde(rename = "EmailTemplate")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     mail_template: Option<String>,
     #[serde(rename = "ErkrankungText")]
     erkrankung_text: String,
@@ -98,25 +98,25 @@ pub struct DataForm {
     #[serde(rename = "hatUnterformulare")]
     hat_unterformulare: bool,
     #[serde(rename = "ScriptBeimSchliessen")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     script_beim_schliessen: Option<Script>,
     #[serde(rename = "ScriptBeimSpeichern")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     script_beim_speichern: Option<Script>,
     #[serde(rename = "ScriptBeimNeuanlegen")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     script_beim_neuanlegen: Option<Script>,
     #[serde(rename = "ScriptBeimBearbeiten")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     script_beim_bearbeiten: Option<Script>,
     #[serde(rename = "ScriptBeimKopieren")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     script_beim_kopieren: Option<Script>,
     #[serde(rename = "ScriptBeimImport")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     script_beim_import: Option<Script>,
     #[serde(rename = "ScriptBeimAnonymisieren")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     script_beim_anonymisieren: Option<Script>,
     #[serde(rename = "SID")]
     sid: String,
@@ -137,11 +137,11 @@ pub struct DataForm {
     #[serde(rename = "Ordner")]
     ordner: Ordner,
     #[serde(rename = "MenuCategory")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     menu_category: Option<MenuCategory>,
     #[serde(rename = "Ansichten")]
-    #[serde(skip_serializing_if="Option::is_none")]
-    ansichten: Option<Ansichten>
+    #[serde(skip_serializing_if = "Option::is_none")]
+    ansichten: Option<Ansichten>,
 }
 
 impl DataForm {
@@ -151,7 +151,8 @@ impl DataForm {
                 if entry.type_ == "formReference" {
                     if let Some(referenced_data_form) = &entry.referenced_data_form {
                         if referenced_data_form == "OS.Tumorkonferenz" {
-                            entry.referenced_data_form = Some("OS.Tumorkonferenz.VarianteUKW".to_string())
+                            entry.referenced_data_form =
+                                Some("OS.Tumorkonferenz.VarianteUKW".to_string())
                         }
                     }
                 }
@@ -168,11 +169,11 @@ pub struct DataCatalogues {
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Entry {
-    #[serde(rename="@parentId")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(rename = "@parentId")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     parent_id: Option<u32>,
-    #[serde(rename="@parentRefId")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(rename = "@parentRefId")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     parent_ref_id: Option<u32>,
     #[serde(rename = "Type")]
     type_: String,
@@ -191,13 +192,13 @@ pub struct Entry {
     #[serde(rename = "Note")]
     note: String,
     #[serde(rename = "Beschriftung1")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     beschriftung1: Option<String>,
     #[serde(rename = "Beschriftung2")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     beschriftung2: Option<String>,
     #[serde(rename = "WertAnzeigenPatmodul")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     wert_anzeigen_patmodul: Option<String>,
     #[serde(rename = "MultipleChoice")]
     multiple_choice: bool,
@@ -210,7 +211,7 @@ pub struct Entry {
     #[serde(rename = "DataCatalogueEntry")]
     data_catalogue_entry: String,
     #[serde(rename = "DataCatalogueEntryTable")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     data_catalogue_entry_table: Option<String>,
     #[serde(rename = "ElementParent")]
     element_parent: String,
@@ -219,34 +220,34 @@ pub struct Entry {
     #[serde(rename = "ZuordnungErkrankung")]
     zuordnung_erkrankung: String,
     #[serde(rename = "Grafik")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     grafik: Option<String>,
     #[serde(rename = "GrafikAusrichtung")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     grafik_ausrichtung: Option<String>,
     #[serde(rename = "Mandatory")]
     mandatory: String,
     #[serde(rename = "Filter")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     filter: Option<Filter>,
     #[serde(rename = "NotSpecified")]
     not_specified: bool,
     #[serde(rename = "Scripts")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     scripts: Option<Script>,
     #[serde(rename = "ReferencedDataForm")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     referenced_data_form: Option<String>,
     #[serde(rename = "ReferencedDataFormField")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     referenced_data_form_field: Option<String>,
     #[serde(rename = "Anzeige")]
     anzeige: String,
     #[serde(rename = "AnzeigeAuswahl")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     anzeige_auswahl: Option<String>,
     #[serde(rename = "VersionFrom")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     version_from: Option<String>,
     #[serde(rename = "Speichern")]
     speichern: String,
@@ -263,13 +264,13 @@ pub struct Entry {
     #[serde(rename = "Hinweis")]
     hinweis: String,
     #[serde(rename = "Vorschlagskategorie")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     vorschlagskategorie: Option<String>,
     #[serde(rename = "CategoryFilterName")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     category_filer_name: Option<String>,
     #[serde(rename = "Platzhalter")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     platzhalter: Option<String>,
     #[serde(rename = "ShowAuspraegungen")]
     show_auspraegungen: bool,
@@ -282,25 +283,25 @@ pub struct Entry {
     #[serde(rename = "SucheAuswahldialog")]
     suche_auswahldialog: String,
     #[serde(rename = "InfoAuswahldialog")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     info_auswahldialog: Option<String>,
     #[serde(rename = "DiseaseCategoryFilter")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     disease_category_filter: Option<String>,
     #[serde(rename = "MindestbreiteLabel")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     mindestbreite_label: Option<u16>,
     #[serde(rename = "MindestbreiteFeld")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     mindestbreite_feld: Option<u16>,
     #[serde(rename = "OrganisationunitFilter")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     ou_filter: Option<String>,
     #[serde(rename = "Aktion")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     aktion: Option<String>,
     #[serde(rename = "Top10")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     top10: Option<String>,
     #[serde(rename = "GroesseTextfeld")]
     groesse_textfeld: u16,
@@ -311,10 +312,10 @@ pub struct Entry {
     #[serde(rename = "Verschluesselt")]
     verschluesselt: bool,
     #[serde(rename = "MemoWidth")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     memo_width: Option<u32>,
     #[serde(rename = "MemoArt")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     memo_art: Option<String>,
     #[serde(rename = "DateValidFrom")]
     date_valid_from: String,
@@ -323,7 +324,7 @@ pub struct Entry {
     #[serde(rename = "DateValidFuture")]
     date_valid_future: bool,
     #[serde(rename = "Titel")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     titel: Option<String>,
     #[serde(rename = "InAuswertung")]
     in_auswertung: bool,
@@ -338,7 +339,7 @@ pub struct Entry {
     #[serde(rename = "MarkierungIgnorieren")]
     markierung_ignorieren: bool,
     #[serde(rename = "SucheArt")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     suche_art: Option<String>,
     #[serde(rename = "SID")]
     sid: String,
@@ -355,5 +356,5 @@ pub struct Entry {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct DataFormEntries {
     #[serde(rename = "EntryName")]
-    entry_name: Option<Vec<String>>
-}
\ No newline at end of file
+    entry_name: Option<Vec<String>>,
+}
diff --git a/src/model/mod.rs b/src/model/mod.rs
index ecf566d..2b4aa89 100644
--- a/src/model/mod.rs
+++ b/src/model/mod.rs
@@ -24,10 +24,10 @@
 
 use serde::{Deserialize, Serialize};
 
-pub mod onkostar_editor;
-pub mod property_catalogue;
 pub mod data_catalogue;
 pub mod data_form;
+pub mod onkostar_editor;
+pub mod property_catalogue;
 pub mod unterformular;
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -35,7 +35,7 @@ pub struct Script {
     #[serde(rename = "Code")]
     code: String,
     #[serde(rename = "Valid")]
-    valid: bool
+    valid: bool,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -57,10 +57,10 @@ pub struct PlausibilityRule<T> {
     #[serde(rename = "Valid")]
     valid: bool,
     #[serde(rename = "Condition")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     condition: Option<String>,
     #[serde(rename = "ConditionValid")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     condition_valid: Option<bool>,
     #[serde(rename = "Statusauswirkung")]
     statusauswirkung: String,
@@ -71,7 +71,7 @@ pub struct PlausibilityRule<T> {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Entries<T> {
     #[serde(rename = "Entry")]
-    entry: Vec<T>
+    entry: Vec<T>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -103,7 +103,7 @@ pub struct Ansicht {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Ansichten {
     #[serde(rename = "Ansicht", default)]
-    program_module: Vec<Ansicht>
+    program_module: Vec<Ansicht>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -113,7 +113,7 @@ pub struct MenuCategory {
     #[serde(rename = "position")]
     position: String,
     #[serde(rename = "column")]
-    column: String
+    column: String,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -123,20 +123,39 @@ pub struct Filter {
     #[serde(rename = "Valid")]
     valid: bool,
     #[serde(rename = "RefEntries")]
-    #[serde(skip_serializing_if="Option::is_none")]
-    ref_entries: Option<RefEntries>
+    #[serde(skip_serializing_if = "Option::is_none")]
+    ref_entries: Option<RefEntries>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct RefEntries {
     #[serde(rename = "RefEntry")]
-    #[serde(skip_serializing_if="Option::is_none")]
-    ref_entry: Option<Vec<String>>
+    #[serde(skip_serializing_if = "Option::is_none")]
+    ref_entry: Option<Vec<String>>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct PlausibilityRules<T> {
     #[serde(rename = "PlausibilityRule")]
-    #[serde(skip_serializing_if="Option::is_none")]
-    plausibility_rule: Option<Vec<PlausibilityRule<T>>>
-}
\ No newline at end of file
+    #[serde(skip_serializing_if = "Option::is_none")]
+    plausibility_rule: Option<Vec<PlausibilityRule<T>>>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Bibliothek {
+    #[serde(rename = "Name")]
+    name: String,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Ordner {
+    #[serde(rename = "Bibliothek")]
+    bibliothek: Bibliothek,
+    #[serde(rename = "Name")]
+    name: String,
+    #[serde(rename = "Typ")]
+    typ: String,
+    #[serde(rename = "ParentOrdner", default)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    parent_order: Option<Box<Ordner>>,
+}
diff --git a/src/model/onkostar_editor.rs b/src/model/onkostar_editor.rs
index 3956eb8..2102741 100644
--- a/src/model/onkostar_editor.rs
+++ b/src/model/onkostar_editor.rs
@@ -34,7 +34,7 @@ pub struct OnkostarEditor {
     #[serde(rename = "InfoXML")]
     info_xml: InfoXML,
     #[serde(rename = "Editor")]
-    editor: Editor
+    editor: Editor,
 }
 
 impl OnkostarEditor {
@@ -55,7 +55,7 @@ pub struct InfoXML {
     #[serde(rename = "Name")]
     name: String,
     #[serde(rename = "Version")]
-    version: String
+    version: String,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -67,25 +67,11 @@ struct Editor {
     #[serde(rename = "Unterformular")]
     unterformular: Vec<Unterformular>,
     #[serde(rename = "DataForm")]
-    data_form: Vec<DataForm>
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Ordner {
-    #[serde(rename = "Bibliothek")]
-    bibliothek: Bibliothek,
-    #[serde(rename = "Name")]
-    name: String,
-    #[serde(rename = "Typ")]
-    typ: String,
-    #[serde(rename = "ParentOrdner", default)]
-    #[serde(skip_serializing_if="Option::is_none")]
-    parent_order: Option<Box<Ordner>>
+    data_form: Vec<DataForm>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Bibliothek {
     #[serde(rename = "Name")]
-    name: String
+    name: String,
 }
-
diff --git a/src/model/property_catalogue.rs b/src/model/property_catalogue.rs
index 8e407f1..db1c3b7 100644
--- a/src/model/property_catalogue.rs
+++ b/src/model/property_catalogue.rs
@@ -24,7 +24,7 @@
 
 use serde::{Deserialize, Serialize};
 
-use crate::model::onkostar_editor::Ordner;
+use crate::model::Ordner;
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct PropertyCatalogue {
@@ -37,7 +37,7 @@ pub struct PropertyCatalogue {
     #[serde(rename = "Readonly")]
     readonly: bool,
     #[serde(rename = "Anmerkung")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     anmerkung: Option<String>,
     #[serde(rename = "SID")]
     sid: String,
@@ -48,14 +48,14 @@ pub struct PropertyCatalogue {
     #[serde(rename = "Versions")]
     versions: Versions,
     #[serde(rename = "Ordner")]
-    ordner: Ordner
+    ordner: Ordner,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Versions {
     #[serde(rename = "Version")]
-    #[serde(skip_serializing_if="Option::is_none")]
-    entry: Option<Vec<Version>>
+    #[serde(skip_serializing_if = "Option::is_none")]
+    entry: Option<Vec<Version>>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -79,16 +79,16 @@ pub struct Version {
     #[serde(rename = "Entries")]
     entries: VersionEntries,
     #[serde(rename = "Abbildung")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     abbildung: Option<Vec<Abbildung>>,
     #[serde(rename = "Categories")]
-    categories: Categories
+    categories: Categories,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct VersionEntries {
     #[serde(rename = "Entry", default)]
-    content: Vec<VersionEntry>
+    content: Vec<VersionEntry>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -100,19 +100,19 @@ pub struct VersionEntry {
     #[serde(rename = "Description")]
     description: String,
     #[serde(rename = "Synonyms", default)]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     synonyms: Option<String>,
     #[serde(rename = "Note", default)]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     note: Option<String>,
     #[serde(rename = "Position")]
-    position: String
+    position: String,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Categories {
     #[serde(rename = "Category", default)]
-    content: Vec<Category>
+    content: Vec<Category>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -128,13 +128,13 @@ pub struct Category {
     #[serde(rename = "Beschreibung")]
     beschreibung: String,
     #[serde(rename = "CategoryEntries")]
-    category_entries: CategoryEntries
+    category_entries: CategoryEntries,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct CategoryEntries {
     #[serde(rename = "CategoryEntry", default)]
-    content: Vec<CategoryEntry>
+    content: Vec<CategoryEntry>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -142,16 +142,16 @@ pub struct CategoryEntry {
     #[serde(rename = "Code")]
     code: String,
     #[serde(rename = "shortdesc", default)]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     shortdesc: Option<String>,
     #[serde(rename = "description", default)]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     description: Option<String>,
     #[serde(rename = "Synonyms", default)]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     synonyms: Option<String>,
     #[serde(rename = "note", default)]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     note: Option<String>,
 }
 
@@ -160,7 +160,7 @@ pub struct Abbildung {
     #[serde(rename = "ZielMKVersionOid")]
     ziel_mk_version_oid: String,
     #[serde(rename = "Eintrag", default)]
-    content: Vec<AbbildungEintrag>
+    content: Vec<AbbildungEintrag>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -168,7 +168,7 @@ pub struct AbbildungEintrag {
     #[serde(rename = "Entry-from")]
     entry_from: AbbildungEntry,
     #[serde(rename = "Entry-to")]
-    entry_to: AbbildungEntry
+    entry_to: AbbildungEntry,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -180,10 +180,10 @@ pub struct AbbildungEntry {
     #[serde(rename = "Description")]
     description: String,
     #[serde(rename = "Synonyms")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     synonyms: Option<String>,
     #[serde(rename = "Note")]
     note: String,
     #[serde(rename = "Position")]
-    position: String
-}
\ No newline at end of file
+    position: String,
+}
diff --git a/src/model/unterformular.rs b/src/model/unterformular.rs
index 4945671..261aa9a 100644
--- a/src/model/unterformular.rs
+++ b/src/model/unterformular.rs
@@ -24,8 +24,8 @@
 
 use serde::{Deserialize, Serialize};
 
+use crate::model::Ordner;
 use crate::model::{Ansichten, Entries, Filter, MenuCategory, PlausibilityRules, Script};
-use crate::model::onkostar_editor::Ordner;
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Unterformular {
@@ -56,7 +56,7 @@ pub struct Unterformular {
     #[serde(rename = "BefragungRelevant")]
     befragung_relevant: bool,
     #[serde(rename = "Hotkey")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     hotkey: Option<String>,
     #[serde(rename = "Summary")]
     summary: String,
@@ -65,22 +65,22 @@ pub struct Unterformular {
     #[serde(rename = "KalenderSchnipsel")]
     kalender_schnipsel: String,
     #[serde(rename = "EmailTemplate")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     mail_template: Option<String>,
     #[serde(rename = "ErkrankungText")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     erkrankung_text: Option<String>,
     #[serde(rename = "ErkrankungTextLong")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     erkrankung_text_long: Option<String>,
     #[serde(rename = "ErkrankungProzedurText")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     erkrankung_prozedur_text: Option<String>,
     #[serde(rename = "ErkrankungSummary")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     erkrankung_summary: Option<String>,
     #[serde(rename = "ErkrankungBigSummary")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     erkrankung_big_summary: Option<String>,
     #[serde(rename = "Kontext")]
     kontext: String,
@@ -103,25 +103,25 @@ pub struct Unterformular {
     #[serde(rename = "hatUnterformulare")]
     hat_unterformulare: bool,
     #[serde(rename = "ScriptBeimSchliessen")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     script_beim_schliessen: Option<Script>,
     #[serde(rename = "ScriptBeimSpeichern")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     script_beim_speichern: Option<Script>,
     #[serde(rename = "ScriptBeimNeuanlegen")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     script_beim_neuanlegen: Option<Script>,
     #[serde(rename = "ScriptBeimBearbeiten")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     script_beim_bearbeiten: Option<Script>,
     #[serde(rename = "ScriptBeimKopieren")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     script_beim_kopieren: Option<Script>,
     #[serde(rename = "ScriptBeimImport")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     script_beim_import: Option<Script>,
     #[serde(rename = "ScriptBeimAnonymisieren")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     script_beim_anonymisieren: Option<Script>,
     #[serde(rename = "SID")]
     sid: String,
@@ -130,7 +130,7 @@ pub struct Unterformular {
     #[serde(rename = "Revision")]
     revision: u16,
     #[serde(rename = "VerknuepftGUID")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     verknuepft_guid: Option<String>,
     #[serde(rename = "SeitenzahlSichtbar")]
     seitenanzahl_sichtbar: bool,
@@ -145,11 +145,11 @@ pub struct Unterformular {
     #[serde(rename = "Ordner")]
     ordner: Ordner,
     #[serde(rename = "MenuCategory")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     menu_category: Option<MenuCategory>,
     #[serde(rename = "Ansichten")]
-    #[serde(skip_serializing_if="Option::is_none")]
-    ansichten: Option<Ansichten>
+    #[serde(skip_serializing_if = "Option::is_none")]
+    ansichten: Option<Ansichten>,
 }
 
 impl Unterformular {
@@ -159,7 +159,8 @@ impl Unterformular {
                 if entry.type_ == "formReference" {
                     if let Some(referenced_data_form) = &entry.referenced_data_form {
                         if referenced_data_form == "OS.Tumorkonferenz" {
-                            entry.referenced_data_form = Some("OS.Tumorkonferenz.VarianteUKW".to_string())
+                            entry.referenced_data_form =
+                                Some("OS.Tumorkonferenz.VarianteUKW".to_string())
                         }
                     }
                 }
@@ -176,11 +177,11 @@ pub struct DataCatalogues {
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Entry {
-    #[serde(rename="@parentId")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(rename = "@parentId")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     parent_id: Option<u32>,
-    #[serde(rename="@parentRefId")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(rename = "@parentRefId")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     parent_ref_id: Option<u32>,
     #[serde(rename = "Type")]
     type_: String,
@@ -199,13 +200,13 @@ pub struct Entry {
     #[serde(rename = "Note")]
     note: String,
     #[serde(rename = "Beschriftung1")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     beschriftung1: Option<String>,
     #[serde(rename = "Beschriftung2")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     beschriftung2: Option<String>,
     #[serde(rename = "WertAnzeigenPatmodul")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     wert_anzeigen_patmodul: Option<String>,
     #[serde(rename = "MultipleChoice")]
     multiple_choice: bool,
@@ -218,7 +219,7 @@ pub struct Entry {
     #[serde(rename = "DataCatalogueEntry")]
     data_catalogue_entry: String,
     #[serde(rename = "DataCatalogueEntryTable")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     data_catalogue_entry_table: Option<String>,
     #[serde(rename = "ElementParent")]
     element_parent: String,
@@ -227,34 +228,34 @@ pub struct Entry {
     #[serde(rename = "ZuordnungErkrankung")]
     zuordnung_erkrankung: String,
     #[serde(rename = "Grafik")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     grafik: Option<String>,
     #[serde(rename = "GrafikAusrichtung")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     grafik_ausrichtung: Option<String>,
     #[serde(rename = "Mandatory")]
     mandatory: String,
     #[serde(rename = "Filter")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     filter: Option<Filter>,
     #[serde(rename = "NotSpecified")]
     not_specified: bool,
     #[serde(rename = "Scripts")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     scripts: Option<Script>,
     #[serde(rename = "ReferencedDataForm")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     referenced_data_form: Option<String>,
     #[serde(rename = "ReferencedDataFormField")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     referenced_data_form_field: Option<String>,
     #[serde(rename = "Anzeige")]
     anzeige: String,
     #[serde(rename = "AnzeigeAuswahl")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     anzeige_auswahl: Option<String>,
     #[serde(rename = "VersionFrom")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     version_from: Option<String>,
     #[serde(rename = "Speichern")]
     speichern: String,
@@ -269,16 +270,16 @@ pub struct Entry {
     #[serde(rename = "InUebersichtAnzeigen")]
     in_uebersicht_anzeigen: bool,
     #[serde(rename = "Hinweis")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     hinweis: Option<String>,
     #[serde(rename = "Vorschlagskategorie")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     vorschlagskategorie: Option<String>,
     #[serde(rename = "CategoryFilterName")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     category_filer_name: Option<String>,
     #[serde(rename = "Platzhalter")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     platzhalter: Option<String>,
     #[serde(rename = "ShowAuspraegungen")]
     show_auspraegungen: bool,
@@ -291,25 +292,25 @@ pub struct Entry {
     #[serde(rename = "SucheAuswahldialog")]
     suche_auswahldialog: String,
     #[serde(rename = "InfoAuswahldialog")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     info_auswahldialog: Option<String>,
     #[serde(rename = "DiseaseCategoryFilter")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     disease_category_filter: Option<String>,
     #[serde(rename = "MindestbreiteLabel")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     mindestbreite_label: Option<u16>,
     #[serde(rename = "MindestbreiteFeld")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     mindestbreite_feld: Option<u16>,
     #[serde(rename = "OrganisationunitFilter")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     ou_filter: Option<String>,
     #[serde(rename = "Aktion")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     aktion: Option<String>,
     #[serde(rename = "Top10")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     top10: Option<String>,
     #[serde(rename = "GroesseTextfeld")]
     groesse_textfeld: u16,
@@ -320,10 +321,10 @@ pub struct Entry {
     #[serde(rename = "Verschluesselt")]
     verschluesselt: bool,
     #[serde(rename = "MemoWidth")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     memo_width: Option<u32>,
     #[serde(rename = "MemoArt")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     memo_art: Option<String>,
     #[serde(rename = "DateValidFrom")]
     date_valid_from: String,
@@ -332,7 +333,7 @@ pub struct Entry {
     #[serde(rename = "DateValidFuture")]
     date_valid_future: bool,
     #[serde(rename = "Titel")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     titel: Option<String>,
     #[serde(rename = "InAuswertung")]
     in_auswertung: bool,
@@ -347,7 +348,7 @@ pub struct Entry {
     #[serde(rename = "MarkierungIgnorieren")]
     markierung_ignorieren: bool,
     #[serde(rename = "SucheArt")]
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     suche_art: Option<String>,
     #[serde(rename = "SID")]
     sid: String,
@@ -364,6 +365,6 @@ pub struct Entry {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct DataFormEntries {
     #[serde(rename = "EntryName")]
-    #[serde(skip_serializing_if="Option::is_none")]
-    entry_name: Option<Vec<String>>
-}
\ No newline at end of file
+    #[serde(skip_serializing_if = "Option::is_none")]
+    entry_name: Option<Vec<String>>,
+}