Update dependencies and bump version

Issue #8: Add sorting by depency for required form references and subforms

Cargo.lock

@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "anstyle"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
 
 [[package]]
 name = "async-trait"
@@ -60,9 +60,9 @@ dependencies = [
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cc"
@@ -81,9 +81,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.2"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6"
+checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -91,9 +91,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.2"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08"
+checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -101,9 +101,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.4.0"
+version = "4.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5"
+checksum = "e3ae8ba90b9d8b007efe66e55e48fb936272f5ca00349b5b0e89877520d35ea7"
 dependencies = [
  "clap",
 ]
@@ -198,9 +198,9 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
 
 [[package]]
 name = "heck"
@@ -216,9 +216,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -238,15 +238,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
 
 [[package]]
 name = "memchr"
-version = "2.6.3"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "miniz_oxide"
@@ -268,7 +268,7 @@ dependencies = [
 
 [[package]]
 name = "osc-variant"
-version = "0.4.0"
+version = "0.5.0"
 dependencies = [
  "clap",
  "clap_complete",
@@ -287,9 +287,9 @@ checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
 dependencies = [
  "unicode-ident",
 ]
@@ -360,9 +360,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.7"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -384,9 +384,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.31"
+version = "2.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398"
+checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -406,21 +406,21 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "unsafe-libyaml"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "osc-variant"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 authors = ["Paul-Christian Volkmer <volkmer_p@ukw.de>"]
 description = "Anwendung zum Anpassen einer OSC-Datei an einen Standort"
@@ -30,6 +30,8 @@ panic = "abort"
 
 [package.metadata.deb]
 copyright = "Copyright (c) 2023 Comprehensive Cancer Center Mainfranken"
+extended-description = "Anwendung zum Anpassen einer OSC-Datei an einen Standort."
 assets = [
+    ["target/release/osc-variant", "usr/bin/", "755"],
     ["completion/osc-variant.bash", "etc/bash_completion.d/", "644"]
 ]

README.md

@@ -16,6 +16,10 @@ unvollständigen Ausgabedateien zu erzeugen.
 
 ### Beispiele
 
+Die folgenden Unterbefehle sind verfügbar
+
+#### `sha256sum`
+
 Das Berechnen der SHA256 Prüfsumme ist mit dem Unterbefehl `sha256sum` auch unter Windows einfach möglich
 und erzeugt eine Ausgabe analog dem Befehl auf Linux-Systemen:
 
@@ -23,21 +27,40 @@ und erzeugt eine Ausgabe analog dem Befehl auf Linux-Systemen:
 osc-variant sha256sum meine-beispieldatei.osc
 ```
 
+#### `list`
+
 Zum Auflisten der Inhalte einer Datei wird folgender Befehl verwendet:
 
 ```
 osc-variant list meine-beispieldatei.osc
 ```
 
-Zum Auflisten der Inhalte mit allen Abhängigkeiten, z.B. Daten- und Merkmalkataloge und bei Formularen wird der Befehl
+Mit der Option `--filter` kann die Ausgabe eingeschränkt werden. 
+
+#### `tree`
+
+Zum Auflisten der Inhalte mit allen Abhängigkeiten, z.B. Daten- und Merkmalskataloge und bei Formularen wird der Befehl
 `tree` verwendet:
 
 ```
 osc-variant tree meine-beispieldatei.osc
 ```
 
+Abhängigkeiten werden je nach Art gekennzeichnet:
+
+* `+`: Datenkatalog
+* `-`: Merkmalskatalog
+* `>`: Formularverweis
+* `*`: Unterformular
+
+Für Formularverweise und Unterformulare werden dabei die verwendeten Datenkataloge nicht erneut ausgegeben.
+
 Achtung! Dies erzeugt eine sehr umfangreiche Ausgabe.
 
+Mit der Option `--filter` kann auch hier die Ausgabe eingeschränkt werden.
+
+#### `diff`
+
 Zum Vergleich zweier OSC-Dateien wird der Unterbefehl `diff` verwendet.
 Der optionale Parameter `--strict` vergleicht auch den Inhalt der OSC-Datei.
 Ohne diesen wird nur das Vorhandensein von Inhalten und die Revision verglichen. 
@@ -52,6 +75,8 @@ bzw.
 osc-variant diff meine-beispieldatei.osc andere-beispieldatei.osc --strict
 ```
 
+#### `modify`
+
 Zum Anpassen des Inhalts einer Datei:
 
 ```
@@ -71,9 +96,9 @@ Hierzu ist die Option `--compact` vorgesehen. Es können, je nach Datei, bis zu
 
 #### Filter
 
-Bei der Auflistung von Inhalten ist es möglich, die Ausgaben anhand des Namens zu filtern.
+Bei der Auflistung von Inhalten ist es möglich, die Anzeige für die Unterbefehle `list` und `tree` anhand des Namens zu filtern.
 Hierzu ist die Option `--filter=` vorgesehen.
-Wird diese angewendet, werden nur Inhalte ausgegeben, deren Name die angegebene Zeichenkette beinhalten.
+Wird diese angewendet, werden nur Inhalte angezeigt, deren Name die angegebene Zeichenkette beinhalten.
 
 #### Sortierung
 
@@ -81,7 +106,11 @@ Bei der Auflistung der Inhalte, kann die Option `--sorted` dazu verwendet werden
 Die Sortierung erfolgt dabei nach Namen des Katalogs oder des Formulars.
 
 Beim Modifizieren der Inhalte kann ebenfalls die Option `--sorted` dazu verwendet werden, die Einträge im Anschluss an die Modifikation
-nach Namen zu sortieren.
+nach Namen und für Formulare der Abhängigkeit von Formularverweisen und Unterformularen zu sortieren.
+
+Formulare, die von anderen Formularen in einem Formularverweis oder als Unterformular verwendet werden, werden dabei weiter oben angeordnet,
+da Onkostar einen Formularimport sequenziell, ohne Berücksichtigung von Abhängigkeiten, durchführt.
+
 Dies erlaubt eine konsistente Reihenfolge der Einträge, wodurch ein direkter Vergleich mit Vorversionen ermöglicht wird.
 
 ##### Entfernen von Inhalten der Systembibliothek bei Modifikation

build.rs

@@ -35,7 +35,7 @@ fn main() -> Result<(), Error> {
 
     let package_name = std::env::var("CARGO_CRATE_NAME").unwrap_or("osc-variant".to_string());
 
-    fs::remove_dir_all("completion")?;
+    fs::remove_dir_all("completion").unwrap_or_default();
     fs::create_dir("completion")?;
 
     generate_to(Bash, &mut cmd, package_name.as_str(), "completion")?;

examples/dnpm-master.yml

@@ -0,0 +1,27 @@
+forms:
+  - name: 'DNPM Klinik/Anamnese'
+    form_references:
+      - name: MTB
+        referenced_data_form: 'OS.Tumorkonferenz'
+        anzeige_auswahl: 'MTB vom {Datum}'
+  - name: 'DNPM Therapieplan'
+    form_references:
+      - name: referstemtb
+        referenced_data_form: 'OS.Tumorkonferenz'
+        anzeige_auswahl: 'MTB vom {Datum}'
+      - name: reftkhumangenber
+        referenced_data_form: 'OS.Tumorkonferenz'
+        anzeige_auswahl: 'MTB vom {Datum}'
+      - name: reftkreevaluation
+        referenced_data_form: 'OS.Tumorkonferenz'
+        anzeige_auswahl: 'MTB vom {Datum}'
+  - name: 'DNPM UF Einzelempfehlung'
+    form_references:
+      - name: mtb
+        referenced_data_form: 'OS.Tumorkonferenz'
+        anzeige_auswahl: 'MTB vom {Datum}'
+  - name: 'DNPM UF Rebiopsie'
+    form_references:
+      - name: reftumorkonferenz
+        referenced_data_form: 'OS.Tumorkonferenz'
+        anzeige_auswahl: 'MTB vom {Datum}'

examples/dnpm-ukm.yml

@@ -4,6 +4,9 @@ forms:
       - name: MTB
         referenced_data_form: 'MR.MTB_Anmeldung'
         anzeige_auswahl: 'MTB Anmeldung vom {Anmeldedatum}'
+        scripts_code: |
+          setFieldValue('AnmeldedatumMTB', getFieldValue('MTB').MTBTermin);
+          setFieldValue('WHOGrad', getFieldValue('MTB').WHOGrad);
   - name: 'DNPM Therapieplan'
     form_references:
       - name: referstemtb

src/model/data_catalogue.rs

@@ -102,7 +102,8 @@ impl Comparable for DataCatalogue {
 
 impl Requires for DataCatalogue {
     fn get_required_entries<'a>(&'a self, all: &'a OnkostarEditor) -> Vec<Requirement> {
-        self.entries
+        let mut result = self
+            .entries
             .entry
             .iter()
             .filter(|&entry| entry.property_catalogue.is_some())
@@ -116,7 +117,10 @@ impl Requires for DataCatalogue {
                 Some(contained) => Requirement::PropertyCatalogue(contained),
                 None => Requirement::ExternalPropertyCatalogue(entry),
             })
-            .collect::<Vec<_>>()
+            .collect::<Vec<_>>();
+        result.sort_unstable_by_key(|item| item.sorting_key());
+
+        result
     }
 
     fn to_requirement_string<'a>(&'a self, all: &'a OnkostarEditor) -> String {

src/model/data_form.rs

@@ -22,6 +22,7 @@
  * SOFTWARE.
  */
 
+use std::cmp::Ordering;
 use std::collections::HashSet;
 
 use console::style;
@@ -252,9 +253,54 @@ impl Comparable for DataForm {
     fn get_revision(&self) -> u16 {
         self.revision
     }
+
+    fn compare_by_requirement(a: &Self, b: &Self) -> Ordering {
+        if a.get_name() == b.get_name()
+            || a.is_system_library_content()
+            || b.is_system_library_content()
+        {
+            return Ordering::Equal;
+        }
+
+        if a.requires_form_reference(&b.get_name()) || a.requires_subform(&b.get_name()) {
+            return Ordering::Greater;
+        }
+
+        Ordering::Less
+    }
 }
 
 impl Requires for DataForm {
+    fn requires_form_reference(&self, name: &str) -> bool {
+        self.entries
+            .entry
+            .iter()
+            .map(|item| {
+                item.type_ == "formReference"
+                    && match item.referenced_data_form.as_ref() {
+                        Some(refname) => refname == name,
+                        _ => false,
+                    }
+            })
+            .filter(|&it| it)
+            .last()
+            .unwrap_or_default()
+    }
+    fn requires_subform(&self, name: &str) -> bool {
+        self.entries
+            .entry
+            .iter()
+            .map(|item| {
+                item.type_ == "subform"
+                    && match item.referenced_data_form.as_ref() {
+                        Some(refname) => refname == name,
+                        _ => false,
+                    }
+            })
+            .filter(|&it| it)
+            .last()
+            .unwrap_or_default()
+    }
     fn get_required_entries<'a>(&'a self, all: &'a OnkostarEditor) -> Vec<Requirement> {
         let mut result = self
             .data_catalogues
@@ -267,6 +313,7 @@ impl Requires for DataForm {
                 None => Requirement::ExternalDataCatalogue(entry.to_string()),
             })
             .collect::<Vec<_>>();
+        result.sort_unstable_by_key(|item| item.sorting_key());
 
         let referenced_forms = &mut self
             .entries
@@ -287,58 +334,33 @@ impl Requires for DataForm {
                 },
             })
             .collect::<Vec<_>>();
+        referenced_forms.sort_unstable_by_key(|item| item.sorting_key());
         result.append(referenced_forms);
 
+        let sub_forms = &mut self
+            .entries
+            .entry
+            .iter()
+            .filter(|&entry| entry.get_type() == "subform")
+            .filter_map(|entry| match &entry.referenced_data_form {
+                Some(name) => Some(name),
+                None => None,
+            })
+            .collect::<HashSet<_>>()
+            .into_iter()
+            .map(|entry| match all.find_data_form(entry.as_str()) {
+                Some(contained) => Requirement::DataFormSubform(contained),
+                None => match all.find_unterformular(entry.as_str()) {
+                    Some(contained) => Requirement::UnterformularSubform(contained),
+                    None => Requirement::ExternalUnterformularSubform(entry.to_string()),
+                },
+            })
+            .collect::<Vec<_>>();
+        sub_forms.sort_unstable_by_key(|item| item.sorting_key());
+        result.append(sub_forms);
+
         result
     }
-
-    fn to_requirement_string<'a>(&'a self, all: &'a OnkostarEditor) -> String {
-        format!(
-            "{}\n{}",
-            self.to_listed_string(),
-            self.get_required_entries(all)
-                .iter()
-                .map(|entry| match entry {
-                    Requirement::DataCatalogue(x) => {
-                        let inner = x
-                            .get_required_entries(all)
-                            .iter()
-                            .map(|inner_entry| match inner_entry {
-                                Requirement::PropertyCatalogue(y) => Some(y.to_listed_string()),
-                                Requirement::ExternalPropertyCatalogue(name) => Some(format!(
-                                    "Merkmalskatalog (-) '{}' - hier nicht enthalten",
-                                    style(name).yellow()
-                                )),
-                                _ => None,
-                            })
-                            .filter(Option::is_some)
-                            .map(|item| format!("    - {}\n", item.unwrap()))
-                            .collect::<Vec<_>>()
-                            .join("");
-
-                        if inner.is_empty() {
-                            Some(format!("  + {}\n", x.to_listed_string()))
-                        } else {
-                            Some(format!("  + {}\n{}", x.to_listed_string(), inner))
-                        }
-                    }
-                    Requirement::ExternalDataCatalogue(_) => {
-                        Some(format!("  + {}\n", entry.to_string()))
-                    }
-                    Requirement::DataFormReference(_)
-                    | Requirement::ExternalDataFormReference(_)
-                    | Requirement::UnterformularReference(_)
-                    | Requirement::ExternalUnterformularReference(_) => {
-                        Some(format!("  > {}\n", entry.to_string()))
-                    }
-                    _ => None,
-                })
-                .filter(Option::is_some)
-                .flatten()
-                .collect::<Vec<_>>()
-                .join("")
-        )
-    }
 }
 
 impl FolderContent for DataForm {
@@ -528,6 +550,9 @@ pub struct Entry {
     direction_pat_modul: String,
     #[serde(rename = "SeitenumbruchPatModul")]
     seitenumbruch_pat_modul: bool,
+    #[serde(rename = "Kontaktliste")]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    kontaktliste: Option<String>,
     #[serde(rename = "MarkierungIgnorieren")]
     markierung_ignorieren: bool,
     #[serde(rename = "SucheArt")]

src/model/mod.rs

@@ -22,10 +22,12 @@
  * SOFTWARE.
  */
 
+use std::cmp::Ordering;
 use std::collections::hash_map::DefaultHasher;
 use std::fmt::Debug;
 use std::hash::{Hash, Hasher};
 
+use crate::model::requirements::Requires;
 use serde::{Deserialize, Serialize};
 
 use crate::profile::{FormField, FormReference, Profile};
@@ -251,6 +253,7 @@ pub trait Listable {
 
 pub trait Sortable {
     fn sorting_key(&self) -> String;
+
     fn sorted(&mut self) -> &Self
     where
         Self: Sized,
@@ -267,6 +270,12 @@ pub trait Comparable: Debug {
         format!("{:?}", self).hash(&mut h);
         h.finish().to_string()
     }
+    fn compare_by_requirement(_: &Self, _: &Self) -> Ordering
+    where
+        Self: Requires,
+    {
+        Ordering::Equal
+    }
 }
 
 pub trait FormEntry {

src/model/onkostar_editor.rs

@@ -229,17 +229,25 @@ impl OnkostarEditor {
             item.sorted();
         });
 
+        /*self.editor
+        .data_form
+        .sort_unstable_by_key(|e| e.sorting_key());*/
+
         self.editor
             .data_form
-            .sort_unstable_by_key(|e| e.sorting_key());
+            .sort_unstable_by(DataForm::compare_by_requirement);
 
         self.editor.data_form.iter_mut().for_each(|item| {
             item.sorted();
         });
 
+        /*self.editor
+        .unterformular
+        .sort_unstable_by_key(|e| e.sorting_key());*/
+
         self.editor
             .unterformular
-            .sort_unstable_by_key(|e| e.sorting_key());
+            .sort_unstable_by(Unterformular::compare_by_requirement);
 
         self.editor.unterformular.iter_mut().for_each(|item| {
             item.sorted();

src/model/requirements.rs

@@ -27,7 +27,7 @@ use crate::model::data_form::DataForm;
 use crate::model::onkostar_editor::OnkostarEditor;
 use crate::model::property_catalogue::PropertyCatalogue;
 use crate::model::unterformular::Unterformular;
-use crate::model::Listable;
+use crate::model::{Comparable, Listable, Sortable};
 
 #[allow(clippy::enum_variant_names)]
 pub enum Requirement<'a> {
@@ -40,6 +40,31 @@ pub enum Requirement<'a> {
     #[allow(dead_code)]
     ExternalDataFormReference(String),
     ExternalUnterformularReference(String),
+
+    DataFormSubform(&'a DataForm),
+    UnterformularSubform(&'a Unterformular),
+    #[allow(dead_code)]
+    ExternalDataFormSubform(String),
+    ExternalUnterformularSubform(String),
+}
+
+impl Sortable for Requirement<'_> {
+    fn sorting_key(&self) -> String {
+        match self {
+            Requirement::PropertyCatalogue(item) => item.get_name(),
+            Requirement::DataCatalogue(item) => item.get_name(),
+            Requirement::DataFormReference(item) => item.get_name(),
+            Requirement::UnterformularReference(item) => item.get_name(),
+            Requirement::DataFormSubform(item) => item.get_name(),
+            Requirement::UnterformularSubform(item) => item.get_name(),
+            Requirement::ExternalPropertyCatalogue(name)
+            | Requirement::ExternalDataCatalogue(name)
+            | Requirement::ExternalDataFormReference(name)
+            | Requirement::ExternalDataFormSubform(name)
+            | Requirement::ExternalUnterformularReference(name)
+            | Requirement::ExternalUnterformularSubform(name) => name.to_string(),
+        }
+    }
 }
 
 impl ToString for Requirement<'_> {
@@ -47,26 +72,92 @@ impl ToString for Requirement<'_> {
         match self {
             Requirement::PropertyCatalogue(item) => item.to_listed_string(),
             Requirement::DataCatalogue(item) => item.to_listed_string(),
+            Requirement::DataFormReference(item) => item.to_listed_string(),
+            Requirement::UnterformularReference(item) => item.to_listed_string(),
+            Requirement::DataFormSubform(item) => item.to_listed_string(),
+            Requirement::UnterformularSubform(item) => item.to_listed_string(),
             Requirement::ExternalPropertyCatalogue(name) => {
                 format!("Merkmalskatalog (-) '{}' - hier nicht enthalten", name)
             }
             Requirement::ExternalDataCatalogue(name) => {
                 format!("Datenkatalog (-) '{}' - hier nicht enthalten", name)
             }
-            Requirement::DataFormReference(item) => item.to_listed_string(),
+            Requirement::ExternalDataFormReference(name)
-            Requirement::UnterformularReference(item) => item.to_listed_string(),
+            | Requirement::ExternalDataFormSubform(name) => {
-            Requirement::ExternalDataFormReference(name) => {
                 format!("Formular (-) '{}' - hier nicht enthalten", name)
             }
-            Requirement::ExternalUnterformularReference(name) => {
+            Requirement::ExternalUnterformularReference(name)
+            | Requirement::ExternalUnterformularSubform(name) => {
                 format!("Unterformular (-) '{}' - hier nicht enthalten", name)
             }
         }
     }
 }
 
-pub trait Requires {
+pub trait Requires
+where
+    Self: Listable,
+{
+    fn requires_form_reference(&self, _: &str) -> bool {
+        false
+    }
+
+    fn requires_subform(&self, _: &str) -> bool {
+        false
+    }
+
     fn get_required_entries<'a>(&'a self, all: &'a OnkostarEditor) -> Vec<Requirement>;
 
-    fn to_requirement_string<'a>(&'a self, all: &'a OnkostarEditor) -> String;
+    fn to_requirement_string<'a>(&'a self, all: &'a OnkostarEditor) -> String {
+        format!(
+            "{}\n{}",
+            self.to_listed_string(),
+            self.get_required_entries(all)
+                .iter()
+                .map(|entry| match entry {
+                    Requirement::DataCatalogue(x) => {
+                        let inner = x
+                            .get_required_entries(all)
+                            .iter()
+                            .map(|inner_entry| match inner_entry {
+                                Requirement::PropertyCatalogue(_) => Some(inner_entry.to_string()),
+                                Requirement::ExternalPropertyCatalogue(_) => {
+                                    Some(inner_entry.to_string())
+                                }
+                                _ => None,
+                            })
+                            .filter(Option::is_some)
+                            .map(|item| format!("    - {}\n", item.unwrap()))
+                            .collect::<Vec<_>>()
+                            .join("");
+
+                        if inner.is_empty() {
+                            Some(format!("  + {}\n", x.to_listed_string()))
+                        } else {
+                            Some(format!("  + {}\n{}", x.to_listed_string(), inner))
+                        }
+                    }
+                    Requirement::ExternalDataCatalogue(_) => {
+                        Some(format!("  + {}\n", entry.to_string()))
+                    }
+                    Requirement::DataFormReference(_)
+                    | Requirement::ExternalDataFormReference(_)
+                    | Requirement::UnterformularReference(_)
+                    | Requirement::ExternalUnterformularReference(_) => {
+                        Some(format!("  > {}\n", entry.to_string()))
+                    }
+                    Requirement::DataFormSubform(_)
+                    | Requirement::ExternalDataFormSubform(_)
+                    | Requirement::UnterformularSubform(_)
+                    | Requirement::ExternalUnterformularSubform(_) => {
+                        Some(format!("  * {}\n", entry.to_string()))
+                    }
+                    _ => None,
+                })
+                .filter(Option::is_some)
+                .flatten()
+                .collect::<Vec<_>>()
+                .join("")
+        )
+    }
 }

src/model/unterformular.rs

@@ -22,6 +22,7 @@
  * SOFTWARE.
  */
 
+use std::cmp::Ordering;
 use std::collections::HashSet;
 
 use console::style;
@@ -256,9 +257,55 @@ impl Comparable for Unterformular {
     fn get_revision(&self) -> u16 {
         self.revision
     }
+
+    fn compare_by_requirement(a: &Self, b: &Self) -> Ordering {
+        if a.get_name() == b.get_name()
+            || a.is_system_library_content()
+            || b.is_system_library_content()
+        {
+            return Ordering::Equal;
+        }
+
+        if a.requires_form_reference(&b.get_name()) || a.requires_subform(&b.get_name()) {
+            return Ordering::Greater;
+        }
+
+        Ordering::Less
+    }
 }
 
 impl Requires for Unterformular {
+    fn requires_form_reference(&self, name: &str) -> bool {
+        self.entries
+            .entry
+            .iter()
+            .map(|item| {
+                item.type_ == "formReference"
+                    && match item.referenced_data_form.as_ref() {
+                        Some(refname) => refname == name,
+                        _ => false,
+                    }
+            })
+            .filter(|&it| it)
+            .last()
+            .unwrap_or_default()
+    }
+    fn requires_subform(&self, name: &str) -> bool {
+        self.entries
+            .entry
+            .iter()
+            .map(|item| {
+                item.type_ == "subform"
+                    && match item.referenced_data_form.as_ref() {
+                        Some(refname) => refname == name,
+                        _ => false,
+                    }
+            })
+            .filter(|&it| it)
+            .last()
+            .unwrap_or_default()
+    }
+
     fn get_required_entries<'a>(&'a self, all: &'a OnkostarEditor) -> Vec<Requirement> {
         let mut result = self
             .data_catalogues
@@ -271,6 +318,7 @@ impl Requires for Unterformular {
                 None => Requirement::ExternalDataCatalogue(entry.to_string()),
             })
             .collect::<Vec<_>>();
+        result.sort_unstable_by_key(|item| item.sorting_key());
 
         let referenced_forms = &mut self
             .entries
@@ -291,57 +339,33 @@ impl Requires for Unterformular {
                 },
             })
             .collect::<Vec<_>>();
+        referenced_forms.sort_unstable_by_key(|item| item.sorting_key());
         result.append(referenced_forms);
 
+        let sub_forms = &mut self
+            .entries
+            .entry
+            .iter()
+            .filter(|&entry| entry.get_type() == "subform")
+            .filter_map(|entry| match &entry.referenced_data_form {
+                Some(name) => Some(name),
+                None => None,
+            })
+            .collect::<HashSet<_>>()
+            .into_iter()
+            .map(|entry| match all.find_data_form(entry.as_str()) {
+                Some(contained) => Requirement::DataFormSubform(contained),
+                None => match all.find_unterformular(entry.as_str()) {
+                    Some(contained) => Requirement::UnterformularSubform(contained),
+                    None => Requirement::ExternalUnterformularSubform(entry.to_string()),
+                },
+            })
+            .collect::<Vec<_>>();
+        sub_forms.sort_unstable_by_key(|item| item.sorting_key());
+        result.append(sub_forms);
+
         result
     }
-
-    fn to_requirement_string<'a>(&'a self, all: &'a OnkostarEditor) -> String {
-        format!(
-            "{}\n{}",
-            self.to_listed_string(),
-            self.get_required_entries(all)
-                .iter()
-                .map(|entry| match entry {
-                    Requirement::DataCatalogue(x) => {
-                        let inner = x
-                            .get_required_entries(all)
-                            .iter()
-                            .map(|inner_entry| match inner_entry {
-                                Requirement::PropertyCatalogue(_) => Some(inner_entry.to_string()),
-                                Requirement::ExternalPropertyCatalogue(_) => {
-                                    Some(inner_entry.to_string())
-                                }
-                                _ => None,
-                            })
-                            .filter(Option::is_some)
-                            .map(|item| format!("    - {}\n", item.unwrap()))
-                            .collect::<Vec<_>>()
-                            .join("");
-
-                        if inner.is_empty() {
-                            Some(format!("  + {}\n", x.to_listed_string()))
-                        } else {
-                            Some(format!("  + {}\n{}", x.to_listed_string(), inner))
-                        }
-                    }
-                    Requirement::ExternalDataCatalogue(_) => {
-                        Some(format!("  + {}\n", entry.to_string()))
-                    }
-                    Requirement::DataFormReference(_)
-                    | Requirement::ExternalDataFormReference(_)
-                    | Requirement::UnterformularReference(_)
-                    | Requirement::ExternalUnterformularReference(_) => {
-                        Some(format!("  > {}\n", entry.to_string()))
-                    }
-                    _ => None,
-                })
-                .filter(Option::is_some)
-                .flatten()
-                .collect::<Vec<_>>()
-                .join("")
-        )
-    }
 }
 
 impl FolderContent for Unterformular {
@@ -532,6 +556,9 @@ pub struct Entry {
     direction_pat_modul: String,
     #[serde(rename = "SeitenumbruchPatModul")]
     seitenumbruch_pat_modul: bool,
+    #[serde(rename = "Kontaktliste")]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    kontaktliste: Option<String>,
     #[serde(rename = "MarkierungIgnorieren")]
     markierung_ignorieren: bool,
     #[serde(rename = "SucheArt")]