From 014fca21694449a920742386032512957386dd96 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <volkmer_p@ukw.de>
Date: Fri, 16 Jun 2023 00:10:20 +0200
Subject: [PATCH] Styled name and revision in content listing

---
 src/model/data_catalogue.rs     | 4 +++-
 src/model/data_form.rs          | 7 ++++++-
 src/model/onkostar_editor.rs    | 2 +-
 src/model/property_catalogue.rs | 4 +++-
 src/model/unterformular.rs      | 7 ++++---
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/model/data_catalogue.rs b/src/model/data_catalogue.rs
index 205f5e1..4160e84 100644
--- a/src/model/data_catalogue.rs
+++ b/src/model/data_catalogue.rs
@@ -22,6 +22,7 @@
  * SOFTWARE.
  */
 
+use console::style;
 use serde::{Deserialize, Serialize};
 
 use crate::model::{Listable, Ordner, Sortable};
@@ -59,7 +60,8 @@ impl Listable for DataCatalogue {
     fn to_listed_string(&self) -> String {
         format!(
             "Datenkatalog '{}' in Revision '{}'",
-            self.name, self.revision
+            style(&self.name).yellow(),
+            style(&self.revision).yellow()
         )
     }
 }
diff --git a/src/model/data_form.rs b/src/model/data_form.rs
index b4b29bf..4314b23 100644
--- a/src/model/data_form.rs
+++ b/src/model/data_form.rs
@@ -22,6 +22,7 @@
  * SOFTWARE.
  */
 
+use console::style;
 use serde::{Deserialize, Serialize};
 
 use crate::model::{
@@ -179,7 +180,11 @@ impl FormEntryContainer for DataForm {
 
 impl Listable for DataForm {
     fn to_listed_string(&self) -> String {
-        format!("Formular '{}' in Revision '{}'", self.name, self.revision)
+        format!(
+            "Formular '{}' in Revision '{}'",
+            style(&self.name).yellow(),
+            style(&self.revision).yellow()
+        )
     }
 }
 
diff --git a/src/model/onkostar_editor.rs b/src/model/onkostar_editor.rs
index 50ae9c9..577be62 100644
--- a/src/model/onkostar_editor.rs
+++ b/src/model/onkostar_editor.rs
@@ -55,7 +55,7 @@ impl OnkostarEditor {
 
     pub fn print_list(&self) {
         println!(
-            "Die Datei wurde am {} mit {} in Version {} erstellt.\n\nFolgende Inhalte sind gespeichert\n",
+            "Die Datei wurde am {} mit {} in Version {} erstellt.\n\nFolgende Inhalte sind gespeichert",
             style(&self.info_xml.datum_xml).yellow(),
             style(&self.info_xml.name).yellow(),
             style(&self.info_xml.version).yellow()
diff --git a/src/model/property_catalogue.rs b/src/model/property_catalogue.rs
index 28710e9..21f9393 100644
--- a/src/model/property_catalogue.rs
+++ b/src/model/property_catalogue.rs
@@ -22,6 +22,7 @@
  * SOFTWARE.
  */
 
+use console::style;
 use serde::{Deserialize, Serialize};
 
 use crate::model::{Listable, Ordner, Sortable};
@@ -56,7 +57,8 @@ impl Listable for PropertyCatalogue {
     fn to_listed_string(&self) -> String {
         format!(
             "Merkmalskatalog '{}' in Revision '{}'",
-            self.name, self.revision
+            style(&self.name).yellow(),
+            style(&self.revision).yellow()
         )
     }
 }
diff --git a/src/model/unterformular.rs b/src/model/unterformular.rs
index f170d52..491d256 100644
--- a/src/model/unterformular.rs
+++ b/src/model/unterformular.rs
@@ -194,14 +194,15 @@ impl Listable for Unterformular {
         if self.hat_unterformulare {
             return format!(
                 "Unterformular '{}' in Revision '{}' {}",
-                self.name,
-                self.revision,
+                style(&self.name).yellow(),
+                style(&self.revision).yellow(),
                 style("Unterformular mit Markierung 'hat Unterformulare'!").red()
             );
         }
         format!(
             "Unterformular '{}' in Revision '{}'",
-            self.name, self.revision
+            style(&self.name).yellow(),
+            style(&self.revision).yellow()
         )
     }
 }