From b0339d10e5bdd0a2b169055e3454b1cdf9210c1f Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Fri, 17 Apr 2026 15:37:57 +0200 Subject: [PATCH 01/13] Email 70 Stellen GKV --- Dakota/Logic/DakotaInfoCreator.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dakota/Logic/DakotaInfoCreator.cs b/Dakota/Logic/DakotaInfoCreator.cs index 83d107a58..ac5086112 100644 --- a/Dakota/Logic/DakotaInfoCreator.cs +++ b/Dakota/Logic/DakotaInfoCreator.cs @@ -195,10 +195,11 @@ namespace Dakota.Logic info.Name1 = infoParameter.AddressInformation.OrganisationName; info.Name2 = infoParameter.AddressInformation.Phone; - info.Name3 = infoParameter.AddressInformation.Mail; - info.Name4 = "Entwicklung dakota.exchange@ownsoft.de"; + info.Name3 = string.Empty; + info.Name4 = infoParameter.AddressInformation.Mail; + //"Entwicklung dakota.exchange@ownsoft.de"; - return info; + return info; } private InfoNachrichtSLLA CreateDakotaInfoNachrichtSLLA(InfoParameterInvoiceItem infoParameter) From 252d2f7d93b8a5ef075085d72bd5bda68d083069 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 16 Apr 2026 16:25:15 +0200 Subject: [PATCH 02/13] Neue Version vom ICD 10 runtergeladen --- Data/ICD10/icd10.xml | 63018 +-- Data/ICD10/icd10gm2012syst_claml_20110923.xml | 354887 --------------- 2 files changed, 32760 insertions(+), 385145 deletions(-) delete mode 100644 Data/ICD10/icd10gm2012syst_claml_20110923.xml diff --git a/Data/ICD10/icd10.xml b/Data/ICD10/icd10.xml index b8f02c735..4de473bd3 100644 --- a/Data/ICD10/icd10.xml +++ b/Data/ICD10/icd10.xml @@ -1,13 +1,12 @@ - - + + - - - - Internationale statistische Klassifikation der Krankheiten und verwandter Gesundheitsprobleme + + + Internationale statistische Klassifikation der Krankheiten und verwandter Gesundheitsprobleme @@ -34,14 +33,14 @@ - + - + @@ -53,14 +52,14 @@ - + - @@ -74,7 +73,7 @@ - @@ -85,40 +84,40 @@ - - - - - - - - @@ -526,7 +525,7 @@ - @@ -543,7 +542,7 @@ - @@ -557,7 +556,7 @@ - @@ -572,7 +571,7 @@ - @@ -587,7 +586,7 @@ - @@ -596,7 +595,7 @@ - @@ -605,7 +604,7 @@ - @@ -614,7 +613,7 @@ - @@ -623,7 +622,7 @@ - @@ -632,7 +631,7 @@ - @@ -646,7 +645,7 @@ - @@ -657,7 +656,7 @@ - @@ -674,7 +673,7 @@ - @@ -691,7 +690,7 @@ - @@ -705,7 +704,7 @@ - @@ -713,79 +712,79 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -794,10 +793,10 @@ - + - @@ -808,10 +807,10 @@ - + - @@ -822,10 +821,10 @@ - + - @@ -836,10 +835,10 @@ - + - @@ -850,10 +849,10 @@ - + - @@ -864,10 +863,10 @@ - + - @@ -875,16 +874,16 @@ - + - + - @@ -892,10 +891,10 @@ - + - @@ -903,10 +902,10 @@ - + - @@ -914,247 +913,247 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1163,10 +1162,10 @@ - + - + @@ -1175,10 +1174,10 @@ - + - + @@ -1187,22 +1186,22 @@ - + - + - + - + - + @@ -1211,7 +1210,7 @@ - + @@ -1220,7 +1219,7 @@ - + @@ -1229,53 +1228,53 @@ - + - + - + - - - + - + - + - - From 17e12f959cb26f3c0fd708088d31f2d16f10b148 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 16 Apr 2026 16:26:40 +0200 Subject: [PATCH 03/13] =?UTF-8?q?Neue=20Filter=20nach=20Betreuungsart=20un?= =?UTF-8?q?d=20Funktion=20bei=20Klienten=20bzw.=20Personen=20hinzugef?= =?UTF-8?q?=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/BeWo.csproj | 1 + BeWo/Converter/FilterDCConverter.cs | 13 ++-- .../Navigation/CustomerNavigationView.xaml.cs | 75 +++++++++++++++++-- .../View/Navigation/Filter/ValueListFilter.cs | 50 +++++++++++++ BeWo/View/Navigation/MainNavigationView.xaml | 2 +- .../Navigation/MainNavigationView.xaml.cs | 11 +-- .../Navigation/PersonNavigationView.xaml.cs | 72 ++++++++++++++++-- .../SupportConceptNavigationView.xaml.cs | 3 +- 8 files changed, 199 insertions(+), 28 deletions(-) create mode 100644 BeWo/View/Navigation/Filter/ValueListFilter.cs diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 9d309aa0d..9767390a5 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -206,6 +206,7 @@ RtfEditView.xaml + AnimatedBeWoWindow.xaml diff --git a/BeWo/Converter/FilterDCConverter.cs b/BeWo/Converter/FilterDCConverter.cs index 9d39f725c..8c56b8e5b 100644 --- a/BeWo/Converter/FilterDCConverter.cs +++ b/BeWo/Converter/FilterDCConverter.cs @@ -18,7 +18,7 @@ namespace BeWo.Converter { var showOnlyArchived = false; var showOnlyOnlyDeleted = false; - CustomFilter customFilter = null; + IList customFilters = null; if (values.Length >= 3) { @@ -29,9 +29,9 @@ namespace BeWo.Converter if (values.Length >= 4) { - if (values[3] is CustomFilter) + if (values[3] is IList) { - customFilter = values[3] as CustomFilter; + customFilters = values[3] as IList; } if (values.Length >= 5) @@ -51,14 +51,15 @@ namespace BeWo.Converter var ret = (values[0] as IEnumerable).Where( dc => { - var filterRelevants = dc.FilterRelevants != null && dc.FilterRelevants.ContainsAll(lFilter) && (customFilter == null || customFilter.IsValid(dc)); + var filterRelevants = dc.FilterRelevants != null && dc.FilterRelevants.ContainsAll(lFilter); var aktiv = (!showOnlyOnlyDeleted && !showOnlyArchived && dc.ActivationType == ActivationTypeId.Active); var archiviert = ((showOnlyArchived && dc.ActivationType == ActivationTypeId.Archived)); var geloescht = ((!showOnlyArchived && showOnlyOnlyDeleted && dc.ActivationType == ActivationTypeId.Deleted)); - var geloeschtOderArchiviert = (showOnlyArchived && dc.ActivationType == ActivationTypeId.Archived || showOnlyOnlyDeleted && dc.ActivationType == ActivationTypeId.Deleted) && filterRelevants; - var ergebnis = (aktiv || archiviert || geloescht || geloeschtOderArchiviert) && filterRelevants; + var customerFilterValid = (customFilters == null || customFilters.All(f => f.IsValid(dc))); + + var ergebnis = (aktiv || archiviert || geloescht || geloeschtOderArchiviert) && filterRelevants && customerFilterValid; return ergebnis; }); diff --git a/BeWo/View/Navigation/CustomerNavigationView.xaml.cs b/BeWo/View/Navigation/CustomerNavigationView.xaml.cs index 892bcb5e6..25c723d06 100644 --- a/BeWo/View/Navigation/CustomerNavigationView.xaml.cs +++ b/BeWo/View/Navigation/CustomerNavigationView.xaml.cs @@ -31,6 +31,7 @@ using System.Collections; using System.Windows.Input; using BeWo.Core.Commands; using BeWo.ViewModel.View.AI; +using DevExpress.Xpf.Editors; namespace BeWo.View.Navigation { @@ -42,8 +43,9 @@ namespace BeWo.View.Navigation //private readonly CheckBox chkShowOnlyMyCustomers; //private readonly CheckBox chkShowOnlyTeamCustomers; private readonly ComboBox supportConceptFilterComboBox; - - private IEnumerable objectList; + private readonly ComboBoxEdit betreuungsartFilterComboBox; + + private IEnumerable objectList; private IEnumerable recentList; public CustomerNavigationView() @@ -169,10 +171,46 @@ namespace BeWo.View.Navigation mainNavigationView.sortPanel.Children.Insert(3, lbl); mainNavigationView.sortPanel.Children.Insert(4, supportConceptFilterComboBox); + betreuungsartFilterComboBox = new ComboBoxEdit(); + betreuungsartFilterComboBox.FontSize = 12; + betreuungsartFilterComboBox.Margin = new Thickness(10, 0, 0, 0); + betreuungsartFilterComboBox.Width = 150; + betreuungsartFilterComboBox.IsTextEditable = false; + betreuungsartFilterComboBox.NullText = Translator.Translate("Nach Betreuungsart filtern"); + betreuungsartFilterComboBox.ItemsSource = ServiceFacade.DoValueListServiceSync(s => s.GetAllValueListEntrysByType(ValueListEntryType.CustomerCareType)); + betreuungsartFilterComboBox.DisplayMember = "TypeDescription"; + betreuungsartFilterComboBox.StyleSettings = new CheckedComboBoxStyleSettings(); + betreuungsartFilterComboBox.EditValueChanged += BetreuungsartComboBox_EditValueChanged; + + //< dxe:ComboBoxEdit x:Name = "checkedComboBox" + // NullText = "Select categories" + // IsTextEditable = "False" + // ItemsSource = "{Binding Categories}" + // EditValue = "{Binding SelectedCategories}" + // DisplayMember = "CategoryName" + // ShowCustomItems = "True" > + // < dxe:ComboBoxEdit.StyleSettings > + // < dxe:CheckedComboBoxStyleSettings /> + // + // + + lbl = new TextBlock + { + Text = Translator.Translate("Betreuungsart:"), + FontSize = 12, + Margin = new Thickness(8, 2, -3, 0) + }; + + mainNavigationView.sortPanel.Children.Insert(5, lbl); + mainNavigationView.sortPanel.Children.Insert(6, betreuungsartFilterComboBox); + + + + UpdateCustomFilter(); } - public Dictionary GetVisibleInformationReferences() + public Dictionary GetVisibleInformationReferences() { var visible = mainNavigationView.objectListBox.ItemsSource; @@ -218,14 +256,37 @@ namespace BeWo.View.Navigation UpdateCustomFilter(); } - private CustomFilter CreateNewCustomFilter() + + + private void BetreuungsartComboBox_EditValueChanged(object sender, EditValueChangedEventArgs e) + { + UpdateCustomFilter(); + } + + private CustomFilter CreateNewCustomerFilter() { var filter = new CustomerNavigationFilter { CustomerFilter = ((CustomerFilterItem)supportConceptFilterComboBox.SelectedItem)?.CustomerFilter ?? CustomerFilterEnum.MyCustomer }; return filter; } - private void OnLoaded(object sender, RoutedEventArgs e) + private CustomFilter CreateNewBetreuungsartFilter() + { + if (betreuungsartFilterComboBox.SelectedItems == null) + return null; + + var list = new List(); + foreach (var item in betreuungsartFilterComboBox.SelectedItems) + { + list.Add(item as ValueListEntryDC); + } + + var filter = new ValueListFilter { SelectedValueListEntries = list, ValueListProperty = "CustomerCareTypes" }; + + return filter; + } + + private void OnLoaded(object sender, RoutedEventArgs e) { ServiceFacade.DoCustomerServiceAsync(s => s.ConvertToNewSubstitutionType(), n => this.Dispatch(delegate { @@ -237,8 +298,8 @@ namespace BeWo.View.Navigation private void UpdateCustomFilter() { - mainNavigationView.CustomFilter = CreateNewCustomFilter(); - } + mainNavigationView.CustomFilters = new List { CreateNewCustomerFilter(), CreateNewBetreuungsartFilter() }; + } private void ChkShowOnlyMyCustomers_Click(object sender, RoutedEventArgs e) { diff --git a/BeWo/View/Navigation/Filter/ValueListFilter.cs b/BeWo/View/Navigation/Filter/ValueListFilter.cs new file mode 100644 index 000000000..08f34d71b --- /dev/null +++ b/BeWo/View/Navigation/Filter/ValueListFilter.cs @@ -0,0 +1,50 @@ +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; +using System.Collections.Generic; +using System.Reflection; + + +namespace BeWo.View.Navigation.Filter +{ + public class ValueListFilter : CustomFilter + { + public IList SelectedValueListEntries { get; set; } + public string ValueListProperty { get; set; } + public override bool IsValid(IFilterableDC dc) + { + var val = GetPropertyValue(dc, ValueListProperty); + + if (SelectedValueListEntries != null && SelectedValueListEntries.Count > 0) + { + if (val != null) + { + foreach (var cct in SelectedValueListEntries) + { + if (val.ToString().Contains(cct.DisplayName)) + { + return true; + } + } + } + return false; + } + + + return true; + } + + private object GetPropertyValue(object obj, string propertyName) + { + if (obj == null || string.IsNullOrWhiteSpace(propertyName)) + return null; + + var prop = obj.GetType().GetProperty( + propertyName, + BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase + ); + + return prop?.GetValue(obj); + } + } +} + diff --git a/BeWo/View/Navigation/MainNavigationView.xaml b/BeWo/View/Navigation/MainNavigationView.xaml index 550531367..31f23eb9f 100644 --- a/BeWo/View/Navigation/MainNavigationView.xaml +++ b/BeWo/View/Navigation/MainNavigationView.xaml @@ -145,7 +145,7 @@ - + diff --git a/BeWo/View/Navigation/MainNavigationView.xaml.cs b/BeWo/View/Navigation/MainNavigationView.xaml.cs index 3e9f0a886..f4b3485fe 100644 --- a/BeWo/View/Navigation/MainNavigationView.xaml.cs +++ b/BeWo/View/Navigation/MainNavigationView.xaml.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; +using System.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; @@ -27,7 +28,7 @@ namespace BeWo.View.Navigation { public partial class MainNavigationView : INotifyPropertyChanged { - internal CustomFilter _CustomFilter; + internal IList _CustomFilters; private readonly string _DetailsLoadLock = string.Empty; @@ -164,18 +165,18 @@ namespace BeWo.View.Navigation } } - public CustomFilter CustomFilter + public IList CustomFilters { get { - return _CustomFilter; + return _CustomFilters; } set { - _CustomFilter = value; + _CustomFilters = value.Where(f => f != null).ToList(); - FirePropertyChanged("CustomFilter"); + FirePropertyChanged("CustomFilters"); // if (listBoxMultiBinding.Bindings.Count == 4) // listBoxMultiBinding.Bindings.RemoveAt(3); diff --git a/BeWo/View/Navigation/PersonNavigationView.xaml.cs b/BeWo/View/Navigation/PersonNavigationView.xaml.cs index 3e5e46cd3..8b5b1697b 100644 --- a/BeWo/View/Navigation/PersonNavigationView.xaml.cs +++ b/BeWo/View/Navigation/PersonNavigationView.xaml.cs @@ -22,6 +22,8 @@ using System.Windows.Input; using BeWo.Core.Commands; using DevExpress.XtraBars.Docking; using BeWo.ViewModel.View.AI; +using DevExpress.Xpf.Editors; +using BS.Shared.Translation; namespace BeWo.View.Navigation { @@ -31,8 +33,9 @@ namespace BeWo.View.Navigation public partial class PersonNavigationView { private readonly ComboBox filterComboBox; + private readonly ComboBoxEdit functionFilterComboBox; - private IEnumerable objectList; + private IEnumerable objectList; private IEnumerable recentList; public PersonNavigationView() @@ -85,7 +88,41 @@ namespace BeWo.View.Navigation mainNavigationView.sortPanel.Children.Insert(3, lbl); mainNavigationView.sortPanel.Children.Insert(4, filterComboBox); - UpdateCustomFilter(); + + functionFilterComboBox = new ComboBoxEdit(); + functionFilterComboBox.FontSize = 12; + functionFilterComboBox.Margin = new Thickness(10, 0, 0, 0); + functionFilterComboBox.Width = 150; + functionFilterComboBox.IsTextEditable = false; + functionFilterComboBox.NullText = Translator.Translate("Nach Funktion filtern"); + functionFilterComboBox.ItemsSource = ServiceFacade.DoValueListServiceSync(s => s.GetAllValueListEntrysByType(ValueListEntryType.FunctionType)); + functionFilterComboBox.DisplayMember = "TypeDescription"; + functionFilterComboBox.StyleSettings = new CheckedComboBoxStyleSettings(); + functionFilterComboBox.EditValueChanged += FunctionComboBox_EditValueChanged; + + //< dxe:ComboBoxEdit x:Name = "checkedComboBox" + // NullText = "Select categories" + // IsTextEditable = "False" + // ItemsSource = "{Binding Categories}" + // EditValue = "{Binding SelectedCategories}" + // DisplayMember = "CategoryName" + // ShowCustomItems = "True" > + // < dxe:ComboBoxEdit.StyleSettings > + // < dxe:CheckedComboBoxStyleSettings /> + // + // + + lbl = new TextBlock + { + Text = Translator.Translate("Funktion:"), + FontSize = 12, + Margin = new Thickness(8, 2, -3, 0) + }; + + mainNavigationView.sortPanel.Children.Insert(5, lbl); + mainNavigationView.sortPanel.Children.Insert(6, functionFilterComboBox); + + UpdateCustomFilter(); } public Dictionary GetVisibleInformationReferences() @@ -135,12 +172,33 @@ namespace BeWo.View.Navigation UpdateCustomFilter(); } - private void UpdateCustomFilter() - { - mainNavigationView.CustomFilter = CreateNewPersonFilter(); - } + private void FunctionComboBox_EditValueChanged(object sender, EditValueChangedEventArgs e) + { + UpdateCustomFilter(); + } - private PersonNavigationFilter CreateNewPersonFilter() + private void UpdateCustomFilter() + { + mainNavigationView.CustomFilters = new List { CreateNewPersonFilter(), CreateNewFunctionFilter() }; + } + + private CustomFilter CreateNewFunctionFilter() + { + if (functionFilterComboBox.SelectedItems == null) + return null; + + var list = new List(); + foreach (var item in functionFilterComboBox.SelectedItems) + { + list.Add(item as ValueListEntryDC); + } + + var filter = new ValueListFilter { SelectedValueListEntries = list, ValueListProperty = "Function" }; + + return filter; + } + + private PersonNavigationFilter CreateNewPersonFilter() { var filter = new PersonNavigationFilter { PersonFilter = ((PersonFilterItem)filterComboBox.SelectedItem)?.Filter ?? PersonFilterEnum.ContactPersons }; diff --git a/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs b/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs index dc8fa2c11..b3099993f 100644 --- a/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs +++ b/BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs @@ -283,9 +283,8 @@ namespace BeWo.View.Navigation private void UpdateCustomFilter() { - this.mainNavigationView.CustomFilter = this.CreateNewCustomFilter(); + mainNavigationView.CustomFilters = new List { CreateNewCustomFilter() }; } - private bool mainNavigationView_ArchiveObject(IFilterableDC obj) { From f72fc58b71ec5029760f53a9be678b4e3a8ba37e Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 16 Apr 2026 16:31:23 +0200 Subject: [PATCH 04/13] =?UTF-8?q?Bugfix=20bei=20Gruppenbuchung=20ohne=20Ze?= =?UTF-8?q?itangabe=20in=20Stunden=C3=BCbersicht,=20nachdem=20ein=20Eintra?= =?UTF-8?q?g=20von=20dort=20bearbeitet=20wurde?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/View/Report/FLSReport/FLSOverviewGrid.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BeWo/View/Report/FLSReport/FLSOverviewGrid.xaml.cs b/BeWo/View/Report/FLSReport/FLSOverviewGrid.xaml.cs index 464ba2811..1860f807b 100644 --- a/BeWo/View/Report/FLSReport/FLSOverviewGrid.xaml.cs +++ b/BeWo/View/Report/FLSReport/FLSOverviewGrid.xaml.cs @@ -580,7 +580,7 @@ namespace BeWo.View.Report.FLSReport } else { - date += String.Format(" {0:0} min.", record.Start, record.End, record.RoundedDuration); + date += String.Format(" {0:0} min.", record.RoundedDuration); } String group = ""; From a7e853983aa6543ac1a52c87dce6533008b93489 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 16 Apr 2026 16:33:52 +0200 Subject: [PATCH 05/13] Tooltip in Punktebogen, wer den Eintrag wann angelegt hat --- BeWo/View/AssessmentSheetRow.cs | 21 +- .../AssessmentSheetValueControl.xaml.cs | 2 +- BeWo/ViewModel/AssessmentSheetValueVM.cs | 8 + .../AssessmentSheetReport.Designer.cs | 1479 ++++++++--------- .../DefaultReports/AssessmentSheetReport.resx | 3 - ...ssmentSheetEntryDC_AssessmentSheetEntry.cs | 2 + .../CompactCustomerDC_Customer.cs | 19 +- .../DataContracts/AssessmentSheetEntryDC.cs | 5 +- .../Compact/CompactCustomerDC.cs | 5 +- 9 files changed, 781 insertions(+), 763 deletions(-) diff --git a/BeWo/View/AssessmentSheetRow.cs b/BeWo/View/AssessmentSheetRow.cs index 027667257..4a646c8f0 100644 --- a/BeWo/View/AssessmentSheetRow.cs +++ b/BeWo/View/AssessmentSheetRow.cs @@ -17,7 +17,8 @@ namespace BeWo.View private readonly long _CustomerOid; - private readonly Dictionary _Day2Entries = new Dictionary(); + private readonly Dictionary _Day2Values = new Dictionary(); + private readonly Dictionary _Day2Entries = new Dictionary(); private readonly AssessmentSheetEntryListVM _EntryList; @@ -45,11 +46,13 @@ namespace BeWo.View if (showWeek) { TimeSpan ts = entry.Day.Value.Subtract(_StartDate); - _Day2Entries[(int) ts.TotalDays + 1] = PossibleValues.SingleOrDefault(vm => vm.DataContract.AssessmentSheetValueOid.Equals(entry.ValueOid)); + _Day2Values[(int) ts.TotalDays + 1] = PossibleValues.SingleOrDefault(vm => vm.DataContract.AssessmentSheetValueOid.Equals(entry.ValueOid)); + _Day2Entries[(int)ts.TotalDays + 1] = entry; } else { - _Day2Entries[entry.Day.Value.Day] = PossibleValues.SingleOrDefault(vm => vm.DataContract.AssessmentSheetValueOid.Equals(entry.ValueOid)); + _Day2Values[entry.Day.Value.Day] = PossibleValues.SingleOrDefault(vm => vm.DataContract.AssessmentSheetValueOid.Equals(entry.ValueOid)); + _Day2Entries[entry.Day.Value.Day] = entry; } } } @@ -471,7 +474,13 @@ namespace BeWo.View private AssessmentSheetValueVM Get(int day) { - return this._Day2Entries.ContainsKey(day) ? this._Day2Entries[day] : null; + var v = this._Day2Values.ContainsKey(day) ? this._Day2Values[day] : null; + if (v != null && this._Day2Entries.ContainsKey(day)) + { + var e = _Day2Entries[day]; + v.Tooltip = string.Format("{0}, {1:dd.MM.yyyy HH:mm} von {2}", v.Description, e.DataContract.InsTs, e.DataContract.InsUser); + } + return v; } private void Set(int day, AssessmentSheetValueVM value) @@ -480,11 +489,13 @@ namespace BeWo.View if (value.IsNew) { value = null; + this._Day2Values.Remove(day); this._Day2Entries.Remove(day); } else { - this._Day2Entries[day] = value; + this._Day2Values[day] = value; + this._Day2Entries.Remove(day); } var list = this._EntryList.VMList.Where(vm => vm.CategoryOid.Equals(this._Category.AssessmentSheetCategoryOid) && vm.Day.HasValue && vm.Day.Value.Equals(date)).ToList(); diff --git a/BeWo/View/Controls/AssessmentSheetValueControl.xaml.cs b/BeWo/View/Controls/AssessmentSheetValueControl.xaml.cs index e477ef077..89ee5b778 100644 --- a/BeWo/View/Controls/AssessmentSheetValueControl.xaml.cs +++ b/BeWo/View/Controls/AssessmentSheetValueControl.xaml.cs @@ -29,7 +29,7 @@ namespace BeWo.View.Controls c.shine.Visibility = Visibility.Visible; c.tb.Text = vm.Sign; c.border.Background = vm.Brush; - c.border.ToolTip = vm.DataContract.Tooltip; + c.border.ToolTip = vm.Tooltip; } else { diff --git a/BeWo/ViewModel/AssessmentSheetValueVM.cs b/BeWo/ViewModel/AssessmentSheetValueVM.cs index 0ab57e656..8b8329f51 100644 --- a/BeWo/ViewModel/AssessmentSheetValueVM.cs +++ b/BeWo/ViewModel/AssessmentSheetValueVM.cs @@ -30,6 +30,7 @@ namespace BeWo.ViewModel private string _ShortcutKey; private string _Sign; + private string _Tooltip; public AssessmentSheetValueVM(AssessmentSheetValueDC pDC) : base(pDC, pDC.AssessmentSheetValueOid == null) { @@ -112,6 +113,13 @@ namespace BeWo.ViewModel } } + public string Tooltip + { + get { return this._Tooltip; } + + set { this._Tooltip = value; } + } + public static int Compare(AssessmentSheetValueVM x, AssessmentSheetValueVM y) { if (x.Position.Equals(y.Position) && x.Description != null) diff --git a/Report/DefaultReports/AssessmentSheetReport.Designer.cs b/Report/DefaultReports/AssessmentSheetReport.Designer.cs index 1ab6c7f23..f8dc7a9ae 100644 --- a/Report/DefaultReports/AssessmentSheetReport.Designer.cs +++ b/Report/DefaultReports/AssessmentSheetReport.Designer.cs @@ -29,169 +29,170 @@ namespace BeWo.Report.DefaultReports /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.Detail = new DevExpress.XtraReports.UI.DetailBand(); - this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); - this.lblCustomerName = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); - this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); - this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell54 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell55 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell56 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell61 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell63 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell62 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell64 = new DevExpress.XtraReports.UI.XRTableCell(); - this.ruleNotApprovedAndExpiringNext4Months = new DevExpress.XtraReports.UI.FormattingRule(); - this.ruleNotApprovedAndExpiringNext8Months = new DevExpress.XtraReports.UI.FormattingRule(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); - this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); - this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand(); - this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); - this.approvedText = new DevExpress.XtraReports.UI.CalculatedField(); - this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); - this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); - // - // Detail - // - this.Detail.HeightF = 0F; - this.Detail.Name = "Detail"; - this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); - this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // ReportHeader - // - this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.components = new System.ComponentModel.Container(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.lblCustomerName = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell54 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell55 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell56 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell61 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell63 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell62 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell64 = new DevExpress.XtraReports.UI.XRTableCell(); + this.ruleNotApprovedAndExpiringNext4Months = new DevExpress.XtraReports.UI.FormattingRule(); + this.ruleNotApprovedAndExpiringNext8Months = new DevExpress.XtraReports.UI.FormattingRule(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); + this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand(); + this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.approvedText = new DevExpress.XtraReports.UI.CalculatedField(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + this.Detail.HeightF = 0F; + this.Detail.Name = "Detail"; + this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.lblCustomerName, this.xrLabel1}); - this.ReportHeader.HeightF = 75F; - this.ReportHeader.Name = "ReportHeader"; - // - // lblCustomerName - // - this.lblCustomerName.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.ReportHeader.HeightF = 75F; + this.ReportHeader.Name = "ReportHeader"; + // + // lblCustomerName + // + this.lblCustomerName.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportDateTime", "{0:MMMM yyyy}")}); - this.lblCustomerName.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.lblCustomerName.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.99999F); - this.lblCustomerName.Multiline = true; - this.lblCustomerName.Name = "lblCustomerName"; - this.lblCustomerName.SizeF = new System.Drawing.SizeF(1007F, 25F); - this.lblCustomerName.StylePriority.UseFont = false; - this.lblCustomerName.Text = "lblCustomerName"; - // - // xrLabel1 - // - this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 8F); - this.xrLabel1.Multiline = true; - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.SizeF = new System.Drawing.SizeF(1007F, 25F); - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.Text = "Punktebogen [Customer]"; - // - // DetailReport - // - this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.lblCustomerName.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.lblCustomerName.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.99999F); + this.lblCustomerName.Multiline = true; + this.lblCustomerName.Name = "lblCustomerName"; + this.lblCustomerName.SizeF = new System.Drawing.SizeF(1007F, 25F); + this.lblCustomerName.StylePriority.UseFont = false; + this.lblCustomerName.Text = "lblCustomerName"; + // + // xrLabel1 + // + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 8F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.SizeF = new System.Drawing.SizeF(1007F, 25F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Punktebogen [Customer]"; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail1}); - this.DetailReport.DataMember = "Rows"; - this.DetailReport.DataSource = this.bindingSource1; - this.DetailReport.Level = 0; - this.DetailReport.Name = "DetailReport"; - // - // Detail1 - // - this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.DetailReport.DataMember = "Rows"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable2}); - this.Detail1.HeightF = 20F; - this.Detail1.Name = "Detail1"; - // - // xrTable2 - // - this.xrTable2.BackColor = System.Drawing.Color.Transparent; - this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 7F); - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable2.Name = "xrTable2"; - this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 0, 100F); - this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.Detail1.HeightF = 20F; + this.Detail1.Name = "Detail1"; + // + // xrTable2 + // + this.xrTable2.BackColor = System.Drawing.Color.Transparent; + this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 7F); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 0, 100F); + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTable2.SizeF = new System.Drawing.SizeF(1109F, 20F); - this.xrTable2.StylePriority.UseBackColor = false; - this.xrTable2.StylePriority.UseBorders = false; - this.xrTable2.StylePriority.UseFont = false; - this.xrTable2.StylePriority.UsePadding = false; - this.xrTable2.StylePriority.UseTextAlignment = false; - this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // - // xrTableRow2 - // - this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTable2.SizeF = new System.Drawing.SizeF(1109F, 20F); + this.xrTable2.StylePriority.UseBackColor = false; + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + this.xrTable2.StylePriority.UsePadding = false; + this.xrTable2.StylePriority.UseTextAlignment = false; + this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell18, this.xrTableCell19, this.xrTableCell36, @@ -224,379 +225,373 @@ namespace BeWo.Report.DefaultReports this.xrTableCell63, this.xrTableCell62, this.xrTableCell64}); - this.xrTableRow2.FormattingRules.Add(this.ruleNotApprovedAndExpiringNext4Months); - this.xrTableRow2.FormattingRules.Add(this.ruleNotApprovedAndExpiringNext8Months); - this.xrTableRow2.Name = "xrTableRow2"; - this.xrTableRow2.Weight = 1D; - // - // xrTableCell18 - // - this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableRow2.FormattingRules.Add(this.ruleNotApprovedAndExpiringNext4Months); + this.xrTableRow2.FormattingRules.Add(this.ruleNotApprovedAndExpiringNext8Months); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 1D; + // + // xrTableCell18 + // + this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Category")}); - this.xrTableCell18.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell18.Name = "xrTableCell18"; - this.xrTableCell18.StylePriority.UseBorders = false; - this.xrTableCell18.StylePriority.UseFont = false; - this.xrTableCell18.StylePriority.UseTextAlignment = false; - this.xrTableCell18.Text = "Name"; - this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell18.Weight = 0.48422002649988632D; - this.xrTableCell18.WordWrap = false; - // - // xrTableCell19 - // - this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell18.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell18.Multiline = true; + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseBorders = false; + this.xrTableCell18.StylePriority.UseFont = false; + this.xrTableCell18.StylePriority.UseTextAlignment = false; + this.xrTableCell18.Text = "Name"; + this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell18.Weight = 0.48422002649988632D; + // + // xrTableCell19 + // + this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day1")}); - this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell19.Name = "xrTableCell19"; - this.xrTableCell19.StylePriority.UseFont = false; - this.xrTableCell19.Text = "Vorname"; - this.xrTableCell19.Weight = 0.081154197199447164D; - this.xrTableCell19.WordWrap = false; - this.xrTableCell19.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell36 - // - this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.StylePriority.UseFont = false; + this.xrTableCell19.Text = "Vorname"; + this.xrTableCell19.Weight = 0.081154197199447164D; + this.xrTableCell19.WordWrap = false; + this.xrTableCell19.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell36 + // + this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day2")}); - this.xrTableCell36.Name = "xrTableCell36"; - this.xrTableCell36.Text = "xrTableCell36"; - this.xrTableCell36.Weight = 0.0811541507626455D; - this.xrTableCell36.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell20 - // - this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Text = "xrTableCell36"; + this.xrTableCell36.Weight = 0.0811541507626455D; + this.xrTableCell36.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell20 + // + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day3", "{0:dd/MM/yyyy}")}); - this.xrTableCell20.Name = "xrTableCell20"; - this.xrTableCell20.StylePriority.UseTextAlignment = false; - this.xrTableCell20.Text = "xrTableCell20"; - this.xrTableCell20.Weight = 0.08115424538675646D; - this.xrTableCell20.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell21 - // - this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.Text = "xrTableCell20"; + this.xrTableCell20.Weight = 0.08115424538675646D; + this.xrTableCell20.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell21 + // + this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day4", "{0:dd/MM/yyyy}")}); - this.xrTableCell21.Name = "xrTableCell21"; - this.xrTableCell21.StylePriority.UseTextAlignment = false; - this.xrTableCell21.Text = "xrTableCell21"; - this.xrTableCell21.Weight = 0.081154025839928062D; - this.xrTableCell21.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell22 - // - this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.StylePriority.UseTextAlignment = false; + this.xrTableCell21.Text = "xrTableCell21"; + this.xrTableCell21.Weight = 0.081154025839928062D; + this.xrTableCell21.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell22 + // + this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day5", "{0:0.00}")}); - this.xrTableCell22.Name = "xrTableCell22"; - this.xrTableCell22.StylePriority.UseTextAlignment = false; - this.xrTableCell22.Text = "xrTableCell22"; - this.xrTableCell22.Weight = 0.081154273564122192D; - this.xrTableCell22.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell23 - // - this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.StylePriority.UseTextAlignment = false; + this.xrTableCell22.Text = "xrTableCell22"; + this.xrTableCell22.Weight = 0.081154273564122192D; + this.xrTableCell22.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell23 + // + this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day6", "{0:0.00}")}); - this.xrTableCell23.Name = "xrTableCell23"; - this.xrTableCell23.StylePriority.UseTextAlignment = false; - this.xrTableCell23.Text = "xrTableCell23"; - this.xrTableCell23.Weight = 0.081154193859620971D; - this.xrTableCell23.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell24 - // - this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.StylePriority.UseTextAlignment = false; + this.xrTableCell23.Text = "xrTableCell23"; + this.xrTableCell23.Weight = 0.081154193859620971D; + this.xrTableCell23.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell24 + // + this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day7", "{0:0.00}")}); - this.xrTableCell24.Name = "xrTableCell24"; - this.xrTableCell24.StylePriority.UseTextAlignment = false; - this.xrTableCell24.Text = "xrTableCell24"; - this.xrTableCell24.Weight = 0.081154190922765934D; - this.xrTableCell24.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell25 - // - this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.StylePriority.UseTextAlignment = false; + this.xrTableCell24.Text = "xrTableCell24"; + this.xrTableCell24.Weight = 0.081154190922765934D; + this.xrTableCell24.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell25 + // + this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day8", "{0:0.00}")}); - this.xrTableCell25.Name = "xrTableCell25"; - this.xrTableCell25.StylePriority.UseTextAlignment = false; - this.xrTableCell25.Text = "xrTableCell25"; - this.xrTableCell25.Weight = 0.081154187824722945D; - this.xrTableCell25.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell26 - // - this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell25.Name = "xrTableCell25"; + this.xrTableCell25.StylePriority.UseTextAlignment = false; + this.xrTableCell25.Text = "xrTableCell25"; + this.xrTableCell25.Weight = 0.081154187824722945D; + this.xrTableCell25.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell26 + // + this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day9", "{0:0.00}")}); - this.xrTableCell26.Name = "xrTableCell26"; - this.xrTableCell26.StylePriority.UseTextAlignment = false; - this.xrTableCell26.Text = "xrTableCell26"; - this.xrTableCell26.Weight = 0.081154197276817663D; - this.xrTableCell26.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell27 - // - this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell26.Name = "xrTableCell26"; + this.xrTableCell26.StylePriority.UseTextAlignment = false; + this.xrTableCell26.Text = "xrTableCell26"; + this.xrTableCell26.Weight = 0.081154197276817663D; + this.xrTableCell26.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell27 + // + this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day10")}); - this.xrTableCell27.Name = "xrTableCell27"; - this.xrTableCell27.StylePriority.UseFont = false; - this.xrTableCell27.StylePriority.UseTextAlignment = false; - this.xrTableCell27.Text = "xrTableCell27"; - this.xrTableCell27.Weight = 0.08115419286831127D; - this.xrTableCell27.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell28 - // - this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell27.Name = "xrTableCell27"; + this.xrTableCell27.StylePriority.UseFont = false; + this.xrTableCell27.StylePriority.UseTextAlignment = false; + this.xrTableCell27.Text = "xrTableCell27"; + this.xrTableCell27.Weight = 0.08115419286831127D; + this.xrTableCell27.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell28 + // + this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day11", "{0:0.00}")}); - this.xrTableCell28.Name = "xrTableCell28"; - this.xrTableCell28.StylePriority.UseTextAlignment = false; - this.xrTableCell28.Text = "xrTableCell28"; - this.xrTableCell28.Weight = 0.0811541902506101D; - this.xrTableCell28.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell29 - // - this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.StylePriority.UseTextAlignment = false; + this.xrTableCell28.Text = "xrTableCell28"; + this.xrTableCell28.Weight = 0.0811541902506101D; + this.xrTableCell28.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell29 + // + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day12", "{0:0.00}")}); - this.xrTableCell29.Name = "xrTableCell29"; - this.xrTableCell29.StylePriority.UseTextAlignment = false; - this.xrTableCell29.Text = "xrTableCell29"; - this.xrTableCell29.Weight = 0.081154190068467136D; - this.xrTableCell29.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell30 - // - this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.StylePriority.UseTextAlignment = false; + this.xrTableCell29.Text = "xrTableCell29"; + this.xrTableCell29.Weight = 0.081154190068467136D; + this.xrTableCell29.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell30 + // + this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day13", "{0:0.00}")}); - this.xrTableCell30.Name = "xrTableCell30"; - this.xrTableCell30.StylePriority.UseTextAlignment = false; - this.xrTableCell30.Text = "xrTableCell30"; - this.xrTableCell30.Weight = 0.081154197479915147D; - this.xrTableCell30.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell31 - // - this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.StylePriority.UseTextAlignment = false; + this.xrTableCell30.Text = "xrTableCell30"; + this.xrTableCell30.Weight = 0.081154197479915147D; + this.xrTableCell30.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell31 + // + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day14", "{0:0.00}")}); - this.xrTableCell31.Name = "xrTableCell31"; - this.xrTableCell31.StylePriority.UseTextAlignment = false; - this.xrTableCell31.Text = "xrTableCell31"; - this.xrTableCell31.Weight = 0.081154188405001215D; - this.xrTableCell31.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell32 - // - this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.StylePriority.UseTextAlignment = false; + this.xrTableCell31.Text = "xrTableCell31"; + this.xrTableCell31.Weight = 0.081154188405001215D; + this.xrTableCell31.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell32 + // + this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day15", "{0:c}")}); - this.xrTableCell32.Name = "xrTableCell32"; - this.xrTableCell32.StylePriority.UseTextAlignment = false; - this.xrTableCell32.Text = "xrTableCell32"; - this.xrTableCell32.Weight = 0.081154187218654084D; - this.xrTableCell32.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell33 - // - this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.StylePriority.UseTextAlignment = false; + this.xrTableCell32.Text = "xrTableCell32"; + this.xrTableCell32.Weight = 0.081154187218654084D; + this.xrTableCell32.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell33 + // + this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day16")}); - this.xrTableCell33.Name = "xrTableCell33"; - this.xrTableCell33.Weight = 0.081154184816944808D; - this.xrTableCell33.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell34 - // - this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.Weight = 0.081154184816944808D; + this.xrTableCell33.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell34 + // + this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day17", "{0:0.00}")}); - this.xrTableCell34.Name = "xrTableCell34"; - this.xrTableCell34.StylePriority.UseBorders = false; - this.xrTableCell34.StylePriority.UseTextAlignment = false; - this.xrTableCell34.Text = "xrTableCell34"; - this.xrTableCell34.Weight = 0.081154193135481556D; - this.xrTableCell34.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell54 - // - this.xrTableCell54.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.StylePriority.UseBorders = false; + this.xrTableCell34.StylePriority.UseTextAlignment = false; + this.xrTableCell34.Text = "xrTableCell34"; + this.xrTableCell34.Weight = 0.081154193135481556D; + this.xrTableCell34.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell54 + // + this.xrTableCell54.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day18")}); - this.xrTableCell54.Name = "xrTableCell54"; - this.xrTableCell54.Text = "xrTableCell54"; - this.xrTableCell54.Weight = 0.08115419313548157D; - this.xrTableCell54.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell53 - // - this.xrTableCell53.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell54.Name = "xrTableCell54"; + this.xrTableCell54.Text = "xrTableCell54"; + this.xrTableCell54.Weight = 0.08115419313548157D; + this.xrTableCell54.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell53 + // + this.xrTableCell53.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day19")}); - this.xrTableCell53.Name = "xrTableCell53"; - this.xrTableCell53.Text = "xrTableCell53"; - this.xrTableCell53.Weight = 0.08115419330432655D; - this.xrTableCell53.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell52 - // - this.xrTableCell52.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell53.Name = "xrTableCell53"; + this.xrTableCell53.Text = "xrTableCell53"; + this.xrTableCell53.Weight = 0.08115419330432655D; + this.xrTableCell53.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell52 + // + this.xrTableCell52.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day20")}); - this.xrTableCell52.Name = "xrTableCell52"; - this.xrTableCell52.Text = "xrTableCell52"; - this.xrTableCell52.Weight = 0.081154193642016481D; - this.xrTableCell52.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell51 - // - this.xrTableCell51.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell52.Name = "xrTableCell52"; + this.xrTableCell52.Text = "xrTableCell52"; + this.xrTableCell52.Weight = 0.081154193642016481D; + this.xrTableCell52.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell51 + // + this.xrTableCell51.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day21")}); - this.xrTableCell51.Name = "xrTableCell51"; - this.xrTableCell51.Text = "xrTableCell51"; - this.xrTableCell51.Weight = 0.081154193642016426D; - this.xrTableCell51.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell55 - // - this.xrTableCell55.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell51.Name = "xrTableCell51"; + this.xrTableCell51.Text = "xrTableCell51"; + this.xrTableCell51.Weight = 0.081154193642016426D; + this.xrTableCell51.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell55 + // + this.xrTableCell55.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day22")}); - this.xrTableCell55.Name = "xrTableCell55"; - this.xrTableCell55.Text = "[Day22]"; - this.xrTableCell55.Weight = 0.081154193135481556D; - this.xrTableCell55.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell57 - // - this.xrTableCell57.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell55.Name = "xrTableCell55"; + this.xrTableCell55.Text = "[Day22]"; + this.xrTableCell55.Weight = 0.081154193135481556D; + this.xrTableCell55.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell57 + // + this.xrTableCell57.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day23")}); - this.xrTableCell57.Name = "xrTableCell57"; - this.xrTableCell57.Text = "xrTableCell57"; - this.xrTableCell57.Weight = 0.081154193135481556D; - this.xrTableCell57.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell56 - // - this.xrTableCell56.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell57.Name = "xrTableCell57"; + this.xrTableCell57.Text = "xrTableCell57"; + this.xrTableCell57.Weight = 0.081154193135481556D; + this.xrTableCell57.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell56 + // + this.xrTableCell56.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day24")}); - this.xrTableCell56.Name = "xrTableCell56"; - this.xrTableCell56.Text = "[Day24]"; - this.xrTableCell56.Weight = 0.081154203328137109D; - this.xrTableCell56.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell60 - // - this.xrTableCell60.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell56.Name = "xrTableCell56"; + this.xrTableCell56.Text = "[Day24]"; + this.xrTableCell56.Weight = 0.081154203328137109D; + this.xrTableCell56.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell60 + // + this.xrTableCell60.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day25")}); - this.xrTableCell60.Name = "xrTableCell60"; - this.xrTableCell60.Text = "xrTableCell60"; - this.xrTableCell60.Weight = 0.081154203328137109D; - this.xrTableCell60.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell59 - // - this.xrTableCell59.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell60.Name = "xrTableCell60"; + this.xrTableCell60.Text = "xrTableCell60"; + this.xrTableCell60.Weight = 0.081154203328137109D; + this.xrTableCell60.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell59 + // + this.xrTableCell59.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day26")}); - this.xrTableCell59.Name = "xrTableCell59"; - this.xrTableCell59.Text = "xrTableCell59"; - this.xrTableCell59.Weight = 0.081154203328137109D; - this.xrTableCell59.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell61 - // - this.xrTableCell61.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell59.Name = "xrTableCell59"; + this.xrTableCell59.Text = "xrTableCell59"; + this.xrTableCell59.Weight = 0.081154203328137109D; + this.xrTableCell59.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell61 + // + this.xrTableCell61.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day27")}); - this.xrTableCell61.Name = "xrTableCell61"; - this.xrTableCell61.Text = "xrTableCell61"; - this.xrTableCell61.Weight = 0.081154203328137109D; - this.xrTableCell61.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell58 - // - this.xrTableCell58.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell61.Name = "xrTableCell61"; + this.xrTableCell61.Text = "xrTableCell61"; + this.xrTableCell61.Weight = 0.081154203328137109D; + this.xrTableCell61.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell58 + // + this.xrTableCell58.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day28")}); - this.xrTableCell58.Name = "xrTableCell58"; - this.xrTableCell58.Text = "xrTableCell58"; - this.xrTableCell58.Weight = 0.081154203328137109D; - this.xrTableCell58.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell63 - // - this.xrTableCell63.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell58.Name = "xrTableCell58"; + this.xrTableCell58.Text = "xrTableCell58"; + this.xrTableCell58.Weight = 0.081154203328137109D; + this.xrTableCell58.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell63 + // + this.xrTableCell63.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day29")}); - this.xrTableCell63.Name = "xrTableCell63"; - this.xrTableCell63.Text = "xrTableCell63"; - this.xrTableCell63.Weight = 0.081154203328137109D; - this.xrTableCell63.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell62 - // - this.xrTableCell62.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell63.Name = "xrTableCell63"; + this.xrTableCell63.Text = "xrTableCell63"; + this.xrTableCell63.Weight = 0.081154203328137109D; + this.xrTableCell63.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell62 + // + this.xrTableCell62.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day30")}); - this.xrTableCell62.Name = "xrTableCell62"; - this.xrTableCell62.Text = "xrTableCell62"; - this.xrTableCell62.Weight = 0.081154203328137109D; - this.xrTableCell62.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // xrTableCell64 - // - this.xrTableCell64.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell62.Name = "xrTableCell62"; + this.xrTableCell62.Text = "xrTableCell62"; + this.xrTableCell62.Weight = 0.081154203328137109D; + this.xrTableCell62.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // xrTableCell64 + // + this.xrTableCell64.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell64.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell64.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Day31")}); - this.xrTableCell64.Name = "xrTableCell64"; - this.xrTableCell64.StylePriority.UseBorders = false; - this.xrTableCell64.Text = "xrTableCell64"; - this.xrTableCell64.Weight = 0.081154203328137109D; - this.xrTableCell64.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); - // - // ruleNotApprovedAndExpiringNext4Months - // - this.ruleNotApprovedAndExpiringNext4Months.Condition = "[IsApproved] == False And [OpenMonths] < 4"; - this.ruleNotApprovedAndExpiringNext4Months.DataMember = "SupportConceptDetailList"; - // - // - // - this.ruleNotApprovedAndExpiringNext4Months.Formatting.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); - this.ruleNotApprovedAndExpiringNext4Months.Name = "ruleNotApprovedAndExpiringNext4Months"; - // - // ruleNotApprovedAndExpiringNext8Months - // - this.ruleNotApprovedAndExpiringNext8Months.Condition = "[IsApproved] == False And [OpenMonths] < 8 And [OpenMonths] >= 4"; - this.ruleNotApprovedAndExpiringNext8Months.DataMember = "SupportConceptDetailList"; - // - // - // - this.ruleNotApprovedAndExpiringNext8Months.Formatting.BackColor = System.Drawing.Color.LightBlue; - this.ruleNotApprovedAndExpiringNext8Months.Name = "ruleNotApprovedAndExpiringNext8Months"; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.AssessmentSheetRO); - // - // PageHeader - // - this.PageHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableCell64.Name = "xrTableCell64"; + this.xrTableCell64.StylePriority.UseBorders = false; + this.xrTableCell64.Text = "xrTableCell64"; + this.xrTableCell64.Weight = 0.081154203328137109D; + this.xrTableCell64.EvaluateBinding += new DevExpress.XtraReports.UI.BindingEventHandler(this.Cell_EvaluateBinding); + // + // ruleNotApprovedAndExpiringNext4Months + // + this.ruleNotApprovedAndExpiringNext4Months.Condition = "[IsApproved] == False And [OpenMonths] < 4"; + this.ruleNotApprovedAndExpiringNext4Months.DataMember = "SupportConceptDetailList"; + this.ruleNotApprovedAndExpiringNext4Months.Formatting.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); + this.ruleNotApprovedAndExpiringNext4Months.Name = "ruleNotApprovedAndExpiringNext4Months"; + // + // ruleNotApprovedAndExpiringNext8Months + // + this.ruleNotApprovedAndExpiringNext8Months.Condition = "[IsApproved] == False And [OpenMonths] < 8 And [OpenMonths] >= 4"; + this.ruleNotApprovedAndExpiringNext8Months.DataMember = "SupportConceptDetailList"; + this.ruleNotApprovedAndExpiringNext8Months.Formatting.BackColor = System.Drawing.Color.LightBlue; + this.ruleNotApprovedAndExpiringNext8Months.Name = "ruleNotApprovedAndExpiringNext8Months"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.AssessmentSheetRO); + // + // PageHeader + // + this.PageHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1}); - this.PageHeader.HeightF = 20F; - this.PageHeader.Name = "PageHeader"; - this.PageHeader.StylePriority.UseBorderColor = false; - this.PageHeader.StylePriority.UseTextAlignment = false; - this.PageHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - // - // xrTable1 - // - this.xrTable1.BackColor = System.Drawing.Color.LightSteelBlue; - this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + this.PageHeader.HeightF = 20F; + this.PageHeader.Name = "PageHeader"; + this.PageHeader.StylePriority.UseBorderColor = false; + this.PageHeader.StylePriority.UseTextAlignment = false; + this.PageHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrTable1 + // + this.xrTable1.BackColor = System.Drawing.Color.LightSteelBlue; + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable1.Name = "xrTable1"; - this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1109F, 20F); - this.xrTable1.StylePriority.UseBackColor = false; - this.xrTable1.StylePriority.UseBorders = false; - this.xrTable1.StylePriority.UseFont = false; - this.xrTable1.StylePriority.UseTextAlignment = false; - this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // - // xrTableRow1 - // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTable1.SizeF = new System.Drawing.SizeF(1109F, 20F); + this.xrTable1.StylePriority.UseBackColor = false; + this.xrTable1.StylePriority.UseBorders = false; + this.xrTable1.StylePriority.UseFont = false; + this.xrTable1.StylePriority.UseTextAlignment = false; + this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell1, this.xrTableCell2, this.xrTableCell35, @@ -629,245 +624,245 @@ namespace BeWo.Report.DefaultReports this.xrTableCell48, this.xrTableCell49, this.xrTableCell50}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 0.47619047619047616D; - // - // xrTableCell1 - // - this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.47619047619047616D; + // + // xrTableCell1 + // + this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.StylePriority.UseBorders = false; - this.xrTableCell1.Text = "Kategorie"; - this.xrTableCell1.Weight = 0.48422002649988627D; - // - // xrTableCell2 - // - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Text = "1."; - this.xrTableCell2.Weight = 0.081154192039802536D; - // - // xrTableCell35 - // - this.xrTableCell35.Name = "xrTableCell35"; - this.xrTableCell35.Text = "2."; - this.xrTableCell35.Weight = 0.0811541971994471D; - // - // xrTableCell3 - // - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.Text = "3."; - this.xrTableCell3.Weight = 0.081154111235996029D; - // - // xrTableCell4 - // - this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.Text = "4."; - this.xrTableCell4.Weight = 0.081154190948556346D; - // - // xrTableCell5 - // - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Text = "5."; - this.xrTableCell5.Weight = 0.081154193589630455D; - // - // xrTableCell6 - // - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Text = "6."; - this.xrTableCell6.Weight = 0.081154191279798588D; - // - // xrTableCell7 - // - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Text = "7."; - this.xrTableCell7.Weight = 0.081154190922765962D; - // - // xrTableCell8 - // - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Text = "8."; - this.xrTableCell8.Weight = 0.0811541878247228D; - // - // xrTableCell9 - // - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Text = "9."; - this.xrTableCell9.Weight = 0.081154197276817663D; - // - // xrTableCell10 - // - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Text = "10."; - this.xrTableCell10.Weight = 0.081154192868311492D; - // - // xrTableCell11 - // - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Text = "11."; - this.xrTableCell11.Weight = 0.081154190250609992D; - // - // xrTableCell12 - // - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Text = "12."; - this.xrTableCell12.Weight = 0.081154190068467136D; - // - // xrTableCell13 - // - this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Text = "13."; - this.xrTableCell13.Weight = 0.081154197479915258D; - // - // xrTableCell14 - // - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.Text = "14."; - this.xrTableCell14.Weight = 0.081154188405001215D; - // - // xrTableCell15 - // - this.xrTableCell15.Name = "xrTableCell15"; - this.xrTableCell15.Text = "15."; - this.xrTableCell15.Weight = 0.081154197537943062D; - // - // xrTableCell16 - // - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.Text = "16."; - this.xrTableCell16.Weight = 0.081154184816944808D; - // - // xrTableCell17 - // - this.xrTableCell17.Name = "xrTableCell17"; - this.xrTableCell17.StylePriority.UseBorders = false; - this.xrTableCell17.Text = "17."; - this.xrTableCell17.Weight = 0.081154194317396344D; - // - // xrTableCell37 - // - this.xrTableCell37.Name = "xrTableCell37"; - this.xrTableCell37.Text = "18."; - this.xrTableCell37.Weight = 0.081154193642016537D; - // - // xrTableCell38 - // - this.xrTableCell38.Name = "xrTableCell38"; - this.xrTableCell38.Text = "19."; - this.xrTableCell38.Weight = 0.0811541933043266D; - // - // xrTableCell39 - // - this.xrTableCell39.Name = "xrTableCell39"; - this.xrTableCell39.Text = "20."; - this.xrTableCell39.Weight = 0.081154193135481612D; - // - // xrTableCell40 - // - this.xrTableCell40.Name = "xrTableCell40"; - this.xrTableCell40.Text = "21."; - this.xrTableCell40.Weight = 0.081154193051059031D; - // - // xrTableCell41 - // - this.xrTableCell41.Name = "xrTableCell41"; - this.xrTableCell41.Text = "22."; - this.xrTableCell41.Weight = 0.081154193008847852D; - // - // xrTableCell42 - // - this.xrTableCell42.Name = "xrTableCell42"; - this.xrTableCell42.Text = "23."; - this.xrTableCell42.Weight = 0.081154192987742235D; - // - // xrTableCell43 - // - this.xrTableCell43.Name = "xrTableCell43"; - this.xrTableCell43.Text = "24."; - this.xrTableCell43.Weight = 0.081154192977189316D; - // - // xrTableCell44 - // - this.xrTableCell44.Name = "xrTableCell44"; - this.xrTableCell44.Text = "25,"; - this.xrTableCell44.Weight = 0.081154192971912981D; - // - // xrTableCell45 - // - this.xrTableCell45.Name = "xrTableCell45"; - this.xrTableCell45.Text = "26."; - this.xrTableCell45.Weight = 0.081154192969274785D; - // - // xrTableCell46 - // - this.xrTableCell46.Name = "xrTableCell46"; - this.xrTableCell46.Text = "27."; - this.xrTableCell46.Weight = 0.0811541929679557D; - // - // xrTableCell47 - // - this.xrTableCell47.Name = "xrTableCell47"; - this.xrTableCell47.Text = "28."; - this.xrTableCell47.Weight = 0.081154192967296118D; - // - // xrTableCell48 - // - this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.Text = "29."; - this.xrTableCell48.Weight = 0.081154192966966354D; - // - // xrTableCell49 - // - this.xrTableCell49.Name = "xrTableCell49"; - this.xrTableCell49.Text = "30."; - this.xrTableCell49.Weight = 0.081154234243958553D; - // - // xrTableCell50 - // - this.xrTableCell50.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.Text = "Kategorie"; + this.xrTableCell1.Weight = 0.48422002649988627D; + // + // xrTableCell2 + // + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Text = "1."; + this.xrTableCell2.Weight = 0.081154192039802536D; + // + // xrTableCell35 + // + this.xrTableCell35.Name = "xrTableCell35"; + this.xrTableCell35.Text = "2."; + this.xrTableCell35.Weight = 0.0811541971994471D; + // + // xrTableCell3 + // + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Text = "3."; + this.xrTableCell3.Weight = 0.081154111235996029D; + // + // xrTableCell4 + // + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Text = "4."; + this.xrTableCell4.Weight = 0.081154190948556346D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Text = "5."; + this.xrTableCell5.Weight = 0.081154193589630455D; + // + // xrTableCell6 + // + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Text = "6."; + this.xrTableCell6.Weight = 0.081154191279798588D; + // + // xrTableCell7 + // + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Text = "7."; + this.xrTableCell7.Weight = 0.081154190922765962D; + // + // xrTableCell8 + // + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Text = "8."; + this.xrTableCell8.Weight = 0.0811541878247228D; + // + // xrTableCell9 + // + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Text = "9."; + this.xrTableCell9.Weight = 0.081154197276817663D; + // + // xrTableCell10 + // + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Text = "10."; + this.xrTableCell10.Weight = 0.081154192868311492D; + // + // xrTableCell11 + // + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Text = "11."; + this.xrTableCell11.Weight = 0.081154190250609992D; + // + // xrTableCell12 + // + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Text = "12."; + this.xrTableCell12.Weight = 0.081154190068467136D; + // + // xrTableCell13 + // + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Text = "13."; + this.xrTableCell13.Weight = 0.081154197479915258D; + // + // xrTableCell14 + // + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Text = "14."; + this.xrTableCell14.Weight = 0.081154188405001215D; + // + // xrTableCell15 + // + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Text = "15."; + this.xrTableCell15.Weight = 0.081154197537943062D; + // + // xrTableCell16 + // + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Text = "16."; + this.xrTableCell16.Weight = 0.081154184816944808D; + // + // xrTableCell17 + // + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.StylePriority.UseBorders = false; + this.xrTableCell17.Text = "17."; + this.xrTableCell17.Weight = 0.081154194317396344D; + // + // xrTableCell37 + // + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.Text = "18."; + this.xrTableCell37.Weight = 0.081154193642016537D; + // + // xrTableCell38 + // + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.Text = "19."; + this.xrTableCell38.Weight = 0.0811541933043266D; + // + // xrTableCell39 + // + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.Text = "20."; + this.xrTableCell39.Weight = 0.081154193135481612D; + // + // xrTableCell40 + // + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.Text = "21."; + this.xrTableCell40.Weight = 0.081154193051059031D; + // + // xrTableCell41 + // + this.xrTableCell41.Name = "xrTableCell41"; + this.xrTableCell41.Text = "22."; + this.xrTableCell41.Weight = 0.081154193008847852D; + // + // xrTableCell42 + // + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.Text = "23."; + this.xrTableCell42.Weight = 0.081154192987742235D; + // + // xrTableCell43 + // + this.xrTableCell43.Name = "xrTableCell43"; + this.xrTableCell43.Text = "24."; + this.xrTableCell43.Weight = 0.081154192977189316D; + // + // xrTableCell44 + // + this.xrTableCell44.Name = "xrTableCell44"; + this.xrTableCell44.Text = "25,"; + this.xrTableCell44.Weight = 0.081154192971912981D; + // + // xrTableCell45 + // + this.xrTableCell45.Name = "xrTableCell45"; + this.xrTableCell45.Text = "26."; + this.xrTableCell45.Weight = 0.081154192969274785D; + // + // xrTableCell46 + // + this.xrTableCell46.Name = "xrTableCell46"; + this.xrTableCell46.Text = "27."; + this.xrTableCell46.Weight = 0.0811541929679557D; + // + // xrTableCell47 + // + this.xrTableCell47.Name = "xrTableCell47"; + this.xrTableCell47.Text = "28."; + this.xrTableCell47.Weight = 0.081154192967296118D; + // + // xrTableCell48 + // + this.xrTableCell48.Name = "xrTableCell48"; + this.xrTableCell48.Text = "29."; + this.xrTableCell48.Weight = 0.081154192966966354D; + // + // xrTableCell49 + // + this.xrTableCell49.Name = "xrTableCell49"; + this.xrTableCell49.Text = "30."; + this.xrTableCell49.Weight = 0.081154234243958553D; + // + // xrTableCell50 + // + this.xrTableCell50.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell50.Name = "xrTableCell50"; - this.xrTableCell50.StylePriority.UseBorders = false; - this.xrTableCell50.Text = "31."; - this.xrTableCell50.Weight = 0.081154234243958553D; - // - // PageFooter - // - this.PageFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableCell50.Name = "xrTableCell50"; + this.xrTableCell50.StylePriority.UseBorders = false; + this.xrTableCell50.Text = "31."; + this.xrTableCell50.Weight = 0.081154234243958553D; + // + // PageFooter + // + this.PageFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrPageInfo2}); - this.PageFooter.HeightF = 35.00001F; - this.PageFooter.Name = "PageFooter"; - // - // xrPageInfo2 - // - this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.xrPageInfo2.Format = "Seite {0} von {1}"; - this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(602.0002F, 17.00001F); - this.xrPageInfo2.Name = "xrPageInfo2"; - this.xrPageInfo2.SizeF = new System.Drawing.SizeF(497F, 18F); - this.xrPageInfo2.StylePriority.UseFont = false; - this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - // - // approvedText - // - this.approvedText.DataMember = "SupportConceptDetailList"; - this.approvedText.Expression = "Iif([IsApproved], \'bewilligt\' , \'nicht bewilligt\')"; - this.approvedText.Name = "approvedText"; - // - // topMarginBand1 - // - this.topMarginBand1.HeightF = 50F; - this.topMarginBand1.Name = "topMarginBand1"; - // - // bottomMarginBand1 - // - this.bottomMarginBand1.HeightF = 20F; - this.bottomMarginBand1.Name = "bottomMarginBand1"; - // - // Punktebogen - // - this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.PageFooter.HeightF = 35.00001F; + this.PageFooter.Name = "PageFooter"; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(602.0002F, 17.00001F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(497F, 18F); + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; + // + // approvedText + // + this.approvedText.DataMember = "SupportConceptDetailList"; + this.approvedText.Expression = "Iif([IsApproved], \'bewilligt\' , \'nicht bewilligt\')"; + this.approvedText.Name = "approvedText"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 20F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // Punktebogen + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail, this.ReportHeader, this.DetailReport, @@ -875,22 +870,22 @@ namespace BeWo.Report.DefaultReports this.PageFooter, this.topMarginBand1, this.bottomMarginBand1}); - this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { this.approvedText}); - this.DataSource = this.bindingSource1; - this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { + this.DataSource = this.bindingSource1; + this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleNotApprovedAndExpiringNext8Months, this.ruleNotApprovedAndExpiringNext4Months}); - this.Landscape = true; - this.Margins = new DevExpress.Drawing.DXMargins(30, 30, 50, 20); - this.PageHeight = 827; - this.PageWidth = 1169; - this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "13.1"; - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + this.Landscape = true; + this.Margins = new DevExpress.Drawing.DXMargins(30F, 30F, 50F, 20F); + this.PageHeight = 827; + this.PageWidth = 1169; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; + this.Version = "23.2"; + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/Report/DefaultReports/AssessmentSheetReport.resx b/Report/DefaultReports/AssessmentSheetReport.resx index 0f60e7858..c7e0d4bdf 100644 --- a/Report/DefaultReports/AssessmentSheetReport.resx +++ b/Report/DefaultReports/AssessmentSheetReport.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file diff --git a/Service/DCEntityMapper/AssessmentSheetEntryDC_AssessmentSheetEntry.cs b/Service/DCEntityMapper/AssessmentSheetEntryDC_AssessmentSheetEntry.cs index e3cfc8bbb..7a2207b4d 100644 --- a/Service/DCEntityMapper/AssessmentSheetEntryDC_AssessmentSheetEntry.cs +++ b/Service/DCEntityMapper/AssessmentSheetEntryDC_AssessmentSheetEntry.cs @@ -11,6 +11,8 @@ namespace BeWo.Service.DCEntityMapper { pDataContract.AssessmentSheetEntryOid = pEntity.Oid; pDataContract.AssessmentSheetEntryVersion = pEntity.Version; + pDataContract.InsUser = pEntity.InsUser; + pDataContract.InsTs = pEntity.InsTs; if (pEntity.Customer != null) { diff --git a/Service/DCEntityMapper/CompactCustomerDC_Customer.cs b/Service/DCEntityMapper/CompactCustomerDC_Customer.cs index 91bdefa3e..80fb29dfb 100644 --- a/Service/DCEntityMapper/CompactCustomerDC_Customer.cs +++ b/Service/DCEntityMapper/CompactCustomerDC_Customer.cs @@ -1,11 +1,9 @@ -using System.Collections.Generic; -using System.Linq; - -using BeWo.Data.Access; +using BeWo.Data.Access; using BeWo.Data.Entities; - using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; +using System.Collections.Generic; +using System.Linq; namespace BeWo.Service.DCEntityMapper { @@ -31,12 +29,13 @@ namespace BeWo.Service.DCEntityMapper { pDataContract.TerminationReason = pEntity.TerminationReason.Value; } - //else if (pEntity.TerminationDate.HasValue) - //{ - // pDataContract.TerminationReason = $"Betreuung vorzeitig beendet am {pEntity.TerminationDate:dd.MM.yyyy}"; - //} - pDataContract.AssistanceBegin = pEntity.AssistanceBegin; + //else if (pEntity.TerminationDate.HasValue) + //{ + // pDataContract.TerminationReason = $"Betreuung vorzeitig beendet am {pEntity.TerminationDate:dd.MM.yyyy}"; + //} + + pDataContract.AssistanceBegin = pEntity.AssistanceBegin; pDataContract.EquityContribution = pEntity.EquityContribution; pDataContract.CustomerAlias = pEntity.CustomerAlias; pDataContract.DebitorNumber = pEntity.DebitorNumber; diff --git a/Shared/DataContracts/AssessmentSheetEntryDC.cs b/Shared/DataContracts/AssessmentSheetEntryDC.cs index 4a238cf13..3f900dacd 100644 --- a/Shared/DataContracts/AssessmentSheetEntryDC.cs +++ b/Shared/DataContracts/AssessmentSheetEntryDC.cs @@ -20,7 +20,10 @@ namespace BS.Shared.DataContracts [DataMember] public long? CustomerOid { get; set; } - + [DataMember] + public DateTime? InsTs { get; set; } + [DataMember] + public string InsUser { get; set; } [DataMember] public DateTime? Day { get; set; } } diff --git a/Shared/DataContracts/Compact/CompactCustomerDC.cs b/Shared/DataContracts/Compact/CompactCustomerDC.cs index 327398aa9..6592862d6 100644 --- a/Shared/DataContracts/Compact/CompactCustomerDC.cs +++ b/Shared/DataContracts/Compact/CompactCustomerDC.cs @@ -44,7 +44,7 @@ namespace BS.Shared.DataContracts.Compact [DataMember] public long PersonOid { get; set; } - + [DataMember] public long CustomerVersion { get; set; } @@ -86,6 +86,9 @@ namespace BS.Shared.DataContracts.Compact [DataMember] public string Town { get; set; } + [DataMember] + public String CustomerCareTypes { get; set; } + [DataMember] public Dictionary VarFieldValues { From 2ca2965a1f6c3a776648e00b9ba6d238f1fadb7b Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 16 Apr 2026 16:34:28 +0200 Subject: [PATCH 06/13] =?UTF-8?q?Bugfix:=20Feld=20Buchungsdatum=20ausblend?= =?UTF-8?q?en,=20wenn=20das=20Modul=20f=C3=BCr=20Avise=20Import=20nicht=20?= =?UTF-8?q?aktiviert=20ist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/View/Detail/AccountingTransactionBookingView.xaml | 1 + BeWo/View/Detail/AccountingTransactionBookingView.xaml.cs | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/BeWo/View/Detail/AccountingTransactionBookingView.xaml b/BeWo/View/Detail/AccountingTransactionBookingView.xaml index 09ebbcc13..0dc464a0c 100644 --- a/BeWo/View/Detail/AccountingTransactionBookingView.xaml +++ b/BeWo/View/Detail/AccountingTransactionBookingView.xaml @@ -107,6 +107,7 @@ IsReadOnly="True" PopUpClick="popupedit_file_PopUpClick" />