1
0
mirror of https://github.com/pcvolkmer/osc-variant.git synced 2025-04-19 11:46:50 +00:00

fix: adapt DataForm properties for Unterformular

Unterformular seems to be the same datatype as DataForm as used in OS
This commit is contained in:
Paul-Christian Volkmer 2024-11-04 18:55:46 +01:00
parent 33b5b8341b
commit a1060242af
2 changed files with 30 additions and 10 deletions

View File

@ -160,6 +160,9 @@ pub struct DataForm {
guid: String,
#[serde(rename = "Revision")]
revision: u16,
#[serde(rename = "maxAnzahl")]
#[serde(skip_serializing_if = "Option::is_none")]
max_anzahl: Option<u16>,
#[serde(rename = "VerknuepftGUID")]
#[serde(skip_serializing_if = "Option::is_none")]
verknuepft_guid: Option<String>,
@ -302,6 +305,7 @@ impl Requires for DataForm {
.last()
.unwrap_or_default()
}
fn requires_subform(&self, name: &str) -> bool {
self.entries
.entry
@ -317,6 +321,7 @@ impl Requires for DataForm {
.last()
.unwrap_or_default()
}
fn get_required_entries<'a>(&'a self, all: &'a OnkostarEditor) -> Vec<Requirement> {
let mut result = self
.data_catalogues
@ -698,6 +703,7 @@ impl Sortable for Entry {
#[serde(deny_unknown_fields)]
pub struct DataFormEntries {
#[serde(rename = "EntryName")]
#[serde(skip_serializing_if = "Option::is_none")]
entry_name: Option<Vec<String>>,
}

View File

@ -62,7 +62,8 @@ pub struct Unterformular {
#[serde(rename = "TudokPosition")]
tudok_position: String,
#[serde(rename = "Aktenbereich")]
aktenbereich: String,
#[serde(skip_serializing_if = "Option::is_none")]
aktenbereich: Option<String>,
#[serde(rename = "BefragungRelevant")]
#[serde(skip_serializing_if = "Option::is_none")]
befragung_relevant: Option<bool>,
@ -74,7 +75,8 @@ pub struct Unterformular {
#[serde(rename = "BigSummary")]
big_summary: String,
#[serde(rename = "KalenderSchnipsel")]
kalender_schnipsel: String,
#[serde(skip_serializing_if = "Option::is_none")]
kalender_schnipsel: Option<String>,
#[serde(rename = "EmailTemplate")]
#[serde(skip_serializing_if = "Option::is_none")]
mail_template: Option<String>,
@ -94,7 +96,8 @@ pub struct Unterformular {
#[serde(skip_serializing_if = "Option::is_none")]
erkrankung_big_summary: Option<String>,
#[serde(rename = "Kontext")]
kontext: String,
#[serde(skip_serializing_if = "Option::is_none")]
kontext: Option<i32>,
#[serde(rename = "Datenart")]
#[serde(skip_serializing_if = "Option::is_none")]
datenart: Option<String>,
@ -102,22 +105,32 @@ pub struct Unterformular {
#[serde(skip_serializing_if = "Option::is_none")]
show_history_button: Option<bool>,
#[serde(rename = "TudokReadonly")]
tudok_readonly: bool,
#[serde(skip_serializing_if = "Option::is_none")]
tudok_readonly: Option<bool>,
#[serde(rename = "VitalstatusRelevant")]
vitalstatus_relevant: bool,
#[serde(skip_serializing_if = "Option::is_none")]
vitalstatus_relevant: Option<bool>,
#[serde(rename = "AutoNummerierung")]
auto_nummerierung: bool,
#[serde(skip_serializing_if = "Option::is_none")]
auto_nummerierung: Option<bool>,
#[serde(rename = "Zwischenspeichern")]
zwischenspeichern: bool,
#[serde(skip_serializing_if = "Option::is_none")]
zwischenspeichern: Option<bool>,
#[serde(rename = "Zurueckblaettern")]
zurueckblaettern: bool,
#[serde(skip_serializing_if = "Option::is_none")]
zurueckblaettern: Option<bool>,
#[serde(rename = "Datenbankexport")]
datenbankexport: bool,
#[serde(skip_serializing_if = "Option::is_none")]
datenbankexport: Option<bool>,
#[serde(rename = "DatenschutzRelevant")]
#[serde(skip_serializing_if = "Option::is_none")]
datenschutz_relevant: Option<bool>,
#[serde(rename = "KonferenzRelevant")]
konferenz_relevant: bool,
#[serde(skip_serializing_if = "Option::is_none")]
konferenz_relevant: Option<bool>,
#[serde(rename = "Drucken")]
#[serde(skip_serializing_if = "Option::is_none")]
drucken: Option<String>,
#[serde(rename = "hatUnterformulare")]
hat_unterformulare: bool,
#[serde(rename = "ScriptBeimSchliessen")]
@ -292,6 +305,7 @@ impl Requires for Unterformular {
.last()
.unwrap_or_default()
}
fn requires_subform(&self, name: &str) -> bool {
self.entries
.entry