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

Nutzdatendatei und Auftragsdatei werden nicht standardhaft mitgeschickt, sondern können angefragt werden

Browse Source
This commit is contained in:
Rene Evertz
2025-02-26 10:08:26 +01:00
parent da4844a038
commit 8e5d60cd23
7 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
BeWo/ServiceProxy/ServiceFacade.cs
View File

@@ -6,13 +6,15 @@ using System.ServiceModel;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Threading;
using BeWo.Multitenancy;
using BeWo.Security;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using DevExpress.CodeParser;
namespace BeWo.ServiceProxy
{
@@ -281,9 +283,16 @@ namespace BeWo.ServiceProxy
{
DoAsync<GkvAccountingServiceClient, IGkvAccountingService, T>(pFunc, pCallBack, true);
}
public static void DoGkvAccountingServiceAsyncGUI<T>(Func<IGkvAccountingService, T> pFunc, Action<T> pCallBack)
public static void DoGkvAccountingServiceAsyncGUI<T>(Func<IGkvAccountingService, T> pFunc, Action<T> pCallBack, Dispatcher dispatcher)
{
DoAsync<GkvAccountingServiceClient, IGkvAccountingService, T>(pFunc, pCallBack, true);
Action<T> action = (t) => dispatcher.BeginInvoke(
DispatcherPriority.Normal,
(Action)delegate
{
pCallBack(t);
});
DoAsync<GkvAccountingServiceClient, IGkvAccountingService, T>(pFunc, action, true);
}
public static void DoGkvAccountingServiceAsync(Action<IGkvAccountingService> pAction)

10
BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs
View File

@@ -64,9 +64,10 @@ namespace BeWo.View.Controls
var oid = protokoll.GkvTransferProtokollOid.Value;
ServiceFacade.DoGkvAccountingServiceAsync(
ServiceFacade.DoGkvAccountingServiceAsyncGUI(
service => service.GetProtokollRawDataString(oid, BS.Shared.GkvRawDataType.Auftragsdatei),
callback => ShowTextViewer("Auftragsdatei", callback));
callback => ShowTextViewer("Auftragsdatei", callback),
Dispatcher);
}
private void btn_nutzdatendatei_Click(object sender, RoutedEventArgs e)
@@ -75,9 +76,10 @@ namespace BeWo.View.Controls
var oid = protokoll.GkvTransferProtokollOid.Value;
ServiceFacade.DoGkvAccountingServiceAsync(
ServiceFacade.DoGkvAccountingServiceAsyncGUI(
service => service.GetProtokollRawDataString(oid, BS.Shared.GkvRawDataType.Nutzdatendatei),
callback => ShowTextViewer("Nutzdatendatei", callback));
callback => ShowTextViewer("Nutzdatendatei", callback),
Dispatcher);
}
private void ShowTextViewer(string title, string text)

19
Data/Access/ScriptDAO.cs
View File

@@ -41,24 +41,5 @@ namespace BeWo.Data.Access
return rtn;
}
public string GetGkvRawData(long oid, GkvRawDataType gkvRawData)
{
if (gkvRawData == GkvRawDataType.Auftragsdatei)
{
}
else if (gkvRawData == GkvRawDataType.Nutzdatendatei)
{
}
else
{
throw new NotImplementedException($"GkvRawDataType \'{gkvRawData}\' unbekannt.");
}
return null;
}
}
}

2
Host/Host.csproj.user
View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>BeWo2.0</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

2
Service/ServiceBehavior/AdminMultitenancyContextInitializer.cs
View File

@@ -40,7 +40,7 @@ namespace BeWo.Service.ServiceBehavior
if (seg.EndsWith(".svc"))
{
lInterface = seg.Substring(0, seg.Length - 4);
lInterface = "I" + seg.Substring(0, seg.Length - 4);
}
}

2
Service/ServiceImplementations/GkvAccountingServiceImp.cs
View File

@@ -110,7 +110,7 @@ namespace BeWo.Service.ServiceImplementations
throw new ArgumentOutOfRangeException(nameof(oid), $"oid \'{oid}\' nicht positiv");
}
var str = DAOFactory.ScriptDAO.GetGkvRawData(oid, gkvRawData);
var str = DAOFactory.SearchDAO.GetGkvRawData(oid, gkvRawData);
return str;
}

2
Service/ServiceUtils/ServiceHelper.cs
View File

@@ -54,7 +54,7 @@ namespace BeWo.Service.ServiceUtils
try
{
// Hole entsprechende Methode
var name = $"BeWo.Service.ServiceContracts.I{pServiceInterface}";
var name = $"BeWo.Service.ServiceContracts.{pServiceInterface}";
var t = Type.GetType(name);
methodInfo = t.GetMethod(pMethodName);
}