diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 388313a3c..6e73c6a16 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -288,15 +288,19 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + MSBuild:Compile Designer - + Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -304,6 +308,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -638,7 +646,6 @@ - @@ -662,7 +669,7 @@ Component - + @@ -707,11 +714,11 @@ - + - + AbsenceTimeEditView.xaml @@ -793,7 +800,9 @@ + + @@ -884,15 +893,21 @@ ValueListEntryEditControl.xaml + + DienstView.xaml + NotizenKategorieView.xaml BudgetView.xaml - + AbsenceTimesView.xaml + + Dienstplaner.xaml + AbwesenheitstabelleView.xaml diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index 2e5bda7d6..30e5787ab 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -1507,6 +1507,8 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ReportTemplateDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ReportTypes))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.DienstDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BargeldkassenDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -1648,6 +1650,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] object ConvertToNewSubstitutionType(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadAbsenceReason", ReplyAction="http://tempuri.org/ICustomerService/LoadAbsenceReasonResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadAbsenceReasonBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + BS.Shared.DataContracts.AbsenceReasonDC LoadAbsenceReason(long absenceReasonOid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateCustomersAbsenceTimes", ReplyAction="http://tempuri.org/ICustomerService/UpdateCustomersAbsenceTimesResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateCustomersAbsenceTimesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void UpdateCustomersAbsenceTimes(long pCustomerOid, System.Collections.Generic.List pAbsenceTimes); @@ -2471,6 +2477,11 @@ namespace BeWo.ServiceProxy return base.Channel.ConvertToNewSubstitutionType(); } + public BS.Shared.DataContracts.AbsenceReasonDC LoadAbsenceReason(long absenceReasonOid) + { + return base.Channel.LoadAbsenceReason(absenceReasonOid); + } + public void UpdateCustomersAbsenceTimes(long pCustomerOid, System.Collections.Generic.List pAbsenceTimes) { base.Channel.UpdateCustomersAbsenceTimes(pCustomerOid, pAbsenceTimes); @@ -4686,6 +4697,22 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteAbsenceTimeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void DeleteAbsenceTime(BS.Shared.DataContracts.AbsenceTimeDC absenceTimeDC); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllDienste", ReplyAction="http://tempuri.org/IOperationsService/GetAllDiensteResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllDiensteBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetAllDienste(); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewDienst", ReplyAction="http://tempuri.org/IOperationsService/InsertNewDienstResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewDienstBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void InsertNewDienst(System.Collections.Generic.List dienst); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateDienst", ReplyAction="http://tempuri.org/IOperationsService/DeactivateDienstResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateDienstBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void DeactivateDienst(System.Collections.Generic.Dictionary pOid2Version); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateDienst", ReplyAction="http://tempuri.org/IOperationsService/UpdateDienstResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateDienstBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void UpdateDienst(System.Collections.Generic.List dienste); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCResponse" + "")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCBeWoFaul" + @@ -5656,6 +5683,26 @@ namespace BeWo.ServiceProxy base.Channel.DeleteAbsenceTime(absenceTimeDC); } + public System.Collections.Generic.List GetAllDienste() + { + return base.Channel.GetAllDienste(); + } + + public void InsertNewDienst(System.Collections.Generic.List dienst) + { + base.Channel.InsertNewDienst(dienst); + } + + public void DeactivateDienst(System.Collections.Generic.Dictionary pOid2Version) + { + base.Channel.DeactivateDienst(pOid2Version); + } + + public void UpdateDienst(System.Collections.Generic.List dienste) + { + base.Channel.UpdateDienst(dienste); + } + public void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType) { base.Channel.UpdateIsChatActiveCustomerAPPCodeDC(customerOid, activeType); diff --git a/BeWo/View/Detail/AbsenceReasonView.xaml.cs b/BeWo/View/Detail/AbsenceReasonView.xaml.cs index 81df815ce..bd1bb8c80 100644 --- a/BeWo/View/Detail/AbsenceReasonView.xaml.cs +++ b/BeWo/View/Detail/AbsenceReasonView.xaml.cs @@ -103,8 +103,8 @@ namespace BeWo.View.Detail private void colorEditor_Loaded(object sender, RoutedEventArgs e) { - ((ListBox) sender).ItemsSource = ViewModel.AllBrushes; - ((ListBox) sender).ItemTemplateSelector = new ComboBoxTemplateSelector((ListBox) sender); + ((ListBox)sender).ItemsSource = ViewModel.AllBrushes; + ((ListBox)sender).ItemTemplateSelector = new ComboBoxTemplateSelector((ListBox) sender); } private void listbox_colorpicker_SelectionChanged(object sender, SelectionChangedEventArgs e) @@ -128,7 +128,6 @@ namespace BeWo.View.Detail vm.Brush = selection as SolidColorBrush; } } - popup_color.IsOpen = false; } } diff --git a/BeWo/View/Detail/BudgetView.xaml.cs b/BeWo/View/Detail/BudgetView.xaml.cs index 88a807849..def221b4d 100644 --- a/BeWo/View/Detail/BudgetView.xaml.cs +++ b/BeWo/View/Detail/BudgetView.xaml.cs @@ -96,27 +96,20 @@ namespace BeWo.View.Detail } } - private void PART_Editor_Click(object sender, RoutedEventArgs e) - { - RowData data = DatagridRegions.View.FocusedRowData; + //private void PART_Editor_Click(object sender, RoutedEventArgs e) + //{ + // RowData data = DatagridRegions.View.FocusedRowData; - if (data != null && data.RowHandle != null) - { - var vm = DatagridRegions.GetRow(data.RowHandle.Value) as BudgetVM; + // if (data != null && data.RowHandle != null) + // { + // var vm = DatagridRegions.GetRow(data.RowHandle.Value) as BudgetVM; - if (vm != null) - { - ViewModel.EditVM = vm; - //popup_costrateperiods.IsOpen = true; - } - } - } - - private void button_edit_Click(object sender, RoutedEventArgs e) - { - //this.ViewModel.EditVM.Values = this.ViewModel.PossibleValues.Where(i => i.IsEditSelected).ToList(); - - //popup_costrateperiods.IsOpen = false; - } + // if (vm != null) + // { + // ViewModel.EditVM = vm; + // //popup_costrateperiods.IsOpen = true; + // } + // } + //} } } diff --git a/BeWo/View/Detail/DienstView.xaml b/BeWo/View/Detail/DienstView.xaml new file mode 100644 index 000000000..64e88adf5 --- /dev/null +++ b/BeWo/View/Detail/DienstView.xaml @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BeWo/View/Detail/DienstView.xaml.cs b/BeWo/View/Detail/DienstView.xaml.cs new file mode 100644 index 000000000..083fa3ff1 --- /dev/null +++ b/BeWo/View/Detail/DienstView.xaml.cs @@ -0,0 +1,131 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows; +using BS.Shared.Core; +using BS.Shared.Extensions; + +using BeWo.Core; +using BeWo.Core.Service; +using BeWo.ServiceProxy; +using BeWo.Validation; +using BeWo.ViewModel; +using BeWo.ViewModel.ListViewModel; + +using DevExpress.Xpf.Editors.Settings; +using DevExpress.Xpf.Grid; +using System.Windows.Controls; +using System.Windows.Media; + +namespace BeWo.View.Detail +{ + public partial class DienstView : BeWoView + { + private DienstListVM _ViewModel; + + public DienstView(DienstListVM listVM) + { + InitializeComponent(); + _FarbeComboBox.ItemTemplateSelector = new ComboBoxTemplateSelector(_FarbeComboBox); + ViewModel = listVM; + } + + public override bool IsDirty + { + get { return ViewModel != null && ViewModel.IsDirty; } + } + + public override string Title + { + get { return "Dienste"; } + } + + private DienstListVM ViewModel + { + get { return _ViewModel; } + + set + { + _ViewModel = value; + root.DataContext = value; + } + } + + protected override void Save() + { + var lToDos = new List>(); + + if (ViewModel.AddedCount > 0) + { + lToDos.Add(s => s.InsertNewDienst(ViewModel.CommitAdded())); + } + + if (ViewModel.RemovedCount > 0) + { + lToDos.Add(s => s.DeactivateDienst(ViewModel.GetRemoved().ToDictionary(dc => dc.DienstOid.Value, dc => dc.DienstVersion.Value))); + } + + if (ViewModel.ChangedCount > 0) + { + lToDos.Add(s => s.UpdateDienst(ViewModel.CommitChanged())); + } + + ServiceFacade.DoMultipleOperationsServicesAsync(lToDos, ReloadViewModel); + } + + private void ReloadViewModel() + { + VMFactory.CreateDienstListVMAsync(r => this.Dispatch(delegate { ViewModel = r; })); + } + + private void Button_Click(object sender, RoutedEventArgs e) + { + if (ValidationTrigger.Validate(this)) + { + ViewModel.AddNewVMToList(); + } + } + + private void DeleteButton_Click(object sender, RoutedEventArgs e) + { + ViewModel.VMList.Remove(_GridControl.GetCurrentValue()); + BeWoWpfUtils.RefreshDXGrid(_GridControl); + } + + private void Part_Editor_Click(object sender, RoutedEventArgs e) + { + _PopupColorPicker.IsOpen = true; + } + + private void ColorEditor_Loaded(object sender, RoutedEventArgs e) + { + ((ListBox)sender).ItemsSource = ViewModel.AllBrushes; + ((ListBox)sender).ItemTemplateSelector = new ComboBoxTemplateSelector((ListBox)sender); + } + + private void Listbox_Colorpicker_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e) + { + if (e.AddedItems.Count == 1) + { + object selection = e.AddedItems[0]; + + DataViewBase view = _GridControl.View; + + RowData data = view.FocusedRowData; + + if (data != null && data.RowHandle != null) + { + int rowHandle = data.RowHandle.Value; + + var vm = _GridControl.GetRow(rowHandle) as DienstVM; + + if (vm != null) + { + vm.Farbe = selection as SolidColorBrush; + } + } + _PopupColorPicker.IsOpen = false; + } + } + } +} diff --git a/BeWo/View/Detail/Report/Dienstplaner.xaml b/BeWo/View/Detail/Report/Dienstplaner.xaml new file mode 100644 index 000000000..57d2ee248 --- /dev/null +++ b/BeWo/View/Detail/Report/Dienstplaner.xaml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BeWo/View/Detail/Report/Dienstplaner.xaml.cs b/BeWo/View/Detail/Report/Dienstplaner.xaml.cs new file mode 100644 index 000000000..02cac4193 --- /dev/null +++ b/BeWo/View/Detail/Report/Dienstplaner.xaml.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Input; +using System.Windows.Forms; +using System.Windows.Media; + +using BeWo.Controls; +using BeWo.Core; +using BeWo.ServiceProxy; +using BeWo.ViewModel; + +using BS.Shared; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; +using BS.Shared.Extensions; +using BS.Shared.Translation; + +using DevExpress.Services; +using DevExpress.XtraScheduler; +using DevExpress.Xpf.Scheduler; +using DevExpress.Xpf.Scheduler.Native; + +using SchedulerStorage = DevExpress.Xpf.Scheduler.SchedulerStorage; +using ResourceStorage = DevExpress.Xpf.Scheduler.ResourceStorage; +using AppointmentStorage = DevExpress.Xpf.Scheduler.AppointmentStorage; +using IAppointmentLabelStorage = DevExpress.Xpf.Scheduler.AppointmentLabelCollection; +using BeWo.Scheduler.View; +using AppointmentLabel = DevExpress.Xpf.Scheduler.AppointmentLabel; + +namespace BeWo.View.Detail.Report +{ + /// + /// Interaction logic for Dienstplaner.xaml + /// + public partial class Dienstplaner : BeWoView + { + public Dienstplaner() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/BeWo/View/Master/AdministrationView.xaml b/BeWo/View/Master/AdministrationView.xaml index aaddf7d95..e8872fc4f 100644 --- a/BeWo/View/Master/AdministrationView.xaml +++ b/BeWo/View/Master/AdministrationView.xaml @@ -99,10 +99,11 @@ - + + - + diff --git a/BeWo/View/Master/AdministrationView.xaml.cs b/BeWo/View/Master/AdministrationView.xaml.cs index 693359866..736c35633 100644 --- a/BeWo/View/Master/AdministrationView.xaml.cs +++ b/BeWo/View/Master/AdministrationView.xaml.cs @@ -367,6 +367,10 @@ namespace BeWo.View.Master VMFactory.CreateBudgetListVMAsync(r => this.Dispatch(() => AddView(TabitemBudgets, new BudgetView(r)))); return; + case nameof(TabitemDienste): + VMFactory.CreateDienstListVMAsync(r => + this.Dispatch(() => AddView(TabitemDienste, new DienstView(r)))); + return; case nameof(TabitemNotizenkategorie): VMFactory.CreateValueListVMAsync(ValueListEntryType.NotizenKategorieEmployee, notizEmpList => VMFactory.CreateValueListVMAsync(ValueListEntryType.NotizenKategorieCustomer, diff --git a/BeWo/View/Master/ReportView.xaml b/BeWo/View/Master/ReportView.xaml index 3877a124e..1013e288e 100644 --- a/BeWo/View/Master/ReportView.xaml +++ b/BeWo/View/Master/ReportView.xaml @@ -39,11 +39,11 @@ + - - + diff --git a/BeWo/View/Master/ReportView.xaml.cs b/BeWo/View/Master/ReportView.xaml.cs index b45a44073..d2178fd40 100644 --- a/BeWo/View/Master/ReportView.xaml.cs +++ b/BeWo/View/Master/ReportView.xaml.cs @@ -189,6 +189,13 @@ namespace BeWo.View.Master Show(tabitem_abwesenheitsTabelle); } + private void tabitem_dienstPlaner_Selected(object sender, RoutedEventArgs e) + { + if (!_OpenViews.ContainsKey(tabitem_dienstPlaner)) + _OpenViews[tabitem_dienstPlaner] = new Dienstplaner(); + Show(tabitem_dienstPlaner); + } + private void tabitem_queries_Selected(object sender, RoutedEventArgs e) { if (!_OpenViews.ContainsKey(tabitem_queries)) diff --git a/BeWo/ViewModel/BudgetVM.cs b/BeWo/ViewModel/BudgetVM.cs index 3c2d433f0..226ae3144 100644 --- a/BeWo/ViewModel/BudgetVM.cs +++ b/BeWo/ViewModel/BudgetVM.cs @@ -10,16 +10,16 @@ namespace BeWo.ViewModel { public class BudgetVM : AbstractDCMapperVM { - public long? _BudgetOid; - public ActivationTypeId _BudgetIsActive; - public string _BudgetNotice; - public DateTime? _BudgetInsTs; - public string _BudgetInsUser; - public long? _BudgetVersion; - public string _BudgetUdpUser; - public SystemEntryID? _BudgetSystemEntryID; - public string _Name; - public decimal? _Betragshoehe; + private long? _BudgetOid; + private ActivationTypeId _BudgetIsActive; + private string _BudgetNotice; + private DateTime? _BudgetInsTs; + private string _BudgetInsUser; + private long? _BudgetVersion; + private string _BudgetUdpUser; + private SystemEntryID? _BudgetSystemEntryID; + private string _Name; + private decimal? _Betragshoehe; public BudgetVM(BudgetDC budgetDC) : base(budgetDC, budgetDC.BudgetOid == null) { } diff --git a/BeWo/ViewModel/DienstVM.cs b/BeWo/ViewModel/DienstVM.cs new file mode 100644 index 000000000..76a88d0de --- /dev/null +++ b/BeWo/ViewModel/DienstVM.cs @@ -0,0 +1,222 @@ +using BS.Shared; +using BS.Shared.DataContracts; +using BS.Shared.Extensions; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Media; + +namespace BeWo.ViewModel +{ + public class DienstVM : AbstractDCMapperVM + { + private long? _DienstOid; + private string _DienstNotice; + private long? _DienstVersion; + private string _DienstName; + private string _Kurz; + private SolidColorBrush _Farbe; + private string _FarbeString; + private DateTime _StartDT; + private DateTime _EndeDT; + private int _Pause; + + public DienstVM(DienstDC dienstDC) : base(dienstDC, dienstDC.DienstOid == null) + { } + + public long? DienstOid + { + get { return _DienstOid; } + set + { + if (AreDifferent(_DienstOid, value)) + { + _DienstOid = value; + StoreDirtyInformation(AreDifferent(DataContract.DienstOid, value), nameof(_DienstOid)); + FirePropertyChanged(nameof(_DienstOid)); + } + } + } + + public string DienstNotice + { + get { return _DienstNotice; } + set + { + if (AreDifferent(_DienstNotice, value)) + { + _DienstNotice = value; + StoreDirtyInformation(AreDifferent(DataContract.DienstNotice, value), nameof(_DienstNotice)); + FirePropertyChanged(nameof(_DienstNotice)); + } + } + } + + public long? DienstVersion + { + get { return _DienstVersion; } + set + { + if (AreDifferent(_DienstVersion, value)) + { + _DienstVersion = value; + StoreDirtyInformation(AreDifferent(DataContract.DienstVersion, value), nameof(_DienstVersion)); + FirePropertyChanged(nameof(_DienstVersion)); + } + } + } + + public string DienstName + { + get { return _DienstName; } + set + { + if (AreDifferent(_DienstName, value)) + { + _DienstName = value; + StoreDirtyInformation(AreDifferent(DataContract.DienstName, value), nameof(_DienstName)); + FirePropertyChanged(nameof(_DienstName)); + } + } + } + + public string Kurz + { + get { return _Kurz; } + set + { + if (AreDifferent(_Kurz, value)) + { + _Kurz = value; + StoreDirtyInformation(AreDifferent(DataContract.Kurz, value), nameof(_Kurz)); + FirePropertyChanged(nameof(_Kurz)); + } + } + } + + public SolidColorBrush Farbe + { + get { return _Farbe; } + set + { + if (AreDifferent(_Farbe, value)) + { + _Farbe = value; + _FarbeString = value.ToStringNullCheck(); + StoreDirtyInformation(AreDifferent(DataContract.Farbe, value), nameof(_Farbe)); + FirePropertyChanged(nameof(_Farbe)); + } + } + } + + public string Start + { + get { return _StartDT.ToString("HH:mm"); } + set + { + if (AreDifferent(Start, value)) + { + var s = value.Split(':'); + var dt = new DateTime(2000, 1, 1).AddHours(int.Parse(s[0])).AddMinutes(int.Parse(s[1])); + _StartDT = dt; + + StoreDirtyInformation(AreDifferent(DataContract.Start, dt), nameof(_StartDT)); + FirePropertyChanged(nameof(_StartDT)); + } + } + } + + public DateTime StartDT + { + get { return _StartDT; } + set + { + if (AreDifferent(_StartDT, value)) + { + _StartDT = value; + StoreDirtyInformation(AreDifferent(DataContract.Start, value), nameof(_StartDT)); + FirePropertyChanged(nameof(_StartDT)); + } + } + } + + public string Ende + { + get { return _EndeDT.ToString("HH:mm"); } + set + { + if (AreDifferent(Start, value)) + { + var s = value.Split(':'); + var dt = new DateTime(2000, 1, 1).AddHours(int.Parse(s[0])).AddMinutes(int.Parse(s[1])); + _EndeDT = dt; + + StoreDirtyInformation(AreDifferent(DataContract.Ende, dt), nameof(_EndeDT)); + FirePropertyChanged(nameof(_EndeDT)); + } + } + } + + public DateTime EndeDT + { + get { return _EndeDT; } + set + { + if (AreDifferent(_EndeDT, value)) + { + _EndeDT = value; + StoreDirtyInformation(AreDifferent(DataContract.Ende, value), nameof(_EndeDT)); + FirePropertyChanged(nameof(_EndeDT)); + } + } + } + + public int Pause + { + get { return _Pause; } + set + { + if (AreDifferent(_Pause, value)) + { + _Pause = value; + StoreDirtyInformation(AreDifferent(DataContract.Pause, value), nameof(_Pause)); + FirePropertyChanged(nameof(_Pause)); + } + } + } + + protected override void InitByDataContract(DienstDC bDataContract) + { + _DienstOid = bDataContract.DienstOid; + _DienstNotice = bDataContract.DienstNotice; + _DienstVersion = bDataContract.DienstVersion; + _DienstName = bDataContract.DienstName; + _Kurz = bDataContract.Kurz; + _StartDT = bDataContract.Start; + _EndeDT = bDataContract.Ende; + _Pause = bDataContract.Pause; + + if (!string.IsNullOrEmpty(bDataContract.Farbe)) + { + _Farbe = (SolidColorBrush)new BrushConverter().ConvertFrom(bDataContract.Farbe); + } + } + + protected override DienstDC MapToDataContract(DienstDC bDataContract, bool doCommit) + { + bDataContract.DienstOid = _DienstOid; + bDataContract.DienstNotice = _DienstNotice; + bDataContract.DienstVersion = _DienstVersion; + bDataContract.DienstName = _DienstName; + bDataContract.Kurz = _Kurz; + bDataContract.Farbe = _FarbeString; + bDataContract.Pause = _Pause; + bDataContract.Start = _StartDT; + bDataContract.Ende = _EndeDT; + + return bDataContract; + } + } +} diff --git a/BeWo/ViewModel/ListViewModel/DienstListVM.cs b/BeWo/ViewModel/ListViewModel/DienstListVM.cs new file mode 100644 index 000000000..243118120 --- /dev/null +++ b/BeWo/ViewModel/ListViewModel/DienstListVM.cs @@ -0,0 +1,31 @@ +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Reflection; +using System.Windows.Media; +using BS.Shared; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using Color = System.Drawing.Color; + +namespace BeWo.ViewModel.ListViewModel +{ + public class DienstListVM : AbstractDCListMapperVM + { + public DienstListVM(List pDCs): base(pDCs) + { + } + + public List AllBrushes + { + get + { + var lTemp = typeof(Color).GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Static).Select(pi => (Color)pi.GetGetMethod().Invoke(null, null)).ToList(); + + lTemp.Sort((x, y) => x.GetBrightness().CompareTo(y.GetBrightness())); + + return lTemp.Select(c => new SolidColorBrush(System.Windows.Media.Color.FromArgb(c.A, c.R, c.G, c.B))).ToList(); + } + } + } +} \ No newline at end of file diff --git a/BeWo/ViewModel/VMFactory.cs b/BeWo/ViewModel/VMFactory.cs index da12cc231..9f5ea1df3 100644 --- a/BeWo/ViewModel/VMFactory.cs +++ b/BeWo/ViewModel/VMFactory.cs @@ -459,7 +459,13 @@ namespace BeWo.ViewModel r => pCallBack(new BudgetListVM(r.ToList()))); } - public static void CreateTextModuleListVMAsync(Action pCallBack, bool pIsInAdministrationView = false, bool pIsInTextModuleEditor = false) + public static void CreateDienstListVMAsync(Action pCallBack) + { + ServiceFacade.DoOperationsServiceAsync(s => s.GetAllDienste(), + r => pCallBack(new DienstListVM(r.ToList()))); + } + + public static void CreateTextModuleListVMAsync(Action pCallBack, bool pIsInAdministrationView = false, bool pIsInTextModuleEditor = false) { ServiceFacade.DoOperationsServiceAsync(s1 => s1.GetTextModules(pIsInTextModuleEditor, BeWoApp.LoggedOnEmployee.EmployeeOid.Value, BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen), pIsInAdministrationView), r1 => ServiceFacade.DoOperationsServiceAsync( s2 => s2.GetAllServiceCategories(), diff --git a/Data/Data.csproj b/Data/Data.csproj index 5b344a605..0a478d15a 100644 --- a/Data/Data.csproj +++ b/Data/Data.csproj @@ -135,6 +135,7 @@ + @@ -605,6 +606,9 @@ Designer + + Designer + Designer diff --git a/Data/Entities/Dienst.cs b/Data/Entities/Dienst.cs new file mode 100644 index 000000000..6049f743e --- /dev/null +++ b/Data/Entities/Dienst.cs @@ -0,0 +1,115 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using BS.Shared; + +namespace BeWo.Data.Entities +{ + public class Dienst : BeWoEntityBase + { + private string _Dienstname; + private string _Kurz; + private string _Farbe; + private DateTime _Start; + private DateTime _Ende; + private int _Pause; + + public Dienst() + { + _Tid = TableID.Dienst; + } + + public virtual string DienstName + { + get + { + return _Dienstname; + } + set + { + if (AreDifferent(_Dienstname, value)) + { + _Dienstname = value; + } + } + } + + public virtual string Kurz + { + get + { + return _Kurz; + } + set + { + if (AreDifferent(_Kurz, value)) + { + _Kurz = value; + } + } + } + + public virtual string Farbe + { + get + { + return _Farbe; + } + set + { + if (AreDifferent(_Farbe, value)) + { + _Farbe = value; + } + } + } + + public virtual DateTime Start + { + get + { + return _Start; + } + set + { + if (AreDifferent(_Start, value)) + { + _Start = value; + } + } + } + + public virtual DateTime Ende + { + get + { + return _Ende; + } + set + { + if (AreDifferent(_Ende, value)) + { + _Ende = value; + } + } + } + + public virtual int Pause + { + get + { + return _Pause; + } + set + { + if (AreDifferent(_Pause, value)) + { + _Pause = value; + } + } + } + } +} diff --git a/Data/Mappings/Dienst.hbm.xml b/Data/Mappings/Dienst.hbm.xml new file mode 100644 index 000000000..5a39e27be --- /dev/null +++ b/Data/Mappings/Dienst.hbm.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Host/Multitenancy/demo.config b/Host/Multitenancy/demo.config index 36201eb31..b3c03c5ef 100644 --- a/Host/Multitenancy/demo.config +++ b/Host/Multitenancy/demo.config @@ -20,7 +20,7 @@ --> - Server=localhost;Password=root;User ID=root; Initial Catalog=1111111111 + Server=localhost;Password=root;User ID=root; Initial Catalog=bewodemo diff --git a/Model/Changes_2020_02_26 Dienste hinzugefügt.txt b/Model/Changes_2020_02_26 Dienste hinzugefügt.txt new file mode 100644 index 000000000..70cc78c42 --- /dev/null +++ b/Model/Changes_2020_02_26 Dienste hinzugefügt.txt @@ -0,0 +1,19 @@ +CREATE TABLE `dienst` ( + `Oid` bigint(19) NOT NULL AUTO_INCREMENT, + `Tid` int(10) DEFAULT NULL, + `IsActive` tinyint(4) DEFAULT NULL, + `Notice` varchar(1024) DEFAULT NULL, + `InsTs` datetime DEFAULT NULL, + `InsUser` varchar(256) DEFAULT NULL, + `Version` bigint(19) DEFAULT NULL, + `UdpUser` varchar(256) DEFAULT NULL, + `SystemEntryID` int(10) DEFAULT NULL, + + `Dienstname` varchar(1024) DEFAULT NULL, + `Kurz` varchar(128) DEFAULT NULL, + `Farbe` varchar(16) DEFAULT NULL, + `Start` datetime DEFAULT NULL, + `Ende` datetime DEFAULT NULL, + `Pause` int(10) DEFAULT NULL, + PRIMARY KEY (`Oid`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 \ No newline at end of file diff --git a/Service/DCEntityMapper/DienstDC_Dienst.cs b/Service/DCEntityMapper/DienstDC_Dienst.cs new file mode 100644 index 000000000..626d8d232 --- /dev/null +++ b/Service/DCEntityMapper/DienstDC_Dienst.cs @@ -0,0 +1,50 @@ +using System.Linq; +using BeWo.Data.Access; +using BeWo.Data.Entities; + +using BS.Shared; +using BS.Shared.DataContracts; +using System.Collections.Generic; +using BS.Shared.Core; + +namespace BeWo.Service.DCEntityMapper +{ + public class DienstDC_Dienst : AbstractIDCEntityMapper + { + public override DienstDC MergeWithDC(Dienst bEntity, DienstDC bDataContract) + { + bDataContract.DienstOid = bEntity.Oid; + bDataContract.DienstNotice = bEntity.Notice; + bDataContract.DienstVersion = bEntity.Version; + bDataContract.DienstName = bEntity.DienstName; + bDataContract.Kurz = bEntity.Kurz; + bDataContract.Farbe = bEntity.Farbe; + bDataContract.Start = bEntity.Start; + bDataContract.Ende = bEntity.Ende; + bDataContract.Pause = bEntity.Pause; + + return bDataContract; + } + + public override Dienst MergeWithEntity(DienstDC bDataContract, Dienst bEntity) + { + this.ConcurrencyCheck(bDataContract.DienstVersion, bEntity); + + bEntity.Oid = bDataContract.DienstOid; + bEntity.Notice = bDataContract.DienstNotice; + bEntity.DienstName = bDataContract.DienstName; + bEntity.Kurz = bDataContract.Kurz; + bEntity.Farbe = bDataContract.Farbe; + bEntity.Start = bDataContract.Start; + bEntity.Ende = bDataContract.Ende; + bEntity.Pause = bDataContract.Pause; + + return bEntity; + } + + protected override bool AreDCAndEntityEqual(DienstDC bDC, Dienst bEntity) + { + return bDC.DienstOid != null && bDC.DienstOid == bEntity.Oid; + } + } +} \ No newline at end of file diff --git a/Service/DCEntityMapper/MapperFactory.cs b/Service/DCEntityMapper/MapperFactory.cs index 0c4466f9f..be123ca4c 100644 --- a/Service/DCEntityMapper/MapperFactory.cs +++ b/Service/DCEntityMapper/MapperFactory.cs @@ -238,6 +238,8 @@ namespace BeWo.Service.DCEntityMapper private static BudgetDC_Budget _BudgetDC_Budget; + private static DienstDC_Dienst _DienstDC_Dienst; + private static FlexibleReportLayoutDC_FlexibleReportLayout _FlexibleReportLayoutDC_FlexibleReportLayout; private static HomeViewPanelDC_HomeViewPanel _HomeViewPanelDC_HomeViewPanel; @@ -645,6 +647,9 @@ namespace BeWo.Service.DCEntityMapper public static BudgetDC_Budget BudgetDC_Budget => _BudgetDC_Budget ?? (_BudgetDC_Budget = new BudgetDC_Budget()); + public static DienstDC_Dienst DienstDC_Dienst => + _DienstDC_Dienst ?? (_DienstDC_Dienst = new DienstDC_Dienst()); + public static FlexibleReportLayoutDC_FlexibleReportLayout FlexibleReportLayoutDC_FlexibleReportLayout => _FlexibleReportLayoutDC_FlexibleReportLayout ?? (_FlexibleReportLayoutDC_FlexibleReportLayout = new FlexibleReportLayoutDC_FlexibleReportLayout()); diff --git a/Service/Service.csproj b/Service/Service.csproj index 8d55ffcba..e29aa6651 100644 --- a/Service/Service.csproj +++ b/Service/Service.csproj @@ -163,6 +163,7 @@ + diff --git a/Service/ServiceContracts/IOperationsService.cs b/Service/ServiceContracts/IOperationsService.cs index c3dbda2a9..b839898e3 100644 --- a/Service/ServiceContracts/IOperationsService.cs +++ b/Service/ServiceContracts/IOperationsService.cs @@ -867,5 +867,21 @@ namespace BeWo.Service.ServiceContracts [FaultContract(typeof(BeWoFault))] [OperationContract] void DeleteAbsenceTime(AbsenceTimeDC absenceTimeDC); + + [FaultContract(typeof(BeWoFault))] + [OperationContract] + List GetAllDienste(); + + [FaultContract(typeof(BeWoFault))] + [OperationContract] + void InsertNewDienst(List dienst); + + [FaultContract(typeof(BeWoFault))] + [OperationContract] + void DeactivateDienst(Dictionary pOid2Version); + + [FaultContract(typeof(BeWoFault))] + [OperationContract] + void UpdateDienst(List dienste); } } \ No newline at end of file diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs index 7499f7872..a9a210d0a 100644 --- a/Service/ServiceImplementations/OperationsServiceImp.cs +++ b/Service/ServiceImplementations/OperationsServiceImp.cs @@ -43,14 +43,14 @@ namespace BeWo.Service.ServiceImplementations { return AppSettings.GetMandatorEntity(); } - + public void DeactivateInvoices(List pInvoices) { try { ServiceLogic.SetActivationType(pInvoices.ToDictionary(i => i.InvoiceOid.Value, i => i.InvoiceVersion.Value), ActivationTypeId.Deleted); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -62,7 +62,7 @@ namespace BeWo.Service.ServiceImplementations { ServiceLogic.SetActivationType(pOid2Version, ActivationTypeId.Deleted); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -74,7 +74,7 @@ namespace BeWo.Service.ServiceImplementations { ServiceLogic.SetActivationType(pOid2Version, ActivationTypeId.Deleted); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -91,7 +91,7 @@ namespace BeWo.Service.ServiceImplementations } }, ActivationTypeId.Deleted); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -108,7 +108,7 @@ namespace BeWo.Service.ServiceImplementations } }, ActivationTypeId.Deleted); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -120,7 +120,7 @@ namespace BeWo.Service.ServiceImplementations { ServiceLogic.SetActivationType(pOid2Version, ActivationTypeId.Deleted); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -132,7 +132,7 @@ namespace BeWo.Service.ServiceImplementations { ServiceLogic.SetActivationType(pOid2Version, ActivationTypeId.Deleted); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -149,7 +149,7 @@ namespace BeWo.Service.ServiceImplementations } }); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -165,7 +165,7 @@ namespace BeWo.Service.ServiceImplementations // DAOFactory.GenericDAO.Deactivate(lOriginals); DAOFactory.GenericDAO.Delete(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -182,7 +182,7 @@ namespace BeWo.Service.ServiceImplementations } }); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -197,7 +197,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Delete(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -212,7 +212,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Delete(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -229,7 +229,7 @@ namespace BeWo.Service.ServiceImplementations } }); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -246,7 +246,7 @@ namespace BeWo.Service.ServiceImplementations } }); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -261,7 +261,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Delete(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -278,7 +278,7 @@ namespace BeWo.Service.ServiceImplementations } }); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -300,9 +300,9 @@ namespace BeWo.Service.ServiceImplementations var srListToDelete = new List(); - foreach(var item in lOriginals) + foreach (var item in lOriginals) { - if(item.Group != null) + if (item.Group != null) { MakeServiceRecordHistoryEntry(item.Group.ServiceRecordList, null, StatementType.Delete); @@ -314,13 +314,13 @@ namespace BeWo.Service.ServiceImplementations } } - if(srListToDelete.Count > 0) + if (srListToDelete.Count > 0) { MakeServiceRecordHistoryEntry(srListToDelete, null, StatementType.Delete); DAOFactory.GenericDAO.Delete(srListToDelete); } } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -340,14 +340,14 @@ namespace BeWo.Service.ServiceImplementations var costBearer = lCb2Sc.CostBearer; string tenant = null; - if(MultitenancyOperationContextExt.Current != null) + if (MultitenancyOperationContextExt.Current != null) { tenant = MultitenancyOperationContextExt.Current.Tenant; } var factory = PluginLoader.FindClass(costBearer.ID); - if(factory == null) + if (factory == null) { factory = InvoiceFactory.GetInstance(costBearer.ID, tenant); } @@ -358,7 +358,7 @@ namespace BeWo.Service.ServiceImplementations return lResult; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -379,7 +379,7 @@ namespace BeWo.Service.ServiceImplementations { return MapperFactory.AccountingTransactionDC_AccountingTransaction.MapToNewDCs(DAOFactory.SearchDAO.FindAccoutingTransactions(pSpan, pSupportConceptOid, pSupportConceptCostBearerRelOid)); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -391,7 +391,7 @@ namespace BeWo.Service.ServiceImplementations { return MapperFactory.InvoiceDC_Invoice.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive()); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -405,7 +405,7 @@ namespace BeWo.Service.ServiceImplementations return s.GetAllActiveSupportConceptCostbearer(onlyApproved, onlyWithAssignedCostbearer, employeeOid); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -418,7 +418,7 @@ namespace BeWo.Service.ServiceImplementations IList list = DAOFactory.GenericDAO.GetAllActive(); return MapperFactory.AdditionalServiceDC_AdditionalService.MapToNewDCs(list); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -436,7 +436,7 @@ namespace BeWo.Service.ServiceImplementations return result; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -449,7 +449,7 @@ namespace BeWo.Service.ServiceImplementations IList list = DAOFactory.GenericDAO.GetAllActive(); return MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewDCs(list); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -464,7 +464,7 @@ namespace BeWo.Service.ServiceImplementations var dcList = MapperFactory.ServiceDescriptionDC_ServiceDescription.MapToNewDCs(list); AppSettings settings = AppSettings.CreateSettings(); - if(settings.SortServiceDescriptionAlphabetically) + if (settings.SortServiceDescriptionAlphabetically) { dcList = dcList.OrderBy(sd => sd.Name).ToList(); } @@ -472,7 +472,7 @@ namespace BeWo.Service.ServiceImplementations { dcList.Sort((a, b) => { - if(a.Position == b.Position) + if (a.Position == b.Position) { return a.ServiceDescriptionOid.Value.CompareTo(b.ServiceDescriptionOid.Value); } @@ -485,7 +485,7 @@ namespace BeWo.Service.ServiceImplementations return dcList; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -497,7 +497,7 @@ namespace BeWo.Service.ServiceImplementations { return MapperFactory.ServiceDescriptionDC_ServiceDescription.MapToNewDCs(DAOFactory.SearchDAO.FindServiceDescriptionForCategory(pCategoryOid)); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -509,7 +509,7 @@ namespace BeWo.Service.ServiceImplementations { return MapperFactory.ServiceDescriptionDC_ServiceDescription.MapToNewDC(DAOFactory.GenericDAO.GetByID(pServiceDescriptionOid)); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -521,7 +521,7 @@ namespace BeWo.Service.ServiceImplementations { return ICD10DAO.GetCompressedString(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -534,7 +534,7 @@ namespace BeWo.Service.ServiceImplementations var result = new CustomerInfoDC(); var customer = DAOFactory.GenericDAO.LoadByID(customerOid); - if(customer.SupportConcepts == null || !customer.SupportConcepts.Exists(sc => sc.IsActive == ActivationTypeId.Active)) + if (customer.SupportConcepts == null || !customer.SupportConcepts.Exists(sc => sc.IsActive == ActivationTypeId.Active)) { result.CurrentSupportConcept = "Kein aktueller Hilfeplan"; } @@ -543,12 +543,12 @@ namespace BeWo.Service.ServiceImplementations SupportConcept currentSC = customer.SupportConcepts.Where(sc => sc.IsActive == ActivationTypeId.Active).OrderByDescending(sc => sc.StartDate).First(); result.CurrentSupportConcept = "Akt. HP: "; - if(currentSC.StartDate.HasValue) + if (currentSC.StartDate.HasValue) { result.CurrentSupportConcept += currentSC.StartDate.Value.ToShortDateString().Remove(6, 2); } - if(currentSC.EndDate.HasValue) + if (currentSC.EndDate.HasValue) { result.CurrentSupportConcept += " - " + currentSC.EndDate.Value.ToShortDateString().Remove(6, 2); } @@ -558,7 +558,7 @@ namespace BeWo.Service.ServiceImplementations return result; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -571,17 +571,17 @@ namespace BeWo.Service.ServiceImplementations var result = new List(); var srList = DAOFactory.SearchDAO.FindServiceRecordsDetailsForLastDays(costbearer2SupportConceptOid, days); - if(srList != null) + if (srList != null) { var serviceRecordsProcessed = new Dictionary(); - foreach(var item in srList) + foreach (var item in srList) { - if(!serviceRecordsProcessed.ContainsKey(item.Oid.Value)) + if (!serviceRecordsProcessed.ContainsKey(item.Oid.Value)) { //ServiceRecordDC dc = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(item); //result.Add(dc); var dc = CreateServiceRecordDCCompact(item); - if(dc != null) + if (dc != null) { result.Add(dc); } @@ -593,7 +593,7 @@ namespace BeWo.Service.ServiceImplementations return result; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -606,19 +606,19 @@ namespace BeWo.Service.ServiceImplementations var result = new List(); var lCustomer = DAOFactory.SearchDAO.FindCustomerWithServiceRecordsWithDetail(pCustomerOid); - if(lCustomer != null) + if (lCustomer != null) { var srList = lCustomer.ServiceRecordList; - if(srList != null) + if (srList != null) { var serviceRecordsProcessed = new Dictionary(); - foreach(var item in srList) + foreach (var item in srList) { - if(!serviceRecordsProcessed.ContainsKey(item.Oid.Value)) + if (!serviceRecordsProcessed.ContainsKey(item.Oid.Value)) { var dc = CreateServiceRecordDCIfSupportConceptIsActive(item, lCustomer, !fetchArchivedSupportConcepts); - if(dc != null) + if (dc != null) { result.Add(dc); } @@ -631,7 +631,7 @@ namespace BeWo.Service.ServiceImplementations return result; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -645,7 +645,7 @@ namespace BeWo.Service.ServiceImplementations return list.Where(i => i.Start.HasValue && i.Start.Value.Year.Equals(pMonth.Year) && i.Start.Value.Month.Equals(pMonth.Month)).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -659,7 +659,7 @@ namespace BeWo.Service.ServiceImplementations return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(list); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -673,7 +673,7 @@ namespace BeWo.Service.ServiceImplementations return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(list); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -687,7 +687,7 @@ namespace BeWo.Service.ServiceImplementations return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(list); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -700,17 +700,17 @@ namespace BeWo.Service.ServiceImplementations var result = new List(); var srList = DAOFactory.SearchDAO.FindServiceRecordsDetailsForLastDaysWithStartEndDate(costbearer2SupportConceptOid, start, ende); - if(srList != null) + if (srList != null) { var serviceRecordsProcessed = new Dictionary(); - foreach(var item in srList) + foreach (var item in srList) { - if(!serviceRecordsProcessed.ContainsKey(item.Oid.Value)) + if (!serviceRecordsProcessed.ContainsKey(item.Oid.Value)) { //ServiceRecordDC dc = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(item); //result.Add(dc); var dc = CreateServiceRecordDCCompact(item); - if(dc != null) + if (dc != null) { result.Add(dc); } @@ -722,7 +722,7 @@ namespace BeWo.Service.ServiceImplementations return result; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -736,7 +736,7 @@ namespace BeWo.Service.ServiceImplementations return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(list); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -750,7 +750,7 @@ namespace BeWo.Service.ServiceImplementations return files.Select(item => MapperFactory.FileAttachmentDC_FileAttachmentInfo.MapToNewDC(item)).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -764,7 +764,7 @@ namespace BeWo.Service.ServiceImplementations bool templateFolder = folder.Any(f => f.SystemEntryID.Equals(SystemEntryID.TemplateDirectory)); var folderDCList = new List(); - foreach(BeWoFolder item in folder) + foreach (BeWoFolder item in folder) { folderDCList.Add(MapperFactory.BeWoFolderDC_BeWoFolder.MapToNewDC(item)); } @@ -772,7 +772,7 @@ namespace BeWo.Service.ServiceImplementations IEnumerable files = DAOFactory.SearchDAO.FindFileAttachmentInfos(pObjectTid, pObjectOid); var fileDCList = new List(); - foreach(FileAttachmentInfo item in files) + foreach (FileAttachmentInfo item in files) { fileDCList.Add(MapperFactory.FileAttachmentDC_FileAttachmentInfo.MapToNewDC(item)); } @@ -781,7 +781,7 @@ namespace BeWo.Service.ServiceImplementations return CreateFolderTree(folderDCList, fileDCList, pObjectTid, pObjectOid, templateFolder); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -796,7 +796,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Delete(origFolder); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -813,7 +813,7 @@ namespace BeWo.Service.ServiceImplementations BeWoFolderDC newFolderDC = MapperFactory.BeWoFolderDC_BeWoFolder.MapToNewDC(newFolder); return newFolderDC.BeWoFolderOid.Value; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -834,7 +834,7 @@ namespace BeWo.Service.ServiceImplementations BeWoFolderDC updatedFolderDC = MapperFactory.BeWoFolderDC_BeWoFolder.MapToNewDC(origFolder); return updatedFolderDC; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -852,7 +852,7 @@ namespace BeWo.Service.ServiceImplementations FileAttachmentDC updatedFileDC = MapperFactory.FileAttachmentDC_FileAttachmentInfo.MapToNewDC(origFile); return updatedFileDC; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -863,7 +863,7 @@ namespace BeWo.Service.ServiceImplementations try { var origFile = DAOFactory.GenericDAO.LoadByID(file.FileAttachmentOid.Value); - if(!origFile.Data.Equals(file.BinaryData)) + if (!origFile.Data.Equals(file.BinaryData)) { } @@ -874,7 +874,7 @@ namespace BeWo.Service.ServiceImplementations FileAttachmentDC updatedFileDC = MapperFactory.FileAttachmentDC_FileAttachment.MapToNewDC(origFile); return updatedFileDC; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -894,14 +894,14 @@ namespace BeWo.Service.ServiceImplementations Dictionary settingValueDict = GetSettingsValueDict(manDc.Settings); - if(fetchContractState) + if (fetchContractState) { string contractState = GetContractState(); Dictionary contractStateDict = GetSettingsValueDict(contractState); - foreach(var kv in contractStateDict) + foreach (var kv in contractStateDict) { - if(settingValueDict.ContainsKey(kv.Key)) + if (settingValueDict.ContainsKey(kv.Key)) { settingValueDict.Remove(kv.Key); } @@ -910,19 +910,19 @@ namespace BeWo.Service.ServiceImplementations } } - if(!settingValueDict.ContainsKey("ShowScheduler") && man.IsSchedulerAllowed) + if (!settingValueDict.ContainsKey("ShowScheduler") && man.IsSchedulerAllowed) { settingValueDict.Add("ShowScheduler", "1"); } - if(!settingValueDict.ContainsKey("ShowMedication") && man.IsMedicationAllowed) + if (!settingValueDict.ContainsKey("ShowMedication") && man.IsMedicationAllowed) { settingValueDict.Add("ShowMedication", "1"); } - if(!settingValueDict.ContainsKey("ShowDistanceFields") && settingValueDict.ContainsKey("ShowKilometer")) + if (!settingValueDict.ContainsKey("ShowDistanceFields") && settingValueDict.ContainsKey("ShowKilometer")) { - if(settingValueDict["ShowKilometer"] != "0") + if (settingValueDict["ShowKilometer"] != "0") { settingValueDict.Add("ShowDistanceFields", "1"); } @@ -932,9 +932,9 @@ namespace BeWo.Service.ServiceImplementations manDc.Settings = ""; - foreach(var kv in settingValueDict) + foreach (var kv in settingValueDict) { - if(manDc.Settings.Length > 0) + if (manDc.Settings.Length > 0) { manDc.Settings += ";"; } @@ -944,7 +944,7 @@ namespace BeWo.Service.ServiceImplementations return manDc; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -960,7 +960,7 @@ namespace BeWo.Service.ServiceImplementations return result; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -977,9 +977,9 @@ namespace BeWo.Service.ServiceImplementations var result = new List(); var serviceRecordsProcessed = new Dictionary(); - foreach(ServiceRecord item in group.ServiceRecordList) + foreach (ServiceRecord item in group.ServiceRecordList) { - if(!serviceRecordsProcessed.ContainsKey(item.Oid.Value)) + if (!serviceRecordsProcessed.ContainsKey(item.Oid.Value)) { var dc = new ServiceRecordDC(); @@ -1000,7 +1000,7 @@ namespace BeWo.Service.ServiceImplementations dc.ServiceRecordFormat = item.ServiceRecordFormat; CompactCustomerDC customerDC = null; - if(item.Customer != null) + if (item.Customer != null) { customerDC = new CompactCustomerDC(); @@ -1016,7 +1016,7 @@ namespace BeWo.Service.ServiceImplementations } dc.Customer = customerDC; - if(item.Employee != null) + if (item.Employee != null) { var employeeDC = new CompactEmployeeDC(); @@ -1031,7 +1031,7 @@ namespace BeWo.Service.ServiceImplementations } CompactSupportConceptDC scDC = null; - if(item.SupportConcept != null) + if (item.SupportConcept != null) { scDC = new CompactSupportConceptDC(); @@ -1045,11 +1045,11 @@ namespace BeWo.Service.ServiceImplementations dc.SupportConcept = scDC; CostBearer2SupportConcept cb2sc = item.CostBearer2SupportConcept; - if(cb2sc != null) + if (cb2sc != null) { dc.CostBearer2SupportConceptOid = cb2sc.Oid.Value; - if(scDC != null) + if (scDC != null) { var costBearer = new CompactCostBearerDC(); @@ -1067,7 +1067,7 @@ namespace BeWo.Service.ServiceImplementations // costBearer.ApprovedFLSTotal = cb2sc.ApprovedFLSTotal; costBearer.CustomerReferenceNumber = cb2sc.CustomerReferenceNumber; - if(cb2sc.CostBearer.Organisation != null) + if (cb2sc.CostBearer.Organisation != null) { CompactOrganisationDC orgDC = MapperFactory.CompactOrganisationDC_Organisation.MapToNewDC(cb2sc.CostBearer.Organisation); @@ -1097,7 +1097,7 @@ namespace BeWo.Service.ServiceImplementations return groupDC; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1168,7 +1168,7 @@ namespace BeWo.Service.ServiceImplementations return res; }).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1180,7 +1180,7 @@ namespace BeWo.Service.ServiceImplementations { return BuildTree(DAOFactory.GenericDAO.GetAllActiveAndArchived()); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1192,7 +1192,7 @@ namespace BeWo.Service.ServiceImplementations { return BuildTree(DAOFactory.GenericDAO.GetAllActive().Where(sc => sc.CostBearer2SupportConceptList.Count > 0)); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1204,7 +1204,7 @@ namespace BeWo.Service.ServiceImplementations { return BuildTree(DAOFactory.SearchDAO.FindCurrentSupportConcepts()); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1218,7 +1218,7 @@ namespace BeWo.Service.ServiceImplementations return s.GetSupportConceptTreeByEmployee(pEmployeeOid); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1230,7 +1230,7 @@ namespace BeWo.Service.ServiceImplementations { return BuildTree(DAOFactory.SearchDAO.FindSupportConceptsInSpan(pSpan)); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1246,7 +1246,7 @@ namespace BeWo.Service.ServiceImplementations dc.CustomerAbsenceTimes = MapperFactory.AbsenceTimeDC_AbsenceTime.MapToNewDCs(customer.AbsenceTimes); - if(pSupportConceptOid != null) + if (pSupportConceptOid != null) { var sc = DAOFactory.GenericDAO.LoadByID(pSupportConceptOid.Value); @@ -1265,20 +1265,20 @@ namespace BeWo.Service.ServiceImplementations dc.ServiceAccountings = MapperFactory.ServiceAccountingDC_ServiceAccounting.MapToNewDCs(sc.ServiceAccountings); } - if(pCostbearer2SupportConceptOid != null) + if (pCostbearer2SupportConceptOid != null) { var c2s = DAOFactory.GenericDAO.LoadByID(pCostbearer2SupportConceptOid.Value); dc.ApprovalPeriods = MapperFactory.SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod.MapToNewDCs(c2s.ApprovalPeriodList); - if(dc.ApprovalPeriods != null) + if (dc.ApprovalPeriods != null) { - foreach(SupportConceptApprovalPeriodDC item in dc.ApprovalPeriods) + foreach (SupportConceptApprovalPeriodDC item in dc.ApprovalPeriods) { - if(!item.StartDate.HasValue) + if (!item.StartDate.HasValue) { item.StartDate = c2s.ApprovedStartDate.HasValue ? c2s.ApprovedStartDate : c2s.RequestedStartDate; } - if(!item.EndDate.HasValue) + if (!item.EndDate.HasValue) { item.EndDate = c2s.ApprovedEndDate.HasValue ? c2s.ApprovedEndDate : c2s.RequestedEndDate; } @@ -1288,7 +1288,7 @@ namespace BeWo.Service.ServiceImplementations return dc; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1298,10 +1298,10 @@ namespace BeWo.Service.ServiceImplementations { try { - if(dc.CostRatePeriods == null || dc.CostRatePeriods.Count == 0) + if (dc.CostRatePeriods == null || dc.CostRatePeriods.Count == 0) { var org = DAOFactory.GenericDAO.LoadByID(dc.OrganisationOid); - if(org != null) + if (org != null) { MapperFactory.CompactOrganisationDC_Organisation.MergeWithDC(org, dc); } @@ -1309,7 +1309,7 @@ namespace BeWo.Service.ServiceImplementations return dc; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1323,7 +1323,7 @@ namespace BeWo.Service.ServiceImplementations return MapperFactory.AccountingTransactionDC_AccountingTransaction.MapToNewDCs(list); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1335,7 +1335,7 @@ namespace BeWo.Service.ServiceImplementations { return MapperFactory.VarFieldDC_VarField.VarFieldMapToDCs(DAOFactory.SearchDAO.GetVarFieldDefs(tid), null); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1345,9 +1345,9 @@ namespace BeWo.Service.ServiceImplementations { try { - foreach(var at in pAccountingTransactions) + foreach (var at in pAccountingTransactions) { - if(at.SupportConceptCostBearerRelDC.CostBearer2SupportConceptOid.HasValue && !at.SupportConceptCostBearerRelDC.CostBearer2SupportConceptVersion.HasValue) + if (at.SupportConceptCostBearerRelDC.CostBearer2SupportConceptOid.HasValue && !at.SupportConceptCostBearerRelDC.CostBearer2SupportConceptVersion.HasValue) { var c2s = DAOFactory.GenericDAO.LoadByID(at.SupportConceptCostBearerRelDC.CostBearer2SupportConceptOid.Value); var c2sDc = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(c2s); @@ -1360,7 +1360,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Insert(lEntities); return lEntities.Select(e => e.Oid.Value).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1372,7 +1372,7 @@ namespace BeWo.Service.ServiceImplementations { DAOFactory.GenericDAO.Insert(MapperFactory.InvoiceDC_Invoice.MapToNewEntities(pInvoices)); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1386,7 +1386,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Insert(lServiceCategories); return lServiceCategories.Select(sc => sc.Oid.Value).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1400,7 +1400,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Insert(lAdditionalServices); return lAdditionalServices.Select(ads => ads.Oid.Value).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1416,21 +1416,21 @@ namespace BeWo.Service.ServiceImplementations //Prüfe ob es HPs gibt wo die Leistung hinterlegt werden muss IList newServiceDescriptionOids = new List(); - foreach(ServiceDescription newSd in lServiceDescriptions) + foreach (ServiceDescription newSd in lServiceDescriptions) { newServiceDescriptionOids.Add(newSd.Oid.Value); } - foreach(ServiceDescription newSd in lServiceDescriptions) + foreach (ServiceDescription newSd in lServiceDescriptions) { ServiceCategory cat = newSd.ServiceCategory; IEnumerable descList = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(cat.Oid.Value); IList oids = new List(); - foreach(ServiceDescription oldSd in descList) + foreach (ServiceDescription oldSd in descList) { - if(!newServiceDescriptionOids.Contains(oldSd.Oid.Value)) + if (!newServiceDescriptionOids.Contains(oldSd.Oid.Value)) { oids.Add(oldSd.Oid.Value); } @@ -1440,11 +1440,11 @@ namespace BeWo.Service.ServiceImplementations IEnumerable accountingList = DAOFactory.SearchDAO.FindServiceAccountingsForServiceDescriptions(oids); var supportConceptCountDict = new Dictionary(); - foreach(ServiceAccounting acc in accountingList) + foreach (ServiceAccounting acc in accountingList) { - if(acc.SupportConceptOid.HasValue) + if (acc.SupportConceptOid.HasValue) { - if(supportConceptCountDict.ContainsKey(acc.SupportConceptOid.Value)) + if (supportConceptCountDict.ContainsKey(acc.SupportConceptOid.Value)) { supportConceptCountDict[acc.SupportConceptOid.Value]++; } @@ -1456,16 +1456,16 @@ namespace BeWo.Service.ServiceImplementations } IList supportConceptToUpdateOids = new List(); - foreach(var pair in supportConceptCountDict) + foreach (var pair in supportConceptCountDict) { - if(pair.Value == oids.Count) + if (pair.Value == oids.Count) { //Wenn es für alle alten Leistungen eine ServiceAccounting gibt, füge die neue Leistung auch hinzu supportConceptToUpdateOids.Add(pair.Key); } } - foreach(long scOid in supportConceptToUpdateOids) + foreach (long scOid in supportConceptToUpdateOids) { var sc = DAOFactory.GenericDAO.LoadByID(scOid); var newSa = new ServiceAccounting(); @@ -1477,7 +1477,7 @@ namespace BeWo.Service.ServiceImplementations } } - if(scToSave.Count > 0) + if (scToSave.Count > 0) { DAOFactory.GenericDAO.Insert(scToSave); } @@ -1485,7 +1485,7 @@ namespace BeWo.Service.ServiceImplementations return lServiceDescriptions.Select(sd => sd.Oid.Value).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1499,7 +1499,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Insert(lAdditionalServiceRegions); return lAdditionalServiceRegions.Select(asr => asr.Oid.Value).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1513,7 +1513,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Insert(lAdditionalServiceRegion); return lAdditionalServiceRegion.Oid.Value; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1525,7 +1525,7 @@ namespace BeWo.Service.ServiceImplementations { return MapperFactory.AdditionalServiceRegionDC_AdditionalServiceRegion.MapToNewDC(DAOFactory.GenericDAO.GetByID(pRegionOid)); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1538,46 +1538,46 @@ namespace BeWo.Service.ServiceImplementations var group = MapperFactory.ServiceRecordGroupDC_ServiceRecordGroup.MapToNewEntity(pServiceRecordGroup); var lServiceRecords = new List(); - if(pServiceRecordGroup.ServiceRecordList != null && pServiceRecordGroup.ServiceRecordList.Count > 0) + if (pServiceRecordGroup.ServiceRecordList != null && pServiceRecordGroup.ServiceRecordList.Count > 0) { lServiceRecords = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewEntities(pServiceRecordGroup.ServiceRecordList); - foreach(var iServiceRecord in lServiceRecords) + foreach (var iServiceRecord in lServiceRecords) { - if(!group.StartDate.HasValue && group.EndDate.HasValue) + if (!group.StartDate.HasValue && group.EndDate.HasValue) { - group.StartDate = group.EndDate.Value.AddMinutes((double) group.RoundedDuration * -1); + group.StartDate = group.EndDate.Value.AddMinutes((double)group.RoundedDuration * -1); } - if(group.StartDate.HasValue && group.EndDate.HasValue) + if (group.StartDate.HasValue && group.EndDate.HasValue) { //Korrigieren - if(group.StartDate.Value == group.EndDate.Value) + if (group.StartDate.Value == group.EndDate.Value) { - if(iServiceRecord.RoundedDuration > 0) + if (iServiceRecord.RoundedDuration > 0) { - group.EndDate = group.StartDate.Value.AddMinutes((double) iServiceRecord.RoundedDuration); + group.EndDate = group.StartDate.Value.AddMinutes((double)iServiceRecord.RoundedDuration); } } } - if(group.StartDate.HasValue) + if (group.StartDate.HasValue) { iServiceRecord.Start = group.StartDate; } - if(group.EndDate.HasValue) + if (group.EndDate.HasValue) { iServiceRecord.End = group.EndDate; } //if(group.RoundedDuration == 0) //{ - if(group.EndDate.HasValue && group.StartDate.HasValue) + if (group.EndDate.HasValue && group.StartDate.HasValue) { var minutes = group.EndDate.Value.Subtract(group.StartDate.Value).TotalMinutes; - group.RoundedDuration = (decimal) minutes; + group.RoundedDuration = (decimal)minutes; } //} @@ -1586,7 +1586,7 @@ namespace BeWo.Service.ServiceImplementations iServiceRecord.GroupRoundedDuration = group.RoundedDuration; //} - if(iServiceRecord.IP == null) + if (iServiceRecord.IP == null) { iServiceRecord.IP = Utils.GetClientIP(); } @@ -1604,7 +1604,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Insert(group); - if(lServiceRecords.Count > 0) + if (lServiceRecords.Count > 0) { MakeServiceRecordHistoryEntry(lServiceRecords, lServiceRecords.Select(sr => sr.Oid.Value).ToList(), StatementType.Insert); } @@ -1615,7 +1615,7 @@ namespace BeWo.Service.ServiceImplementations return newGroupDC; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1625,9 +1625,9 @@ namespace BeWo.Service.ServiceImplementations { try { - DeleteAdditionalServiceGroupOfPeopleRelations(new Dictionary {{pOid, pVersion}}); + DeleteAdditionalServiceGroupOfPeopleRelations(new Dictionary { { pOid, pVersion } }); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1642,7 +1642,7 @@ namespace BeWo.Service.ServiceImplementations lOriginals.DoForEach(or => MapperFactory.AdditionalServiceBookingDC_AdditionalServiceBooking.ConcurrencyCheck(pOid2Version[or.Oid.Value], or)); List asbListToDelete = lOriginals.ToList(); - if(asbListToDelete.Count <= 0) + if (asbListToDelete.Count <= 0) return; DAOFactory.GenericDAO.Delete(asbListToDelete); @@ -1650,7 +1650,7 @@ namespace BeWo.Service.ServiceImplementations IList allEntries = DAOFactory.GenericDAO.GetAll(); var entries2Delete = new List(); - foreach(AdditionalServiceBooking item in lOriginals) + foreach (AdditionalServiceBooking item in lOriginals) { entries2Delete.AddRange(allEntries.Where(e => pOid2Version.ContainsKey(e.Customer.Oid.Value) && e.Day.Equals(item.Datum.Value) && @@ -1659,7 +1659,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Delete(entries2Delete); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1673,7 +1673,7 @@ namespace BeWo.Service.ServiceImplementations MapperFactory.AdditionalServiceGroupOfPeopleRelationDC_AdditionalService2GroupOfPeople.MergeWithEntitys(pAdditionalServiceGroupOfPeopleRelations, lOriginals); DAOFactory.GenericDAO.Update(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1699,7 +1699,7 @@ namespace BeWo.Service.ServiceImplementations //var no = avList.First(v => !String.IsNullOrEmpty(v.Description) && v.Description.Equals("Nein") && // v.SystemEntryID.Equals(SystemEntryID.AdditionalServiceAssessmentSheet)); - foreach(AdditionalServiceBooking item in lOriginals) + foreach (AdditionalServiceBooking item in lOriginals) { IEnumerable list = DAOFactory.SearchDAO.GetAdditionalAssessmentSheetEntries(item.Datum.Value); @@ -1709,30 +1709,30 @@ namespace BeWo.Service.ServiceImplementations entries2Update.AddRange(list2); - foreach(Customer2AddServiceBooking c2a in item.Customer2AddServiceBookings) + foreach (Customer2AddServiceBooking c2a in item.Customer2AddServiceBookings) { bool containsEntry = false; - foreach(AssessmentSheetEntry entry in entries2Update) + foreach (AssessmentSheetEntry entry in entries2Update) { - if(entry.Customer.Oid == null) + if (entry.Customer.Oid == null) continue; - if(entry.Customer.Oid.Value.Equals(c2a.CustomerOid)) + if (entry.Customer.Oid.Value.Equals(c2a.CustomerOid)) { containsEntry = true; - if(c2a.Participated) + if (c2a.Participated) entry.AssessmentSheetValue = yes; else entries2Delete.Add(entry); } } - if(c2a.Participated && !containsEntry) + if (c2a.Participated && !containsEntry) { AssessmentSheetCategory cat = DAOFactory.SearchDAO.GetAddServiceAssessmentSheetCategoryWithName( item.AdditionalServiceRegion.AdditionalService.Name); - if(cat != null) + if (cat != null) { newEntries.Add(new AssessmentSheetEntry { @@ -1753,7 +1753,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Delete(entries2Delete); DAOFactory.GenericDAO.Insert(newEntries); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1794,7 +1794,7 @@ namespace BeWo.Service.ServiceImplementations return newGroupDC; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1811,7 +1811,7 @@ namespace BeWo.Service.ServiceImplementations return lAdditionalServiceGroupOfPeopleRelations.Select(asgopr => asgopr.Oid.Value).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1829,7 +1829,7 @@ namespace BeWo.Service.ServiceImplementations return lGroups.Select(asgop => asgop.Oid.Value).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1846,22 +1846,22 @@ namespace BeWo.Service.ServiceImplementations { ServiceRecordGroup group = null; - foreach(var iServiceRecord in lServiceRecords) + foreach (var iServiceRecord in lServiceRecords) { - if(string.IsNullOrEmpty(iServiceRecord.IP)) + if (string.IsNullOrEmpty(iServiceRecord.IP)) { iServiceRecord.IP = OperationContext.Current != null ? Utils.GetClientIP() : "::1"; } - if(iServiceRecord.InsTs == null) + if (iServiceRecord.InsTs == null) { iServiceRecord.InsTs = DateTime.Now; } - if(iServiceRecord.GroupEmployeeCount != null && iServiceRecord.GroupPersonCount != null && + if (iServiceRecord.GroupEmployeeCount != null && iServiceRecord.GroupPersonCount != null && (iServiceRecord.GroupEmployeeCount.Value + iServiceRecord.GroupPersonCount.Value > 2)) { - if(group == null) + if (group == null) { group = new ServiceRecordGroup { @@ -1878,13 +1878,13 @@ namespace BeWo.Service.ServiceImplementations else { var srdc = PluginLoader.FindClass(); - if(srdc != null) + if (srdc != null) { srdc.CalculateRoundedDuration(iServiceRecord); } var bsi = PluginLoader.FindClass(); - if(bsi != null) + if (bsi != null) { bsi.BeforeSaveServiceRecord(iServiceRecord); } @@ -1897,7 +1897,7 @@ namespace BeWo.Service.ServiceImplementations return lServiceRecords.Select(sr => sr.Oid.Value).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1910,14 +1910,14 @@ namespace BeWo.Service.ServiceImplementations List lAdditionalServiceBookings = MapperFactory.AdditionalServiceBookingDC_AdditionalServiceBooking.MapToNewEntities(pAdditionalServiceBookings); DAOFactory.GenericDAO.Insert(lAdditionalServiceBookings); - foreach(AdditionalServiceBooking booking in lAdditionalServiceBookings) + foreach (AdditionalServiceBooking booking in lAdditionalServiceBookings) { AttachAddServiceToAssessment(booking); } return lAdditionalServiceBookings.Select(asb => asb.Oid.Value).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1941,7 +1941,7 @@ namespace BeWo.Service.ServiceImplementations return lResult; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1960,7 +1960,7 @@ namespace BeWo.Service.ServiceImplementations return lResult; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1974,7 +1974,7 @@ namespace BeWo.Service.ServiceImplementations MapperFactory.AccountingTransactionDC_AccountingTransaction.MergeWithEntitys(pAccountingTransactions, lOriginals); DAOFactory.GenericDAO.Update(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -1988,7 +1988,7 @@ namespace BeWo.Service.ServiceImplementations MapperFactory.InvoiceDC_Invoice.MergeWithEntitys(invoices, lOriginals); DAOFactory.GenericDAO.Update(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2005,7 +2005,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(lOriginal); return MapperFactory.MandatorDC_Mandator.MapToNewDC(lOriginal); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2021,7 +2021,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2037,7 +2037,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2053,7 +2053,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2069,7 +2069,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2084,7 +2084,7 @@ namespace BeWo.Service.ServiceImplementations var originalStart = lOriginal.StartDate; var originalEnde = lOriginal.EndDate; - if(originalStart.HasValue && originalEnde.HasValue && pServiceRecordGroup.StartDate.HasValue && + if (originalStart.HasValue && originalEnde.HasValue && pServiceRecordGroup.StartDate.HasValue && pServiceRecordGroup.EndDate.HasValue) { var minutesOrg = originalEnde.Value.Subtract(originalStart.Value).TotalMinutes; @@ -2092,17 +2092,17 @@ namespace BeWo.Service.ServiceImplementations //Start und Ende korrigieren - if(Math.Abs(minutesNew - minutesOrg) < 0.1 && pServiceRecordGroup.StartDate.Value.Hour == 0 && pServiceRecordGroup.StartDate.Value.Minute == 0 && + if (Math.Abs(minutesNew - minutesOrg) < 0.1 && pServiceRecordGroup.StartDate.Value.Hour == 0 && pServiceRecordGroup.StartDate.Value.Minute == 0 && pServiceRecordGroup.StartDate.Value.Second == 0) { //prüfen ob korrigiert werden muss - if(originalStart.Value.Hour != 0 || + if (originalStart.Value.Hour != 0 || originalStart.Value.Minute != 0) { pServiceRecordGroup.StartDate = originalStart; pServiceRecordGroup.EndDate = originalEnde; - pServiceRecordGroup.RoundedDuration = (decimal) originalEnde.Value.Subtract(originalStart.Value).TotalMinutes; - foreach(var srdc in pServiceRecordGroup.ServiceRecordList) + pServiceRecordGroup.RoundedDuration = (decimal)originalEnde.Value.Subtract(originalStart.Value).TotalMinutes; + foreach (var srdc in pServiceRecordGroup.ServiceRecordList) { srdc.Start = originalStart; srdc.End = originalEnde; @@ -2114,16 +2114,16 @@ namespace BeWo.Service.ServiceImplementations } - if(!pServiceRecordGroup.StartDate.HasValue && pServiceRecordGroup.EndDate.HasValue) + if (!pServiceRecordGroup.StartDate.HasValue && pServiceRecordGroup.EndDate.HasValue) { pServiceRecordGroup.StartDate = - pServiceRecordGroup.EndDate.Value.AddMinutes((double) pServiceRecordGroup.RoundedDuration * -1); + pServiceRecordGroup.EndDate.Value.AddMinutes((double)pServiceRecordGroup.RoundedDuration * -1); } - pServiceRecordGroup.RoundedDuration = (decimal) pServiceRecordGroup.EndDate.Value.Subtract(pServiceRecordGroup.StartDate.Value).TotalMinutes; - foreach(var srdc in pServiceRecordGroup.ServiceRecordList) + pServiceRecordGroup.RoundedDuration = (decimal)pServiceRecordGroup.EndDate.Value.Subtract(pServiceRecordGroup.StartDate.Value).TotalMinutes; + foreach (var srdc in pServiceRecordGroup.ServiceRecordList) { srdc.GroupRoundedDuration = pServiceRecordGroup.RoundedDuration; } @@ -2135,9 +2135,9 @@ namespace BeWo.Service.ServiceImplementations // update servicerecords MapperFactory.ServiceRecordDC_ServiceRecord.MergeWithEntitys(pServiceRecordGroup.ServiceRecordList, lOriginal.ServiceRecordList); - foreach(ServiceRecord iServiceRecord in lOriginal.ServiceRecordList) + foreach (ServiceRecord iServiceRecord in lOriginal.ServiceRecordList) { - if(String.IsNullOrEmpty(iServiceRecord.IP)) + if (String.IsNullOrEmpty(iServiceRecord.IP)) iServiceRecord.IP = Utils.GetClientIP(); iServiceRecord.GroupOid = lOriginal.Oid; @@ -2146,7 +2146,7 @@ namespace BeWo.Service.ServiceImplementations var gdc = PluginLoader.FindClass(); - if(gdc != null) + if (gdc != null) { gdc.CalculateGroupDuration(lOriginal); } @@ -2161,7 +2161,7 @@ namespace BeWo.Service.ServiceImplementations return newGroupDC; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2175,7 +2175,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.LoadByIDs( pServiceRecords.Select(sr => sr.ServiceRecordOid.Value)); - if(lOriginals.Count == 1 && pServiceRecords.Count == 1) + if (lOriginals.Count == 1 && pServiceRecords.Count == 1) { var srDc = pServiceRecords[0]; var srOrg = lOriginals[0]; @@ -2183,17 +2183,17 @@ namespace BeWo.Service.ServiceImplementations var originalStart = srOrg.Start; var originalEnde = srOrg.End; - if(originalStart.HasValue && originalEnde.HasValue && srDc.Start.HasValue && srDc.End.HasValue) + if (originalStart.HasValue && originalEnde.HasValue && srDc.Start.HasValue && srDc.End.HasValue) { var minutesOrg = originalEnde.Value.Subtract(originalStart.Value).TotalMinutes; var minutesNew = srDc.End.Value.Subtract(srDc.Start.Value).TotalMinutes; //Start und Ende korrigieren - if(Math.Abs(minutesNew - minutesOrg) < 0.1 && srDc.Start.Value.Hour == 0 && srDc.Start.Value.Minute == 0 && srDc.Start.Value.Second == 0) + if (Math.Abs(minutesNew - minutesOrg) < 0.1 && srDc.Start.Value.Hour == 0 && srDc.Start.Value.Minute == 0 && srDc.Start.Value.Second == 0) { //prüfen ob korrigiert werden muss - if(originalStart.Value.Hour != 0 || + if (originalStart.Value.Hour != 0 || originalStart.Value.Minute != 0) { srDc.Start = originalStart; @@ -2213,21 +2213,21 @@ namespace BeWo.Service.ServiceImplementations var srdc = PluginLoader.FindClass(); var gdc = PluginLoader.FindClass(); - foreach(var serviceRecord in lOriginals) + foreach (var serviceRecord in lOriginals) { - if(srdc != null) + if (srdc != null) { srdc.CalculateRoundedDuration(serviceRecord); } - if(serviceRecord.GroupOid.HasValue && serviceRecord.GroupPersonCount.HasValue && serviceRecord.GroupEmployeeCount.HasValue && gdc != null) + if (serviceRecord.GroupOid.HasValue && serviceRecord.GroupPersonCount.HasValue && serviceRecord.GroupEmployeeCount.HasValue && gdc != null) { var gc = gdc.CalculateGroupDuration(serviceRecord.GroupPersonCount.Value, serviceRecord.GroupEmployeeCount.Value, serviceRecord.RoundedDuration); var singleduration = serviceRecord.RoundedDuration / serviceRecord.GroupPersonCount.Value; - if(gc != null) + if (gc != null) { singleduration = gc.SingleDuration; } @@ -2238,15 +2238,15 @@ namespace BeWo.Service.ServiceImplementations } - if(srdc != null) + if (srdc != null) { } var si = PluginLoader.FindClass(); - if(si != null) + if (si != null) { - foreach(var serviceRecord in lOriginals) + foreach (var serviceRecord in lOriginals) { si.BeforeSaveServiceRecord(serviceRecord); } @@ -2261,7 +2261,7 @@ namespace BeWo.Service.ServiceImplementations MakeServiceRecordHistoryEntry(lOriginals, null, StatementType.Update); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2297,7 +2297,7 @@ namespace BeWo.Service.ServiceImplementations IList as2gop = DAOFactory.GenericDAO.GetAll(); return as2gop.Select(item => MapperFactory.AdditionalServiceGroupOfPeopleRelationDC_AdditionalService2GroupOfPeople.MergeWithDC(item, new AdditionalServiceGroupOfPeopleRelationDC())).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2313,7 +2313,7 @@ namespace BeWo.Service.ServiceImplementations return result; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2329,7 +2329,7 @@ namespace BeWo.Service.ServiceImplementations return result; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2369,17 +2369,17 @@ namespace BeWo.Service.ServiceImplementations { IList allSettlementInvoices = DAOFactory.GenericDAO.GetAll(); - foreach(SettlementInvoice rechnung in allSettlementInvoices) + foreach (SettlementInvoice rechnung in allSettlementInvoices) { - if(rechnung.InvoiceBase.CostBearer2SupportConcept.Oid.HasValue) - if(rechnung.InvoiceBase.CostBearer2SupportConcept.Oid.Value.Equals(pServiceRecord.CostBearer2SupportConceptOid.Value) && rechnung.IsActive.Equals(ActivationTypeId.Active)) + if (rechnung.InvoiceBase.CostBearer2SupportConcept.Oid.HasValue) + if (rechnung.InvoiceBase.CostBearer2SupportConcept.Oid.Value.Equals(pServiceRecord.CostBearer2SupportConceptOid.Value) && rechnung.IsActive.Equals(ActivationTypeId.Active)) { result.Add(ServiceRecordValidationResult.SettlementInvoiceAlreadyExisting); break; } } } - catch(Exception) + catch (Exception) { result.Add(ServiceRecordValidationResult.Error); } @@ -2401,7 +2401,7 @@ namespace BeWo.Service.ServiceImplementations return result; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2413,13 +2413,13 @@ namespace BeWo.Service.ServiceImplementations { var sr = DAOFactory.GenericDAO.GetByID(pId); - if(sr == null) + if (sr == null) return null; ServiceRecordDC result = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(sr); return result; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2431,7 +2431,7 @@ namespace BeWo.Service.ServiceImplementations { return MapperFactory.FileAttachmentDC_FileAttachmentInfo.MapToNewDCs(DAOFactory.SearchDAO.FindFileAttachmentInfoByType(fileAttachmentType)); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2443,7 +2443,7 @@ namespace BeWo.Service.ServiceImplementations { return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(DAOFactory.SearchDAO.FindServiceRecordsForSupportConcept(pSupportConceptOid)); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2456,7 +2456,7 @@ namespace BeWo.Service.ServiceImplementations BeWoMobilBrowserInfo info = MapperFactory.BeWoMobilBrowserInfoDC_BeWoMobilBrowserInfo.MapToNewEntity(browserInfo); DAOFactory.GenericDAO.Insert(info); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2468,7 +2468,7 @@ namespace BeWo.Service.ServiceImplementations { return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(DAOFactory.SearchDAO.FindServiceRecordsForDays(costbearer2SupportConceptOid, days, employeeOid)); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2483,7 +2483,7 @@ namespace BeWo.Service.ServiceImplementations return s.GetCompactSupportConcepts(supportConceptOid, employeeOid); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2502,7 +2502,7 @@ namespace BeWo.Service.ServiceImplementations dc.Notice3 = sr.Notice3; dc.Notice4 = sr.Notice4; dc.Notice5 = sr.Notice5; - if(sr.ServiceDescription != null) + if (sr.ServiceDescription != null) dc.ServiceDescription = MapperFactory.ServiceDescriptionDC_ServiceDescription.MapToNewDC(sr.ServiceDescription); @@ -2522,7 +2522,7 @@ namespace BeWo.Service.ServiceImplementations dc.GroupOid = sr.GroupOid; dc.SignatureOid = sr.SignatureOid; - if(sr.Employee != null) + if (sr.Employee != null) { //dc.Employee = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(sr.Employee); dc.Employee = new CompactEmployeeDC(); @@ -2554,14 +2554,14 @@ namespace BeWo.Service.ServiceImplementations entryDc.Rating = v2o.Rating; dc.Goals.Add(entryDc); } - + return dc; } private static ServiceRecordDC CreateServiceRecordDCIfSupportConceptIsActive(ServiceRecord sr, Customer cust, bool checkArchivedSupportConcepts) { ServiceRecordDC dc = null; - if(!checkArchivedSupportConcepts || (sr.SupportConcept != null && sr.SupportConcept.IsActive == ActivationTypeId.Active)) + if (!checkArchivedSupportConcepts || (sr.SupportConcept != null && sr.SupportConcept.IsActive == ActivationTypeId.Active)) { dc = new ServiceRecordDC(); @@ -2574,7 +2574,7 @@ namespace BeWo.Service.ServiceImplementations dc.Notice3 = sr.Notice3; dc.Notice4 = sr.Notice4; dc.Notice5 = sr.Notice5; - if(sr.ServiceDescription != null) + if (sr.ServiceDescription != null) dc.ServiceDescription = MapperFactory.ServiceDescriptionDC_ServiceDescription.MapToNewDC(sr.ServiceDescription); dc.RoundedDuration = sr.RoundedDuration; dc.InsertedOn = sr.InsTs; @@ -2603,7 +2603,7 @@ namespace BeWo.Service.ServiceImplementations //Employee ----------------- - if(sr.Employee != null) + if (sr.Employee != null) { //dc.Employee = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(sr.Employee); dc.Employee = new CompactEmployeeDC(); @@ -2618,7 +2618,7 @@ namespace BeWo.Service.ServiceImplementations //SupportConcept ----------------- - if(sr.SupportConcept != null) + if (sr.SupportConcept != null) { dc.SupportConcept = new CompactSupportConceptDC(); @@ -2668,15 +2668,15 @@ namespace BeWo.Service.ServiceImplementations } //Costbearer ----------------- - if(sr.CostBearer2SupportConcept != null) + if (sr.CostBearer2SupportConcept != null) { dc.CostBearer2SupportConceptOid = sr.CostBearer2SupportConcept.Oid.Value; - if(dc.SupportConcept != null) + if (dc.SupportConcept != null) { var costBearer = new CompactCostBearerDC(); - if(sr.CostBearer2SupportConcept.CostBearer.Organisation != null) + if (sr.CostBearer2SupportConcept.CostBearer.Organisation != null) { var orgDC = new CompactOrganisationDC(); orgDC.Name = sr.CostBearer2SupportConcept.CostBearer.Organisation.Name; @@ -2702,9 +2702,9 @@ namespace BeWo.Service.ServiceImplementations dc.SupportConcept.CostBearerRelOids.Add(sr.CostBearer2SupportConcept.Oid.Value); } - if(dc.CostBearer == null) + if (dc.CostBearer == null) { - if(sr.CostBearer2SupportConcept.CostBearer.Organisation != null) + if (sr.CostBearer2SupportConcept.CostBearer.Organisation != null) dc.CostBearer = MapperFactory.CompactOrganisationDC_Organisation.MapToNewDC(sr.CostBearer2SupportConcept.CostBearer.Organisation); } } @@ -2744,19 +2744,19 @@ namespace BeWo.Service.ServiceImplementations Files = new List() }; - if(templateFolder) + if (templateFolder) root = folderDCList.First(f => f.Name.Equals("Vorlagen")); resultList.Add(root); - foreach(BeWoFolderDC cfo in folderDCList) + foreach (BeWoFolderDC cfo in folderDCList) { - if(root.Equals(cfo)) + if (root.Equals(cfo)) continue; - if(cfo.ParentBeWoFolderOid.HasValue) + if (cfo.ParentBeWoFolderOid.HasValue) { - if(folderDict.ContainsKey(cfo.ParentBeWoFolderOid.Value)) + if (folderDict.ContainsKey(cfo.ParentBeWoFolderOid.Value)) { BeWoFolderDC parent = folderDict[cfo.ParentBeWoFolderOid.Value]; parent.SubFolders.Add(cfo); @@ -2772,11 +2772,11 @@ namespace BeWo.Service.ServiceImplementations } } - foreach(FileAttachmentDC fi in fileDCList) + foreach (FileAttachmentDC fi in fileDCList) { - if(fi.BeWoFolderOid.HasValue) + if (fi.BeWoFolderOid.HasValue) { - if(folderDict.ContainsKey(fi.BeWoFolderOid.Value)) + if (folderDict.ContainsKey(fi.BeWoFolderOid.Value)) { BeWoFolderDC parent = folderDict[fi.BeWoFolderOid.Value]; parent.Files.Add(fi); @@ -2798,14 +2798,14 @@ namespace BeWo.Service.ServiceImplementations public static Dictionary GetSettingsValueDict(string settings) { var dict = new Dictionary(); - if(!String.IsNullOrEmpty(settings)) + if (!String.IsNullOrEmpty(settings)) { string[] keyValuePairs = settings.Split(';'); - foreach(string pair in keyValuePairs) + foreach (string pair in keyValuePairs) { string[] keyValuePair = pair.Split('='); - if(keyValuePair.Length == 2) + if (keyValuePair.Length == 2) { dict.Add(keyValuePair[0], keyValuePair[1]); } @@ -2831,7 +2831,7 @@ namespace BeWo.Service.ServiceImplementations try { string url = ConfigurationManager.AppSettings.Get("ContractStateUrl"); - if(MultitenancyOperationContextExt.Current != null) + if (MultitenancyOperationContextExt.Current != null) { url = url.Replace("[TENANT]", MultitenancyOperationContextExt.Current.Tenant); } @@ -2842,7 +2842,7 @@ namespace BeWo.Service.ServiceImplementations url += "&t=1"; - using(var client = new WebClient()) + using (var client = new WebClient()) { //MessageBox.Show(hostAddress); byte[] response = client.DownloadData(url); @@ -2850,7 +2850,7 @@ namespace BeWo.Service.ServiceImplementations return Encoding.ASCII.GetString(response); } } - catch(Exception) + catch (Exception) { } @@ -2867,10 +2867,10 @@ namespace BeWo.Service.ServiceImplementations List srListToDelete = lOriginals.ToList(); - if(srListToDelete.Count > 0) + if (srListToDelete.Count > 0) DAOFactory.GenericDAO.Delete(srListToDelete); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2880,14 +2880,14 @@ namespace BeWo.Service.ServiceImplementations { try { - var newCategoryDC = new AssessmentSheetCategoryDC {Description = pAdditionalServiceBookingDC.AdditionalServiceRegion.AdditionalService.Name}; + var newCategoryDC = new AssessmentSheetCategoryDC { Description = pAdditionalServiceBookingDC.AdditionalServiceRegion.AdditionalService.Name }; AssessmentSheetCategory lCategory = MapperFactory.AssessmentSheetCategoryDC_AssessmentSheetCategory.MapToNewEntity(newCategoryDC); lCategory.SystemEntryID = SystemEntryID.AdditionalServiceAssessmentSheet; AssessmentSheetCategory cat = DAOFactory.SearchDAO.GetAddServiceAssessmentSheetCategoryWithName(lCategory.Description); - if(cat == null) + if (cat == null) { DAOFactory.GenericDAO.Insert(lCategory); } @@ -2927,7 +2927,7 @@ namespace BeWo.Service.ServiceImplementations SystemEntryID = SystemEntryID.AdditionalServiceAssessmentSheet }; - if(!yesExists) + if (!yesExists) { DAOFactory.GenericDAO.Insert(lYes); } @@ -2939,7 +2939,7 @@ namespace BeWo.Service.ServiceImplementations c.Description.Equals(lYes.Description)); } - if(!noExists) + if (!noExists) { DAOFactory.GenericDAO.Insert(lNo); } @@ -2951,16 +2951,16 @@ namespace BeWo.Service.ServiceImplementations c.Description.Equals(lNo.Description)); } - if(!lCategory.PossibleValues.Contains(lYes)) + if (!lCategory.PossibleValues.Contains(lYes)) DAOFactory.AdoDAO.ExecuteQuery(string.Format("INSERT INTO assessmentsheetcategory2assessmentsheetvalue(assessmentsheetcategoryoid, assessmentsheetvalueoid) VALUES({0}, {1})", lCategory.Oid.Value, lYes.Oid.Value)); - if(!lCategory.PossibleValues.Contains(lNo)) + if (!lCategory.PossibleValues.Contains(lNo)) DAOFactory.AdoDAO.ExecuteQuery(string.Format("INSERT INTO assessmentsheetcategory2assessmentsheetvalue(assessmentsheetcategoryoid, assessmentsheetvalueoid) VALUES({0}, {1})", lCategory.Oid.Value, lNo.Oid.Value)); var entryList = new List(); string sqlString = string.Empty; - foreach(Customer2AddServiceBooking customerParticipated in pAdditionalServiceBookingDC.Customer2AddServiceBookings) + foreach (Customer2AddServiceBooking customerParticipated in pAdditionalServiceBookingDC.Customer2AddServiceBookings) { var customer = DAOFactory.GenericDAO.GetByID(customerParticipated.CustomerOid); entryList.Add(new AssessmentSheetEntry @@ -2977,14 +2977,14 @@ namespace BeWo.Service.ServiceImplementations abc.SystemEntryID.Equals(SystemEntryID.AdditionalServiceAssessmentSheet) && abc.Description.Equals(lCategory.Description)); - if(f.Customers == null || !f.Customers.Contains(customer)) + if (f.Customers == null || !f.Customers.Contains(customer)) sqlString += string.Format("INSERT INTO customer2assessmentsheetcategory(customeroid, assessmentsheetoid) VALUES({0}, {1});", customer.Oid.Value, lCategory.Oid.Value); } DAOFactory.GenericDAO.Insert(entryList); DAOFactory.AdoDAO.ExecuteQuery(sqlString); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -2994,10 +2994,10 @@ namespace BeWo.Service.ServiceImplementations { var hServiceRecords = new List(); - if(statementType.Equals(StatementType.Insert) && serviceRecordOidList != null) + if (statementType.Equals(StatementType.Insert) && serviceRecordOidList != null) { int iterator = 0; - foreach(ServiceRecordHistory history in lOriginals.Select(ServiceRecordOriginal => new ServiceRecordHistory + foreach (ServiceRecordHistory history in lOriginals.Select(ServiceRecordOriginal => new ServiceRecordHistory { TimeStamp = DateTime.Now, ChangeType = statementType, @@ -3081,7 +3081,7 @@ namespace BeWo.Service.ServiceImplementations { return MapperFactory.TextModuleDC_TextModule.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive()); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3094,7 +3094,7 @@ namespace BeWo.Service.ServiceImplementations var list = MapperFactory.TextModuleDC_TextModule.MapToNewDCs(DAOFactory.SearchDAO.GetActiveTextModules(pShouldShowAllTextModules, pHasRightToSeeAllTextModules, pIsInAdministrationView, pEmployeeOid)); return list.OrderBy(t => t.Name).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3106,7 +3106,7 @@ namespace BeWo.Service.ServiceImplementations { return MapperFactory.TextModuleDC_TextModule.MapToNewDCs(DAOFactory.SearchDAO.GetActiveTextModuleByServiceCategory(pServiceCategoryOid)); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3121,7 +3121,7 @@ namespace BeWo.Service.ServiceImplementations return lTextbausteine.Select(asb => asb.Oid.Value).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3137,7 +3137,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3152,14 +3152,14 @@ namespace BeWo.Service.ServiceImplementations IList modulesToDelete = new List(); - foreach(var textModule in lOriginals) + foreach (var textModule in lOriginals) { AddModuleAndChildsToList(textModule, modulesToDelete); } DAOFactory.GenericDAO.Delete(modulesToDelete); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3169,7 +3169,7 @@ namespace BeWo.Service.ServiceImplementations { var children = DAOFactory.SearchDAO.GetChildTextModules(textModule); - foreach(var child in children) + foreach (var child in children) { AddModuleAndChildsToList(child, modulesToDelete); } @@ -3184,7 +3184,7 @@ namespace BeWo.Service.ServiceImplementations var records = DAOFactory.SearchDAO.FindServiceRecordsInSpan(pCostBearer2SupportConceptOid, period); return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(records); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3198,7 +3198,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Insert(lSignature); SignatureDC updatedSignatureDC = MapperFactory.SignatureDC_Signature.MapToNewDC(lSignature); - if(s.ServiceRecordOid.HasValue) + if (s.ServiceRecordOid.HasValue) { var sr = DAOFactory.GenericDAO.LoadByID(s.ServiceRecordOid.Value); @@ -3209,7 +3209,7 @@ namespace BeWo.Service.ServiceImplementations return updatedSignatureDC; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3227,11 +3227,11 @@ namespace BeWo.Service.ServiceImplementations var aa = DAOFactory.SearchDAO.FindAllEmployeeAppCodes(employeeOid).ToList(); bool isOk = false; - if(aa.Count > 0) + if (aa.Count > 0) { var response = DeletZufallsCode(apikey, kundennummer, "E" + employeeOid); - if(response == 0) + if (response == 0) { isOk = true; } @@ -3249,16 +3249,16 @@ namespace BeWo.Service.ServiceImplementations isOk = true; } - if(isOk) + if (isOk) { string zufallscode = ErzeugeZufallsCode(apikey, kundennummer, "E" + employeeOid); - if(zufallscode != null) + if (zufallscode != null) { var appcodes = DAOFactory.SearchDAO.FindAllEmployeeAppCodes(employeeOid).ToList(); EmployeeAPPCode newCode = null; - if(appcodes.Count > 0) + if (appcodes.Count > 0) { newCode = appcodes[0]; } @@ -3286,7 +3286,7 @@ namespace BeWo.Service.ServiceImplementations return null; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3298,9 +3298,9 @@ namespace BeWo.Service.ServiceImplementations { var employeecode = DAOFactory.SearchDAO.FindAllEmployeeAppCodes(employeeOid); - foreach(var items in employeecode) + foreach (var items in employeecode) { - if(activeType == 1) + if (activeType == 1) items.IsChatAktiv = activeType; else items.IsChatAktiv = 0; @@ -3308,7 +3308,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(employeecode); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3320,7 +3320,7 @@ namespace BeWo.Service.ServiceImplementations { var employeecode = DAOFactory.SearchDAO.FindAllEmployeeAppCodes(employeeOid); - foreach(var items in employeecode) + foreach (var items in employeecode) { items.NotfallStatement = notfallstate; } @@ -3328,7 +3328,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(employeecode); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3346,11 +3346,11 @@ namespace BeWo.Service.ServiceImplementations var aa = DAOFactory.SearchDAO.FindAllCustomerAppCodes(customerOid).ToList(); bool isOk = false; - if(aa.Count > 0) + if (aa.Count > 0) { var response = DeletZufallsCode(apikey, kundennummer, "C" + customerOid); - if(response == 0) + if (response == 0) { isOk = true; } @@ -3369,15 +3369,15 @@ namespace BeWo.Service.ServiceImplementations } - if(isOk) + if (isOk) { string zufallscode = ErzeugeZufallsCode(apikey, kundennummer, "C" + customerOid); - if(zufallscode != null) + if (zufallscode != null) { var appcodes = DAOFactory.SearchDAO.FindAllCustomerAppCodes(customerOid).ToList(); CustomerAPPCode newCode = null; - if(appcodes.Count > 0) + if (appcodes.Count > 0) { newCode = appcodes[0]; } @@ -3407,7 +3407,7 @@ namespace BeWo.Service.ServiceImplementations return null; } } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3429,7 +3429,7 @@ namespace BeWo.Service.ServiceImplementations }; - if(teamid != 0) + if (teamid != 0) { chatMessage.TeamOid = teamid; } @@ -3444,7 +3444,7 @@ namespace BeWo.Service.ServiceImplementations return ChatMessagesDC; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3456,9 +3456,9 @@ namespace BeWo.Service.ServiceImplementations { var customercode = DAOFactory.SearchDAO.FindAllCustomerAppCodes(customerOid); - foreach(var items in customercode) + foreach (var items in customercode) { - if(activeType == 1) + if (activeType == 1) { items.IsChatAktiv = activeType; // Erstelle hier ein weiteren Code @@ -3472,7 +3472,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(customercode); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3488,7 +3488,7 @@ namespace BeWo.Service.ServiceImplementations return customerAPPCodeDC; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3507,7 +3507,7 @@ namespace BeWo.Service.ServiceImplementations string serverUrl = ErmittleServerURL(customerId); - if(serverUrl.IsNullOrEmpty()) + if (serverUrl.IsNullOrEmpty()) { return 3; // ServerURl konnte nicht ermittelt werden } @@ -3526,11 +3526,11 @@ namespace BeWo.Service.ServiceImplementations response = request.GetResponse(); // Display the status. - var statusResponse = ((HttpWebResponse) response).StatusDescription; + var statusResponse = ((HttpWebResponse)response).StatusDescription; string responseFromServer = ReadStreamForChatCode(response); - var def = new {result = ""}; + var def = new { result = "" }; var jsonDatentyp = JsonConvert.DeserializeAnonymousType(responseFromServer, def); @@ -3539,13 +3539,13 @@ namespace BeWo.Service.ServiceImplementations return Convert.ToInt32(jsonDatentyp.result); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } } } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3569,16 +3569,16 @@ namespace BeWo.Service.ServiceImplementations response = request.GetResponse(); // Display the status. - var statusResponse = ((HttpWebResponse) response).StatusDescription; + var statusResponse = ((HttpWebResponse)response).StatusDescription; string responseFromServer = ReadStreamForChatCode(response); - var definiti = new {result = "", chatcode = ""}; + var definiti = new { result = "", chatcode = "" }; var jsonDatentyp = JsonConvert.DeserializeAnonymousType(responseFromServer, definiti); // neuen authentifikationstyp erstellen response.Close(); - if(!jsonDatentyp.result.Equals("0")) + if (!jsonDatentyp.result.Equals("0")) { //fange fehler ab return null; @@ -3588,7 +3588,7 @@ namespace BeWo.Service.ServiceImplementations return jsonDatentyp.chatcode; } } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3608,7 +3608,7 @@ namespace BeWo.Service.ServiceImplementations string responseFromServer = ReadStreamForChatCode(response); - var definition = new {status = "", URL = "", SYNCTYPE = ""}; + var definition = new { status = "", URL = "", SYNCTYPE = "" }; var jsondaten = JsonConvert.DeserializeAnonymousType(responseFromServer, definition); @@ -3617,7 +3617,7 @@ namespace BeWo.Service.ServiceImplementations return serverUrl; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3641,7 +3641,7 @@ namespace BeWo.Service.ServiceImplementations return responseFromServer; } - catch(Exception e) + catch (Exception e) { return null; } @@ -3657,7 +3657,7 @@ namespace BeWo.Service.ServiceImplementations return ChatMessagesDC; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3675,7 +3675,7 @@ namespace BeWo.Service.ServiceImplementations var serviceRecordOid = oidList[0]; - if(!String.IsNullOrEmpty(sig.DataBild)) + if (!String.IsNullOrEmpty(sig.DataBild)) { var lSignature = MapperFactory.SignatureDC_Signature.MapToNewEntity(sig); // lSignature.ServiceRecordOid = serviceRecordOid; @@ -3686,7 +3686,7 @@ namespace BeWo.Service.ServiceImplementations return serviceRecordOid; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3701,7 +3701,7 @@ namespace BeWo.Service.ServiceImplementations return s.CreateDefaultServiceRecords(monat, oids); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3715,7 +3715,7 @@ namespace BeWo.Service.ServiceImplementations return MapperFactory.OrganisationPersonRelDC_Organisation2PersonMapper.MapToNewDCs(customerPersonRels); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3729,7 +3729,7 @@ namespace BeWo.Service.ServiceImplementations return MapperFactory.BargeldkassenDCBargeldkasseDC_BargeldkassenDCBargeldkasse.MapToNewDCs(bargeldkassen); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3744,7 +3744,7 @@ namespace BeWo.Service.ServiceImplementations return lBargeldkasse.Oid.Value; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3761,7 +3761,7 @@ namespace BeWo.Service.ServiceImplementations return MapperFactory.BargeldkassenDCBargeldkasseDC_BargeldkassenDCBargeldkasse.MapToNewDC(lOriginal); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3771,9 +3771,9 @@ namespace BeWo.Service.ServiceImplementations { try { - ServiceLogic.SetActivationType(new Dictionary {{pOid, pVersion}}, ActivationTypeId.Deleted); + ServiceLogic.SetActivationType(new Dictionary { { pOid, pVersion } }, ActivationTypeId.Deleted); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3785,7 +3785,7 @@ namespace BeWo.Service.ServiceImplementations { var kategorien = DAOFactory.SearchDAO.FindNotizenKategorien(objectTid, objectOid); - if(kategorien.Count == 0) + if (kategorien.Count == 0) { var newKat = new NotizenKategorie(); newKat.KategorieName = "Gesprächsnotizen"; @@ -3798,7 +3798,7 @@ namespace BeWo.Service.ServiceImplementations return MapperFactory.NotizenKategorieDC_NotizenKategorie.MapToNewDCs(kategorien.Where(k => k.IsActive == ActivationTypeId.Active)); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3813,7 +3813,7 @@ namespace BeWo.Service.ServiceImplementations return entity.Oid.Value; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3830,7 +3830,7 @@ namespace BeWo.Service.ServiceImplementations return MapperFactory.NotizenKategorieDC_NotizenKategorie.MapToNewDC(lOriginal); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3840,9 +3840,9 @@ namespace BeWo.Service.ServiceImplementations { try { - ServiceLogic.SetActivationType(new Dictionary {{pOid, pVersion}}, ActivationTypeId.Deleted); + ServiceLogic.SetActivationType(new Dictionary { { pOid, pVersion } }, ActivationTypeId.Deleted); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3852,9 +3852,9 @@ namespace BeWo.Service.ServiceImplementations { try { - ServiceLogic.SetActivationType(new Dictionary {{pOid, pVersion}}, ActivationTypeId.Deleted); + ServiceLogic.SetActivationType(new Dictionary { { pOid, pVersion } }, ActivationTypeId.Deleted); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3869,7 +3869,7 @@ namespace BeWo.Service.ServiceImplementations var lOriginals = DAOFactory.GenericDAO.LoadByIDs(pOid2Version.Select(e => e.Key)).Where(e => e.SystemEntryID == null).ToList(); DAOFactory.GenericDAO.Delete(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3884,7 +3884,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(emp); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3900,7 +3900,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(cust); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3914,7 +3914,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Delete(origVertretung); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3933,7 +3933,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(origVertretung); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3958,7 +3958,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(origAbsenceTime); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3973,7 +3973,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Insert(x); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -3989,7 +3989,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(x); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4002,7 +4002,7 @@ namespace BeWo.Service.ServiceImplementations var vertretungsManager = new VertretungsManager(); return vertretungsManager.CreateVertretungsListe(datum.Date, datum.Date); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4019,7 +4019,7 @@ namespace BeWo.Service.ServiceImplementations // return x; return null; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4038,7 +4038,7 @@ namespace BeWo.Service.ServiceImplementations //return cusAcc; return null; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4053,7 +4053,7 @@ namespace BeWo.Service.ServiceImplementations return mgr.CreateVertretungsListe(start.Date, ende.Date); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4068,9 +4068,9 @@ namespace BeWo.Service.ServiceImplementations var vertreter = DAOFactory.GenericDAO.GetAllActive(); - foreach(var vert in vertreter) + foreach (var vert in vertreter) { - if(vert.CustomerOid == klientenOid) + if (vert.CustomerOid == klientenOid) { vlist.Add(vert); } @@ -4078,9 +4078,9 @@ namespace BeWo.Service.ServiceImplementations List emOidList = new List(); - foreach(var empoid in vlist) + foreach (var empoid in vlist) { - if(empoid.VertretenderMitarbeiterOid.HasValue) + if (empoid.VertretenderMitarbeiterOid.HasValue) { emOidList.Add(empoid.VertretenderMitarbeiterOid.Value); } @@ -4094,7 +4094,7 @@ namespace BeWo.Service.ServiceImplementations return x; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4108,40 +4108,40 @@ namespace BeWo.Service.ServiceImplementations IList fToken = new List(); - if(zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient) + if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient) { var x = GetCustomer2TokenList(); - foreach(var item in token) + foreach (var item in token) { - foreach(var c2t in x) + foreach (var c2t in x) { - if(item.Oid == c2t.Token.TokenOid && c2t.Customer.CustomerOid == oid) + if (item.Oid == c2t.Token.TokenOid && c2t.Customer.CustomerOid == oid) { item.MemberOid = oid; fToken.Add(item); } - else if(item.Oid == c2t.Token.TokenOid) + else if (item.Oid == c2t.Token.TokenOid) { fToken.Add(item); } } } } - else if(zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter) + else if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter) { var x = GetEmployee2TokenList(); - foreach(var item in token) + foreach (var item in token) { - foreach(var e2t in x) + foreach (var e2t in x) { - if(item.Oid == e2t.Token.TokenOid && e2t.Employee.EmployeeOid == oid) + if (item.Oid == e2t.Token.TokenOid && e2t.Employee.EmployeeOid == oid) { item.MemberOid = oid; fToken.Add(item); } - else if(item.Oid == e2t.Token.TokenOid) + else if (item.Oid == e2t.Token.TokenOid) { fToken.Add(item); } @@ -4151,7 +4151,7 @@ namespace BeWo.Service.ServiceImplementations return MapperFactory.CompactTokenDC_Token.MapToNewDCs(fToken); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4165,7 +4165,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(t); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4181,7 +4181,7 @@ namespace BeWo.Service.ServiceImplementations TokenTyp = typ }; - if(zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient) + if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient) { var x = DAOFactory.GenericDAO.GetByID(oid.Value); @@ -4198,7 +4198,7 @@ namespace BeWo.Service.ServiceImplementations token.RelatedCustomers = c2tList; } - else if(zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter) + else if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter) { var x = DAOFactory.GenericDAO.GetByID(oid.Value); @@ -4219,7 +4219,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Insert(t); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4229,21 +4229,21 @@ namespace BeWo.Service.ServiceImplementations { try { - if(art == 1) + if (art == 1) { - if(verfuegbarerAusschlussToken.ContainsKey(token)) + if (verfuegbarerAusschlussToken.ContainsKey(token)) { CompactTokenDC nToken = null; - foreach(var tokenkey in verfuegbarerAusschlussToken) + foreach (var tokenkey in verfuegbarerAusschlussToken) { - if(tokenkey.Key.Equals(token)) + if (tokenkey.Key.Equals(token)) { nToken = tokenkey.Value; } } - if(nToken != null) + if (nToken != null) { InsertNewRelationToken(nToken, TokenTyp.AusschlussKriterium, zugehoerigkeitsTyp, Oid); } @@ -4254,63 +4254,63 @@ namespace BeWo.Service.ServiceImplementations } } - if(art == 0) + if (art == 0) { - if(verfuegbarerAusschlussToken.ContainsKey(token)) + if (verfuegbarerAusschlussToken.ContainsKey(token)) { CompactTokenDC nToken = null; - foreach(var tokenkey in verfuegbarerAusschlussToken) + foreach (var tokenkey in verfuegbarerAusschlussToken) { - if(tokenkey.Key.Equals(token)) + if (tokenkey.Key.Equals(token)) { nToken = tokenkey.Value; } } - if(nToken != null) + if (nToken != null) { DeletTokenRelation(nToken, Oid, zugehoerigkeitsTyp); } } else { - if(zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient) + if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient) { var c2tList = GetCustomer2TokenList(); List otoken = new List(); - foreach(var ct2 in c2tList) + foreach (var ct2 in c2tList) { - if(ct2.Token.Beschreibung.Equals(token) && ct2.Customer.CustomerOid == Oid) + if (ct2.Token.Beschreibung.Equals(token) && ct2.Customer.CustomerOid == Oid) { otoken.Add(ct2.Token); } } - foreach(var ken in otoken) + foreach (var ken in otoken) { - if(ken != null) + if (ken != null) DeletTokenRelation(ken, Oid, zugehoerigkeitsTyp); } } - else if(zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter) + else if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter) { var e2tList = GetEmployee2TokenList(); List otoken = new List(); - foreach(var et2 in e2tList) + foreach (var et2 in e2tList) { - if(et2.Token.Beschreibung.Equals(token) && et2.Employee.EmployeeOid == Oid) + if (et2.Token.Beschreibung.Equals(token) && et2.Employee.EmployeeOid == Oid) { otoken.Add(et2.Token); } } - foreach(var ken in otoken) + foreach (var ken in otoken) { DeletTokenRelation(ken, Oid, zugehoerigkeitsTyp); } @@ -4318,7 +4318,7 @@ namespace BeWo.Service.ServiceImplementations } } } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4328,21 +4328,21 @@ namespace BeWo.Service.ServiceImplementations { try { - if(art == 1) + if (art == 1) { - if(verfuegbarerWunschToken.ContainsKey(token)) + if (verfuegbarerWunschToken.ContainsKey(token)) { CompactTokenDC nToken = null; - foreach(var tokenkey in verfuegbarerWunschToken) + foreach (var tokenkey in verfuegbarerWunschToken) { - if(tokenkey.Key.Equals(token)) + if (tokenkey.Key.Equals(token)) { nToken = tokenkey.Value; } } - if(nToken != null) + if (nToken != null) { InsertNewRelationToken(nToken, TokenTyp.WunschKriterium, zugehoerigkeitsTyp, Oid); } @@ -4354,61 +4354,61 @@ namespace BeWo.Service.ServiceImplementations } - if(art == 0) + if (art == 0) { - if(verfuegbarerWunschToken.ContainsKey(token)) + if (verfuegbarerWunschToken.ContainsKey(token)) { CompactTokenDC nToken = null; - foreach(var tokenkey in verfuegbarerWunschToken) + foreach (var tokenkey in verfuegbarerWunschToken) { - if(tokenkey.Key.Equals(token)) + if (tokenkey.Key.Equals(token)) { nToken = tokenkey.Value; } } - if(nToken != null) + if (nToken != null) { DeletTokenRelation(nToken, Oid, zugehoerigkeitsTyp); } } else { - if(zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient) + if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient) { var c2tList = GetCustomer2TokenList(); List otoken = new List(); - foreach(var ct2 in c2tList) + foreach (var ct2 in c2tList) { - if(ct2.Token.Beschreibung.Equals(token) && ct2.Customer.CustomerOid == Oid) + if (ct2.Token.Beschreibung.Equals(token) && ct2.Customer.CustomerOid == Oid) { otoken.Add(ct2.Token); } } - foreach(var ken in otoken) + foreach (var ken in otoken) { DeletTokenRelation(ken, Oid, zugehoerigkeitsTyp); } } - else if(zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter) + else if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter) { var e2tList = GetEmployee2TokenList(); List otoken = new List(); - foreach(var et2 in e2tList) + foreach (var et2 in e2tList) { - if(et2.Token.Beschreibung.Equals(token) && et2.Employee.EmployeeOid == Oid) + if (et2.Token.Beschreibung.Equals(token) && et2.Employee.EmployeeOid == Oid) { otoken.Add(et2.Token); } } - foreach(var ken in otoken) + foreach (var ken in otoken) { DeletTokenRelation(ken, Oid, zugehoerigkeitsTyp); } @@ -4417,7 +4417,7 @@ namespace BeWo.Service.ServiceImplementations } } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4431,7 +4431,7 @@ namespace BeWo.Service.ServiceImplementations var token = MapperFactory.TokenDC_Token.MapToNewDC(tk); - if(zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient) + if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient) { var x = DAOFactory.GenericDAO.GetByID(oid.Value); @@ -4448,7 +4448,7 @@ namespace BeWo.Service.ServiceImplementations token.RelatedCustomers = c2tList; } - else if(zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter) + else if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter) { var x = DAOFactory.GenericDAO.GetByID(oid.Value); @@ -4471,7 +4471,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(t); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4485,7 +4485,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Delete(t); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4495,48 +4495,48 @@ namespace BeWo.Service.ServiceImplementations { try { - if(typ == SchulbegleitenderZugehoerigkeitsTyp.Klient) + if (typ == SchulbegleitenderZugehoerigkeitsTyp.Klient) { var tokenEntity = DAOFactory.GenericDAO.LoadByID(token.TokenOid.Value); Customer2Token t = null; - foreach(var c2tToken in tokenEntity.Customer2TokenList) + foreach (var c2tToken in tokenEntity.Customer2TokenList) { - if(c2tToken.Customer.Oid == oid) + if (c2tToken.Customer.Oid == oid) { t = c2tToken; } } - if(t != null) + if (t != null) { tokenEntity.Customer2TokenList.Remove(t); DAOFactory.GenericDAO.Update(tokenEntity); } } - else if(typ == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter) + else if (typ == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter) { var tokenEntity = DAOFactory.GenericDAO.LoadByID(token.TokenOid.Value); Employee2Token t = null; - foreach(var e2tToken in tokenEntity.Employee2TokenList) + foreach (var e2tToken in tokenEntity.Employee2TokenList) { - if(e2tToken.Employee.Oid == oid) + if (e2tToken.Employee.Oid == oid) { t = e2tToken; } } - if(t != null) + if (t != null) { tokenEntity.Employee2TokenList.Remove(t); DAOFactory.GenericDAO.Update(tokenEntity); } } } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4552,7 +4552,7 @@ namespace BeWo.Service.ServiceImplementations return y; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4568,7 +4568,7 @@ namespace BeWo.Service.ServiceImplementations return y; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4587,7 +4587,7 @@ namespace BeWo.Service.ServiceImplementations return lResult; } - catch(Exception e) + catch (Exception e) { throw (Utils.CreateBeWoFaultException(e)); } @@ -4597,7 +4597,7 @@ namespace BeWo.Service.ServiceImplementations { var factory = PluginLoader.FindClass(); - if(factory != null) + if (factory != null) { return factory.GetServiceRecordStatisticInfo(costBearer2SupportConceptOid, statisticsDate); } @@ -4610,7 +4610,7 @@ namespace BeWo.Service.ServiceImplementations var factory = PluginLoader.FindClass(); - if(factory == null) + if (factory == null) { factory = new ServiceRecordStatisticFactory(); } @@ -4645,7 +4645,7 @@ namespace BeWo.Service.ServiceImplementations { var calc = PluginLoader.FindClass(); - if(calc != null) + if (calc != null) { return calc.CalculateGroupDuration(personCount, employeeCount, totalDuration); } @@ -4657,7 +4657,7 @@ namespace BeWo.Service.ServiceImplementations { var calc = PluginLoader.FindClass(); - if(calc != null) + if (calc != null) { return calc.CalculateGroupDuration(personCount, employeeCount, totalDuration, costBearer2SupportConceptArray); } @@ -4669,7 +4669,7 @@ namespace BeWo.Service.ServiceImplementations { var factory = PluginLoader.FindClass(); - if(factory == null) + if (factory == null) { factory = new UiElementFactory(); } @@ -4680,7 +4680,7 @@ namespace BeWo.Service.ServiceImplementations private static List BuildTree(IEnumerable pSupportConcepts) { var lResult = new List(); - foreach(SupportConcept iSC in pSupportConcepts) + foreach (SupportConcept iSC in pSupportConcepts) { var lScNode = new SupportConceptTreeNodeDC { @@ -4689,14 +4689,14 @@ namespace BeWo.Service.ServiceImplementations }; lScNode.Description = String.Format("{0}, {1}", iSC.Customer.Person.LastName, iSC.Customer.Person.FirstName); - foreach(CostBearer2SupportConcept iSC2Cb in iSC.CostBearer2SupportConceptList) + foreach (CostBearer2SupportConcept iSC2Cb in iSC.CostBearer2SupportConceptList) { var tnode = new SupportConceptTreeNodeDC(); tnode.NodeType = NodeType.SupportConceptCostBearerRelDC; tnode.SupportConcept = lScNode.SupportConcept; tnode.SupportConceptCostBearerRelDC = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(iSC2Cb); - if(iSC2Cb.CostBearer.Organisation != null) + if (iSC2Cb.CostBearer.Organisation != null) { tnode.Description = iSC2Cb.CostBearer.Organisation.Name; } @@ -4732,7 +4732,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Insert(organisation2Person); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4746,7 +4746,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Delete(organisation2Person); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4760,13 +4760,13 @@ namespace BeWo.Service.ServiceImplementations string serverUrl = ErmittleServerURL(customerId); - if(serverUrl == null) + if (serverUrl == null) { handout.Result = 11; return handout; } - else if(serverUrl.Equals("")) + else if (serverUrl.Equals("")) { handout.Result = 11; @@ -4858,7 +4858,7 @@ namespace BeWo.Service.ServiceImplementations string postdaten = ""; int i = 0; - foreach(var key in postparameter.Keys) + foreach (var key in postparameter.Keys) { //hier noch chatcode übergeben postdaten += HttpUtility.UrlEncode(key) + "=" + HttpUtility.UrlEncode(postparameter[key]) + "&"; @@ -4883,14 +4883,14 @@ namespace BeWo.Service.ServiceImplementations requestStream.Close(); } - catch(Exception e) + catch (Exception e) { MessageBox.Show("Es konnte keine Verbindung aufgebaut werden.", "Fehler", MessageBoxButton.OK); } //response bereich | Verarbeiten - HttpWebResponse response = (HttpWebResponse) requesten.GetResponse(); + HttpWebResponse response = (HttpWebResponse)requesten.GetResponse(); //response.ContentType = "application/pdf"; //###################################################################### @@ -4905,7 +4905,7 @@ namespace BeWo.Service.ServiceImplementations //WebResponse response = request.GetResponse(); - using(Stream stream = response.GetResponseStream()) + using (Stream stream = response.GetResponseStream()) { byte[] buffer = new byte[stream.Length]; stream.Read(buffer, 0, buffer.Length); @@ -4914,7 +4914,7 @@ namespace BeWo.Service.ServiceImplementations string responseFromServer = ReadStreamForChatCode(response); - if(responseFromServer.Contains("PDF")) + if (responseFromServer.Contains("PDF")) { PdfChatHandoutDC hd = new PdfChatHandoutDC(); hd.File = responseFromServer; @@ -4930,7 +4930,7 @@ namespace BeWo.Service.ServiceImplementations return jsonDatentyp; } } - catch(Exception e) + catch (Exception e) { //throw Utils.CreateBeWoFaultException(e); var handout = new PdfChatHandoutDC(); @@ -4946,20 +4946,20 @@ namespace BeWo.Service.ServiceImplementations CustomerAPPCodeDC aa = new CustomerAPPCodeDC(); var result = DeletZufallsCode(apikey, kundennummer, "C" + customeroid); - if(result == 0 || result == 32) + if (result == 0 || result == 32) { try { var customerappcode = DAOFactory.SearchDAO.FindAllCustomerAppCodes(customeroid); - if(customerappcode != null) + if (customerappcode != null) { var anzahl = customerappcode.Count(); - if(anzahl > 0) + if (anzahl > 0) { - foreach(var code in customerappcode) + foreach (var code in customerappcode) { code.CustomerCode = ""; code.CustomerCodeGenDate = DateTime.Now; @@ -4981,7 +4981,7 @@ namespace BeWo.Service.ServiceImplementations } } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -4998,7 +4998,7 @@ namespace BeWo.Service.ServiceImplementations EmployeeAPPCodeDC emp = new EmployeeAPPCodeDC(); var result = DeletZufallsCode(apikey, kundennummer, "E" + employeeoid); - if(result == 0 || result == 32) + if (result == 0 || result == 32) { try { @@ -5007,14 +5007,14 @@ namespace BeWo.Service.ServiceImplementations var employeeappcode = DAOFactory.SearchDAO.FindAllEmployeeAppCodes(employeeoid); - if(employeeappcode != null) + if (employeeappcode != null) { var anzahl = employeeappcode.Count(); - if(anzahl > 0) + if (anzahl > 0) { - foreach(var code in employeeappcode) + foreach (var code in employeeappcode) { code.EmployeeCode = ""; code.EmployeeCodeGenDate = DateTime.Now; @@ -5038,7 +5038,7 @@ namespace BeWo.Service.ServiceImplementations return emp; } } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5054,7 +5054,7 @@ namespace BeWo.Service.ServiceImplementations { var td = PluginLoader.FindClass(); - if(td != null) + if (td != null) { return td.GetTranslationDictionary(); } @@ -5068,7 +5068,7 @@ namespace BeWo.Service.ServiceImplementations { return MapperFactory.TextbausteinDC_Textbaustein.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive()); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5083,7 +5083,7 @@ namespace BeWo.Service.ServiceImplementations return lTextbausteine.Select(asb => asb.Oid.Value).ToList(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5099,7 +5099,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5114,7 +5114,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Delete(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5126,14 +5126,14 @@ namespace BeWo.Service.ServiceImplementations { var pi = PluginLoader.FindClass(); - if(pi != null) + if (pi != null) { return pi.GetSbdConfig(); } return new SbdConfigDC(); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5145,13 +5145,13 @@ namespace BeWo.Service.ServiceImplementations { var pi = PluginLoader.FindClass(); - if(pi != null) + if (pi != null) { pi.SaveSbdConfig(config); } } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5166,7 +5166,7 @@ namespace BeWo.Service.ServiceImplementations var pPerson = DAOFactory.GenericDAO.LoadByID(pPersonOid); pPerson.Abbreviation = null; - if(pPerson.DateOfBirth != null) + if (pPerson.DateOfBirth != null) { pPerson.DateOfBirth = new DateTime(pPerson.DateOfBirth.Value.Year, 1, 1); } @@ -5175,7 +5175,7 @@ namespace BeWo.Service.ServiceImplementations pPerson.LastName = anonimyzedName; pPerson.Notice = null; - if(pPerson.Address != null) + if (pPerson.Address != null) { pPerson.Address.AddressLine1 = null; pPerson.Address.AddressLine2 = null; @@ -5195,13 +5195,13 @@ namespace BeWo.Service.ServiceImplementations pPerson.UdpUser = anonimyzedName; var bankaccountOid = pPerson.BankAccount?.Oid; - if(bankaccountOid != null) + if (bankaccountOid != null) { pPerson.BankAccount = null; } pPerson.FamilyStatus = null; - if(pPerson.InvoiceAddress != null) + if (pPerson.InvoiceAddress != null) { pPerson.InvoiceAddress.AddressLine1 = null; pPerson.InvoiceAddress.AddressLine2 = null; @@ -5220,7 +5220,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(pPerson); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5233,7 +5233,7 @@ namespace BeWo.Service.ServiceImplementations const string anonimyzedName = "Anonymisiert"; var customer = DAOFactory.GenericDAO.GetByID(pCustomerOid); - if(customer.Person.Oid != null) + if (customer.Person.Oid != null) { AnonymizePerson(customer.Person.Oid.Value); } @@ -5335,7 +5335,7 @@ namespace BeWo.Service.ServiceImplementations }); }); - if(customer.Oid != null) + if (customer.Oid != null) { var bargeldKassen = DAOFactory.SearchDAO.FindBargeldkasse(TableID.Customer, customer.Oid.Value); @@ -5348,7 +5348,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(customer); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5366,7 +5366,7 @@ namespace BeWo.Service.ServiceImplementations var supportConceptOids = customer.SupportConcepts.Select(sc => sc.Oid.Value).ToList(); UserDC user; - if(LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null) + if (LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null) { user = MapperFactory.UserDC_User.MapToNewDC(LoggedInUserOperationContextExt.Current.User); } @@ -5375,19 +5375,19 @@ namespace BeWo.Service.ServiceImplementations user = MapperFactory.UserDC_User.MapToNewDC(SessionFacade.LoggedInUser); } - if(user != null) + if (user != null) { string initial; - if(customer.Person.FirstName.Length > 0) + if (customer.Person.FirstName.Length > 0) { initial = customer.Person.FirstName[0].ToString(); } - else if(customer.Person.LastName.Length > 0) + else if (customer.Person.LastName.Length > 0) { initial = customer.Person.LastName[0].ToString(); } - else if(customer.CustomerAlias?.Length > 0) + else if (customer.CustomerAlias?.Length > 0) { initial = customer.CustomerAlias[0].ToString(); } @@ -5407,16 +5407,16 @@ namespace BeWo.Service.ServiceImplementations var costBearer2SupportConcepts = new List(); var groupsToGetReferencesRemoved = new List(); - foreach(var sc in customer.SupportConcepts) + foreach (var sc in customer.SupportConcepts) { - foreach(var cb2sc in sc.CostBearer2SupportConceptList) + foreach (var cb2sc in sc.CostBearer2SupportConceptList) { groupsToGetReferencesRemoved.AddRangeIfElementsNotIn(DAOFactory.SearchDAO.GroupOfPeopleForSupportConcept(cb2sc.Oid.Value)); costBearer2SupportConcepts.AddIfNotIn(cb2sc); } } - foreach(var group in groupsToGetReferencesRemoved) + foreach (var group in groupsToGetReferencesRemoved) { group.CostBearer2SupportConceptList.RemoveRange(costBearer2SupportConcepts); } @@ -5426,7 +5426,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(customer.SupportConcepts); var additionalServiceGroups = DAOFactory.SearchDAO.GetAdditionalServiceGroupOfPeopleForCustomer(customer.Oid.Value); - foreach(var additionalServiceGroup in additionalServiceGroups) + foreach (var additionalServiceGroup in additionalServiceGroups) { additionalServiceGroup.CustomerList.Remove(customer); } @@ -5443,7 +5443,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(customer); customer.SupportConcepts.DoForEach(s => s.CostBearer2SupportConceptList?.Clear()); - foreach(var assessmentSheetCategory in customer.AssessmentSheetCategoryList) + foreach (var assessmentSheetCategory in customer.AssessmentSheetCategoryList) { assessmentSheetCategory.Customers.Remove(customer); } @@ -5460,7 +5460,7 @@ namespace BeWo.Service.ServiceImplementations invoiceBases2Delete.DoForEach(ib => invoiceItems.AddRange(ib.InvoiceItems)); DAOFactory.GenericDAO.Update(invoiceBases2Delete); - if(supportConceptOids.Any()) + if (supportConceptOids.Any()) { var tasksAndAppointments2Delete = DAOFactory.SearchDAO.GetTasksAndAppointmentsBySupportConceptOids(supportConceptOids); DAOFactory.GenericDAO.Delete(tasksAndAppointments2Delete); @@ -5484,12 +5484,12 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Delete(DAOFactory.GenericDAO.LoadByID(customer.Oid.Value)); - if(deletionHistoryEntry.DeletingEmployeeName != null) + if (deletionHistoryEntry.DeletingEmployeeName != null) { DAOFactory.GenericDAO.Insert(deletionHistoryEntry); } } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5502,7 +5502,7 @@ namespace BeWo.Service.ServiceImplementations { } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5515,7 +5515,7 @@ namespace BeWo.Service.ServiceImplementations { } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5528,7 +5528,7 @@ namespace BeWo.Service.ServiceImplementations { var employee = DAOFactory.GenericDAO.LoadByID(pEmployeeOid); - if(employee.Person.Oid != null) + if (employee.Person.Oid != null) { AnonymizePerson(employee.Person.Oid.Value); } @@ -5541,7 +5541,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(employee); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5555,7 +5555,7 @@ namespace BeWo.Service.ServiceImplementations var appointments2Delete = DAOFactory.SearchDAO.LoadFilteredAppointments(pHasRightToSeeAllEmployeeAppointments, pEmployeeOid, new DateTime(1, 1, 1), pIntervalEnd, pSelectedEmployees, pSelectedCustomers, pSelectedResources, pEmployeesOnly, pCustomersOnly, pResourcesOnly, pPrivateAppointmentsOnly, pOnlyMyAppointments, true); DAOFactory.GenericDAO.Delete(appointments2Delete); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5569,34 +5569,34 @@ namespace BeWo.Service.ServiceImplementations const string foreground = "Foreground=\"Red\""; const string fontWeight = "FontWeight=\"Bold\""; - if(pObjectTid == TableID.Customer && pMessageType == MessageType.Anonymization) + if (pObjectTid == TableID.Customer && pMessageType == MessageType.Anonymization) { actualTextMessage = "Achtung! Das Anonymisieren eines Klienten kann nicht rückgängig gemacht werden! "; } - if(pObjectTid == TableID.Customer && pMessageType == MessageType.DeleteForGood) + if (pObjectTid == TableID.Customer && pMessageType == MessageType.DeleteForGood) { actualTextMessage = "Achtung! Das endgültige Löschen eines Klienten kann nicht rückgängig gemacht werden! "; } - if(pObjectTid == TableID.Person && pMessageType == MessageType.DeleteForGood) + if (pObjectTid == TableID.Person && pMessageType == MessageType.DeleteForGood) { actualTextMessage = "Achtung! Das endgültige Löschen einer Person kann nicht rückgängig gemacht werden! "; } - if(pObjectTid == TableID.Employee && pMessageType == MessageType.Anonymization) + if (pObjectTid == TableID.Employee && pMessageType == MessageType.Anonymization) { actualTextMessage = "Achtung! Das Anonymisieren eines Mitarbeiters kann nicht rückgängig gemacht werden! "; } - if(pObjectTid == TableID.Employee && pMessageType == MessageType.DeleteForGood) + if (pObjectTid == TableID.Employee && pMessageType == MessageType.DeleteForGood) { actualTextMessage = "Achtung! Das endgültige Löschen eines Mitarbeiters kann nicht rückgängig gemacht werden! "; } return $""; } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5619,7 +5619,7 @@ namespace BeWo.Service.ServiceImplementations return MapperFactory.SignatureDC_Signature.MapToNewDC(lOriginal); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5632,7 +5632,7 @@ namespace BeWo.Service.ServiceImplementations var list = DAOFactory.GenericDAO.GetAllActive(); return MapperFactory.BudgetDC_Budget.MapToNewDCs(list); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5645,7 +5645,7 @@ namespace BeWo.Service.ServiceImplementations var budget = MapperFactory.BudgetDC_Budget.MapToNewEntities(budgets); DAOFactory.GenericDAO.Insert(budget); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5657,7 +5657,7 @@ namespace BeWo.Service.ServiceImplementations { ServiceLogic.SetActivationType(pOid2Version, ActivationTypeId.Deleted); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5673,7 +5673,7 @@ namespace BeWo.Service.ServiceImplementations DAOFactory.GenericDAO.Update(lOriginals); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5687,7 +5687,7 @@ namespace BeWo.Service.ServiceImplementations return s.GetAllFlexibleReportEntrys(filter); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5697,7 +5697,7 @@ namespace BeWo.Service.ServiceImplementations { var result = new List(); - foreach(var item in DAOFactory.GenericDAO.GetAllActive().Where(x => x.CreatorOid == LoggedInUserOperationContextExt.Current.User.Oid.Value)) + foreach (var item in DAOFactory.GenericDAO.GetAllActive().Where(x => x.CreatorOid == LoggedInUserOperationContextExt.Current.User.Oid.Value)) { result.Add(MapperFactory.FlexibleReportLayoutDC_FlexibleReportLayout.MapToNewDC(item)); } @@ -5713,7 +5713,7 @@ namespace BeWo.Service.ServiceImplementations flexibleReportLayout.CreatorOid = LoggedInUserOperationContextExt.Current.User.Oid.Value; DAOFactory.GenericDAO.Insert(flexibleReportLayout); } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5731,17 +5731,17 @@ namespace BeWo.Service.ServiceImplementations var toUpdate = new List(); var toDelete = new List(); - foreach(var flexOri in flexOriList) + foreach (var flexOri in flexOriList) { bool gefunden = false; - foreach(var flexNew in flexNewList) + foreach (var flexNew in flexNewList) { - if(flexOri.Oid == flexNew.FlexibleReportOid) + if (flexOri.Oid == flexNew.FlexibleReportOid) { gefunden = true; - if(flexOri.LayoutName != flexNew.LayoutName) + if (flexOri.LayoutName != flexNew.LayoutName) { flexOri.LayoutName = flexNew.LayoutName; DAOFactory.GenericDAO.Update(flexOri); @@ -5751,11 +5751,11 @@ namespace BeWo.Service.ServiceImplementations } } - if(!gefunden) + if (!gefunden) DAOFactory.GenericDAO.Deactivate(flexOri); } } - catch(Exception e) + catch (Exception e) { throw Utils.CreateBeWoFaultException(e); } @@ -5780,7 +5780,7 @@ namespace BeWo.Service.ServiceImplementations return MapperFactory.HomeViewPanelDC_HomeViewPanel.MapToNewDCs( DAOFactory.GenericDAO.GetAllActive()); } - catch(Exception exception) + catch (Exception exception) { throw Utils.CreateBeWoFaultException(exception); } @@ -5797,7 +5797,7 @@ namespace BeWo.Service.ServiceImplementations throw Utils.CreateBeWoFaultException(e); } } - + public IList GetIcf() { try @@ -5871,7 +5871,7 @@ namespace BeWo.Service.ServiceImplementations if (!Enum.TryParse(typeString, out ReportTypes reportType)) return null; - + return MapperFactory.ReportTemplateDC_ReportTemplate.MapToNewDCs(DAOFactory.GenericDAO .GetAllActive().Where(x => x.ReportTemplateType == reportType)); } @@ -5951,5 +5951,52 @@ namespace BeWo.Service.ServiceImplementations throw Utils.CreateBeWoFaultException(e); } } + + public List GetAllDienste() + { + var temp = DAOFactory.GenericDAO.GetAllActive(); + return MapperFactory.DienstDC_Dienst.MapToNewDCs(temp); + } + + public void InsertNewDienst(List dienst) + { + try + { + var temp = MapperFactory.DienstDC_Dienst.MapToNewEntities(dienst); + DAOFactory.GenericDAO.Insert(temp); + } + catch (Exception e) + { + throw Utils.CreateBeWoFaultException(e); + } + } + + public void DeactivateDienst(Dictionary pOid2Version) + { + try + { + ServiceLogic.SetActivationType(pOid2Version, ActivationTypeId.Deleted); + } + catch (Exception e) + { + throw Utils.CreateBeWoFaultException(e); + } + } + + public void UpdateDienst(List dienste) + { + try + { + var temp = DAOFactory.GenericDAO.LoadByIDs(dienste.Select(sc => sc.DienstOid.Value)); + + MapperFactory.DienstDC_Dienst.MergeWithEntitys(dienste, temp); + + DAOFactory.GenericDAO.Update(temp); + } + catch (Exception e) + { + throw Utils.CreateBeWoFaultException(e); + } + } } } diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs index 23dbf8937..b68c63812 100644 --- a/Shared/BeWoEntityEnums.cs +++ b/Shared/BeWoEntityEnums.cs @@ -147,6 +147,7 @@ namespace BS.Shared ReportTemplate = 140, Arbeitszeit = 141, ArbeitszeitEintrag = 142, + Dienst = 143 } public enum SystemEntryID diff --git a/Shared/DataContracts/DienstDC.cs b/Shared/DataContracts/DienstDC.cs new file mode 100644 index 000000000..55d210369 --- /dev/null +++ b/Shared/DataContracts/DienstDC.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Runtime.Serialization; + +using BS.Shared.Core; + +namespace BS.Shared.DataContracts +{ + public class DienstDC : IDataContract + { + [DataMember] + public long? DienstOid { get; set; } + + [DataMember] + public string DienstNotice { get; set; } + + [DataMember] + public long? DienstVersion { get; set; } + + [DataMember] + public string DienstName { get; set; } + + [DataMember] + public string Kurz { get; set; } + + [DataMember] + public string Farbe { get; set; } + + [DataMember] + public DateTime Start { get; set; } + + [DataMember] + public DateTime Ende { get; set; } + + [DataMember] + public int Pause { get; set; } + + public override string ToString() + { + return "[" + DienstOid + "]:" + DienstName; + } + + public override bool Equals(object obj) + { + if (obj is DienstDC d) + { + return DienstOid == d.DienstOid; + } + + return false; + } + + public override int GetHashCode() + { + return GetType().Name.GetHashCode() ^ DienstOid.GetHashCode(); + } + } +} diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj index 11825b0a4..79ac111b0 100644 --- a/Shared/Shared.csproj +++ b/Shared/Shared.csproj @@ -149,6 +149,7 @@ +