From aeab8bee2f35baffa684fc0831d3465a63ccfe04 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Mon, 8 Apr 2024 19:37:57 +0200 Subject: [PATCH] chore: simple code cleanup --- src/model/data_form.rs | 52 ++++++++++++++++++++++++++---------- src/model/unterformular.rs | 54 ++++++++++++++++++++++++++++---------- src/profile.rs | 7 +++-- 3 files changed, 83 insertions(+), 30 deletions(-) diff --git a/src/model/data_form.rs b/src/model/data_form.rs index a038a13..1fcd4d3 100644 --- a/src/model/data_form.rs +++ b/src/model/data_form.rs @@ -28,16 +28,16 @@ use std::collections::HashSet; use console::style; use serde::{Deserialize, Serialize}; -use crate::checks::{Checkable, CheckNotice}; use crate::checks::CheckNotice::ErrorWithCode; +use crate::checks::{CheckNotice, Checkable}; +use crate::model::onkostar_editor::OnkostarEditor; +use crate::model::requirements::{Requirement, Requires}; use crate::model::{ - Ansichten, apply_profile_to_form_entry, apply_profile_to_form_field, Comparable, Entries, + apply_profile_to_form_entry, apply_profile_to_form_field, Ansichten, Comparable, Entries, Filter, FolderContent, FormEntry, FormEntryContainer, Kennzahlen, Listable, MenuCategory, PlausibilityRules, PunkteKategorien, RefEntries, Script, Sortable, }; use crate::model::{Haeufigkeiten, Ordner}; -use crate::model::onkostar_editor::OnkostarEditor; -use crate::model::requirements::{Requirement, Requires}; use crate::profile::Profile; #[derive(Serialize, Deserialize, Debug)] @@ -713,13 +713,25 @@ mod tests { assert!(profile.is_ok()); let profile = profile.unwrap(); - assert_eq!(onkostar_editor.editor.data_form[0].entries.entry[2].name, "Auswahl"); - assert_eq!(onkostar_editor.editor.data_form[0].entries.entry[2].default_value, ""); + assert_eq!( + onkostar_editor.editor.data_form[0].entries.entry[2].name, + "Auswahl" + ); + assert_eq!( + onkostar_editor.editor.data_form[0].entries.entry[2].default_value, + "" + ); onkostar_editor.apply_profile(&profile); - assert_eq!(onkostar_editor.editor.data_form[0].entries.entry[2].name, "Auswahl"); - assert_eq!(onkostar_editor.editor.data_form[0].entries.entry[2].default_value, "B") + assert_eq!( + onkostar_editor.editor.data_form[0].entries.entry[2].name, + "Auswahl" + ); + assert_eq!( + onkostar_editor.editor.data_form[0].entries.entry[2].default_value, + "B" + ) } #[test] @@ -737,13 +749,25 @@ mod tests { assert!(profile.is_ok()); let profile = profile.unwrap(); - assert_eq!(onkostar_editor.editor.data_form[0].entries.entry[2].name, "Auswahl"); - assert_eq!(onkostar_editor.editor.data_form[0].entries.entry[2].default_value, ""); + assert_eq!( + onkostar_editor.editor.data_form[0].entries.entry[2].name, + "Auswahl" + ); + assert_eq!( + onkostar_editor.editor.data_form[0].entries.entry[2].default_value, + "" + ); onkostar_editor.apply_profile(&profile); - assert_eq!(onkostar_editor.editor.data_form[0].entries.entry[2].name, "Auswahl"); - assert_eq!(onkostar_editor.editor.data_form[0].entries.entry[2].default_value, "") + assert_eq!( + onkostar_editor.editor.data_form[0].entries.entry[2].name, + "Auswahl" + ); + assert_eq!( + onkostar_editor.editor.data_form[0].entries.entry[2].default_value, + "" + ) } #[test] @@ -769,7 +793,7 @@ mod tests { match &onkostar_editor.editor.data_form[0].menu_category { Some(menu_category) => assert_eq!(menu_category.name, "Testformulare"), - _ => panic!("Test failed: MenuCategory not found!") + _ => panic!("Test failed: MenuCategory not found!"), } } @@ -792,7 +816,7 @@ mod tests { match &onkostar_editor.editor.data_form[0].menu_category { Some(menu_category) => assert_eq!(menu_category.name, "Test"), - _ => panic!("Test failed: MenuCategory not found!") + _ => panic!("Test failed: MenuCategory not found!"), } } } diff --git a/src/model/unterformular.rs b/src/model/unterformular.rs index fc4a721..604ac2f 100644 --- a/src/model/unterformular.rs +++ b/src/model/unterformular.rs @@ -28,16 +28,16 @@ use std::collections::HashSet; use console::style; use serde::{Deserialize, Serialize}; -use crate::checks::{Checkable, CheckNotice}; use crate::checks::CheckNotice::ErrorWithCode; +use crate::checks::{CheckNotice, Checkable}; +use crate::model::onkostar_editor::OnkostarEditor; +use crate::model::requirements::{Requirement, Requires}; use crate::model::{ - Ansichten, apply_profile_to_form_entry, apply_profile_to_form_field, Comparable, Entries, + apply_profile_to_form_entry, apply_profile_to_form_field, Ansichten, Comparable, Entries, Filter, FolderContent, FormEntry, FormEntryContainer, Kennzahlen, Listable, MenuCategory, PlausibilityRules, PunkteKategorien, RefEntries, Script, Sortable, }; use crate::model::{Haeufigkeiten, Ordner}; -use crate::model::onkostar_editor::OnkostarEditor; -use crate::model::requirements::{Requirement, Requires}; use crate::profile::Profile; #[derive(Serialize, Deserialize, Debug)] @@ -712,13 +712,25 @@ mod tests { assert!(profile.is_ok()); let profile = profile.unwrap(); - assert_eq!(onkostar_editor.editor.unterformular[0].entries.entry[1].name, "Termin"); - assert_eq!(onkostar_editor.editor.unterformular[0].entries.entry[1].default_value, ""); + assert_eq!( + onkostar_editor.editor.unterformular[0].entries.entry[1].name, + "Termin" + ); + assert_eq!( + onkostar_editor.editor.unterformular[0].entries.entry[1].default_value, + "" + ); onkostar_editor.apply_profile(&profile); - assert_eq!(onkostar_editor.editor.unterformular[0].entries.entry[1].name, "Termin"); - assert_eq!(onkostar_editor.editor.unterformular[0].entries.entry[1].default_value, "2024-03-18") + assert_eq!( + onkostar_editor.editor.unterformular[0].entries.entry[1].name, + "Termin" + ); + assert_eq!( + onkostar_editor.editor.unterformular[0].entries.entry[1].default_value, + "2024-03-18" + ) } #[test] @@ -736,13 +748,25 @@ mod tests { assert!(profile.is_ok()); let profile = profile.unwrap(); - assert_eq!(onkostar_editor.editor.unterformular[0].entries.entry[1].name, "Termin"); - assert_eq!(onkostar_editor.editor.unterformular[0].entries.entry[1].default_value, ""); + assert_eq!( + onkostar_editor.editor.unterformular[0].entries.entry[1].name, + "Termin" + ); + assert_eq!( + onkostar_editor.editor.unterformular[0].entries.entry[1].default_value, + "" + ); onkostar_editor.apply_profile(&profile); - assert_eq!(onkostar_editor.editor.unterformular[0].entries.entry[1].name, "Termin"); - assert_eq!(onkostar_editor.editor.unterformular[0].entries.entry[1].default_value, "") + assert_eq!( + onkostar_editor.editor.unterformular[0].entries.entry[1].name, + "Termin" + ); + assert_eq!( + onkostar_editor.editor.unterformular[0].entries.entry[1].default_value, + "" + ) } #[test] @@ -762,6 +786,8 @@ mod tests { onkostar_editor.apply_profile(&profile); - assert!(&onkostar_editor.editor.unterformular[0].menu_category.is_none()); + assert!(&onkostar_editor.editor.unterformular[0] + .menu_category + .is_none()); } -} \ No newline at end of file +} diff --git a/src/profile.rs b/src/profile.rs index 88f947e..83652f8 100644 --- a/src/profile.rs +++ b/src/profile.rs @@ -89,7 +89,7 @@ pub struct FormField { pub name: String, #[serde(default)] pub hide: bool, - pub default_value: Option + pub default_value: Option, } #[derive(Deserialize)] @@ -280,7 +280,10 @@ mod tests { assert_eq!(profile.forms.len(), 1); assert_eq!(profile.forms[0].name, "DNPM Therapieplan"); assert_eq!(profile.forms[0].form_fields[0].name, "formularfeld_to_keep"); - assert_eq!(profile.forms[0].form_fields[0].default_value, Some("X".to_string())); + assert_eq!( + profile.forms[0].form_fields[0].default_value, + Some("X".to_string()) + ); } Err(e) => panic!("Cannot deserialize profile: {}", e), }