diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index a98a8ee0a..1c1a57d66 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -1051,6 +1051,7 @@
+
DPCtrlEmployeeContractTooltip.xaml
diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs
index e90ac745d..ebe56270f 100644
--- a/BeWo/ServiceProxy/Generated.cs
+++ b/BeWo/ServiceProxy/Generated.cs
@@ -1860,6 +1860,10 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BargeldtransaktionshistoryDC))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SignatureDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ConfirmationReceiptSignatureDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
@@ -1888,7 +1892,6 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordValidationResultDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SbdConfigDC))]
- [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SignatureDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.PreisDC))]
@@ -1979,16 +1982,16 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.FLSAnalysisDataDetailDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.StatementType))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureStateType))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Zahlungstyp))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordValidationResult))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.HomeViewPanelType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Auszahlungsintervall))]
- [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Zahlungstyp))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.VertretungsStatus))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SchulbegleitenderZugehoerigkeitsTyp))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.MessageType))]
- [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.StatementType))]
- [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureStateType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UiElementType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))]
@@ -2045,6 +2048,8 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnungDC))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnungViewFilterDC))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnungFilterDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.InvoiceType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.IO.MemoryStream))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.IO.Stream))]
@@ -5274,6 +5279,21 @@ namespace BeWo.ServiceProxy
"aultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List FindServiceRecordsForLastDaysPaginated(out int rowCount, System.Nullable costbearer2SupportConceptOid, int days, System.Nullable employeeOid, int firstResult, int maxResults);
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/LoadBargeldtransaktionshistoryEntries", ReplyAction="http://tempuri.org/IOperationsService/LoadBargeldtransaktionshistoryEntriesRespon" +
+ "se")]
+ [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/LoadBargeldtransaktionshistoryEntriesBeWoFa" +
+ "ultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+ System.Collections.Generic.List LoadBargeldtransaktionshistoryEntries(long transaktionsOid);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteBargeldtransaktionSignature", ReplyAction="http://tempuri.org/IOperationsService/DeleteBargeldtransaktionSignatureResponse")]
+ [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteBargeldtransaktionSignatureBeWoFaultF" +
+ "ault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+ void DeleteBargeldtransaktionSignature(long signatureOid);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllSignatures", ReplyAction="http://tempuri.org/IOperationsService/GetAllSignaturesResponse")]
+ [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllSignaturesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+ System.Collections.Generic.List GetAllSignatures();
+
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteCertainDienstEintragOutOfTable", ReplyAction="http://tempuri.org/IOperationsService/DeleteCertainDienstEintragOutOfTableRespons" +
"e")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteCertainDienstEintragOutOfTableBeWoFau" +
@@ -5840,6 +5860,10 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BargeldtransaktionshistoryDC))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SignatureDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ConfirmationReceiptSignatureDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
@@ -5868,7 +5892,6 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordValidationResultDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SbdConfigDC))]
- [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SignatureDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.PreisDC))]
@@ -5959,16 +5982,16 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.FLSAnalysisDataDetailDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.StatementType))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureStateType))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Zahlungstyp))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordValidationResult))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.HomeViewPanelType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Auszahlungsintervall))]
- [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Zahlungstyp))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.VertretungsStatus))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SchulbegleitenderZugehoerigkeitsTyp))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.MessageType))]
- [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.StatementType))]
- [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureStateType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UiElementType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))]
@@ -6025,6 +6048,8 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnungDC))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnungViewFilterDC))]
+ [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GkvAbrechnungFilterDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.InvoiceType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.IO.MemoryStream))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.IO.Stream))]
@@ -7241,6 +7266,21 @@ namespace BeWo.ServiceProxy
return base.Channel.FindServiceRecordsForLastDaysPaginated(out rowCount, costbearer2SupportConceptOid, days, employeeOid, firstResult, maxResults);
}
+ public System.Collections.Generic.List LoadBargeldtransaktionshistoryEntries(long transaktionsOid)
+ {
+ return base.Channel.LoadBargeldtransaktionshistoryEntries(transaktionsOid);
+ }
+
+ public void DeleteBargeldtransaktionSignature(long signatureOid)
+ {
+ base.Channel.DeleteBargeldtransaktionSignature(signatureOid);
+ }
+
+ public System.Collections.Generic.List GetAllSignatures()
+ {
+ return base.Channel.GetAllSignatures();
+ }
+
public void DeleteCertainDienstEintragOutOfTable(long dienstEintragOid)
{
base.Channel.DeleteCertainDienstEintragOutOfTable(dienstEintragOid);
@@ -9334,6 +9374,22 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/InsertNewGkvAbrechnungen", ReplyAction="http://tempuri.org/IAccountingService/InsertNewGkvAbrechnungenResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/InsertNewGkvAbrechnungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List InsertNewGkvAbrechnungen(System.Collections.Generic.List dc);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/GetGkvAbrechnung", ReplyAction="http://tempuri.org/IAccountingService/GetGkvAbrechnungResponse")]
+ [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/GetGkvAbrechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+ BS.Shared.DataContracts.GkvAbrechnungDC GetGkvAbrechnung(long oid);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/GetAllGkvAbrechnungen", ReplyAction="http://tempuri.org/IAccountingService/GetAllGkvAbrechnungenResponse")]
+ [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/GetAllGkvAbrechnungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+ System.Collections.Generic.List GetAllGkvAbrechnungen();
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/GetFilteredGkvAbrechnungen", ReplyAction="http://tempuri.org/IAccountingService/GetFilteredGkvAbrechnungenResponse")]
+ [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/GetFilteredGkvAbrechnungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+ System.Collections.Generic.List GetFilteredGkvAbrechnungen(BS.Shared.DataContracts.GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingService/MakeNewGkvAbrechnung", ReplyAction="http://tempuri.org/IAccountingService/MakeNewGkvAbrechnungResponse")]
+ [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingService/MakeNewGkvAbrechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+ BS.Shared.DataContracts.GkvAbrechnungDC MakeNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnungFilterDC abrechnungFilterDC);
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -9529,6 +9585,26 @@ namespace BeWo.ServiceProxy
{
return base.Channel.InsertNewGkvAbrechnungen(dc);
}
+
+ public BS.Shared.DataContracts.GkvAbrechnungDC GetGkvAbrechnung(long oid)
+ {
+ return base.Channel.GetGkvAbrechnung(oid);
+ }
+
+ public System.Collections.Generic.List GetAllGkvAbrechnungen()
+ {
+ return base.Channel.GetAllGkvAbrechnungen();
+ }
+
+ public System.Collections.Generic.List GetFilteredGkvAbrechnungen(BS.Shared.DataContracts.GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter)
+ {
+ return base.Channel.GetFilteredGkvAbrechnungen(gkvAbrechnungViewFilter);
+ }
+
+ public BS.Shared.DataContracts.GkvAbrechnungDC MakeNewGkvAbrechnung(BS.Shared.DataContracts.GkvAbrechnungFilterDC abrechnungFilterDC)
+ {
+ return base.Channel.MakeNewGkvAbrechnung(abrechnungFilterDC);
+ }
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
diff --git a/BeWo/View/BeWoWindow.xaml.cs b/BeWo/View/BeWoWindow.xaml.cs
index 2c2afec03..70049c5de 100644
--- a/BeWo/View/BeWoWindow.xaml.cs
+++ b/BeWo/View/BeWoWindow.xaml.cs
@@ -8,7 +8,7 @@ namespace BeWo.View
///
/// Interaktionslogik für BeWoWindow.xaml
///
- public partial class BeWoWindow : Window
+ public partial class BeWoWindow : System.Windows.Window
{
private object _GroupBoxContent;
public object GroupBoxContent
diff --git a/BeWo/View/BeWoWindowBuilder.cs b/BeWo/View/BeWoWindowBuilder.cs
new file mode 100644
index 000000000..2f16f1873
--- /dev/null
+++ b/BeWo/View/BeWoWindowBuilder.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace BeWo.View
+{
+ public static class BeWoWindowBuilder
+ {
+ public static BeWoWindow GetTextViewer(string title, string text, bool fixed_size = false, double height = 600, double width = 400)
+ {
+ if (fixed_size)
+ return GetTextViewer(title, text, height, height, height, width, width, width);
+
+ return GetTextViewer(title, text, 300, height, 1000, 200, width, 1900);
+ }
+
+ public static BeWoWindow GetTextViewer(string title, string text, double min_height, double height, double max_height, double min_width, double width, double max_width)
+ {
+ var control = new TextBlock();
+
+ control.Text = text;
+
+ var scrollviewer = new ScrollViewer();
+
+ scrollviewer.Content = control;
+
+ var beWoWindow = new BeWoWindow();
+
+ beWoWindow.Height = height;
+ beWoWindow.MinHeight = min_height;
+ beWoWindow.MaxHeight= max_height;
+ beWoWindow.Width = width;
+ beWoWindow.MinWidth = min_width;
+ beWoWindow.MaxHeight = max_width;
+
+ beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+ beWoWindow.GroupBoxContent = scrollviewer;
+ beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+ beWoWindow.rootGroupBox.Header = title;
+
+ return beWoWindow;
+ }
+ }
+}
diff --git a/BeWo/View/Detail/Accounting/DigitalInvoiceOverview.xaml.cs b/BeWo/View/Detail/Accounting/DigitalInvoiceOverview.xaml.cs
index d991e01f9..d50d59e26 100644
--- a/BeWo/View/Detail/Accounting/DigitalInvoiceOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/DigitalInvoiceOverview.xaml.cs
@@ -1,144 +1,144 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Web;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Media;
-using System.Windows.Navigation;
-using System.Windows.Threading;
-using BeWo.Core;
-using BeWo.ServiceProxy;
-using BeWo.ViewModel;
-using BeWo.ViewModel.ListViewModel;
-
-using BS.Shared;
-using BS.Shared.Core;
-using BS.Shared.DataContracts;
-using BS.Shared.Extensions;
-
-using DevExpress.Xpf.Editors;
-using DevExpress.Xpf.Grid;
-using Microsoft.Win32;
-
-namespace BeWo.View.Detail.Accounting
-{
- public partial class DigitalInvoiceOverview : BeWoView
- {
- private readonly EquityInvoiceItemEditView _EquityInvoiceItemEditView;
-
- private readonly GeneralInvoiceItemEditView _GeneralInvoiceItemEditView;
-
- private readonly SettlementInvoiceItemEditView _SettlementInvoiceItemEditView;
-
- private readonly SettlementInvoiceItemEditView2 _SettlementInvoiceItemEditView2;
-
- private readonly ServiceInvoiceItemEditView _ServiceInvoiceItemEditView;
-
- private InvoiceBaseListVM _Viewmodel;
-
- public DigitalInvoiceOverview()
- {
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Media;
+using System.Windows.Navigation;
+using System.Windows.Threading;
+using BeWo.Core;
+using BeWo.ServiceProxy;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+
+using DevExpress.Xpf.Editors;
+using DevExpress.Xpf.Grid;
+using Microsoft.Win32;
+
+namespace BeWo.View.Detail.Accounting
+{
+ public partial class DigitalInvoiceOverview : BeWoView
+ {
+ private readonly EquityInvoiceItemEditView _EquityInvoiceItemEditView;
+
+ private readonly GeneralInvoiceItemEditView _GeneralInvoiceItemEditView;
+
+ private readonly SettlementInvoiceItemEditView _SettlementInvoiceItemEditView;
+
+ private readonly SettlementInvoiceItemEditView2 _SettlementInvoiceItemEditView2;
+
+ private readonly ServiceInvoiceItemEditView _ServiceInvoiceItemEditView;
+
+ private InvoiceBaseListVM _Viewmodel;
+
+ public DigitalInvoiceOverview()
+ {
this.InitializeComponent();
this.ViewModel = new InvoiceBaseListVM(null);
-
- RefreshInvoiceList();
- }
-
- private void RefreshInvoiceList()
- {
- DateTime? start = null;
- DateTime? end = null;
-
- if (ViewModel.DateTimeSpanFilter != null)
- {
- start = ViewModel.DateTimeSpanFilter.StartDate;
- end = ViewModel.DateTimeSpanFilter.EndDate;
- }
+
+ RefreshInvoiceList();
+ }
+
+ private void RefreshInvoiceList()
+ {
+ DateTime? start = null;
+ DateTime? end = null;
+
+ if (ViewModel.DateTimeSpanFilter != null)
+ {
+ start = ViewModel.DateTimeSpanFilter.StartDate;
+ end = ViewModel.DateTimeSpanFilter.EndDate;
+ }
else
{
start = new DateTime(2023, 1, 1);
end = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
}
- ServiceFacade.DoAccountingServiceAsync(s => s.GetInvoiceBases(start, end), UpdateInvoiceList);
- }
-
- private void UpdateInvoiceList(IList dcList)
- {
- this.Dispatcher.BeginInvoke(
- DispatcherPriority.Normal,
- (Action)delegate
- {
- ViewModel.UpdateList(dcList.Where(x => true).ToList());
- this.gridView.BestFitColumns();
- });
- }
-
- private InvoiceBaseListVM ViewModel
- {
- get
- {
- return this._Viewmodel;
- }
-
- set
- {
- this.DataContext = value;
- this._Viewmodel = value;
- }
- }
-
- private void RefreshItemInList(InvoiceBaseDC cb)
- {
- this.Dispatch(
- delegate
- {
- var old = this.ViewModel.VMList.Single(i => i.DataContract.InvoiceBaseOid.Equals(cb.InvoiceBaseOid));
- var lNew = new InvoiceBaseVM(cb);
-
- this.ViewModel.VMList.Remove(old);
- this.ViewModel.VMList.Add(lNew);
- this.datagrid_invoices.RefreshData();
- this.gridView.FocusedRow = lNew;
- });
- }
-
- private void gridView_Loaded(object sender, RoutedEventArgs e)
- {
- this.gridView.BestFitColumns();
- }
-
- private void gridView_ShownEditor(object sender, EditorEventArgs e)
- {
- if (e.Editor is CheckEdit)
- {
- var ed = (CheckEdit)e.Editor;
- ed.Tag = e.Row;
- }
- }
-
- private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
- {
- var uri = ((Hyperlink)sender).NavigateUri;
- string dcid = HttpUtility.ParseQueryString(uri.Query).Get("ibid");
-
- var schaarf = ServiceFacade.DoOperationsServiceSync(x => x.GetDakotaFileFormat(dcid));
-
- Output.Text = schaarf;
- }
-
- private void ReloadButton_OnClick(object sender, RoutedEventArgs e)
- {
- RefreshInvoiceList();
- }
-
- private void YearMonthFilter_FilterSpanChanged(object sender, EventArgs e)
- {
- this.ViewModel.DateTimeSpanFilter = e.Data;
- RefreshInvoiceList();
- }
- }
+ ServiceFacade.DoAccountingServiceAsync(s => s.GetInvoiceBases(start, end), UpdateInvoiceList);
+ }
+
+ private void UpdateInvoiceList(IList dcList)
+ {
+ this.Dispatcher.BeginInvoke(
+ DispatcherPriority.Normal,
+ (Action)delegate
+ {
+ ViewModel.UpdateList(dcList.Where(x => true).ToList());
+ this.gridView.BestFitColumns();
+ });
+ }
+
+ private InvoiceBaseListVM ViewModel
+ {
+ get
+ {
+ return this._Viewmodel;
+ }
+
+ set
+ {
+ this.DataContext = value;
+ this._Viewmodel = value;
+ }
+ }
+
+ private void RefreshItemInList(InvoiceBaseDC cb)
+ {
+ this.Dispatch(
+ delegate
+ {
+ var old = this.ViewModel.VMList.Single(i => i.DataContract.InvoiceBaseOid.Equals(cb.InvoiceBaseOid));
+ var lNew = new InvoiceBaseVM(cb);
+
+ this.ViewModel.VMList.Remove(old);
+ this.ViewModel.VMList.Add(lNew);
+ this.datagrid_invoices.RefreshData();
+ this.gridView.FocusedRow = lNew;
+ });
+ }
+
+ private void gridView_Loaded(object sender, RoutedEventArgs e)
+ {
+ this.gridView.BestFitColumns();
+ }
+
+ private void gridView_ShownEditor(object sender, EditorEventArgs e)
+ {
+ if (e.Editor is CheckEdit)
+ {
+ var ed = (CheckEdit)e.Editor;
+ ed.Tag = e.Row;
+ }
+ }
+
+ private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
+ {
+ var uri = ((Hyperlink)sender).NavigateUri;
+ string dcid = HttpUtility.ParseQueryString(uri.Query).Get("ibid");
+
+ var schaarf = ServiceFacade.DoOperationsServiceSync(x => x.GetDakotaFileFormat(dcid));
+
+ Output.Text = schaarf;
+ }
+
+ private void ReloadButton_OnClick(object sender, RoutedEventArgs e)
+ {
+ RefreshInvoiceList();
+ }
+
+ private void YearMonthFilter_FilterSpanChanged(object sender, EventArgs e)
+ {
+ this.ViewModel.DateTimeSpanFilter = e.Data;
+ RefreshInvoiceList();
+ }
+ }
}
\ No newline at end of file
diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
index a8e17d48b..766344501 100644
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
@@ -1,4 +1,13 @@
-
+
@@ -27,7 +36,7 @@
-
+
@@ -41,22 +50,26 @@
+
+
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
index 7a942a867..9a5f34b1d 100644
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
@@ -1,4 +1,5 @@
using System;
+using System.Activities.Statements;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@@ -58,7 +59,19 @@ namespace BeWo.View.Detail.Accounting
this._NewGkvAbrechnungPopUpView.CreateButtonClicked += (s, e) =>
{
this.MainControl.CloseCurrentPopUp();
- ServiceFacade.DoAccountingServiceSync(svc => svc.InsertNewGkvAbrechnungen(e.Data));
+ var checked_invoice_bases = _NewGkvAbrechnungPopUpView.ViewModel.InvoiceBases.Where(x => x.IsChecked).Select(x => x.DataContract.InvoiceBaseOid.Value).ToList();
+ var gkv_abrechnung = e.Data.First();
+ var gkv_filter = new GkvAbrechnungFilterDC(gkv_abrechnung);
+
+ gkv_abrechnung.InvoiceBaseOids = checked_invoice_bases;
+
+ ServiceFacade.DoAccountingServiceAsync(
+ svc => svc.MakeNewGkvAbrechnung(gkv_filter),
+ () => Dispatcher.BeginInvoke(DispatcherPriority.Normal,
+ (Action)delegate
+ {
+ RefreshGkvAbrechnungenList();
+ }));
};
this._EquityInvoiceItemEditView = new EquityInvoiceItemEditView();
@@ -82,19 +95,22 @@ namespace BeWo.View.Detail.Accounting
}
private void RefreshGkvAbrechnungenList()
- {
- DateTime? start = null;
- DateTime? end = null;
-
- if (ViewModel.DateTimeSpanFilter != null)
- {
- start = ViewModel.DateTimeSpanFilter.StartDate;
- end = ViewModel.DateTimeSpanFilter.EndDate;
- }
-
- bool filterByInvoiceDate = radioFilterByInvoiceDate.IsChecked.Value;
-
- //ServiceFacade.DoAccountingServiceAsync(s => s.GetInvoiceBases2(start, end, filterByInvoiceDate), UpdateGkvAbrechnungList);
+ {
+ if (ViewModel.DateTimeSpanFilter == null)
+ {
+ ServiceFacade.DoAccountingServiceAsync(x => x.GetAllGkvAbrechnungen(), UpdateGkvAbrechnungList);
+ return;
+ }
+
+ var filter = new GkvAbrechnungViewFilterDC();
+
+ filter.FilterTime = true;
+ filter.Start = ViewModel.DateTimeSpanFilter.StartDate;
+ filter.End = ViewModel.DateTimeSpanFilter.EndDate;
+
+ filter.FilterForInvoiceDate = radioFilterByInvoiceDate.IsChecked.Value;
+
+ ServiceFacade.DoAccountingServiceAsync(s => s.GetFilteredGkvAbrechnungen(filter), UpdateGkvAbrechnungList);
}
private void UpdateGkvAbrechnungList(IList dcList)
@@ -105,6 +121,7 @@ namespace BeWo.View.Detail.Accounting
{
ViewModel.UpdateList(dcList);
this.gridView.BestFitColumns();
+ ViewModel.UpdateList(dcList);
});
}
@@ -155,10 +172,21 @@ namespace BeWo.View.Detail.Accounting
{
mIgnoreCheckChanges = true;
this.ViewModel.DateTimeSpanFilter = e.Data;
- RefreshGkvAbrechnungenList();
+ RefreshGkvAbrechnungenList();
mIgnoreCheckChanges = false;
}
+ private void btn_nutz_Click(object sender, RoutedEventArgs e)
+ {
+ var vm = this.datagrid_gkvAbrechnungen.GetCurrentValue();
+ BeWoWindowBuilder.GetTextViewer("Nutzdatei", vm.Nutzdatendatei, false).ShowDialog();
+ }
+ private void btn_auf_Click(object sender, RoutedEventArgs e)
+ {
+ var vm = this.datagrid_gkvAbrechnungen.GetCurrentValue();
+
+ BeWoWindowBuilder.GetTextViewer("Auftragsdatei", vm.Auftragsdatei, false).ShowDialog();
+ }
private void btn_delete_Click(object sender, RoutedEventArgs e)
{
mIgnoreCheckChanges = true;
@@ -171,7 +199,6 @@ namespace BeWo.View.Detail.Accounting
}
mIgnoreCheckChanges = false;
}
-
private void btn_storno_Click(object sender, RoutedEventArgs e)
{
mIgnoreCheckChanges = true;
@@ -191,18 +218,14 @@ namespace BeWo.View.Detail.Accounting
mIgnoreCheckChanges = false;
}
-
private void btn_edit_Click(object sender, RoutedEventArgs e)
{
var vm = this.datagrid_gkvAbrechnungen.GetCurrentValue();
}
-
-
private void gridView_Loaded(object sender, RoutedEventArgs e)
{
this.gridView.BestFitColumns();
}
-
private void gridView_ShownEditor(object sender, EditorEventArgs e)
{
if (e.Editor is CheckEdit)
@@ -211,17 +234,14 @@ namespace BeWo.View.Detail.Accounting
ed.Tag = e.Row;
}
}
-
private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
{
- BeWoUtils.NavigateToReportUri(((Hyperlink)sender).NavigateUri.ToString(), "Druckvorschau");
+ BeWoUtils.NavigateToReportUri(((Hyperlink)sender).NavigateUri.ToString(), "Druckvorschau");
}
-
- private void ReloadButton_OnClick(object sender, RoutedEventArgs e)
- {
- RefreshGkvAbrechnungenList();
+ private void ReloadButton_OnClick(object sender, RoutedEventArgs e)
+ {
+ RefreshGkvAbrechnungenList();
}
-
private void btn_storno_Initialized(object sender, EventArgs e)
{
if (!BeWoApp.AppSettings.AllowStorno)
@@ -230,7 +250,6 @@ namespace BeWo.View.Detail.Accounting
btn.Visibility = Visibility.Collapsed;
}
}
-
private void gridView_CellValueChanged(object sender, CellValueChangedEventArgs e)
{
if (e.Column != null && e.Column.FieldName == "IsPaid")
@@ -241,7 +260,6 @@ namespace BeWo.View.Detail.Accounting
}
}
}
-
private void TableView_OnCustomRowAppearance(object sender, CustomRowAppearanceEventArgs e)
{
if (e.Property != null && e.Property.Name == "Background")
@@ -256,7 +274,6 @@ namespace BeWo.View.Detail.Accounting
*/
}
}
-
private void button_checkAll_Click(object sender, RoutedEventArgs e)
{
var visible = GetVisibleVMs();
@@ -265,7 +282,6 @@ namespace BeWo.View.Detail.Accounting
item.IsChecked = true;
}
}
-
private void button_uncheckAll_Click(object sender, RoutedEventArgs e)
{
var visible = GetVisibleVMs();
@@ -274,7 +290,6 @@ namespace BeWo.View.Detail.Accounting
item.IsChecked = false;
}
}
-
private void button_printInvoices_Click(object sender, RoutedEventArgs e)
{
var list = new List();
@@ -297,13 +312,13 @@ namespace BeWo.View.Detail.Accounting
// PrintInvoices(list);
}
-
private void NewButton_OnClick(object sender, RoutedEventArgs e)
{
GkvAbrechnungDC gkvAbrechnungDC = new GkvAbrechnungDC();
int year = DateTime.Now.Year;
int month = DateTime.Now.Month - 1;
- gkvAbrechnungDC.AbrechnungsZeitraumStart = new DateTime(year, month, 1);
+ gkvAbrechnungDC.AbrechnungsZeitraumStart = new DateTime(1999, 1, 1);
+ //new DateTime(year, month, 1);
gkvAbrechnungDC.AbrechnungsZeitraumEnde = new DateTime(year, month, DateTime.DaysInMonth(year, month));
GkvAbrechnungVM gkvAbrechnungVM = new GkvAbrechnungVM(gkvAbrechnungDC);
_NewGkvAbrechnungPopUpView.ViewModel = gkvAbrechnungVM;
@@ -313,10 +328,9 @@ namespace BeWo.View.Detail.Accounting
private void PrintInvoices(List list)
{
var oidList = list.Select(i => i.DataContract.InvoiceBaseOid.Value).ToList();
-
+
ServiceFacade.DoReportServiceAsync(s => s.CreateInvoiceListReport(oidList), ms => BeWoApp.MainControl.Dispatch(() => BeWoUtils.ShowReportWindow(ms, "Rechnungen")));
}
-
private IList GetVisibleVMs()
{
var list = new List();
@@ -340,7 +354,7 @@ namespace BeWo.View.Detail.Accounting
return list;
}
-
+
}
}
\ No newline at end of file
diff --git a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView .xaml.cs b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView .xaml.cs
index 09b6deb37..6350dbea5 100644
--- a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView .xaml.cs
+++ b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView .xaml.cs
@@ -133,7 +133,7 @@ namespace BeWo.View.Detail.Accounting
{
popup_organisation.IsOpen = false;
gkvsearchview.ItemSelected -= gkvsearchview_OrganisationSelected;
- ViewModel.IKEmpfang = e.Data.IKKrankenkasse;
+ ViewModel.IKVersichertenKarte = e.Data.IKKrankenkasse;
ViewModel.IKDatenannahmestelle = e.Data.IKDatenannahmestelle;
popupedit_GkvSearch.Text = e.Data.ToString();
diff --git a/BeWo/View/Master/FinanceView.xaml.cs b/BeWo/View/Master/FinanceView.xaml.cs
index df743ed41..6df1c0ed4 100644
--- a/BeWo/View/Master/FinanceView.xaml.cs
+++ b/BeWo/View/Master/FinanceView.xaml.cs
@@ -135,12 +135,6 @@ namespace BeWo.View.Master
tabitem_bargeldverwaltung.Visibility = Visibility.Collapsed;
}
- if (!BeWoApp.AppSettings.AllowGkvAbrechnung)
- {
- tabitem_gkvabrechnung.Visibility = Visibility.Collapsed;
- tabitem_gkvabrechnung_alt.Visibility = Visibility.Collapsed;
- }
-
if (BeWoApp.AppSettings.AllowGkvAbrechnung)
{
tabitem_gkvabrechnung.Visibility = Visibility.Visible;
diff --git a/BeWo/ViewModel/GkvAbrechnungVM.cs b/BeWo/ViewModel/GkvAbrechnungVM.cs
index b560c3268..c9fca8fd8 100644
--- a/BeWo/ViewModel/GkvAbrechnungVM.cs
+++ b/BeWo/ViewModel/GkvAbrechnungVM.cs
@@ -27,54 +27,43 @@ UebertragenAm
AntwortErhaltenAm
AntwortEntschluesseltAm
*/
- public static string PropertyName_IKDatenannahmestelle = "IKDatenannahmestelle";
-
- public static string PropertyName_IKEmpfang = "IKEmpfang";
-
- public static string PropertyName_IKLeistungserbringer = "IKLeistungserbringer";
-
public static string PropertyName_AbrechnungsZeitraumStart = "AbrechnungsZeitraumStart";
-
public static string PropertyName_AbrechnungsZeitraumEnde = "AbrechnungsZeitraumEnde";
- public static string PropertyName_Nutzdatendatei = "Nutzdatendatei";
-
+ public static string PropertyName_Nutzdatendatei = "Nutzdatendatei";
public static string PropertyName_Auftragsdatei = "Auftragsdatei";
-
public static string PropertyName_Transfername = "Transfername";
+ public static string PropertyName_ErstelltAm = "ErstelltAm";
public static string PropertyName_VerschluesseltAm = "VerschluesseltAm";
-
public static string PropertyName_UebertragenAm = "UebertragenAm";
-
public static string PropertyName_AntwortErhaltenAm = "AntwortErhaltenAm";
-
public static string PropertyName_AntwortEntschluesseltAm = "AntwortEntschluesseltAm";
- private string _IKDatenannahmestelle;
-
- private string _IKEmpfang;
+ private long? _GkvAbrechnungOid;
+ private long? _GkvAbrechnungVersion;
+ private string _Notice;
private string _IKLeistungserbringer;
+ private string _IKVersichertenKarte;
+ private string _IKKostenträger;
+ private string _IKDatenannahmestelle;
private DateTime? _AbrechnungsZeitraumStart;
-
private DateTime? _AbrechnungsZeitraumEnde;
private string _Nutzdatendatei;
-
private string _Auftragsdatei;
-
private string _Transfername;
+ private DateTime? _ErstelltAm;
private DateTime? _VerschluesseltAm;
-
private DateTime? _UebertragenAm;
-
private DateTime? _AntwortErhaltenAm;
-
private DateTime? _AntwortEntschluesseltAm;
+ private decimal _Betrag;
+
internal bool _IsChecked;
private BindingList _InvoiceBases;
@@ -82,21 +71,37 @@ AntwortEntschluesseltAm
public GkvAbrechnungVM(GkvAbrechnungDC pDC) : base(pDC, !pDC.GkvAbrechnungOid.HasValue)
{
- _InvoiceBases = new BindingList ();
+ _InvoiceBases = new BindingList();
}
- [ValidationAttribute(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
- public string IKEmpfang
+ [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+ public string IKVersichertenKarte
{
- get { return this._IKEmpfang; }
+ get { return this._IKVersichertenKarte; }
set
{
- if (this.AreDifferent(this._IKEmpfang, value))
+ if (this.AreDifferent(this._IKVersichertenKarte, value))
{
- this._IKEmpfang = value;
- this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IKEmpfang, value), PropertyName_IKEmpfang);
- this.FirePropertyChanged(PropertyName_IKEmpfang);
+ this._IKVersichertenKarte = value;
+ this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IKVersichertenKarte, value), nameof(IKVersichertenKarte));
+ this.FirePropertyChanged(nameof(IKVersichertenKarte));
+ }
+ }
+ }
+
+ [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+ public string IKKostenträger
+ {
+ get { return this._IKKostenträger; }
+
+ set
+ {
+ if (this.AreDifferent(this._IKKostenträger, value))
+ {
+ this._IKKostenträger = value;
+ this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IKKostenträger, value), nameof(IKKostenträger));
+ this.FirePropertyChanged(nameof(IKKostenträger));
}
}
}
@@ -111,8 +116,8 @@ AntwortEntschluesseltAm
if (this.AreDifferent(this._IKDatenannahmestelle, value))
{
this._IKDatenannahmestelle = value;
- this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IKDatenannahmestelle, value), PropertyName_IKDatenannahmestelle);
- this.FirePropertyChanged(PropertyName_IKDatenannahmestelle);
+ this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IKDatenannahmestelle, value), nameof(IKDatenannahmestelle));
+ this.FirePropertyChanged(nameof(IKDatenannahmestelle));
}
}
}
@@ -126,12 +131,14 @@ AntwortEntschluesseltAm
if (this.AreDifferent(this._IKLeistungserbringer, value))
{
this._IKLeistungserbringer = value;
- this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IKLeistungserbringer, value), PropertyName_IKLeistungserbringer);
- this.FirePropertyChanged(PropertyName_IKLeistungserbringer);
+ this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IKLeistungserbringer, value), nameof(IKLeistungserbringer));
+ this.FirePropertyChanged(nameof(IKLeistungserbringer));
}
}
}
+ public string AbrechnungsZeitraum => $"{AbrechnungsZeitraumStart.Value.ToShortDateString()} - {AbrechnungsZeitraumEnde.Value.ToShortDateString()}";
+
[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public DateTime? AbrechnungsZeitraumStart
{
@@ -144,6 +151,10 @@ AntwortEntschluesseltAm
this._AbrechnungsZeitraumStart = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.AbrechnungsZeitraumStart, value), PropertyName_AbrechnungsZeitraumStart);
this.FirePropertyChanged(PropertyName_AbrechnungsZeitraumStart);
+
+ // RE893748923
+ // var day = value.Value.Day;
+ // AbrechnungsZeitraumEnde = value.Value.AddDays(1 - day).AddMonths(1).AddDays(-1);
}
}
}
@@ -212,6 +223,22 @@ AntwortEntschluesseltAm
}
}
+ [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+ public DateTime? ErstelltAm
+ {
+ get { return this._ErstelltAm; }
+
+ set
+ {
+ if (this.AreDifferent(this._ErstelltAm, value))
+ {
+ this._ErstelltAm = value;
+ this.StoreDirtyInformation(this.AreDifferent(this.DataContract.ErstelltAm, value), nameof(ErstelltAm));
+ this.FirePropertyChanged(nameof(ErstelltAm));
+ }
+ }
+ }
+
[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public DateTime? VerschluesseltAm
{
@@ -276,6 +303,69 @@ AntwortEntschluesseltAm
}
}
+ [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+ public long? GkvAbrechnungOid
+ {
+ get { return this._GkvAbrechnungOid; }
+
+ set
+ {
+ if (this.AreDifferent(this._GkvAbrechnungOid, value))
+ {
+ this._GkvAbrechnungOid = value;
+ this.StoreDirtyInformation(this.AreDifferent(this.DataContract.GkvAbrechnungOid, value), nameof(GkvAbrechnungOid));
+ this.FirePropertyChanged(nameof(GkvAbrechnungOid));
+ }
+ }
+ }
+
+ [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+ public long? GkvAbrechnungVersion
+ {
+ get { return this._GkvAbrechnungOid; }
+
+ set
+ {
+ if (this.AreDifferent(this._GkvAbrechnungVersion, value))
+ {
+ this._GkvAbrechnungVersion = value;
+ this.StoreDirtyInformation(this.AreDifferent(this.DataContract.GkvAbrechnungVersion, value), nameof(GkvAbrechnungVersion));
+ this.FirePropertyChanged(nameof(GkvAbrechnungVersion));
+ }
+ }
+ }
+ [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+ public string Notice
+ {
+ get { return this._Notice; }
+
+ set
+ {
+ if (this.AreDifferent(this._Notice, value))
+ {
+ this._Notice = value;
+ this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Notice, value), nameof(Notice));
+ this.FirePropertyChanged(nameof(Notice));
+ }
+ }
+ }
+
+ [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+ public decimal Betrag
+ {
+ get { return this._Betrag; }
+
+ set
+ {
+ if (this.AreDifferent(this._Betrag, value))
+ {
+ this._Betrag = value;
+ this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Betrag, value), nameof(Betrag));
+ this.FirePropertyChanged(nameof(Betrag));
+ }
+ }
+ }
+
public bool IsChecked
{
get { return _IsChecked; }
@@ -298,34 +388,49 @@ AntwortEntschluesseltAm
protected override void InitByDataContract(GkvAbrechnungDC pDataContract)
{
- this._IKDatenannahmestelle= pDataContract.IKDatenannahmestelle;
- this._IKDatenannahmestelle = pDataContract.IKDatenannahmestelle;
- this._IKDatenannahmestelle = pDataContract.IKDatenannahmestelle;
- this._AbrechnungsZeitraumStart = pDataContract.AbrechnungsZeitraumStart;
- this._AbrechnungsZeitraumEnde = pDataContract.AbrechnungsZeitraumEnde;
- this._Nutzdatendatei = pDataContract.Nutzdatendatei;
- this._Auftragsdatei = pDataContract.Auftragsdatei;
- this._Transfername = pDataContract.Transfername;
- this._VerschluesseltAm = pDataContract.VerschluesseltAm;
- this._UebertragenAm = pDataContract.UebertragenAm;
- this._AntwortErhaltenAm = pDataContract.AntwortErhaltenAm;
- this._AntwortEntschluesseltAm = pDataContract.AntwortEntschluesseltAm;
+ _IKDatenannahmestelle = pDataContract.IKDatenannahmestelle;
+ _IKKostenträger = pDataContract.IKKostenträger;
+ _IKLeistungserbringer = pDataContract.IKLeistungserbringer;
+ _IKVersichertenKarte = pDataContract.IKVersichertenKarte;
+ _AbrechnungsZeitraumStart = pDataContract.AbrechnungsZeitraumStart;
+ _AbrechnungsZeitraumEnde = pDataContract.AbrechnungsZeitraumEnde;
+ _Nutzdatendatei = pDataContract.Nutzdatendatei;
+ _Auftragsdatei = pDataContract.Auftragsdatei;
+ _Transfername = pDataContract.Transfername;
+ _VerschluesseltAm = pDataContract.VerschluesseltAm;
+ _UebertragenAm = pDataContract.UebertragenAm;
+ _AntwortErhaltenAm = pDataContract.AntwortErhaltenAm;
+ _AntwortEntschluesseltAm = pDataContract.AntwortEntschluesseltAm;
+ _ErstelltAm = pDataContract.ErstelltAm;
+
+ _GkvAbrechnungOid = pDataContract.GkvAbrechnungOid;
+ _GkvAbrechnungVersion = pDataContract.GkvAbrechnungVersion;
+ _Notice = pDataContract.Notice;
+
+ _Betrag = pDataContract.Betrag;
}
protected override GkvAbrechnungDC MapToDataContract(GkvAbrechnungDC pDataContract, bool doCommit)
{
- pDataContract.IKDatenannahmestelle = this._IKDatenannahmestelle;
- pDataContract.IKEmpfang = this._IKEmpfang;
- pDataContract.IKLeistungserbringer = this._IKLeistungserbringer;
- pDataContract.AbrechnungsZeitraumStart = this._AbrechnungsZeitraumStart;
- pDataContract.AbrechnungsZeitraumEnde = this._AbrechnungsZeitraumEnde;
- pDataContract.Nutzdatendatei = this._Nutzdatendatei;
- pDataContract.Auftragsdatei = this._Auftragsdatei;
- pDataContract.Transfername= this._Transfername;
- pDataContract.VerschluesseltAm = this._VerschluesseltAm;
- pDataContract.UebertragenAm = this._UebertragenAm;
- pDataContract.AntwortErhaltenAm = this._AntwortErhaltenAm;
- pDataContract.AntwortEntschluesseltAm= this._AntwortEntschluesseltAm;
+ pDataContract.IKDatenannahmestelle = _IKDatenannahmestelle;
+ pDataContract.IKVersichertenKarte = _IKVersichertenKarte;
+ pDataContract.IKKostenträger = _IKKostenträger;
+ pDataContract.IKLeistungserbringer = _IKLeistungserbringer;
+ pDataContract.AbrechnungsZeitraumStart = _AbrechnungsZeitraumStart;
+ pDataContract.AbrechnungsZeitraumEnde = _AbrechnungsZeitraumEnde;
+ pDataContract.Nutzdatendatei = _Nutzdatendatei;
+ pDataContract.Auftragsdatei = _Auftragsdatei;
+ pDataContract.Transfername = _Transfername;
+ pDataContract.VerschluesseltAm = _VerschluesseltAm;
+ pDataContract.UebertragenAm = _UebertragenAm;
+ pDataContract.AntwortErhaltenAm = _AntwortErhaltenAm;
+ pDataContract.AntwortEntschluesseltAm = _AntwortEntschluesseltAm;
+ pDataContract.ErstelltAm = _ErstelltAm;
+ pDataContract.GkvAbrechnungOid = _GkvAbrechnungOid;
+ pDataContract.GkvAbrechnungVersion = _GkvAbrechnungVersion;
+
+ pDataContract.Notice = _Notice;
+ pDataContract.Betrag = _Betrag;
return pDataContract;
}
diff --git a/BeWo/ViewModel/ListViewModel/GkvAbrechnungListVM.cs b/BeWo/ViewModel/ListViewModel/GkvAbrechnungListVM.cs
index b21bd9edf..b27878e85 100644
--- a/BeWo/ViewModel/ListViewModel/GkvAbrechnungListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/GkvAbrechnungListVM.cs
@@ -32,7 +32,6 @@ namespace BeWo.ViewModel.ListViewModel
{
this._DateTimeSpanFilter = value;
this.FirePropertyChanged(PropertyName_DateTimeSpanFilter);
-
}
}
}
@@ -40,7 +39,11 @@ namespace BeWo.ViewModel.ListViewModel
internal void UpdateList(IList dcList)
{
this.VMList.Clear();
- //this.VMList.AddRange(dcList.Select(CreateVM));
+
+ foreach (var dc in dcList)
+ {
+ VMList.Add(CreateVM(dc));
+ }
this.FirePropertyChanged(PropertyName_FilterResultAmountSum);
this.FirePropertyChanged(PropertyName_FilterResultAmountNotPaidSum);
diff --git a/Dakota/Logic/DakotaInfoCreator.cs b/Dakota/Logic/DakotaInfoCreator.cs
index 4e17434ee..ebc1432f9 100644
--- a/Dakota/Logic/DakotaInfoCreator.cs
+++ b/Dakota/Logic/DakotaInfoCreator.cs
@@ -87,7 +87,7 @@ namespace Dakota.Logic
info.Korrektur = 0;
// info.DateigrosseNutzdaten = 0;
// info.DateigrosseUbertragung = 0;
- info.Zeichensatz = "l1";
+ info.Zeichensatz = "I1";
info.Komprimierung = 0;
info.Verschlusselungsart = 0;
info.ElektronischeUnterschrift = 0;
@@ -169,8 +169,6 @@ namespace Dakota.Logic
return pos;
}
-
-
// -----------------------------------------------------------------------------------------------------------------------------------
private static InfoNachricht CreateDakotaInfoNachricht(bool isSLGA, int version)
@@ -230,7 +228,8 @@ namespace Dakota.Logic
var info = new InfoAbrechnungsfall();
info.VersichtertenNummer = infoParameter.Customer.InsuranceNumber;
- info.Versichertenstatus = infoParameter.Customer.VersichertenStatus;
+ info.Versichertenstatus = "50000";
+ //infoParameter.Customer.VersichertenStatus;
info.Beleginformation = SchlüsselBeleginformation.KeineBeleguebermittlung;
info.Belegnummer = infoParameter.Belegnummer;
diff --git a/Dakota/Logic/DakotaManager.cs b/Dakota/Logic/DakotaManager.cs
index 1c8303e72..3f789e703 100644
--- a/Dakota/Logic/DakotaManager.cs
+++ b/Dakota/Logic/DakotaManager.cs
@@ -30,9 +30,11 @@ namespace Dakota.Logic
DakotaInfoAufDict = new Dictionary();
}
- public void Add(InfoParameterInvoiceItem info) => Add(info.ServiceInvoice, info.Organisation, info.Customer, info.Mandator);
public void Add(ServiceInvoiceDC serviceInvoice, OrganisationDC organisation, CustomerDC customer, MandatorDC mandator)
{
+ try
+ {
+
var ik_datenannahmestelle = organisation.IKDatenannahmestelle;
var success = DakotaInfoNutzDict.TryGetValue(ik_datenannahmestelle, out InfoDateiNutzdaten nutzdaten);
@@ -56,6 +58,12 @@ namespace Dakota.Logic
nutzdaten.AddInfoParameter(info_nutz_item, Version);
}
}
+
+ }
+ catch(Exception e)
+ {
+
+ }
}
public void Apply()
@@ -74,32 +82,45 @@ namespace Dakota.Logic
}
}
- public void Save()
+ public void Save(string root_path, bool debug_mode = false)
{
+ if (!root_path.EndsWith("\\"))
+ {
+ root_path += '\\';
+ }
+
foreach (var ik_datenannahmestelle in DakotaFileDict.Keys)
{
var code = DakotaFileDict[ik_datenannahmestelle];
- var empfang = code.GetIKEmpfang();
+ var empfang = code.GetIKDatenannahmestelle();
var transferdateiname = code.GetTransferName();
- var path = @"C:\Projects\out";
- var pathauf = @"C:\Projects\out.auf";
- var path2 = $@"C:\dakotale\TP5Daten\{empfang}\{transferdateiname}";
- var path2auf = $@"C:\dakotale\TP5Daten\{empfang}\{transferdateiname}.auf";
- var path3 = $@"C:\dakotale\TP5Daten\{empfang}";
+ string subpath;
+ if (debug_mode)
+ {
+ subpath = $"{empfang}-{transferdateiname}";
+ }
+ else
+ {
+ subpath = $@"{empfang}\{transferdateiname}";
+ }
+
+ //var pathauf = @"C:\Projects\out.auf";
+ //var path2 = $@"C:\dakotale\TP5Daten\{empfang}\{transferdateiname}";
+ //var path2auf = $@"C:\dakotale\TP5Daten\{empfang}\{transferdateiname}.auf";
+ //var path3 = $@"C:\dakotale\TP5Daten\{empfang}";
var auftragsdatei = code.GetAuftragsdatei();
var nutzdatendatei = code.GetNutzdatendatei();
var auftragsdatei2 = Encoding.GetEncoding("ISO-8859-1").GetBytes(auftragsdatei);
- Directory.CreateDirectory(path3);
- File.WriteAllText(path2, nutzdatendatei);
- File.WriteAllBytes(path2auf, auftragsdatei2);
+ var finalpath = root_path + subpath;
- File.WriteAllText(path, nutzdatendatei);
- File.WriteAllBytes(pathauf, auftragsdatei2);
+ Directory.CreateDirectory(root_path);
+ File.WriteAllText(finalpath, nutzdatendatei);
+ File.WriteAllBytes(finalpath + ".auf", auftragsdatei2);
}
}
diff --git a/Dakota/Models/Blocke/BlockKrankenkasse.cs b/Dakota/Models/Blocke/BlockKrankenkasse.cs
index ad2d7c08b..4eeb9bf73 100644
--- a/Dakota/Models/Blocke/BlockKrankenkasse.cs
+++ b/Dakota/Models/Blocke/BlockKrankenkasse.cs
@@ -36,8 +36,8 @@ namespace Dakota.Models.Blocke
public string IKKrankenkasseKVKarte
{
- get { return NachrichtSLGA.SegmentFKT.IKKrankenkasse.GetValue(); }
- set { NachrichtSLGA.SegmentFKT.IKKrankenkasse.SetValue(value); }
+ get { return NachrichtSLGA.SegmentFKT.IKVersichertenKarte.GetValue(); }
+ set { NachrichtSLGA.SegmentFKT.IKVersichertenKarte.SetValue(value); }
}
public int SLGASegmentLength() => NachrichtSLGA.GetSegmentLength();
diff --git a/Dakota/Models/DakotaFile.cs b/Dakota/Models/DakotaFile.cs
index e2a9a8ec5..575d40767 100644
--- a/Dakota/Models/DakotaFile.cs
+++ b/Dakota/Models/DakotaFile.cs
@@ -52,9 +52,34 @@ namespace Dakota
return Nutzdatendatei.GetRows();
}
- public string GetIKEmpfang()
+ public string GetIKVersichertenKarte()
+ {
+ return Nutzdatendatei.BlockKostenträger.First().BlockKrankenkasse.First().NachrichtSLGA.SegmentFKT.IKVersichertenKarte.GetValue();
+ }
+
+ public string GetIKLeistungserbringer()
+ {
+ return Nutzdatendatei.BlockKostenträger.First().BlockKrankenkasse.First().NachrichtSLGA.SegmentFKT.IKLeistungserbringers.GetValue();
+ }
+
+ public string GetIKDatenannahmestelle()
{
return Nutzdatendatei.SegmentUNB.Empfangdatei.GetValue();
}
+
+ public string GetIKKostenträger()
+ {
+ return Nutzdatendatei.BlockKostenträger.First().BlockKrankenkasse.First().NachrichtSLGA.SegmentFKT.IKKostenträger.GetValue();
+ }
+
+ public decimal GetBetrag()
+ {
+ return Nutzdatendatei.BlockKostenträger.First().BlockKrankenkasse.Sum(x => x.NachrichtSLGA.SegmentGES00.GesamtrechnungsbetragDecimal);
+ }
+
+ public int GetKostenträgerCount()
+ {
+ return Nutzdatendatei.BlockKostenträger.Count;
+ }
}
}
diff --git a/Dakota/Models/Daten/DatenelementDecimal.cs b/Dakota/Models/Daten/DatenelementDecimal.cs
index 20db2aca1..26c45dd6a 100644
--- a/Dakota/Models/Daten/DatenelementDecimal.cs
+++ b/Dakota/Models/Daten/DatenelementDecimal.cs
@@ -19,11 +19,12 @@ namespace Dakota.Models.Daten
if (temp != default(decimal))
{
dec = temp.ToString("#.00").Replace(".", ",");
- var tester = Math.Abs(temp).ToString("#.00").Replace(".", "").Replace(",", "");
+ // var tester = Math.Abs(temp).ToString("#.00").Replace(".", "").Replace(",", "");
- if (tester.Length < MinStellen || tester.Length > MaxStellen)
+ if (dec.Length < MinStellen || dec.Length > MaxStellen)
{
- throw new NotImplementedException("Error Code: 3483091097895");
+ // - Tester:{tester}
+ throw new NotImplementedException($"Error Code: 3483091097895 - Dec:{dec} - Title:{Title} - Min:{MinStellen} - Max:{MaxStellen}");
}
}
else
diff --git a/Dakota/Models/Infos/InfoAbrechnungsfall.cs b/Dakota/Models/Infos/InfoAbrechnungsfall.cs
index 247506e66..f19c65d9c 100644
--- a/Dakota/Models/Infos/InfoAbrechnungsfall.cs
+++ b/Dakota/Models/Infos/InfoAbrechnungsfall.cs
@@ -38,12 +38,6 @@ namespace Dakota.Models.Infos
public DateTime? DatumDerGenehmigung { get; set; }
public SchlüsselArtDerGenehmigung ArtDerGenehmigung { get; set; }
- //public decimal GesamtbetragBrutto { get; set; }
- //public decimal GesamtbetragGesetzlicheZuzahlung { get; set; }
- //public decimal GesamtbetragProzentualeZuzahlung { get; set; }
- //public decimal PauschalerZuzahlungsbetrag { get; set; }
- //public decimal GesamtbetragEigenanteil { get; set; }
-
public InfoAbrechnungsfall()
{
InfosAbrechnungsposition = new List();
diff --git a/Dakota/Models/Nachrichten/NachrichtSLGA.cs b/Dakota/Models/Nachrichten/NachrichtSLGA.cs
index eb1a3263a..4e369d864 100644
--- a/Dakota/Models/Nachrichten/NachrichtSLGA.cs
+++ b/Dakota/Models/Nachrichten/NachrichtSLGA.cs
@@ -79,7 +79,7 @@ namespace Dakota.Models.Nachrichten
SegmentFKT.Sammelrechnung.SetValue("J");
SegmentFKT.IKLeistungserbringers.SetValue(info.IKLeistungserbringer);
SegmentFKT.IKKostenträger.SetValue(info.IKKostentrager);
- SegmentFKT.IKKrankenkasse.SetValue(info.IKKrankenkasse);
+ SegmentFKT.IKVersichertenKarte.SetValue(info.IKKrankenkasse);
SegmentFKT.IKAbsender.SetValue(info.IKAbsender);
SegmentREC.SammelRechnungsnummer.SetValue(info.Rechnungsnummer);
diff --git a/Dakota/Models/Segmente/SLGA/SegmentSLGAFKT.cs b/Dakota/Models/Segmente/SLGA/SegmentSLGAFKT.cs
index 70fad71db..b3af015ac 100644
--- a/Dakota/Models/Segmente/SLGA/SegmentSLGAFKT.cs
+++ b/Dakota/Models/Segmente/SLGA/SegmentSLGAFKT.cs
@@ -45,7 +45,7 @@ namespace Dakota.Models.Segmente.SLGA
/// Angabe identisch mit SLLA.FKT.IK der
/// Krankenkasse der zugehörigen SLLANachricht.
///
- public Datenelement IKKrankenkasse { get; private set; }
+ public Datenelement IKVersichertenKarte { get; private set; }
///
/// Einzutragen ist das IK des Absenders der Datei. Diese Angabe ist identisch mit UNB.Absender
///
@@ -57,12 +57,12 @@ namespace Dakota.Models.Segmente.SLGA
Sammelrechnung = new Datenelement("Sammelrechnung", 1, Feldart.Kann);
IKLeistungserbringers = new Datenelement("IKLeistungserbringers", 9, Feldart.Muss);
IKKostenträger = new Datenelement("IKKostenträger", 9, Feldart.Muss);
- IKKrankenkasse = new Datenelement("IKKrankenkasse", 9, Feldart.Kann);
+ IKVersichertenKarte = new Datenelement("IKKrankenkasse", 9, Feldart.Kann);
IKAbsender = new Datenelement("IKAbsender", 9, Feldart.Muss);
}
public override string GetHead() => "FKT";
public override List GetBody()
- => new List() { Verarbeitungskennzeichen, Sammelrechnung, IKLeistungserbringers, IKKostenträger, IKKrankenkasse, IKAbsender };
+ => new List() { Verarbeitungskennzeichen, Sammelrechnung, IKLeistungserbringers, IKKostenträger, IKVersichertenKarte, IKAbsender };
}
}
diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index 45e59bf3a..3f3ec3d44 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -1735,6 +1735,30 @@ namespace BeWo.Data.Access
return lCriteria.List();
}
+ public IEnumerable GetGkvAbrechnungen(DateTime? startDate, DateTime? endDate, bool useInvoiceDate = true)
+ {
+ if (endDate.HasValue)
+ endDate = endDate.Value.Date.AddDays(1).AddMilliseconds(-1);
+
+ var lCriteria = CreateCriteriaIsActive();
+ if (useInvoiceDate)
+ {
+ if (startDate.HasValue)
+ lCriteria.Add(Restrictions.Ge(nameof(GkvAbrechnung.ErstelltAm), startDate));
+ if (endDate.HasValue)
+ lCriteria.Add(Restrictions.Le(nameof(GkvAbrechnung.ErstelltAm), endDate));
+ }
+ else
+ {
+ if (startDate.HasValue)
+ lCriteria.Add(Restrictions.Ge(nameof(GkvAbrechnung.AbrechnungsZeitraumEnde), startDate));
+ if (endDate.HasValue)
+ lCriteria.Add(Restrictions.Le(nameof(GkvAbrechnung.AbrechnungsZeitraumStart), endDate));
+ }
+
+ return lCriteria.List();
+ }
+
public IEnumerable GetInvoiceBases(DateTime? startDate, DateTime? endDate, long costBearerOid, String invoiceId)
{
var lCriteria = CreateCriteriaIsActive();
diff --git a/Data/Entities/GkvAbrechnung.cs b/Data/Entities/GkvAbrechnung.cs
index 9e5bf5317..84dcfe5c1 100644
--- a/Data/Entities/GkvAbrechnung.cs
+++ b/Data/Entities/GkvAbrechnung.cs
@@ -14,12 +14,14 @@ namespace BeWo.Data.Entities
public virtual string Kundennummer { get; set; }
- public virtual string IKDatenannahmestelle { get; set; }
-
- public virtual string IKEmpfang { get; set; }
-
public virtual string IKLeistungserbringer { get; set; }
+ public virtual string IKVersichertenKarte { get; set; }
+
+ public virtual string IKKostentrager { get; set; }
+
+ public virtual string IKDatenannahmestelle { get; set; }
+
public virtual DateTime? AbrechnungsZeitraumStart { get; set; }
public virtual DateTime? AbrechnungsZeitraumEnde { get; set; }
@@ -30,6 +32,8 @@ namespace BeWo.Data.Entities
public virtual string Transfername { get; set; }
+ public virtual DateTime? ErstelltAm { get; set; }
+
public virtual DateTime? VerschluesseltAm { get; set; }
public virtual DateTime? UebertragenAm { get; set; }
@@ -38,12 +42,20 @@ namespace BeWo.Data.Entities
public virtual DateTime? AntwortEntschluesseltAm { get; set; }
+ public virtual decimal Betrag { get; set; }
+
+ // Kundennummer nur bei App8
+
+ /*
+ IKLeistungserbringer
+ IKVersichertenKarte
+ IKKostentrager
+ IKDatenannahmestelle
+ */
+
/*
Notice
Kundennummer
- IKDatenannahmestelle
- IKEmpfang
- IKLeistungserbringer
AbrechnungsZeitraumStart
AbrechnungsZeitraumEnde
Nutzdatendatei
diff --git a/Data/Mappings/GkvAbrechnung.hbm.xml b/Data/Mappings/GkvAbrechnung.hbm.xml
index 6f2f101f4..9010f9fdb 100644
--- a/Data/Mappings/GkvAbrechnung.hbm.xml
+++ b/Data/Mappings/GkvAbrechnung.hbm.xml
@@ -8,14 +8,16 @@
-
-
+
+
+
+
@@ -26,5 +28,6 @@
+
diff --git a/Host/GkvInvoiceService.svc b/Host/GkvInvoiceService.svc
new file mode 100644
index 000000000..e38a5ffd8
--- /dev/null
+++ b/Host/GkvInvoiceService.svc
@@ -0,0 +1 @@
+<%@ ServiceHost Language="C#" Debug="true" Service="BeWo.Service.ServiceImplementations.GkvInvoiceServiceImp" %>
\ No newline at end of file
diff --git a/Host/Host.csproj b/Host/Host.csproj
index ab9cf2eb6..51c3e2064 100644
--- a/Host/Host.csproj
+++ b/Host/Host.csproj
@@ -198,6 +198,7 @@
+
diff --git a/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs b/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs
index 7521d0e3d..d200a23c3 100644
--- a/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs
+++ b/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs
@@ -9,43 +9,61 @@ namespace BeWo.Service.DCEntityMapper
{
public override GkvAbrechnungDC MergeWithDC(GkvAbrechnung pEntity, GkvAbrechnungDC pDataContract)
{
- pDataContract.Notice = pEntity.Notice;
+ pDataContract.GkvAbrechnungOid = pEntity.Oid;
+ pDataContract.GkvAbrechnungVersion = pEntity.Version;
+ pDataContract.Notice = pEntity.Notice;
+
+ pDataContract.IKDatenannahmestelle = pEntity.IKDatenannahmestelle;
+ pDataContract.IKVersichertenKarte = pEntity.IKVersichertenKarte;
+ pDataContract.IKLeistungserbringer = pEntity.IKLeistungserbringer;
+ pDataContract.IKKostenträger = pEntity.IKKostentrager;
- pDataContract.IKDatenannahmestelle = pEntity.IKDatenannahmestelle;
- pDataContract.IKEmpfang = pEntity.IKEmpfang;
- pDataContract.IKLeistungserbringer= pEntity.IKLeistungserbringer;
pDataContract.AbrechnungsZeitraumStart = pEntity.AbrechnungsZeitraumStart;
pDataContract.AbrechnungsZeitraumEnde = pEntity.AbrechnungsZeitraumEnde;
+
pDataContract.Nutzdatendatei= pEntity.Nutzdatendatei;
pDataContract.Auftragsdatei = pEntity.Auftragsdatei;
pDataContract.Transfername = pEntity.Transfername;
+
pDataContract.UebertragenAm = pEntity.UebertragenAm;
pDataContract.AntwortErhaltenAm = pEntity.AntwortErhaltenAm;
pDataContract.AntwortEntschluesseltAm = pEntity.AntwortEntschluesseltAm;
pDataContract.UebertragenAm = pEntity.UebertragenAm;
+ pDataContract.ErstelltAm = pEntity.ErstelltAm;
+ pDataContract.Betrag = pEntity.Betrag;
+
return pDataContract;
}
public override GkvAbrechnung MergeWithEntity(GkvAbrechnungDC pDataContract, GkvAbrechnung pEntity)
{
this.ConcurrencyCheck(pDataContract.GkvAbrechnungVersion, pEntity);
+
pEntity.Oid = pDataContract.GkvAbrechnungOid;
+ pEntity.Version = pDataContract.GkvAbrechnungVersion;
pEntity.Notice = pDataContract.Notice;
pEntity.IKDatenannahmestelle = pDataContract.IKDatenannahmestelle;
- pEntity.IKEmpfang = pDataContract.IKEmpfang;
+ pEntity.IKVersichertenKarte = pDataContract.IKVersichertenKarte;
pEntity.IKLeistungserbringer = pDataContract.IKLeistungserbringer;
+ pEntity.IKKostentrager = pDataContract.IKKostenträger;
+
pEntity.AbrechnungsZeitraumStart = pDataContract.AbrechnungsZeitraumStart;
pEntity.AbrechnungsZeitraumEnde = pDataContract.AbrechnungsZeitraumEnde;
+
pEntity.Nutzdatendatei = pDataContract.Nutzdatendatei;
pEntity.Auftragsdatei = pDataContract.Auftragsdatei;
pEntity.Transfername = pDataContract.Transfername;
+
+ pEntity.ErstelltAm = pDataContract.ErstelltAm;
pEntity.VerschluesseltAm = pDataContract.VerschluesseltAm;
pEntity.UebertragenAm = pDataContract.UebertragenAm;
pEntity.AntwortErhaltenAm = pDataContract.AntwortErhaltenAm;
pEntity.AntwortEntschluesseltAm = pDataContract.AntwortEntschluesseltAm;
+ pEntity.Betrag = pDataContract.Betrag;
+
return pEntity;
}
diff --git a/Service/Service.csproj b/Service/Service.csproj
index c3235c278..bb43a7d95 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -468,6 +468,7 @@
+
@@ -479,6 +480,7 @@
+
diff --git a/Service/ServiceContracts/IAccountingService.cs b/Service/ServiceContracts/IAccountingService.cs
index 750230907..d2fa77201 100644
--- a/Service/ServiceContracts/IAccountingService.cs
+++ b/Service/ServiceContracts/IAccountingService.cs
@@ -32,9 +32,9 @@ namespace BeWo.Service.ServiceContracts
[OperationContract]
List GetAllActiveInvoiceBases();
- [FaultContract(typeof (BeWoFault))]
- [OperationContract]
- List GetInvoiceBases(DateTime? startDate, DateTime? endDate);
+ [FaultContract(typeof(BeWoFault))]
+ [OperationContract]
+ List GetInvoiceBases(DateTime? startDate, DateTime? endDate);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
@@ -108,7 +108,7 @@ namespace BeWo.Service.ServiceContracts
[OperationContract]
List UpdateInvoiceBases(List invoices);
- [FaultContract(typeof (BeWoFault))]
+ [FaultContract(typeof(BeWoFault))]
[OperationContract]
List SetInvoicePaid(List invoices, bool isPaid);
@@ -139,5 +139,21 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List InsertNewGkvAbrechnungen(List dc);
+
+ [FaultContract(typeof(BeWoFault))]
+ [OperationContract]
+ GkvAbrechnungDC GetGkvAbrechnung(long oid);
+
+ [FaultContract(typeof(BeWoFault))]
+ [OperationContract]
+ List GetAllGkvAbrechnungen();
+
+ [FaultContract(typeof(BeWoFault))]
+ [OperationContract]
+ List GetFilteredGkvAbrechnungen(GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter);
+
+ [FaultContract(typeof(BeWoFault))]
+ [OperationContract]
+ GkvAbrechnungDC MakeNewGkvAbrechnung(GkvAbrechnungFilterDC abrechnungFilterDC);
}
}
\ No newline at end of file
diff --git a/Service/ServiceContracts/IGkvInvoiceService.cs b/Service/ServiceContracts/IGkvInvoiceService.cs
new file mode 100644
index 000000000..1cd3854b8
--- /dev/null
+++ b/Service/ServiceContracts/IGkvInvoiceService.cs
@@ -0,0 +1,19 @@
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+using BS.Shared.DataContracts.Reports;
+using System;
+using System.Collections.Generic;
+using System.ServiceModel;
+using BeWo.Data.Entities;
+
+
+namespace BeWo.Service.ServiceContracts
+{
+ [ServiceContract]
+ public interface IGkvInvoiceService
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/Service/ServiceImplementations/AccountingServiceImp.cs b/Service/ServiceImplementations/AccountingServiceImp.cs
index fca02c988..7a185a4a6 100644
--- a/Service/ServiceImplementations/AccountingServiceImp.cs
+++ b/Service/ServiceImplementations/AccountingServiceImp.cs
@@ -17,6 +17,7 @@ using BS.Shared.DataContracts;
using Utils = BeWo.Service.Core.Utils;
using BeWo.Service.Invoicing;
+using Dakota.Logic;
namespace BeWo.Service.ServiceImplementations
{
@@ -669,6 +670,128 @@ namespace BeWo.Service.ServiceImplementations
}
}
+ public GkvAbrechnungDC GetGkvAbrechnung(long oid)
+ {
+ try
+ {
+ var gkv = DAOFactory.GenericDAO.GetByID(oid);
+
+ var dc = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewDC(gkv);
+
+ return dc;
+ }
+ catch (Exception e)
+ {
+ throw Utils.CreateBeWoFaultException(e);
+ }
+ }
+
+ public List GetFilteredGkvAbrechnungen(GkvAbrechnungViewFilterDC gkvAbrechnungViewFilter)
+ {
+ try
+ {
+ if (gkvAbrechnungViewFilter == null || !gkvAbrechnungViewFilter.FilterTime)
+ return GetAllGkvAbrechnungen();
+
+ var entities = DAOFactory.SearchDAO.GetGkvAbrechnungen(gkvAbrechnungViewFilter.Start, gkvAbrechnungViewFilter.End, gkvAbrechnungViewFilter.FilterForInvoiceDate);
+
+ return MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewDCs(entities);
+ }
+ catch (Exception e)
+ {
+ throw Utils.CreateBeWoFaultException(e);
+ }
+ }
+
+ public List GetAllGkvAbrechnungen()
+ {
+ try
+ {
+ var gkvs = DAOFactory.GenericDAO.GetAllActive();
+
+ var dcs = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewDCs(gkvs);
+
+ return dcs;
+ }
+ catch (Exception e)
+ {
+ throw Utils.CreateBeWoFaultException(e);
+ }
+ }
+
+ public GkvAbrechnungDC MakeNewGkvAbrechnung(GkvAbrechnungFilterDC abrechnungFilterDC)
+ {
+ try
+ {
+ var test_datetime = abrechnungFilterDC.GkvAbrechnungDC.AbrechnungsZeitraumStart.Value;
+
+ var manager = new DakotaManager(test_datetime.Month, DateTime.Now);
+
+ var mandatordc = new OperationsServiceImp().GetMandator();
+
+ foreach (var invoicebase_oid in abrechnungFilterDC.GkvAbrechnungDC.InvoiceBaseOids)
+ {
+ var service = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(invoicebase_oid);
+ var invoicebase = DAOFactory.GenericDAO.GetByID(invoicebase_oid);
+ var orga = invoicebase.CostBearer2SupportConcept.CostBearer.Organisation;
+ var customer = invoicebase.CostBearer2SupportConcept.SupportConcept.Customer;
+
+ var servicedc = MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(service);
+ var orgadc = MapperFactory.OrganisationDC_OrganisationMapper.MapToNewDC(orga);
+ var customerdc = MapperFactory.CustomerDC_Customer.MapToNewDC(customer);
+
+ manager.Add(servicedc, orgadc, customerdc, mandatordc);
+ }
+
+ manager.Apply();
+
+ if(manager.DakotaFileDict.Count != 1 || manager.DakotaFileDict.First().Value.GetKostenträgerCount() != 1)
+ {
+ throw new NotImplementedException();
+ }
+
+ var file_from_manager = manager.DakotaFileDict.First().Value;
+ var gkv_abrechnung_dc = abrechnungFilterDC.GkvAbrechnungDC;
+
+ var nutzdatendatei = file_from_manager.GetNutzdatendatei();
+
+ // https://dev.mysql.com/doc/refman/8.3/en/string-type-syntax.html
+ // A TEXT column with a maximum length of 65,535 (2^16 − 1) characters.
+ // The effective maximum length is less if the value contains multibyte
+ // characters. Each TEXT value is stored using a 2-byte length prefix
+ // that indicates the number of bytes in the value.
+ if (nutzdatendatei.Length > 65535)
+ {
+ throw new ArgumentOutOfRangeException("nutzdatendatei", $"Länger als 65535: {nutzdatendatei.Length}");
+ }
+
+ gkv_abrechnung_dc.IKDatenannahmestelle = file_from_manager.GetIKDatenannahmestelle();
+ gkv_abrechnung_dc.IKKostenträger= file_from_manager.GetIKKostenträger();
+ gkv_abrechnung_dc.IKLeistungserbringer= file_from_manager.GetIKLeistungserbringer();
+ gkv_abrechnung_dc.IKVersichertenKarte = file_from_manager.GetIKVersichertenKarte();
+
+ gkv_abrechnung_dc.Auftragsdatei = file_from_manager.GetAuftragsdatei();
+ gkv_abrechnung_dc.Nutzdatendatei = file_from_manager.GetNutzdatendatei();
+ gkv_abrechnung_dc.Transfername = file_from_manager.GetTransferName();
+
+ gkv_abrechnung_dc.ErstelltAm = file_from_manager.Created;
+
+ gkv_abrechnung_dc.Betrag = file_from_manager.GetBetrag();
+
+ var gkv_abrechnung = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewEntity(gkv_abrechnung_dc);
+
+ DAOFactory.GenericDAO.Insert(gkv_abrechnung);
+
+ var new_gkv_abrechnung_dc = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewDC(gkv_abrechnung);
+
+ return new_gkv_abrechnung_dc;
+ }
+ catch (Exception e)
+ {
+ throw Utils.CreateBeWoFaultException(e);
+ }
+ }
+
public List InsertNewGkvAbrechnungen(List dcList)
{
try
diff --git a/Service/ServiceImplementations/GkvInvoiceServiceImp.cs b/Service/ServiceImplementations/GkvInvoiceServiceImp.cs
new file mode 100644
index 000000000..b64e98055
--- /dev/null
+++ b/Service/ServiceImplementations/GkvInvoiceServiceImp.cs
@@ -0,0 +1,11 @@
+using BeWo.Service.ServiceContracts;
+using System.ServiceModel;
+
+namespace BeWo.Service.ServiceImplementations
+{
+ [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, ConcurrencyMode = ConcurrencyMode.Single)]
+ public class GkvInvoiceService : IGkvInvoiceService
+ {
+
+ }
+}
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index c10a93674..a62aacc10 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -323,10 +323,10 @@ namespace BeWo.Service.ServiceImplementations
lOriginals.DoForEach(or => MapperFactory.ServiceRecordDC_ServiceRecord.ConcurrencyCheck(pOid2Version[or.Oid.Value], or));
var srListToDelete = new List();
-
- foreach(var item in lOriginals)
+
+ foreach (var item in lOriginals)
{
- if(item.Group != null)
+ if (item.Group != null)
{
RemoveServiceRecordsFromConfirmationReceiptSignatureForDeletion(item.Group.ServiceRecordList);
@@ -340,7 +340,7 @@ namespace BeWo.Service.ServiceImplementations
}
}
- if(srListToDelete.Count <= 0)
+ if (srListToDelete.Count <= 0)
{
return;
}
@@ -432,10 +432,10 @@ namespace BeWo.Service.ServiceImplementations
var juengsteRechnung = existingInvoices.OrderByDescending(i => i.InvoiceBase.AccountingPeriodEnd).First();
var acs = PluginLoader.FindClass();
-
+
return acs.ErstelleDifferenzSpitzabrechnung(newInvoice, MapperFactory.SettlementDC_SettlementInvoice.MapToNewDC(juengsteRechnung));
-
+
}
catch (Exception e)
@@ -845,7 +845,7 @@ namespace BeWo.Service.ServiceImplementations
fileAttachments.DoForEach(fileAttachment =>
{
- if(fileAttachment.BinaryData != null)
+ if (fileAttachment.BinaryData != null)
{
return;
}
@@ -1398,7 +1398,7 @@ namespace BeWo.Service.ServiceImplementations
list.Add(ValueListEntryType.SupportConceptIndividualGoalType);
var dc = new SupportConceptTreeNodeDetailInfoDC();
-
+
dc.SupportConceptGoals =
MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDCs(
sc.ValueList.FindByTypes(list)
@@ -1796,7 +1796,7 @@ namespace BeWo.Service.ServiceImplementations
{
var bookings = DAOFactory.SearchDAO.GetAdditionalServiceBookingsForCustomer(oid, monat, monat.AddMonths(1).AddDays(-1));
-
+
foreach (var item in bookings)
{
@@ -1816,9 +1816,9 @@ namespace BeWo.Service.ServiceImplementations
}
-
+
}
-
+
}
catch (Exception e)
@@ -2290,7 +2290,7 @@ namespace BeWo.Service.ServiceImplementations
if (!pServiceRecordGroup.StartDate.HasValue && pServiceRecordGroup.EndDate.HasValue)
{
- pServiceRecordGroup.StartDate = pServiceRecordGroup.EndDate.Value.AddMinutes((double)pServiceRecordGroup.RoundedDuration * -1);
+ pServiceRecordGroup.StartDate = pServiceRecordGroup.EndDate.Value.AddMinutes((double)pServiceRecordGroup.RoundedDuration * -1);
}
pServiceRecordGroup.RoundedDuration = (decimal)pServiceRecordGroup.EndDate.Value.Subtract(pServiceRecordGroup.StartDate.Value).TotalMinutes;
@@ -2300,8 +2300,8 @@ namespace BeWo.Service.ServiceImplementations
}
// (Veraltet. Es ist keine Änderung an der Zeit bei vorhandener Einzelunterschrift) Bei geänderten Daten oder Uhrzeiten werden die Klientenunterschriften gelöscht
- var serviceRecords = pServiceRecordGroup.ServiceRecordList;
- var originalServiceRecords = lOriginal.ServiceRecordList.ToList();
+ var serviceRecords = pServiceRecordGroup.ServiceRecordList;
+ var originalServiceRecords = lOriginal.ServiceRecordList.ToList();
var serviceRecordOidsWithDeletedSingleSignatures = DeleteSignaturesFromServiceRecords(serviceRecords, originalServiceRecords);
var serviceRecordsdWithRemovedConfirmationReceiptSignatures = RemoveServiceRecordsFromConfirmationReceiptSignatures(serviceRecords, originalServiceRecords, false);
@@ -2345,11 +2345,11 @@ namespace BeWo.Service.ServiceImplementations
}
}
- private static void MakeServiceRecordHistoryEntryWithSignatureStates(List serviceRecords2SignatureStates, StatementType statementType)
+ private static void MakeServiceRecordHistoryEntryWithSignatureStates(List serviceRecords2SignatureStates, StatementType statementType)
{
var serviceRecordHistoryEntries = new List();
-
- foreach(var serviceRecord2SignatureState in serviceRecords2SignatureStates)
+
+ foreach (var serviceRecord2SignatureState in serviceRecords2SignatureStates)
{
var serviceRecord = serviceRecord2SignatureState.ServiceRecord;
var singleSignatureState = serviceRecord2SignatureState.SingleSignatureStateType;
@@ -2358,7 +2358,7 @@ namespace BeWo.Service.ServiceImplementations
SignatureStateInfoFromServiceRecordHistoryEntry previousRecordHistorySignatureInfo = null;
- if(serviceRecord.Oid.HasValue)
+ if (serviceRecord.Oid.HasValue)
{
//previousRecordHistoryEntry = DAOFactory.SearchDAO.FindMostRecentServiceRecordHistoryEntryByServiceRecordOid(serviceRecord.Oid.Value);
previousRecordHistorySignatureInfo = DAOFactory.SearchDAO.FindMostRecentSignatureStatusInfoByServiceRecordOid(serviceRecord.Oid.Value);
@@ -2366,41 +2366,41 @@ namespace BeWo.Service.ServiceImplementations
serviceRecordHistoryEntries.AddIfNotIn(new ServiceRecordHistory
{
- TimeStamp = DateTime.Now,
- ChangeType = statementType,
- CostBearer2SupportConcept = serviceRecord.CostBearer2SupportConcept,
- CostBearer2SupportConceptOid = serviceRecord.CostBearer2SupportConceptOid,
- Customer = serviceRecord.Customer,
- CustomerOid = serviceRecord.CustomerOid,
- Employee = serviceRecord.Employee,
- EmployeeOid = serviceRecord.EmployeeOid,
- End = serviceRecord.End,
- Group = serviceRecord.Group,
- GroupEmployeeCount = serviceRecord.GroupEmployeeCount,
- GroupOid = serviceRecord.GroupOid,
- GroupPersonCount = serviceRecord.GroupPersonCount,
- GroupRoundedDuration = serviceRecord.GroupRoundedDuration,
- IP = serviceRecord.IP,
- IsActive = serviceRecord.IsActive,
- Notice = serviceRecord.Notice,
- ServiceRecordOid = serviceRecord.Oid,
- RoundedDuration = serviceRecord.RoundedDuration,
- ServiceDescription = serviceRecord.ServiceDescription,
- ServiceRecordType = serviceRecord.ServiceRecordType,
- ServiceRecordInsTs = serviceRecord.InsTs,
- ServiceRecordVersion = serviceRecord.Version ?? 0,
- ServiceRecordInsUser = serviceRecord.InsUser,
- ServiceRecordUdpUser = serviceRecord.UdpUser,
- Start = serviceRecord.Start,
- SupportConcept = serviceRecord.SupportConcept,
- SystemEntryID = serviceRecord.SystemEntryID,
- DistanceInMeter = serviceRecord.DistanceInMeter,
- IsCreatedInMobileClient = serviceRecord.IsCreatedInMobileClient,
- ServiceRecordSignatureStateType = singleSignatureState ?? previousRecordHistorySignatureInfo?.ServiceRecordSignatureStateType ?? SignatureStateType.None,
+ TimeStamp = DateTime.Now,
+ ChangeType = statementType,
+ CostBearer2SupportConcept = serviceRecord.CostBearer2SupportConcept,
+ CostBearer2SupportConceptOid = serviceRecord.CostBearer2SupportConceptOid,
+ Customer = serviceRecord.Customer,
+ CustomerOid = serviceRecord.CustomerOid,
+ Employee = serviceRecord.Employee,
+ EmployeeOid = serviceRecord.EmployeeOid,
+ End = serviceRecord.End,
+ Group = serviceRecord.Group,
+ GroupEmployeeCount = serviceRecord.GroupEmployeeCount,
+ GroupOid = serviceRecord.GroupOid,
+ GroupPersonCount = serviceRecord.GroupPersonCount,
+ GroupRoundedDuration = serviceRecord.GroupRoundedDuration,
+ IP = serviceRecord.IP,
+ IsActive = serviceRecord.IsActive,
+ Notice = serviceRecord.Notice,
+ ServiceRecordOid = serviceRecord.Oid,
+ RoundedDuration = serviceRecord.RoundedDuration,
+ ServiceDescription = serviceRecord.ServiceDescription,
+ ServiceRecordType = serviceRecord.ServiceRecordType,
+ ServiceRecordInsTs = serviceRecord.InsTs,
+ ServiceRecordVersion = serviceRecord.Version ?? 0,
+ ServiceRecordInsUser = serviceRecord.InsUser,
+ ServiceRecordUdpUser = serviceRecord.UdpUser,
+ Start = serviceRecord.Start,
+ SupportConcept = serviceRecord.SupportConcept,
+ SystemEntryID = serviceRecord.SystemEntryID,
+ DistanceInMeter = serviceRecord.DistanceInMeter,
+ IsCreatedInMobileClient = serviceRecord.IsCreatedInMobileClient,
+ ServiceRecordSignatureStateType = singleSignatureState ?? previousRecordHistorySignatureInfo?.ServiceRecordSignatureStateType ?? SignatureStateType.None,
CustomerConfirmationReceiptSignatureStateType = customerMonthlySignatureState ?? previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
EmployeeConfirmationReceiptSignatureStateType = employeeMonthlySignatureState ?? previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
- CustomerConfirmationReceiptSignatureOid = previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureOid,
- EmployeeConfirmationReceiptSignatureOid = previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureOid
+ CustomerConfirmationReceiptSignatureOid = previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureOid,
+ EmployeeConfirmationReceiptSignatureOid = previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureOid
});
}
@@ -2412,17 +2412,17 @@ namespace BeWo.Service.ServiceImplementations
var serviceRecords2SignatureStates = new List();
// Die ServiceRecords, deren Einzelunterschriften duch bearbeitete Zeitangaben im Zuge des Updates gelöscht werden zu der SignatureStatus-Liste hinzugefügt (sollte eigentlich nicht vorkommen)
- foreach(var serviceRecord in serviceRecordsWithDeletedSingleSignatures)
+ foreach (var serviceRecord in serviceRecordsWithDeletedSingleSignatures)
{
serviceRecords2SignatureStates.Add(new ServiceRecord2SignatureStates(serviceRecord, SignatureStateType.AutomaticallyDeleted, null, null));
}
// Die ServiceRecords, deren Monatsunterschriften duch bearbeitete Zeitangaben im Zuge des Updates gelöscht werden zu der SignatureStatus-Liste hinzugefügt
- foreach(var serviceRecord2SignatureStates in serviceRecordsdWithRemovedConfirmationReceiptSignatures)
+ foreach (var serviceRecord2SignatureStates in serviceRecordsdWithRemovedConfirmationReceiptSignatures)
{
var existingServiceRecord2SignatureStates = serviceRecords2SignatureStates.FirstOrDefault(f => f.ServiceRecord.Equals(serviceRecord2SignatureStates.ServiceRecord));
- if(existingServiceRecord2SignatureStates is null)
+ if (existingServiceRecord2SignatureStates is null)
{
serviceRecords2SignatureStates.Add(serviceRecord2SignatureStates);
}
@@ -2434,16 +2434,16 @@ namespace BeWo.Service.ServiceImplementations
}
// Die ServiceRecords, bei denen keine Zeitangaben geändert wurden und deren Unterschriften so erhalten bleiben, werden zu der SignatureStatus-Liste hinzugefügt
- foreach(var serviceRecord in originals)
+ foreach (var serviceRecord in originals)
{
- if(serviceRecord.Oid is null)
+ if (serviceRecord.Oid is null)
{
continue;
}
var oid = serviceRecord.Oid.Value;
- if(serviceRecordsWithDeletedSingleSignatures.All(a => a.Oid.HasValue && a.Oid.Value.Equals(oid)) &&
+ if (serviceRecordsWithDeletedSingleSignatures.All(a => a.Oid.HasValue && a.Oid.Value.Equals(oid)) &&
serviceRecordsdWithRemovedConfirmationReceiptSignatures.All(a => a.ServiceRecord.Oid.HasValue && a.ServiceRecord.Oid.Value.Equals(oid)))
{
serviceRecords2SignatureStates.AddIfNotIn(new ServiceRecord2SignatureStates(serviceRecord, null, null, null));
@@ -2496,7 +2496,7 @@ namespace BeWo.Service.ServiceImplementations
var serviceRecordDurationCalculator = PluginLoader.FindClass();
var groupDurationCalculator = PluginLoader.FindClass();
- foreach(var serviceRecord in lOriginals)
+ foreach (var serviceRecord in lOriginals)
{
serviceRecordDurationCalculator?.CalculateRoundedDuration(serviceRecord);
@@ -2516,9 +2516,9 @@ namespace BeWo.Service.ServiceImplementations
}
var saveInterceptor = PluginLoader.FindClass();
- if(saveInterceptor != null)
+ if (saveInterceptor != null)
{
- foreach(var serviceRecord in lOriginals)
+ foreach (var serviceRecord in lOriginals)
{
saveInterceptor.BeforeSaveServiceRecord(serviceRecord);
}
@@ -2701,7 +2701,7 @@ namespace BeWo.Service.ServiceImplementations
var validator = PluginLoader.FindClass();
return validator.CheckForExistingSignature(serviceRecord);
}
-
+
public List CheckExistingSettlementInvoices(ServiceRecordDC pServiceRecord)
{
var result = new List();
@@ -2875,7 +2875,7 @@ namespace BeWo.Service.ServiceImplementations
dc.BackgroundColor = "#FF78BFFF";
}
-
+
if (sr.Employee != null)
{
//dc.Employee = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(sr.Employee);
@@ -3120,7 +3120,7 @@ namespace BeWo.Service.ServiceImplementations
tenant = SessionFacade.Tenant;
typ = "&t=1";
}
-
+
if (String.IsNullOrEmpty(tenant))
{
return "";
@@ -3139,7 +3139,7 @@ namespace BeWo.Service.ServiceImplementations
}
}
if (!_ContractStates.ContainsKey(tenant))
- {
+ {
string url = ConfigurationManager.AppSettings.Get("ContractStateUrl");
url = url.Replace("[TENANT]", tenant);
url += typ;
@@ -3315,36 +3315,36 @@ namespace BeWo.Service.ServiceImplementations
var iterator = 0;
foreach (var history in lOriginals.Select(serviceRecordOriginal => new ServiceRecordHistory
{
- TimeStamp = DateTime.Now,
- ChangeType = statementType,
- CostBearer2SupportConcept = serviceRecordOriginal.CostBearer2SupportConcept,
+ TimeStamp = DateTime.Now,
+ ChangeType = statementType,
+ CostBearer2SupportConcept = serviceRecordOriginal.CostBearer2SupportConcept,
CostBearer2SupportConceptOid = serviceRecordOriginal.CostBearer2SupportConceptOid,
- Customer = serviceRecordOriginal.Customer,
- CustomerOid = serviceRecordOriginal.CustomerOid,
- Employee = serviceRecordOriginal.Employee,
- EmployeeOid = serviceRecordOriginal.EmployeeOid,
- End = serviceRecordOriginal.End,
- Group = serviceRecordOriginal.Group,
- GroupEmployeeCount = serviceRecordOriginal.GroupEmployeeCount,
- GroupOid = serviceRecordOriginal.GroupOid,
- GroupPersonCount = serviceRecordOriginal.GroupPersonCount,
- GroupRoundedDuration = serviceRecordOriginal.GroupRoundedDuration,
- IP = serviceRecordOriginal.IP,
- IsActive = serviceRecordOriginal.IsActive,
- Notice = serviceRecordOriginal.Notice,
- ServiceRecordOid = serviceRecordOidList.ElementAt(iterator),
- RoundedDuration = serviceRecordOriginal.RoundedDuration,
- ServiceDescription = serviceRecordOriginal.ServiceDescription,
- ServiceRecordType = serviceRecordOriginal.ServiceRecordType,
- ServiceRecordInsTs = serviceRecordOriginal.InsTs,
- ServiceRecordVersion = serviceRecordOriginal.Version ?? 0,
- ServiceRecordInsUser = serviceRecordOriginal.InsUser,
- ServiceRecordUdpUser = serviceRecordOriginal.UdpUser,
- Start = serviceRecordOriginal.Start,
- SupportConcept = serviceRecordOriginal.SupportConcept,
- SystemEntryID = serviceRecordOriginal.SystemEntryID,
- DistanceInMeter = serviceRecordOriginal.DistanceInMeter,
- IsCreatedInMobileClient = serviceRecordOriginal.IsCreatedInMobileClient
+ Customer = serviceRecordOriginal.Customer,
+ CustomerOid = serviceRecordOriginal.CustomerOid,
+ Employee = serviceRecordOriginal.Employee,
+ EmployeeOid = serviceRecordOriginal.EmployeeOid,
+ End = serviceRecordOriginal.End,
+ Group = serviceRecordOriginal.Group,
+ GroupEmployeeCount = serviceRecordOriginal.GroupEmployeeCount,
+ GroupOid = serviceRecordOriginal.GroupOid,
+ GroupPersonCount = serviceRecordOriginal.GroupPersonCount,
+ GroupRoundedDuration = serviceRecordOriginal.GroupRoundedDuration,
+ IP = serviceRecordOriginal.IP,
+ IsActive = serviceRecordOriginal.IsActive,
+ Notice = serviceRecordOriginal.Notice,
+ ServiceRecordOid = serviceRecordOidList.ElementAt(iterator),
+ RoundedDuration = serviceRecordOriginal.RoundedDuration,
+ ServiceDescription = serviceRecordOriginal.ServiceDescription,
+ ServiceRecordType = serviceRecordOriginal.ServiceRecordType,
+ ServiceRecordInsTs = serviceRecordOriginal.InsTs,
+ ServiceRecordVersion = serviceRecordOriginal.Version ?? 0,
+ ServiceRecordInsUser = serviceRecordOriginal.InsUser,
+ ServiceRecordUdpUser = serviceRecordOriginal.UdpUser,
+ Start = serviceRecordOriginal.Start,
+ SupportConcept = serviceRecordOriginal.SupportConcept,
+ SystemEntryID = serviceRecordOriginal.SystemEntryID,
+ DistanceInMeter = serviceRecordOriginal.DistanceInMeter,
+ IsCreatedInMobileClient = serviceRecordOriginal.IsCreatedInMobileClient
}))
{
iterator++;
@@ -3353,48 +3353,48 @@ namespace BeWo.Service.ServiceImplementations
}
else
{
- foreach(var original in lOriginals)
+ foreach (var original in lOriginals)
{
SignatureStateInfoFromServiceRecordHistoryEntry previousRecordHistorySignatureInfo = null;
- if(original.Oid.HasValue)
+ if (original.Oid.HasValue)
{
previousRecordHistorySignatureInfo = DAOFactory.SearchDAO.FindMostRecentSignatureStatusInfoByServiceRecordOid(original.Oid.Value);
}
serviceRecordHistoryEntries.AddIfNotIn(new ServiceRecordHistory
{
- TimeStamp = DateTime.Now,
- ChangeType = statementType,
- CostBearer2SupportConcept = original.CostBearer2SupportConcept,
- CostBearer2SupportConceptOid = original.CostBearer2SupportConceptOid,
- Customer = original.Customer,
- CustomerOid = original.CustomerOid,
- Employee = original.Employee,
- EmployeeOid = original.EmployeeOid,
- End = original.End,
- Group = original.Group,
- GroupEmployeeCount = original.GroupEmployeeCount,
- GroupOid = original.GroupOid,
- GroupPersonCount = original.GroupPersonCount,
- GroupRoundedDuration = original.GroupRoundedDuration,
- IP = original.IP,
- IsActive = original.IsActive,
- Notice = original.Notice,
- ServiceRecordOid = original.Oid,
- RoundedDuration = original.RoundedDuration,
- ServiceDescription = original.ServiceDescription,
- ServiceRecordType = original.ServiceRecordType,
- ServiceRecordInsTs = original.InsTs,
- ServiceRecordVersion = original.Version ?? 0,
- ServiceRecordInsUser = original.InsUser,
- ServiceRecordUdpUser = original.UdpUser,
- Start = original.Start,
- SupportConcept = original.SupportConcept,
- SystemEntryID = original.SystemEntryID,
- DistanceInMeter = original.DistanceInMeter,
- IsCreatedInMobileClient = original.IsCreatedInMobileClient,
- ServiceRecordSignatureStateType = previousRecordHistorySignatureInfo?.ServiceRecordSignatureStateType ?? SignatureStateType.None,
+ TimeStamp = DateTime.Now,
+ ChangeType = statementType,
+ CostBearer2SupportConcept = original.CostBearer2SupportConcept,
+ CostBearer2SupportConceptOid = original.CostBearer2SupportConceptOid,
+ Customer = original.Customer,
+ CustomerOid = original.CustomerOid,
+ Employee = original.Employee,
+ EmployeeOid = original.EmployeeOid,
+ End = original.End,
+ Group = original.Group,
+ GroupEmployeeCount = original.GroupEmployeeCount,
+ GroupOid = original.GroupOid,
+ GroupPersonCount = original.GroupPersonCount,
+ GroupRoundedDuration = original.GroupRoundedDuration,
+ IP = original.IP,
+ IsActive = original.IsActive,
+ Notice = original.Notice,
+ ServiceRecordOid = original.Oid,
+ RoundedDuration = original.RoundedDuration,
+ ServiceDescription = original.ServiceDescription,
+ ServiceRecordType = original.ServiceRecordType,
+ ServiceRecordInsTs = original.InsTs,
+ ServiceRecordVersion = original.Version ?? 0,
+ ServiceRecordInsUser = original.InsUser,
+ ServiceRecordUdpUser = original.UdpUser,
+ Start = original.Start,
+ SupportConcept = original.SupportConcept,
+ SystemEntryID = original.SystemEntryID,
+ DistanceInMeter = original.DistanceInMeter,
+ IsCreatedInMobileClient = original.IsCreatedInMobileClient,
+ ServiceRecordSignatureStateType = previousRecordHistorySignatureInfo?.ServiceRecordSignatureStateType ?? SignatureStateType.None,
CustomerConfirmationReceiptSignatureStateType = previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
EmployeeConfirmationReceiptSignatureStateType = previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
CustomerConfirmationReceiptSignatureOid = previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureOid,
@@ -3548,9 +3548,9 @@ namespace BeWo.Service.ServiceImplementations
DAOFactory.GenericDAO.Insert(lSignature);
var updatedSignatureDC = MapperFactory.SignatureDC_Signature.MapToNewDC(lSignature);
- if(s.ServiceRecordOid is null)
+ if (s.ServiceRecordOid is null)
{
- if(s.BargeldtransaktionsOid.HasValue)
+ if (s.BargeldtransaktionsOid.HasValue)
{
var transaction = DAOFactory.GenericDAO.LoadByID(s.BargeldtransaktionsOid.Value);
@@ -4099,14 +4099,14 @@ namespace BeWo.Service.ServiceImplementations
// Die Oids der gelöschten Transaktionen, um die damit verbundenen Unterschriften zu löschen
var deletedOids = new List();
- foreach(var originalTransaction in originalTransactions)
+ foreach (var originalTransaction in originalTransactions)
{
var changedOrDeletedTransactionDC = pBargeldkasse.Bargeldtransaktionen.FirstOrDefault(transaction => transaction.BargeldtransaktionOid.HasValue && transaction.BargeldtransaktionOid.Value.Equals(originalTransaction.BargeldtransaktionOid.Value));
// Die Transaktion wurde entfernt
- if(changedOrDeletedTransactionDC is null && originalTransaction.BargeldtransaktionOid.HasValue)
+ if (changedOrDeletedTransactionDC is null && originalTransaction.BargeldtransaktionOid.HasValue)
{
- if(originalTransaction.SignatureOid.HasValue)
+ if (originalTransaction.SignatureOid.HasValue)
{
signatureOids2Delete.AddRangeIfElementsNotIn(DAOFactory.SearchDAO.LoadSignatureOidsByTransaktionOid(originalTransaction.BargeldtransaktionOid.Value));
signatureOids2Delete.AddIfNotIn(originalTransaction.SignatureOid.Value);
@@ -4116,14 +4116,14 @@ namespace BeWo.Service.ServiceImplementations
}
// Die Transaktion ist nicht neu und wurde geändert
- if((changedOrDeletedTransactionDC?.BargeldtransaktionOid.HasValue ?? false) && !originalTransaction.Equals(changedOrDeletedTransactionDC))
+ if ((changedOrDeletedTransactionDC?.BargeldtransaktionOid.HasValue ?? false) && !originalTransaction.Equals(changedOrDeletedTransactionDC))
{
// Es wurde eine Transaktion unterschrieben.
- if(originalTransaction.SignatureOid is null && changedOrDeletedTransactionDC.SignatureOid.HasValue)
+ if (originalTransaction.SignatureOid is null && changedOrDeletedTransactionDC.SignatureOid.HasValue)
{
oids2ChangeTypes.AddIfNotIn(
new KeyValuePair>(
- changedOrDeletedTransactionDC.BargeldtransaktionOid.Value,
+ changedOrDeletedTransactionDC.BargeldtransaktionOid.Value,
new KeyValuePair(StatementType.Signature, SignatureStateType.Valid)));
}
else // Es wurde eine andere Eigenschaft geändert als die Unterschrift
@@ -4131,16 +4131,16 @@ namespace BeWo.Service.ServiceImplementations
var newSignatureState = SignatureStateType.None;
// Wenn die Transaktion eine Unterschrift vor der Änderung hatte, wird diese als ungültig gespeichert und gelöscht.
- if(changedOrDeletedTransactionDC.SignatureOid.HasValue)
+ if (changedOrDeletedTransactionDC.SignatureOid.HasValue)
{
newSignatureState = SignatureStateType.Invalid;
-
+
signatureOids2Delete.AddRangeIfElementsNotIn(DAOFactory.SearchDAO.LoadSignatureOidsByTransaktionOid(changedOrDeletedTransactionDC.BargeldtransaktionOid.Value));
signatureOids2Delete.AddIfNotIn(changedOrDeletedTransactionDC.SignatureOid.Value);
changedOrDeletedTransactionDC.SignatureOid = null;
}
// Die Unterschrift wurde gelöscht
- else if(changedOrDeletedTransactionDC.SignatureOid is null && originalTransaction.SignatureOid.HasValue)
+ else if (changedOrDeletedTransactionDC.SignatureOid is null && originalTransaction.SignatureOid.HasValue)
{
signatureOids2Delete.AddRangeIfElementsNotIn(DAOFactory.SearchDAO.LoadSignatureOidsByTransaktionOid(changedOrDeletedTransactionDC.BargeldtransaktionOid.Value));
newSignatureState = SignatureStateType.ManuallyDeleted;
@@ -4155,16 +4155,16 @@ namespace BeWo.Service.ServiceImplementations
}
}
#endregion
-
+
var deletedTransactions = DAOFactory.GenericDAO.LoadByIDs(deletedOids);
var signatures2Delete = new List();
// Die Transaktion wurde gelöscht
- foreach(var deletedTransaction in deletedTransactions)
+ foreach (var deletedTransaction in deletedTransactions)
{
var signatureStateType = SignatureStateType.None;
- if(deletedTransaction.SignatureOid.HasValue)
+ if (deletedTransaction.SignatureOid.HasValue)
{
var signature = DAOFactory.GenericDAO.LoadByID(deletedTransaction.SignatureOid.Value);
signatures2Delete.Add(signature);
@@ -4182,17 +4182,17 @@ namespace BeWo.Service.ServiceImplementations
DAOFactory.GenericDAO.Update(lOriginal);
// Nach dem Insert der neuen Transaktionen haben diese eine Oid und es können die History-Einträge gemacht werden
- foreach(var newTransaction in newTransactions)
+ foreach (var newTransaction in newTransactions)
{
transactionHistoryEntries.Add(CreateTransactionHistoryObject(newTransaction, StatementType.Insert, SignatureStateType.None));
}
// Die History-Einträge für die bearbeiteten werden gemacht
- foreach(var oid2ChangeTypes in oids2ChangeTypes)
+ foreach (var oid2ChangeTypes in oids2ChangeTypes)
{
var editedTransaction = lOriginal.Bargeldtransaktionen.FirstOrDefault(transaction => transaction.Oid.HasValue && transaction.Oid.Value.Equals(oid2ChangeTypes.Key));
- if(editedTransaction is null)
+ if (editedTransaction is null)
{
continue;
}
@@ -4222,7 +4222,7 @@ namespace BeWo.Service.ServiceImplementations
DAOFactory.GenericDAO.Delete(signature2Delete);
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -4238,7 +4238,7 @@ namespace BeWo.Service.ServiceImplementations
var historyEntries = new List();
- foreach(var transaction in bargeldkasse.Bargeldtransaktionen)
+ foreach (var transaction in bargeldkasse.Bargeldtransaktionen)
{
var signatureState = transaction.SignatureOid is null ? SignatureStateType.None : SignatureStateType.AutomaticallyDeleted;
historyEntries.Add(CreateTransactionHistoryObject(transaction, StatementType.Delete, signatureState));
@@ -4252,7 +4252,7 @@ namespace BeWo.Service.ServiceImplementations
// SignatureOids aus den Transaktionen löschen, da die Signature-Objekte gelöscht wurden
bargeldkasse = DAOFactory.GenericDAO.LoadByID(pOid);
- foreach(var transaction in bargeldkasse.Bargeldtransaktionen)
+ foreach (var transaction in bargeldkasse.Bargeldtransaktionen)
{
transaction.SignatureOid = null;
}
@@ -4269,20 +4269,20 @@ namespace BeWo.Service.ServiceImplementations
{
return new Bargeldtransaktionshistory
{
- Betrag = transaction.Betrag,
- BargeldtransaktionOid = transaction.Oid,
- BargeldtransaktionInsTs = transaction.InsTs,
+ Betrag = transaction.Betrag,
+ BargeldtransaktionOid = transaction.Oid,
+ BargeldtransaktionInsTs = transaction.InsTs,
BargeldtransaktionInsUser = transaction.InsUser,
BargeldtransaktionUdpUser = transaction.UdpUser,
BargeldtransaktionVersion = transaction.Version,
- ChangeType = changeType,
- Belegnummer = transaction.Belegnummer,
- Notice = transaction.Notice,
- IsActive = ActivationTypeId.Active,
- SignatureOid = transaction.SignatureOid,
- SignatureState = signatureState,
- Zahlungstyp = transaction.Zahlungstyp,
- Zahlungsdatum = transaction.Zahlungsdatum
+ ChangeType = changeType,
+ Belegnummer = transaction.Belegnummer,
+ Notice = transaction.Notice,
+ IsActive = ActivationTypeId.Active,
+ SignatureOid = transaction.SignatureOid,
+ SignatureState = signatureState,
+ Zahlungstyp = transaction.Zahlungstyp,
+ Zahlungsdatum = transaction.Zahlungsdatum
};
}
@@ -4613,7 +4613,7 @@ namespace BeWo.Service.ServiceImplementations
{
c2tList = DAOFactory.SearchDAO.GetCustomer2TokensByCustomerOid(oid.Value);
}
-
+
foreach (var item in token)
{
@@ -4623,7 +4623,7 @@ namespace BeWo.Service.ServiceImplementations
{
if (item.Oid == c2t.TokenOid)
{
- item.MemberOid = oid;
+ item.MemberOid = oid;
}
}
}
@@ -4636,7 +4636,7 @@ namespace BeWo.Service.ServiceImplementations
{
e2tList = DAOFactory.SearchDAO.GeEmployee2TokensByEmployeeOid(oid.Value);
}
-
+
foreach (var item in token)
{
fToken.Add(item);
@@ -4646,7 +4646,7 @@ namespace BeWo.Service.ServiceImplementations
if (item.Oid == e2t.TokenOid)
{
item.MemberOid = oid;
-
+
}
}
}
@@ -5136,7 +5136,7 @@ namespace BeWo.Service.ServiceImplementations
var url = ConfigurationManager.AppSettings.Get("LicenseOrderUrl");
url = url.Replace("[TENANT]", MultitenancyOperationContextExt.Current.Tenant);
-
+
return url;
}
@@ -6118,7 +6118,7 @@ namespace BeWo.Service.ServiceImplementations
{
DAOFactory.GenericDAO.Insert(deletionHistoryEntry);
}
-
+
}
catch (Exception e)
{
@@ -6496,7 +6496,7 @@ namespace BeWo.Service.ServiceImplementations
public List GetWholeIcf()
{
try
- {
+ {
return ICFDAO.GetWholeIcf();
}
catch (Exception e)
@@ -6515,14 +6515,14 @@ namespace BeWo.Service.ServiceImplementations
foreach (var chapter in icf)
{
foreach (var vorhandenesKapitel in vorhandeneZiele)
- {
+ {
// TEMPORÄR ZUM TESTEN; Richtiger Ansatz, aber muss differenzieren, ob es oberkapitel sind
- if (vorhandenesKapitel != null && vorhandenesKapitel.DisplayName == chapter.DisplayName && !vorhandenesKapitel.DisplayName.Contains("ICF") &&
+ if (vorhandenesKapitel != null && vorhandenesKapitel.DisplayName == chapter.DisplayName && !vorhandenesKapitel.DisplayName.Contains("ICF") &&
!vorhandenesKapitel.DisplayName.Contains("Komponente") && !vorhandenesKapitel.DisplayName.Contains("Kapitel"))
{
if (!icf.Any(c => c.ParentOid == vorhandenesKapitel.ValueListEntryOid))
{
- listeMitUeberschneidungen.Add(chapter);
+ listeMitUeberschneidungen.Add(chapter);
}
}
}
@@ -6575,7 +6575,7 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
- // enthält alles, außer das, was gebraucht wird
+ // enthält alles, außer das, was gebraucht wird
private List EntferneParentOhneKinder(List listeMitUeberschneidungen, Dictionary> alleKinderDerVadderOid, List icf)
{
// Zum Zeitpunkt des Aufrufens dieser Methode sind alle Ziele, die bereits importiert wurden, aus dem ICF entfernt, sofern diese keine Kinder mehr haben
@@ -6990,10 +6990,10 @@ namespace BeWo.Service.ServiceImplementations
{
var gr = new GoalRatingDC();
gr.GoalEntry = ve;
-
+
if (ve.Type == ValueListEntryType.SupportConceptGoalType || ve.Type == ValueListEntryType.SupportConceptIndividualGoalType)
- {
+ {
//Bei Maßnahmen nimm das übergeordnete Ziel
if (ve.ParentOid.HasValue && oid2Entry.ContainsKey(ve.ParentOid.Value))
{
@@ -7150,7 +7150,7 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
- public bool DeleteDienstEintrag2(long empId, long wohnId, int zeile, DateTime date, DienstEintragDC dienstEintrag, List alleDiensteintraege,
+ public bool DeleteDienstEintrag2(long empId, long wohnId, int zeile, DateTime date, DienstEintragDC dienstEintrag, List alleDiensteintraege,
List alleDienstvertretungen, int day, DateTime pflichtStart, DateTime pflichtEnde)
{
try
@@ -7299,7 +7299,7 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
-
+
public void InsertConfirmationReceiptSignature(ConfirmationReceiptSignatureDC confirmationReceiptSignature)
{
try
@@ -7335,9 +7335,9 @@ namespace BeWo.Service.ServiceImplementations
// ToDo: Ist der SignatureStateType Valid und ist die CRSOid null, die CRSOid hinzufügen!
private static void MakeHistoryEntriesForConfirmationReceiptSignatures(List confirmationReceiptSignatures, SignatureStateType signatureStateType)
{
- foreach(var confirmationReceiptSignature in confirmationReceiptSignatures)
+ foreach (var confirmationReceiptSignature in confirmationReceiptSignatures)
{
- foreach(var serviceRecord in confirmationReceiptSignature.ServiceRecords)
+ foreach (var serviceRecord in confirmationReceiptSignature.ServiceRecords)
{
SignatureStateType? customerMonthlySignatureStateType;
SignatureStateType? employeeMonthlySignatureStateType;
@@ -7345,12 +7345,12 @@ namespace BeWo.Service.ServiceImplementations
long? customerConfirmationReceiptSignatureOid = null;
long? employeeConfirmationReceiptSignatureOid = null;
- if(confirmationReceiptSignature.SignatureType == SignatureType.Customer)
+ if (confirmationReceiptSignature.SignatureType == SignatureType.Customer)
{
customerMonthlySignatureStateType = signatureStateType;
employeeMonthlySignatureStateType = null;
- if(signatureStateType == SignatureStateType.Valid)
+ if (signatureStateType == SignatureStateType.Valid)
{
customerConfirmationReceiptSignatureOid = confirmationReceiptSignature.Oid;
}
@@ -7360,7 +7360,7 @@ namespace BeWo.Service.ServiceImplementations
customerMonthlySignatureStateType = null;
employeeMonthlySignatureStateType = signatureStateType;
- if(signatureStateType == SignatureStateType.Valid)
+ if (signatureStateType == SignatureStateType.Valid)
{
employeeConfirmationReceiptSignatureOid = confirmationReceiptSignature.Oid;
}
@@ -7581,7 +7581,7 @@ namespace BeWo.Service.ServiceImplementations
//url = url.Replace("[TENANT]", MultitenancyOperationContextExt.Current.Tenant);
//return url;
-
+
if (MultitenancyOperationContextExt.Current != null)
{
var tenant = MultitenancyOperationContextExt.Current.Tenant;
@@ -7616,10 +7616,10 @@ namespace BeWo.Service.ServiceImplementations
response.Close();
-
+
return String.Format("{0}/settings/{1}/{2}", serverUrl, tenant, jsondaten.token);
}
-
+
return "https://www.bewoplaner.de";
}
@@ -7798,7 +7798,7 @@ namespace BeWo.Service.ServiceImplementations
{
return DAOFactory.SearchDAO.HasConfirmationReceiptSignature(serviceRecordOids, signatureType);
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -7810,7 +7810,7 @@ namespace BeWo.Service.ServiceImplementations
{
return VorlagenManager.ReplacePlaceholdersInTemplate(template, objectOid, tableOid);
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -7851,23 +7851,23 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
-
+
public void RemoveAllDiensteForOneMonth(CompactWohnheimDC wh, DateTime month, List rd)
{
try
- {
+ {
DienstplanungsManager.RemoveAllDiensteForOneMonth(wh, month, rd);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
- }
+ }
public void RemoveAllDiensteForOneYear(CompactWohnheimDC wh, DateTime year, List rd)
{
try
- {
+ {
DienstplanungsManager.RemoveAllDiensteForOneYear(wh, year, rd);
}
catch (Exception e)
@@ -7951,7 +7951,7 @@ namespace BeWo.Service.ServiceImplementations
}
public DienstZeileDC InitStatusZeile(DateTime date)
{
-
+
try
{
return DienstplanungsManager.InitStatusZeile(date);
@@ -7993,7 +7993,7 @@ namespace BeWo.Service.ServiceImplementations
dict.Add("Vorname", employee.Person.FirstName);
dict.Add("Nachname", employee.Person.LastName);
- if(employee.Person.DateOfBirth != null)
+ if (employee.Person.DateOfBirth != null)
{
var dateAndTime = employee.Person.DateOfBirth.ToString().Split(' ');
dict.Add("Geburtstag", dateAndTime[0]);
@@ -8007,11 +8007,11 @@ namespace BeWo.Service.ServiceImplementations
// c++;
// }
//}
- if(employee.IsQualified != null)
+ if (employee.IsQualified != null)
dict.Add("Qualifiziert", ((bool)employee.IsQualified) ? "Ja" : "Nein");
- if(employee.Schutzstufe != null)
+ if (employee.Schutzstufe != null)
dict.Add("Schutzstufe", employee.Schutzstufe);
-
+
return dict;
}
@@ -8058,11 +8058,11 @@ namespace BeWo.Service.ServiceImplementations
serviceRecordOidsWithSignatures = new List();
- foreach(var crs in signatures)
+ foreach (var crs in signatures)
{
- foreach(var sr in crs.ServiceRecords)
+ foreach (var sr in crs.ServiceRecords)
{
- if(sr.Oid.HasValue && serviceRecordOids.Contains(sr.Oid.Value))
+ if (sr.Oid.HasValue && serviceRecordOids.Contains(sr.Oid.Value))
{
serviceRecordOidsWithSignatures.AddIfNotIn(sr.Oid.Value);
}
@@ -8071,7 +8071,7 @@ namespace BeWo.Service.ServiceImplementations
return MapperFactory.ConfirmationReceiptSignatureDC_ConfirmationReceiptSignature.MapToNewDCs(signatures);
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -8091,7 +8091,7 @@ namespace BeWo.Service.ServiceImplementations
return MapperFactory.ConfirmationReceiptSignatureDC_ConfirmationReceiptSignature.MapToNewDCs(lOriginals);
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -8107,7 +8107,7 @@ namespace BeWo.Service.ServiceImplementations
MakeHistoryEntriesForConfirmationReceiptSignatures(originals, SignatureStateType.ManuallyDeleted);
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -8119,7 +8119,7 @@ namespace BeWo.Service.ServiceImplementations
{
return DAOFactory.SearchDAO.HasConfirmationReceiptSignaturesByCustomerAndServiceRecords(customerOid, serviceRecordOids);
}
- catch(Exception exception)
+ catch (Exception exception)
{
throw Utils.CreateBeWoFaultException(exception);
}
@@ -8133,14 +8133,14 @@ namespace BeWo.Service.ServiceImplementations
serviceRecordOidsWithSignature = new Dictionary>();
- foreach(var csr in confirmationReceiptSignatures)
+ foreach (var csr in confirmationReceiptSignatures)
{
serviceRecordOidsWithSignature.AddOrUpdateValueInDictionary(csr.SignatureType, csr.ServiceRecords.Where(sr => sr.Oid.HasValue).Select(sr => sr.Oid.Value).ToList());
}
return MapperFactory.ConfirmationReceiptSignatureDC_ConfirmationReceiptSignature.MapToNewDCs(confirmationReceiptSignatures);
}
- catch(Exception exception)
+ catch (Exception exception)
{
throw Utils.CreateBeWoFaultException(exception);
}
@@ -8152,7 +8152,7 @@ namespace BeWo.Service.ServiceImplementations
{
return DAOFactory.SearchDAO.LoadServiceRecordOidsWithConfirmationReceiptSignatures(serviceRecordOids);
}
- catch(Exception exception)
+ catch (Exception exception)
{
throw Utils.CreateBeWoFaultException(exception);
}
@@ -8164,7 +8164,7 @@ namespace BeWo.Service.ServiceImplementations
{
return DAOFactory.SearchDAO.LoadServiceRecordOidsWithConfirmationReceiptSignatures(serviceRecordOids, signatureType);
}
- catch(Exception exception)
+ catch (Exception exception)
{
throw Utils.CreateBeWoFaultException(exception);
}
@@ -8176,7 +8176,7 @@ namespace BeWo.Service.ServiceImplementations
{
return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(DAOFactory.SearchDAO.GetServiceRecordsWithoutConfirmationReceiptSignature(serviceRecordOids, signatureType));
}
- catch(Exception exception)
+ catch (Exception exception)
{
throw Utils.CreateBeWoFaultException(exception);
}
@@ -8191,25 +8191,25 @@ namespace BeWo.Service.ServiceImplementations
/// Ist true, wenn es sich um das Löschen von ServiceRecords handelt
private static List RemoveServiceRecordsFromConfirmationReceiptSignatures(List serviceRecordsToUpdate, IEnumerable oldServiceRecords, bool isDeleting)
{
- var result = new List();
+ var result = new List();
var serviceRecordOids = new List();
- var oldVsNew = new Dictionary();
- var orderedOldOnes = oldServiceRecords.Where(x => x.Oid.HasValue).OrderBy(x => x.Oid.Value).ToList();
- var orderedNewOnes = serviceRecordsToUpdate.Where(x => x.ServiceRecordOid.HasValue).OrderBy(x => x.ServiceRecordOid.Value).ToList();
+ var oldVsNew = new Dictionary();
+ var orderedOldOnes = oldServiceRecords.Where(x => x.Oid.HasValue).OrderBy(x => x.Oid.Value).ToList();
+ var orderedNewOnes = serviceRecordsToUpdate.Where(x => x.ServiceRecordOid.HasValue).OrderBy(x => x.ServiceRecordOid.Value).ToList();
- foreach(var oldSr in orderedOldOnes)
+ foreach (var oldSr in orderedOldOnes)
{
var newSr = orderedNewOnes.FirstOrDefault(f => f.ServiceRecordOid == oldSr.Oid);
- if(newSr != null)
+ if (newSr != null)
{
oldVsNew.Add(oldSr, newSr);
}
}
- foreach(var kvp in oldVsNew)
+ foreach (var kvp in oldVsNew)
{
- if(kvp.Value.ServiceRecordOid.HasValue && (kvp.Key.Start != kvp.Value.Start || kvp.Key.End != kvp.Value.End || isDeleting))
+ if (kvp.Value.ServiceRecordOid.HasValue && (kvp.Key.Start != kvp.Value.Start || kvp.Key.End != kvp.Value.End || isDeleting))
{
serviceRecordOids.AddIfNotIn(kvp.Value.ServiceRecordOid.Value);
}
@@ -8220,11 +8220,11 @@ namespace BeWo.Service.ServiceImplementations
var confirmationReceiptSignatures2Delete = new List();
var confirmationReceiptSignatures2Update = new List();
- foreach(var signature in confirmationReceiptSignatures)
+ foreach (var signature in confirmationReceiptSignatures)
{
var signatures2Keep = signature.ServiceRecords.Where(sr => sr.Oid.HasValue && !serviceRecordOids.Contains(sr.Oid.Value)).ToList();
- if(signatures2Keep.Count == 0)
+ if (signatures2Keep.Count == 0)
{
confirmationReceiptSignatures2Delete.AddIfNotIn(signature);
continue;
@@ -8241,7 +8241,7 @@ namespace BeWo.Service.ServiceImplementations
var oids2Versions = new Dictionary();
confirmationReceiptSignatures2Delete.DoForEach(signature =>
{
- if(signature.Oid is null || signature.Version is null)
+ if (signature.Oid is null || signature.Version is null)
{
return;
}
@@ -8252,20 +8252,20 @@ namespace BeWo.Service.ServiceImplementations
ServiceLogic.SetActivationType(oids2Versions, ActivationTypeId.Deleted);
var timeAlteredServiceRecords = DAOFactory.GenericDAO.LoadByIDs(serviceRecordOids);
-
+
var mostRecentSignatureStatusInfos = DAOFactory.SearchDAO.FindMostRecentSignatureStatusInfoByServiceRecords(serviceRecordOids);
- if(confirmationReceiptSignatures2Update.Any())
+ if (confirmationReceiptSignatures2Update.Any())
{
- foreach(var serviceRecord in timeAlteredServiceRecords)
+ foreach (var serviceRecord in timeAlteredServiceRecords)
{
SignatureStateInfoFromServiceRecordHistoryEntry previousRecordHistorySignatureInfo = null;
- if(serviceRecord.Oid.HasValue && mostRecentSignatureStatusInfos.ContainsKey(serviceRecord.Oid.Value))
+ if (serviceRecord.Oid.HasValue && mostRecentSignatureStatusInfos.ContainsKey(serviceRecord.Oid.Value))
{
previousRecordHistorySignatureInfo = mostRecentSignatureStatusInfos[serviceRecord.Oid.Value];
}
-
+
var newCustomerSignatureState = DetermineNewSignatureState(previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureStateType);
var newEmployeeSignatureState = DetermineNewSignatureState(previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureStateType);
@@ -8280,12 +8280,12 @@ namespace BeWo.Service.ServiceImplementations
}
}
- foreach(var confirmationReceiptSignature in confirmationReceiptSignatures2Delete)
+ foreach (var confirmationReceiptSignature in confirmationReceiptSignatures2Delete)
{
var first = confirmationReceiptSignature.ServiceRecords.FirstOrDefault();
// Eine Unterschrift, die in der confirmationReceiptSignatures2Delete ist, hat nur noch den einen ServiceRecord, der gerade in der Zeit bearbeitet wird!
- if(first != null)
+ if (first != null)
{
var signatureOid = confirmationReceiptSignature.Oid.Value;
@@ -8298,7 +8298,7 @@ namespace BeWo.Service.ServiceImplementations
confirmationReceiptSignature.ServiceRecords.AddRangeIfElementsNotIn(formerlySignedServiceRecords);
}
- foreach(var serviceRecord in confirmationReceiptSignature.ServiceRecords)
+ foreach (var serviceRecord in confirmationReceiptSignature.ServiceRecords)
{
var previousServiceRecord2SignatureStates = result.FirstOrDefault(f => f.ServiceRecord.Equals(serviceRecord));
@@ -8309,11 +8309,11 @@ namespace BeWo.Service.ServiceImplementations
SignatureStateType.None
);
- if(previousServiceRecord2SignatureStates is null)
+ if (previousServiceRecord2SignatureStates is null)
{
SignatureStateInfoFromServiceRecordHistoryEntry previousRecordHistorySignatureInfo = null;
- if(serviceRecord.Oid.HasValue && mostRecentSignatureStatusInfos.ContainsKey(serviceRecord.Oid.Value))
+ if (serviceRecord.Oid.HasValue && mostRecentSignatureStatusInfos.ContainsKey(serviceRecord.Oid.Value))
{
previousRecordHistorySignatureInfo = mostRecentSignatureStatusInfos[serviceRecord.Oid.Value];
}
@@ -8336,7 +8336,7 @@ namespace BeWo.Service.ServiceImplementations
private static SignatureStateType DetermineNewDeletedSignatureState(SignatureStateType? previouSignatureStateType)
{
- switch(previouSignatureStateType)
+ switch (previouSignatureStateType)
{
case null:
return SignatureStateType.None;
@@ -8353,7 +8353,7 @@ namespace BeWo.Service.ServiceImplementations
{
var newSignatureStateType = SignatureStateType.None;
- switch(previousSignatureStateType)
+ switch (previousSignatureStateType)
{
case SignatureStateType.Valid:
newSignatureStateType = SignatureStateType.Invalid;
@@ -8362,10 +8362,10 @@ namespace BeWo.Service.ServiceImplementations
newSignatureStateType = SignatureStateType.Invalid;
break;
case SignatureStateType.ManuallyDeleted:
- newSignatureStateType = (SignatureStateType) previousSignatureStateType;
+ newSignatureStateType = (SignatureStateType)previousSignatureStateType;
break;
case SignatureStateType.AutomaticallyDeleted:
- newSignatureStateType = (SignatureStateType) previousSignatureStateType;
+ newSignatureStateType = (SignatureStateType)previousSignatureStateType;
break;
}
@@ -8382,7 +8382,7 @@ namespace BeWo.Service.ServiceImplementations
var confirmationReceiptSignatures = DAOFactory.SearchDAO.LoadAllConfirmationReceiptSignaturesByServiceRecordOids(serviceRecordOids);
- foreach(var signature in confirmationReceiptSignatures)
+ foreach (var signature in confirmationReceiptSignatures)
{
var serviceRecords2Keep = signature.ServiceRecords.Where(serviceRecord => serviceRecord.Oid.HasValue && !serviceRecordOids.Contains(serviceRecord.Oid.Value)).ToList();
signature.ServiceRecords.Clear();
@@ -8400,7 +8400,7 @@ namespace BeWo.Service.ServiceImplementations
return MapperFactory.RatingTypeDC_RatingType.MapToNewDCs(ratingTypes);
}
- catch(Exception exception)
+ catch (Exception exception)
{
throw Utils.CreateBeWoFaultException(exception);
}
@@ -8481,7 +8481,7 @@ namespace BeWo.Service.ServiceImplementations
}
}
- if(signatureOids.Any())
+ if (signatureOids.Any())
{
var signatures2Delete = DAOFactory.GenericDAO.LoadByIDs(signatureOids);
@@ -8493,7 +8493,7 @@ namespace BeWo.Service.ServiceImplementations
ServiceLogic.SetActivationType(oids2Versions, ActivationTypeId.Deleted);
- foreach(var serviceRecord in originals)
+ foreach (var serviceRecord in originals)
{
//MakeSignatureStatusTypeServiceRecordHistoryEntry(serviceRecord, SignatureStateType.Invalid, null, null);
result.AddIfNotIn(serviceRecord);
@@ -8543,7 +8543,7 @@ namespace BeWo.Service.ServiceImplementations
try
{
//prüfe ob Datei existiert, sonst kommt ein Hibernate Fehler
-
+
if (file.Data?.Length > 0)
{
FileAttachmentUtils.SaveFileToFileDirectory(file);
@@ -8553,9 +8553,9 @@ namespace BeWo.Service.ServiceImplementations
{
}
-
-
+
+
}
}
@@ -8568,7 +8568,7 @@ namespace BeWo.Service.ServiceImplementations
return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(distinctServiceRecords);
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -8582,7 +8582,7 @@ namespace BeWo.Service.ServiceImplementations
return MapperFactory.ConfirmationReceiptSignatureDC_ConfirmationReceiptSignature.MapToNewDCs(signatures);
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -8592,7 +8592,7 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
- if(Guid.TryParse(recurrenceId, out var guid))
+ if (Guid.TryParse(recurrenceId, out var guid))
{
var rootAppointment = DAOFactory.SearchDAO.FindRootAppointmentByRecurrenceId(recurrenceId);
@@ -8601,7 +8601,7 @@ namespace BeWo.Service.ServiceImplementations
return null;
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -8612,14 +8612,14 @@ namespace BeWo.Service.ServiceImplementations
{
var result = new Dictionary();
- foreach(var code in icd10Codes)
+ foreach (var code in icd10Codes)
{
result.AddIfNotIn(new KeyValuePair(code, ICD10DAO.GetDiagnosisForCode(code)));
}
return result;
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -8633,12 +8633,12 @@ namespace BeWo.Service.ServiceImplementations
var signature = DAOFactory.GenericDAO.LoadByID(signatureOid);
- if(signature?.Oid is null || serviceRecord?.SignatureOid is null)
+ if (signature?.Oid is null || serviceRecord?.SignatureOid is null)
{
return;
}
- if(!serviceRecord.SignatureOid.Value.Equals(signature.Oid.Value))
+ if (!serviceRecord.SignatureOid.Value.Equals(signature.Oid.Value))
{
return;
}
@@ -8652,7 +8652,7 @@ namespace BeWo.Service.ServiceImplementations
MakeSignatureStatusTypeServiceRecordHistoryEntry(serviceRecord, SignatureStateType.ManuallyDeleted, null, null, null, null);
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -8670,59 +8670,59 @@ namespace BeWo.Service.ServiceImplementations
{
return DAOFactory.SearchDAO.CheckForConfirmationReceiptSignatureForServiceRecord(serviceRecordOid, signatureType);
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
-
+
private static void MakeSignatureStatusTypeServiceRecordHistoryEntry(ServiceRecord serviceRecord, SignatureStateType? singleSignatureStateType, SignatureStateType? customerMonthlySignatureStateType, SignatureStateType? employeeMonthlySignatureStateType, long? customerConfirmationReceiptSignatureOid, long? employeeConfirmationReceiptsignatureOid)
{
// Alten Unterschriftenstatus aus ServiceRecordHistory laden
SignatureStateInfoFromServiceRecordHistoryEntry previousRecordHistorySignatureInfo = null;
- if(serviceRecord.Oid.HasValue)
+ if (serviceRecord.Oid.HasValue)
{
previousRecordHistorySignatureInfo = DAOFactory.SearchDAO.FindMostRecentSignatureStatusInfoByServiceRecordOid(serviceRecord.Oid.Value);
}
var seviceRecordHistoryEntry = new ServiceRecordHistory
{
- TimeStamp = DateTime.Now,
- ChangeType = StatementType.Signature,
- CostBearer2SupportConcept = serviceRecord.CostBearer2SupportConcept,
- CostBearer2SupportConceptOid = serviceRecord.CostBearer2SupportConceptOid,
- Customer = serviceRecord.Customer,
- CustomerOid = serviceRecord.CustomerOid,
- Employee = serviceRecord.Employee,
- EmployeeOid = serviceRecord.EmployeeOid,
- End = serviceRecord.End,
- Group = serviceRecord.Group,
- GroupEmployeeCount = serviceRecord.GroupEmployeeCount,
- GroupOid = serviceRecord.GroupOid,
- GroupPersonCount = serviceRecord.GroupPersonCount,
- GroupRoundedDuration = serviceRecord.GroupRoundedDuration,
- IP = serviceRecord.IP,
- IsActive = serviceRecord.IsActive,
- Notice = serviceRecord.Notice,
- ServiceRecordOid = serviceRecord.Oid,
- RoundedDuration = serviceRecord.RoundedDuration,
- ServiceDescription = serviceRecord.ServiceDescription,
- ServiceRecordType = serviceRecord.ServiceRecordType,
- ServiceRecordInsTs = serviceRecord.InsTs,
- ServiceRecordVersion = serviceRecord.Version.Value,
- ServiceRecordInsUser = serviceRecord.InsUser,
- ServiceRecordUdpUser = serviceRecord.UdpUser,
- Start = serviceRecord.Start,
- SupportConcept = serviceRecord.SupportConcept,
- SystemEntryID = serviceRecord.SystemEntryID,
- DistanceInMeter = serviceRecord.DistanceInMeter,
- IsCreatedInMobileClient = serviceRecord.IsCreatedInMobileClient,
+ TimeStamp = DateTime.Now,
+ ChangeType = StatementType.Signature,
+ CostBearer2SupportConcept = serviceRecord.CostBearer2SupportConcept,
+ CostBearer2SupportConceptOid = serviceRecord.CostBearer2SupportConceptOid,
+ Customer = serviceRecord.Customer,
+ CustomerOid = serviceRecord.CustomerOid,
+ Employee = serviceRecord.Employee,
+ EmployeeOid = serviceRecord.EmployeeOid,
+ End = serviceRecord.End,
+ Group = serviceRecord.Group,
+ GroupEmployeeCount = serviceRecord.GroupEmployeeCount,
+ GroupOid = serviceRecord.GroupOid,
+ GroupPersonCount = serviceRecord.GroupPersonCount,
+ GroupRoundedDuration = serviceRecord.GroupRoundedDuration,
+ IP = serviceRecord.IP,
+ IsActive = serviceRecord.IsActive,
+ Notice = serviceRecord.Notice,
+ ServiceRecordOid = serviceRecord.Oid,
+ RoundedDuration = serviceRecord.RoundedDuration,
+ ServiceDescription = serviceRecord.ServiceDescription,
+ ServiceRecordType = serviceRecord.ServiceRecordType,
+ ServiceRecordInsTs = serviceRecord.InsTs,
+ ServiceRecordVersion = serviceRecord.Version.Value,
+ ServiceRecordInsUser = serviceRecord.InsUser,
+ ServiceRecordUdpUser = serviceRecord.UdpUser,
+ Start = serviceRecord.Start,
+ SupportConcept = serviceRecord.SupportConcept,
+ SystemEntryID = serviceRecord.SystemEntryID,
+ DistanceInMeter = serviceRecord.DistanceInMeter,
+ IsCreatedInMobileClient = serviceRecord.IsCreatedInMobileClient,
CustomerConfirmationReceiptSignatureStateType = customerMonthlySignatureStateType ?? previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
EmployeeConfirmationReceiptSignatureStateType = employeeMonthlySignatureStateType ?? previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
- ServiceRecordSignatureStateType = singleSignatureStateType ?? previousRecordHistorySignatureInfo?.ServiceRecordSignatureStateType ?? SignatureStateType.None,
- CustomerConfirmationReceiptSignatureOid = customerConfirmationReceiptSignatureOid ?? previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureOid,
- EmployeeConfirmationReceiptSignatureOid = employeeConfirmationReceiptsignatureOid ?? previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureOid
+ ServiceRecordSignatureStateType = singleSignatureStateType ?? previousRecordHistorySignatureInfo?.ServiceRecordSignatureStateType ?? SignatureStateType.None,
+ CustomerConfirmationReceiptSignatureOid = customerConfirmationReceiptSignatureOid ?? previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureOid,
+ EmployeeConfirmationReceiptSignatureOid = employeeConfirmationReceiptsignatureOid ?? previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureOid
};
DAOFactory.GenericDAO.Insert(seviceRecordHistoryEntry);
@@ -8732,65 +8732,67 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
- var test_oid = Convert.ToInt64(param);
- var test_invoicebase = DAOFactory.GenericDAO.GetByID(test_oid);
- var test_datetime = test_invoicebase.InvoiceDate.Value;
+ //var test_oid = Convert.ToInt64(param);
+ //var test_invoicebase = DAOFactory.GenericDAO.GetByID(test_oid);
+ //var test_datetime = test_invoicebase.InvoiceDate.Value;
- var manager = new DakotaManager(test_datetime.Month, DateTime.Now);
- var oids = new List();
+ //var manager = new DakotaManager(test_datetime.Month, DateTime.Now);
+ //var oids = new List();
- oids.Add(test_oid);
+ //oids.Add(test_oid);
- foreach (var invoicebase_oid in oids)
- {
- var service = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(invoicebase_oid);
- var invoicebase = DAOFactory.GenericDAO.GetByID(invoicebase_oid);
- var orga = invoicebase.CostBearer2SupportConcept.CostBearer.Organisation;
- var customer = invoicebase.CostBearer2SupportConcept.SupportConcept.Customer;
- var mandator = GetMandatorEntity();
+ //foreach (var invoicebase_oid in oids)
+ //{
+ // var service = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(invoicebase_oid);
+ // var invoicebase = DAOFactory.GenericDAO.GetByID(invoicebase_oid);
+ // var orga = invoicebase.CostBearer2SupportConcept.CostBearer.Organisation;
+ // var customer = invoicebase.CostBearer2SupportConcept.SupportConcept.Customer;
+ // var mandator = GetMandatorEntity();
- var servicedc = MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(service);
- var orgadc = MapperFactory.OrganisationDC_OrganisationMapper.MapToNewDC(orga);
- var customerdc = MapperFactory.CustomerDC_Customer.MapToNewDC(customer);
- var mandatordc = MapperFactory.MandatorDC_Mandator.MapToNewDC(mandator);
+ // var servicedc = MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(service);
+ // var orgadc = MapperFactory.OrganisationDC_OrganisationMapper.MapToNewDC(orga);
+ // var customerdc = MapperFactory.CustomerDC_Customer.MapToNewDC(customer);
+ // var mandatordc = MapperFactory.MandatorDC_Mandator.MapToNewDC(mandator);
- manager.Add(servicedc, orgadc, customerdc, mandatordc);
- }
+ // manager.Add(servicedc, orgadc, customerdc, mandatordc);
+ //}
- manager.Apply();
+ //manager.Apply();
- manager.Save();
+ //manager.Save(@"C:\Projects\GKV Abrechnung Tests", true);
- //return manager.DakotaFileDict.First().Value.GetNutzdatendatei();
+ ////return manager.DakotaFileDict.First().Value.GetNutzdatendatei();
- var nutzdatendatei = manager.DakotaFileDict.First().Value.GetNutzdatendatei();
+ //var nutzdatendatei = manager.DakotaFileDict.First().Value.GetNutzdatendatei();
- String url = "http://localhost:3777/Host/GkvAbrechnungView.aspx";
- //String url = "https://app8.bewoplaner.de/service/GkvAbrechnungView.aspx";
- using (WebClient client = new WebClient())
- {
- //MessageBox.Show(hostAddress);
+ //String url = "http://localhost:3777/Host/GkvAbrechnungView.aspx";
+ ////String url = "https://app8.bewoplaner.de/service/GkvAbrechnungView.aspx";
+ //using (WebClient client = new WebClient())
+ //{
+ // //MessageBox.Show(hostAddress);
- var nvc = new NameValueCollection();
- nvc.Add("Kundennummer", "7375324044");
- nvc.Add("IKDatenannahmestelle", manager.DakotaFileDict.First().Value.GetIKEmpfang());
- nvc.Add("IKEmpfang", manager.DakotaFileDict.First().Value.GetIKEmpfang());
- nvc.Add("TransferName", manager.DakotaFileDict.First().Value.GetTransferName());
- nvc.Add("Nutzdatendatei", nutzdatendatei);
- nvc.Add("Auftragsdatei", manager.DakotaFileDict.First().Value.GetAuftragsdatei());
+ // var nvc = new NameValueCollection();
+ // nvc.Add("Kundennummer", "7375324044");
+ // nvc.Add("IKDatenannahmestelle", manager.DakotaFileDict.First().Value.GetIKEmpfang());
+ // nvc.Add("IKEmpfang", manager.DakotaFileDict.First().Value.GetIKEmpfang());
+ // nvc.Add("TransferName", manager.DakotaFileDict.First().Value.GetTransferName());
+ // nvc.Add("Nutzdatendatei", nutzdatendatei);
+ // nvc.Add("Auftragsdatei", manager.DakotaFileDict.First().Value.GetAuftragsdatei());
- byte[] response = client.UploadValues(url, "POST", nvc);
+ // byte[] response = client.UploadValues(url, "POST", nvc);
- String responseStr = System.Text.Encoding.ASCII.GetString(response);
- }
+ // String responseStr = System.Text.Encoding.ASCII.GetString(response);
+ //}
- return nutzdatendatei;
+ //return nutzdatendatei;
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
+
+ throw new NotImplementedException();
}
public List GetEmployeesServiceRecordsWithStartEndDatePaginated(long pEmployeeOid, DateTime start, DateTime ende, int firstResult, int maxResults, out int rowCount)
@@ -8801,7 +8803,7 @@ namespace BeWo.Service.ServiceImplementations
return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(serviceRecords);
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -8815,7 +8817,7 @@ namespace BeWo.Service.ServiceImplementations
return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(serviceRecords);
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -8830,7 +8832,7 @@ namespace BeWo.Service.ServiceImplementations
return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(distinctServiceRecords);
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -8842,7 +8844,7 @@ namespace BeWo.Service.ServiceImplementations
{
return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(DAOFactory.SearchDAO.FindServiceRecordsForDaysPaginated(costbearer2SupportConceptOid, days, employeeOid, firstResult, maxResults, out rowCount));
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -8856,7 +8858,7 @@ namespace BeWo.Service.ServiceImplementations
return MapperFactory.BargeldtransaktionshistoryDC_Bargeldtransaktionshistory.MapToNewDCs(historyEntries);
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -8868,7 +8870,7 @@ namespace BeWo.Service.ServiceImplementations
{
return MapperFactory.SignatureDC_Signature.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive());
}
- catch(Exception e)
+ catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
@@ -8891,15 +8893,15 @@ namespace BeWo.Service.ServiceImplementations
///
public ServiceRecord2SignatureStates(ServiceRecord serviceRecord, SignatureStateType? singleSignatureStateType, SignatureStateType? customerMonthlySignatureStateType, SignatureStateType? employeeMonthlySignatreStateType)
{
- ServiceRecord = serviceRecord;
- SingleSignatureStateType = singleSignatureStateType;
+ ServiceRecord = serviceRecord;
+ SingleSignatureStateType = singleSignatureStateType;
CustomerMonthlySignatureStateType = customerMonthlySignatureStateType;
- EmployeeMonthlySignatreStateType = employeeMonthlySignatreStateType;
+ EmployeeMonthlySignatreStateType = employeeMonthlySignatreStateType;
}
public override bool Equals(object obj)
{
- if(obj is ServiceRecord2SignatureStates sr2Ss && !(sr2Ss.ServiceRecord is null))
+ if (obj is ServiceRecord2SignatureStates sr2Ss && !(sr2Ss.ServiceRecord is null))
{
return ServiceRecord?.Equals(sr2Ss.ServiceRecord) ?? false;
}
diff --git a/Shared/DataContracts/GkvAbrechnungDC.cs b/Shared/DataContracts/GkvAbrechnungDC.cs
index 570267f15..a5ad79318 100644
--- a/Shared/DataContracts/GkvAbrechnungDC.cs
+++ b/Shared/DataContracts/GkvAbrechnungDC.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Runtime.Serialization;
using BS.Shared.DataContracts.Compact;
@@ -16,15 +17,18 @@ namespace BS.Shared.DataContracts
[DataMember]
public string Notice { get; set; }
- [DataMember]
- public string IKDatenannahmestelle { get; set; }
-
- [DataMember]
- public string IKEmpfang { get; set; }
-
[DataMember]
public string IKLeistungserbringer { get; set; }
+ [DataMember]
+ public string IKVersichertenKarte { get; set; }
+
+ [DataMember]
+ public string IKKostenträger { get; set; }
+
+ [DataMember]
+ public string IKDatenannahmestelle { get; set; }
+
[DataMember]
public DateTime? AbrechnungsZeitraumStart { get; set; }
@@ -40,6 +44,9 @@ namespace BS.Shared.DataContracts
[DataMember]
public string Transfername { get; set; }
+ [DataMember]
+ public DateTime? ErstelltAm { get; set; }
+
[DataMember]
public DateTime? VerschluesseltAm { get; set; }
@@ -52,6 +59,10 @@ namespace BS.Shared.DataContracts
[DataMember]
public DateTime? AntwortEntschluesseltAm { get; set; }
- public bool AllowEdit { get; set; }
+ [DataMember]
+ public decimal Betrag { get; set; }
+
+ [DataMember]
+ public List InvoiceBaseOids { get; set; }
}
}
\ No newline at end of file
diff --git a/Shared/DataContracts/GkvAbrechnungFilterDC.cs b/Shared/DataContracts/GkvAbrechnungFilterDC.cs
new file mode 100644
index 000000000..07ffb845c
--- /dev/null
+++ b/Shared/DataContracts/GkvAbrechnungFilterDC.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BS.Shared.DataContracts
+{
+ [DataContract]
+ public class GkvAbrechnungFilterDC : IDataContract
+ {
+ public GkvAbrechnungFilterDC(GkvAbrechnungDC gkvAbrechnungDC) : base()
+ {
+ GkvAbrechnungDC = gkvAbrechnungDC;
+ }
+ public GkvAbrechnungFilterDC()
+ {
+
+ }
+
+
+ [DataMember]
+ public GkvAbrechnungDC GkvAbrechnungDC { get; set; }
+ }
+}
diff --git a/Shared/DataContracts/GkvAbrechnungViewFilterDC.cs b/Shared/DataContracts/GkvAbrechnungViewFilterDC.cs
new file mode 100644
index 000000000..f176b9271
--- /dev/null
+++ b/Shared/DataContracts/GkvAbrechnungViewFilterDC.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BS.Shared.DataContracts
+{
+ [DataContract]
+ public class GkvAbrechnungViewFilterDC : IDataContract
+ {
+ public GkvAbrechnungViewFilterDC()
+ {
+
+ }
+
+ [DataMember]
+ public bool FilterTime { get; set; }
+
+ [DataMember]
+ public DateTime? Start { get; set; }
+
+ [DataMember]
+ public DateTime? End { get; set; }
+
+ [DataMember]
+ public bool FilterForInvoiceDate { get; set; }
+ }
+}
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index 58e10ed0f..256e88079 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -184,6 +184,8 @@
+
+