ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

https -> http

Browse Source
This commit is contained in:
Rene Evertz
2024-06-26 13:02:57 +02:00
parent 761cb7c8ae
commit 777b461928
6 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWo/BeWoApp.xaml.cs
View File

@@ -920,7 +920,7 @@ namespace BeWo
base.OnStartup(e);
//AppDomain.CurrentDomain.UnhandledException += (s, ex) => ShowError(null, ex.ExceptionObject as Exception, true);
Dispatcher.UnhandledException += (s, ex)
=>
{

2
BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
View File

@@ -50,7 +50,7 @@
<!--<Button Click="btn_nutz_Click" Content="¥" Padding="0" Margin="1" ToolTip="Nutzdatendatei" Foreground="#BBBBBB" FontSize="10" FontFamily="Webdings" x:Name="btn_nutz" Height="17" Width="20" VerticalAlignment="Center" />
<Button Click="btn_auf_Click" Content="¥" Padding="0" Margin="1" ToolTip="Auftragsdatei" Foreground="#BBBBBB" FontSize="10" FontFamily="Webdings" x:Name="btn_auf" Height="17" Width="20" VerticalAlignment="Center" />-->
<Button Click="btn_send_Click" Content="*" Padding="0" Margin="1" ToolTip="Senden" Foreground="#ffffff" FontSize="11" FontFamily="Wingdings" x:Name="btn_send" Height="18" Width="20" VerticalAlignment="Center"/>
<Button Click="btn_force_send_Click" Content="r" Padding="0" Margin="1" ToolTip="DEBUG: Protokolle Löschen" Foreground="#FFFF00" FontSize="11" FontFamily="Wingdings" x:Name="btn_force_send" Height="18" Width="20" VerticalAlignment="Center" Visibility="Visible"/>
<Button Click="btn_force_send_Click" Content="r" Padding="0" Margin="1" ToolTip="DEBUG: Protokolle Löschen" Foreground="#FFFF00" FontSize="11" FontFamily="Wingdings" x:Name="btn_force_send" Height="18" Width="20" VerticalAlignment="Center" Visibility="Collapsed"/>
<Button Click="btn_delete_Click" Content="r" Padding="0" Margin="1" ToolTip="Löschen" Foreground="#FF0000" FontSize="11" FontFamily="Webdings" x:Name="btn_delete" Height="18" Width="20" VerticalAlignment="Center" />
</StackPanel>
</ControlTemplate>

5
BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
View File

@@ -203,6 +203,11 @@ namespace BeWo.View.Detail.Accounting
private void btn_force_send_Click(object sender, RoutedEventArgs e)
{
#if DEBUG
#else
return;
#endif
var vm = datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();

3
Dakota/Logic/DakotaInfoCreator.cs
View File

@@ -266,8 +266,7 @@ namespace Dakota.Logic
throw new ArgumentOutOfRangeException(nameof(infoParameter.Organisation.Leistungserbringergruppe), infoParameter.Organisation.Leistungserbringergruppe.Length, "Leistungserbringergruppe 7 Stellen oder 5 Stelle ohne Abrechnungscode");
}
info.AbrechnungspositionString = infoParameter.InvoiceItem.UnitDescription.Substring(6);
info.AbrechnungspositionString = infoParameter.Abrechnungsposition;
info.AnzahlMenge = infoParameter.InvoiceItem.UnitCount.Value;
info.EinzelbetragAbrechnungsposition = infoParameter.InvoiceItem.AmountPerUnit.Value;
info.DatumDerLeistungserbringung = infoParameter.InvoiceItem.ItemPeriodStart.Value;

6
Dakota/Models/Infos/InfoParameterInvoiceItem.cs
View File

@@ -17,7 +17,8 @@ namespace Dakota.Models.Infos
public OrganisationDC Organisation { get; set; }
public MandatorDC Mandator { get; set; }
public string IKDatenannahmestelle => Organisation.IKDatenannahmestelle;
public string Abrechnungsposition { get; set; }
public string IKKostentrager => Organisation.IKKostentrager;
public string IKKrankenkasse => Organisation.IKKrankenkasse;
public string IKLeistungserbringer => Mandator.IKLeistungserbringer;
@@ -30,6 +31,9 @@ namespace Dakota.Models.Infos
Customer = customer;
Organisation = organisation;
Mandator = mandator;
// Todo: Valid prüfen
Abrechnungsposition = invoiceItem.UnitDescription?.Substring(6) ?? "TODO";
}
}
}

52
Service/ServiceImplementations/AccountingServiceImp.cs
View File

@@ -863,19 +863,11 @@ namespace BeWo.Service.ServiceImplementations
{
response.Message = "Validierung fehlgeschlagen";
return response;
}
}
string response_app8_str = SendApp8SendNewRequest(protokoll, user.LoginName, user.RC2EncryptedHash);
var app8_response = SendApp8SendNewRequest(protokoll, user.LoginName, user.RC2EncryptedHash);
if (string.IsNullOrEmpty(response_app8_str))
throw new DakotaException("Leere Antwort", "App8");
var response_app8 = JsonConvert.DeserializeObject<GkvApp8SendNewResponse>(response_app8_str);
if (!response_app8.Success)
throw new DakotaException(response_app8.Message, "App8 Error");
var app8_protokoll = response_app8.GkvTransferProtokollDC;
var app8_protokoll = app8_response.GkvTransferProtokollDC;
MapperFactory.GkvTransferProtokollDC_GkvTransferprotokoll.MergeWithEntity(app8_protokoll, protokoll);
@@ -1041,14 +1033,14 @@ namespace BeWo.Service.ServiceImplementations
return new Tuple<int, int>(d, t);
}
private string SendApp8SendNewRequest(GkvTransferProtokoll protokoll, string loginName, string hashed_password)
private GkvApp8SendNewResponse SendApp8SendNewRequest(GkvTransferProtokoll protokoll, string loginName, string hashed_password)
{
var gkv_transfer_dc = MapperFactory.GkvTransferProtokollDC_GkvTransferprotokoll.MapToNewDC(protokoll);
var url = "https://app8.bewoplaner.de/service/GkvAbrechnungView.aspx";
var url = "http://app8.bewoplaner.de/service/GkvAbrechnungView.aspx";
#if DEBUG
url = "http://localhost:3777/Host/GkvAbrechnungView.aspx";
// url = "http://localhost:3777/Host/GkvAbrechnungView.aspx";
#endif
var request_app8 = new GkvApp8SendNewRequest
@@ -1064,7 +1056,14 @@ namespace BeWo.Service.ServiceImplementations
request_app8.SendDirect = false;
#endif
return SendApp8Request(url, request_app8);
var response_app8_str = SendApp8Request(url, request_app8);
var response_app8 = JsonConvert.DeserializeObject<GkvApp8SendNewResponse>(response_app8_str);
if (!response_app8.Success)
throw new DakotaException(response_app8.Message, "App8 Error");
return response_app8;
}
/// <summary>
///
@@ -1138,15 +1137,26 @@ namespace BeWo.Service.ServiceImplementations
private string SendApp8Request(string url, object request) => SendApp8Request(url, JsonConvert.SerializeObject(request));
private string SendApp8Request(string url, string dataString)
{
url += "?tenant=" + MultitenancyOperationContextExt.Current.Tenant;
string response_app8_str;
using (WebClient client = new WebClient())
{
client.Headers.Add(HttpRequestHeader.ContentType, "application/json");
response_app8_str = client.UploadString(url, "POST", dataString);
try
{
url += "?tenant=" + MultitenancyOperationContextExt.Current.Tenant;
using (WebClient client = new WebClient())
{
client.Headers.Add(HttpRequestHeader.ContentType, "application/json");
response_app8_str = client.UploadString(url, "POST", dataString);
}
}
catch(Exception e)
{
throw new DakotaException(e.Message, "App8");
}
if (string.IsNullOrEmpty(response_app8_str))
throw new DakotaException("Leere Antwort", "App8");
return response_app8_str;
}