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

BeWoFault in BS.Shared + neue Script Logik

Browse Source
This commit is contained in:
Rene Evertz
2025-06-02 12:33:14 +02:00
parent 1e1bd2e53e
commit 185299d22e
38 changed files with 4380 additions and 4648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BeWo/LoginControl.xaml.cs
View File

@@ -32,6 +32,7 @@ using BeWo.View.Detail;
using BS.Shared.Translation;
using Path = System.IO.Path;
using System.Linq;
using BS.Shared.Core;
namespace BeWo
{

1
BeWo/Scripts/AccountingEnhancedService.bat Normal file
View File

@@ -0,0 +1 @@
call src/create.bat %~n0

1
BeWo/Scripts/AiEnhancedService.bat Normal file
View File

@@ -0,0 +1 @@
call src/create.bat %~n0

1
BeWo/Scripts/OperationsEnhancedService.bat Normal file
View File

@@ -0,0 +1 @@
call src/create.bat %~n0

33
BeWo/Scripts/ServiceReferences_AccountingEnhancedService.bat
View File

@@ -1,33 +0,0 @@
..\svcutil.exe /noConfig /noLogo /edb /n:*,BeWo.ServiceProxy /out:..\ServiceProxy\GeneratedAccountingEnhancedService.cs /ct:System.Collections.Generic.List`1 /r:..\..\Shared\bin\Debug\BS.Shared.dll http://localhost:3777/Host/AccountingEnhancedService.svc?wsdl
@echo off
setlocal EnableDelayedExpansion
set "input=..\ServiceProxy\GeneratedAccountingEnhancedService.cs"
set "output=temp.txt"
set /a start=12
set /a end=162
set /a line=0
REM Zeilen zählen
set /a total=0
for /f "usebackq delims=" %%A in ("%input%") do (
set /a total+=1
)
REM Nur löschen, wenn genug Zeilen vorhanden
if %total% leq %end% (
echo Datei hat nur %total% Zeilen – nichts wird gelöscht.
copy /y "%input%" "%input2%"
goto :eof
)
> "%output%" (
for /f "usebackq delims=" %%A in ("%input%") do (
set /a line+=1
if !line! lss %start% echo(%%A
if !line! gtr %end% echo(%%A
)
)
move /y "%output%" "%input%"

23
BeWo/Scripts/ServiceReferences_AccountingEnhancedService_Log.bat
View File

@@ -1,23 +0,0 @@
@echo off
REM Diese Batch-Datei führt eine andere Batch-Datei aus und schreibt das Ergebnis in eine Log-Datei
REM Pfad zur anderen Batch-Datei
set "SCRIPT_PATH=ServiceReferences_AccountingEnhancedService.bat"
REM Pfad zur Log-Datei
set "LOG_FILE=ServiceReferences_AccountingEnhancedService_Log.log.txt"
REM Leere die Log-Datei vor dem Start
echo. > %LOG_FILE%
REM Führe die andere Batch-Datei aus und leite die Ausgabe in die Log-Datei um
call %SCRIPT_PATH% >> %LOG_FILE% 2>&1
REM Überprüfe, ob die Ausführung erfolgreich war
if %errorlevel% equ 0 (
echo Die Ausführung von %SCRIPT_PATH% war erfolgreich. >> %LOG_FILE%
) else (
echo Die Ausführung von %SCRIPT_PATH% ist fehlgeschlagen. >> %LOG_FILE%
)
echo Log wurde in %LOG_FILE% geschrieben.

33
BeWo/Scripts/ServiceReferences_AiEnhancedService.bat
View File

@@ -1,33 +0,0 @@
..\svcutil.exe /noConfig /noLogo /edb /n:*,BeWo.ServiceProxy /out:..\ServiceProxy\GeneratedAiEnhancedService.cs /ct:System.Collections.Generic.List`1 /r:..\..\Shared\bin\Debug\BS.Shared.dll http://localhost:3777/Host/AiEnhancedService.svc?wsdl
@echo off
setlocal EnableDelayedExpansion
set "input=..\ServiceProxy\GeneratedAiEnhancedService.cs"
set "output=temp.txt"
set /a start=12
set /a end=162
set /a line=0
REM Zeilen zählen
set /a total=0
for /f "usebackq delims=" %%A in ("%input%") do (
set /a total+=1
)
REM Nur löschen, wenn genug Zeilen vorhanden
if %total% leq %end% (
echo Datei hat nur %total% Zeilen – nichts wird gelöscht.
copy /y "%input%" "%input2%"
goto :eof
)
> "%output%" (
for /f "usebackq delims=" %%A in ("%input%") do (
set /a line+=1
if !line! lss %start% echo(%%A
if !line! gtr %end% echo(%%A
)
)
move /y "%output%" "%input%"

23
BeWo/Scripts/ServiceReferences_AiEnhancedService_Log.bat
View File

@@ -1,23 +0,0 @@
@echo off
REM Diese Batch-Datei führt eine andere Batch-Datei aus und schreibt das Ergebnis in eine Log-Datei
REM Pfad zur anderen Batch-Datei
set "SCRIPT_PATH=ServiceReferences_AiEnhancedService.bat"
REM Pfad zur Log-Datei
set "LOG_FILE=ServiceReferences_AiEnhancedService_Log.log.txt"
REM Leere die Log-Datei vor dem Start
echo. > %LOG_FILE%
REM Führe die andere Batch-Datei aus und leite die Ausgabe in die Log-Datei um
call %SCRIPT_PATH% >> %LOG_FILE% 2>&1
REM Überprüfe, ob die Ausführung erfolgreich war
if %errorlevel% equ 0 (
echo Die Ausführung von %SCRIPT_PATH% war erfolgreich. >> %LOG_FILE%
) else (
echo Die Ausführung von %SCRIPT_PATH% ist fehlgeschlagen. >> %LOG_FILE%
)
echo Log wurde in %LOG_FILE% geschrieben.

33
BeWo/Scripts/ServiceReferences_OperationsEnhancedService.bat
View File

@@ -1,33 +0,0 @@
..\svcutil.exe /noConfig /noLogo /edb /n:*,BeWo.ServiceProxy /out:..\ServiceProxy\GeneratedOperationsEnhancedService.cs /ct:System.Collections.Generic.List`1 /r:..\..\Shared\bin\Debug\BS.Shared.dll http://localhost:3777/Host/OperationsEnhancedService.svc?wsdl
@echo off
setlocal EnableDelayedExpansion
set "input=..\ServiceProxy\GeneratedOperationsEnhancedService.cs"
set "output=temp.txt"
set /a start=12
set /a end=162
set /a line=0
REM Zeilen zählen
set /a total=0
for /f "usebackq delims=" %%A in ("%input%") do (
set /a total+=1
)
REM Nur löschen, wenn genug Zeilen vorhanden
if %total% leq %end% (
echo Datei hat nur %total% Zeilen – nichts wird gelöscht.
copy /y "%input%" "%input2%"
goto :eof
)
> "%output%" (
for /f "usebackq delims=" %%A in ("%input%") do (
set /a line+=1
if !line! lss %start% echo(%%A
if !line! gtr %end% echo(%%A
)
)
move /y "%output%" "%input%"

6
BeWo/Scripts/sharedTypes.xml
View File

@@ -1,6 +0,0 @@
<types>
<sharedType>
<name>BeWoFault</name>
<namespace>BeWo.ServiceProxy</namespace>
</sharedType>
</types>

13
BeWo/Scripts/ServiceReferences_OperationsEnhancedService_Log.bat → BeWo/Scripts/src/create.bat
View File

@@ -2,16 +2,23 @@
REM Diese Batch-Datei führt eine andere Batch-Datei aus und schreibt das Ergebnis in eine Log-Datei
REM Pfad zur anderen Batch-Datei
set "SCRIPT_PATH=ServiceReferences_OperationsEnhancedService.bat"
REM set "SCRIPT_PATH=src/ServiceReferences_AccountingEnhancedService.bat"
REM Pfad zur Log-Datei
set "LOG_FILE=ServiceReferences_OperationsEnhancedService_Log.log.txt"
REM set "LOG_FILE=log/ServiceReferences_AccountingEnhancedService.log.txt"
REM Argumente zuweisen
set "SCRIPT_PATH=src/svcutils_service.bat"
set "LOG_FILE=log/%~1.log.txt"
REM Erstelle Log-Pfad falls nicht vorhanden
if not exist "log" mkdir log
REM Leere die Log-Datei vor dem Start
echo. > %LOG_FILE%
REM Führe die andere Batch-Datei aus und leite die Ausgabe in die Log-Datei um
call %SCRIPT_PATH% >> %LOG_FILE% 2>&1
call %SCRIPT_PATH% %~1 >> %LOG_FILE% 2>&1
REM Überprüfe, ob die Ausführung erfolgreich war
if %errorlevel% equ 0 (

1
BeWo/Scripts/src/svcutils_service.bat Normal file
View File

@@ -0,0 +1 @@
..\svcutil.exe /noConfig /noLogo /edb /n:*,BeWo.ServiceProxy /out:..\ServiceProxy\Generated%1.cs /ct:System.Collections.Generic.List`1 /r:..\..\Shared\bin\Debug\BS.Shared.dll http://localhost:3777/Host/%1.svc?wsdl

8657
BeWo/ServiceProxy/Generated.cs
View File

File diff suppressed because it is too large Load Diff

5
BeWo/ServiceProxy/GeneratedAccountingEnhancedService.cs
View File

@@ -7,15 +7,18 @@
// der Code erneut generiert wird.
// </auto-generated>
//------------------------------------------------------------------------------
namespace BeWo.ServiceProxy
{
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
[System.ServiceModel.ServiceContractAttribute(ConfigurationName="BeWo.ServiceProxy.IAccountingEnhancedService")]
public interface IAccountingEnhancedService
{
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAccountingEnhancedService/CreateXRechnung", ReplyAction="http://tempuri.org/IAccountingEnhancedService/CreateXRechnungResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAccountingEnhancedService/CreateXRechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
[System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IAccountingEnhancedService/CreateXRechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
byte[] CreateXRechnung(long invoice_base_oid, int report_type, string report_url);
}

23
BeWo/ServiceProxy/GeneratedAiEnhancedService.cs
View File

@@ -7,48 +7,51 @@
// der Code erneut generiert wird.
// </auto-generated>
//------------------------------------------------------------------------------
namespace BeWo.ServiceProxy
{
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
[System.ServiceModel.ServiceContractAttribute(ConfigurationName="BeWo.ServiceProxy.IAiEnhancedService")]
public interface IAiEnhancedService
{
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/GetAiConfig", ReplyAction="http://tempuri.org/IAiEnhancedService/GetAiConfigResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/GetAiConfigBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
[System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/GetAiConfigBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
BS.Shared.DataContracts.Feature.AI.AiConfigDC GetAiConfig();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/UpdateAiConfig", ReplyAction="http://tempuri.org/IAiEnhancedService/UpdateAiConfigResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/UpdateAiConfigBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
[System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/UpdateAiConfigBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
BS.Shared.DataContracts.Feature.AI.AiConfigDC UpdateAiConfig(BS.Shared.DataContracts.Feature.AI.AiConfigDC toUpdate);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/GetAiModels", ReplyAction="http://tempuri.org/IAiEnhancedService/GetAiModelsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/GetAiModelsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
[System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/GetAiModelsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
System.Collections.Generic.List<BS.Shared.DataContracts.Feature.AI.AiModelDC> GetAiModels();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/GetAiConversations", ReplyAction="http://tempuri.org/IAiEnhancedService/GetAiConversationsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/GetAiConversationsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
[System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/GetAiConversationsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
System.Collections.Generic.List<BS.Shared.DataContracts.Feature.AI.AiConversationDC> GetAiConversations(int uicontext, System.Nullable<long> oid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/CreateAiConversation", ReplyAction="http://tempuri.org/IAiEnhancedService/CreateAiConversationResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/CreateAiConversationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
[System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/CreateAiConversationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
BS.Shared.DataContracts.Feature.AI.AiConversationDC CreateAiConversation(BS.Shared.DataContracts.Feature.AI.AiConversationDC conversation, long modell_oid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/CreateAiConversationWithMessage", ReplyAction="http://tempuri.org/IAiEnhancedService/CreateAiConversationWithMessageResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/CreateAiConversationWithMessageBeWoFaultFau" +
"lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
[System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/CreateAiConversationWithMessageBeWoFaultFau" +
"lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
BS.Shared.DataContracts.Feature.AI.AiConversationDC CreateAiConversationWithMessage(BS.Shared.DataContracts.Feature.AI.AiConversationDC conversation, long modell_oid, string message);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/CloneAiConversation", ReplyAction="http://tempuri.org/IAiEnhancedService/CloneAiConversationResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/CloneAiConversationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
[System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/CloneAiConversationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
BS.Shared.DataContracts.Feature.AI.AiConversationDC CloneAiConversation(long conversation_oid, System.Nullable<long> message_oid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/DeleteAiConversation", ReplyAction="http://tempuri.org/IAiEnhancedService/DeleteAiConversationResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/DeleteAiConversationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
[System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/DeleteAiConversationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
void DeleteAiConversation(long conversation_oid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/SendNewMessage", ReplyAction="http://tempuri.org/IAiEnhancedService/SendNewMessageResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/SendNewMessageBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
[System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/SendNewMessageBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
System.Collections.Generic.List<BS.Shared.DataContracts.AiConversationMessageDC> SendNewMessage(long conversation, string message);
}

20
BeWo/ServiceProxy/GeneratedOperationsEnhancedService.cs
View File

@@ -7,20 +7,19 @@
// der Code erneut generiert wird.
// </auto-generated>
//------------------------------------------------------------------------------
namespace BeWo.ServiceProxy
{
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
[System.ServiceModel.ServiceContractAttribute(ConfigurationName="BeWo.ServiceProxy.IOperationsEnhancedService")]
public interface IOperationsEnhancedService
{
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsEnhancedService/HelloWorld", ReplyAction="http://tempuri.org/IOperationsEnhancedService/HelloWorldResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsEnhancedService/HelloWorldBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void HelloWorld();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsEnhancedService/CreateXRechnung", ReplyAction="http://tempuri.org/IOperationsEnhancedService/CreateXRechnungResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsEnhancedService/CreateXRechnungBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
byte[] CreateXRechnung(long invoice_base_oid, int report_type, string report_url);
[System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IOperationsEnhancedService/HelloWorldBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")]
string HelloWorld();
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -57,14 +56,9 @@ namespace BeWo.ServiceProxy
{
}
public void HelloWorld()
public string HelloWorld()
{
base.Channel.HelloWorld();
}
public byte[] CreateXRechnung(long invoice_base_oid, int report_type, string report_url)
{
return base.Channel.CreateXRechnung(invoice_base_oid, report_type, report_url);
return base.Channel.HelloWorld();
}
}
}

4
BeWo/ServiceReferences.bat
View File

@@ -1 +1,5 @@
echo %time%
svcutil.exe /noConfig /edb /n:*,BeWo.ServiceProxy /out:ServiceProxy\Generated.cs /ct:System.Collections.Generic.List`1 /r:..\Shared\bin\Debug\BS.Shared.dll http://localhost:3777/Host/EmployeeService.svc?wsdl http://localhost:3777/Host/CustomerService.svc?wsdl http://localhost:3777/Host/UserService.svc?wsdl http://localhost:3777/Host/StreamingService.svc?wsdl http://localhost:3777/Host/ValueListService.svc?wsdl http://localhost:3777/Host/DownloadService.svc?wsdl http://localhost:3777/Host/ResourceService.svc?wsdl http://localhost:3777/Host/OperationsService.svc?wsdl http://localhost:3777/Host/AnalysisService.svc?wsdl http://localhost:3777/Host/MailService.svc?wsdl http://localhost:3777/Host/AccountingService.svc?wsdl http://localhost:3777/Host/GkvAccountingService.svc?wsdl http://localhost:3777/Host/ReportService.svc?wsdl http://localhost:3777/Host/QueryService.svc?wsdl
echo %time%

4
BeWo/View/Detail/Accounting/InvoiceOverview.xaml.cs
View File

@@ -632,7 +632,7 @@ namespace BeWo.View.Detail.Accounting
private void button_eRechnung_Click(object sender, RoutedEventArgs e)
{
ServiceFacade.DoOperationsEnhancedServiceSnyc(x => x.CreateXRechnung(0, 0, null));
ServiceFacade.DoAccountingEnhancedServiceAsnyc(x => x.CreateXRechnung(0, 0, null));
//var res = ServiceFacade.DoAccountingServiceSync(x => x.GetXRechnung(null));
@@ -656,7 +656,7 @@ namespace BeWo.View.Detail.Accounting
var invoice_type = (int)vm.DataContract.Type;
var report_link = vm.ReportLink;
ServiceFacade.DoOperationsEnhancedServiceAsnyc(
ServiceFacade.DoAccountingEnhancedServiceAsnyc(
x => x.CreateXRechnung(invoice_base_oid, invoice_type, report_link),
cb =>
{

1
BeWo/View/Detail/UserGroupView.xaml.cs
View File

@@ -8,6 +8,7 @@ using BeWo.ServiceProxy;
using BeWo.ViewModel;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.Extensions;
namespace BeWo.View.Detail

1
Service/Service.csproj
View File

@@ -519,7 +519,6 @@
<Compile Include="ServiceBehavior\WCFError\WCFErrorBehavior.cs" />
<Compile Include="ServiceBehavior\WCFError\WCFErrorBehaviorExtension.cs" />
<Compile Include="ServiceBehavior\WCFError\WCFErrorHandler.cs" />
<Compile Include="ServiceContracts\BeWoFault.cs" />
<Compile Include="ServiceContracts\Enhanced\IAccountingEnhancedService.cs" />
<Compile Include="ServiceContracts\IAccountingService.cs" />
<Compile Include="ServiceContracts\IAdminService.cs" />

1
Service/ServiceContracts/Enhanced/IAccountingEnhancedService.cs
View File

@@ -1,6 +1,7 @@
using BeWo.Data.Entities;
using BS.Shared;
using BS.Shared.Attributes;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Feature.AI;
using System;

1
Service/ServiceContracts/Enhanced/IAiEnhancedService.cs
View File

@@ -1,6 +1,7 @@
using BeWo.Data.Entities;
using BS.Shared;
using BS.Shared.Attributes;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Feature.AI;
using System;

1
Service/ServiceContracts/Enhanced/IOperationsEnhancedService.cs
View File

@@ -1,6 +1,7 @@
using BeWo.Data.Entities;
using BS.Shared;
using BS.Shared.Attributes;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Feature.AI;
using System;

1
Service/ServiceContracts/ICustomerService.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.ServiceModel;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;

2
Service/ServiceContracts/IDownloadService.cs
View File

@@ -1,6 +1,6 @@
using System;
using System.ServiceModel;
using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.ServiceContracts

1
Service/ServiceContracts/IEmployeeService.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.ServiceModel;
using BeWo.Data.Entities;
using BeWo.View.Navigation.Filter;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;

1
Service/ServiceContracts/IGkvAccountingService.cs
View File

@@ -1,6 +1,7 @@
using BeWo.Data.Entities.Light;
using BS.Shared;
using BS.Shared.Attributes;
using BS.Shared.Core;
using BS.Shared.DataContracts.GkvAbrechnung;
using BS.Shared.DataContracts.Light;
using System;

2
Service/ServiceContracts/IMailService.cs
View File

@@ -1,6 +1,6 @@
using System.Collections.Generic;
using System.ServiceModel;
using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.ServiceContracts

1
Service/ServiceContracts/IQueryService.cs
View File

@@ -3,6 +3,7 @@ using System.Data;
using System.ServiceModel;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.ServiceContracts

2
Service/ServiceContracts/ISearchService.cs
View File

@@ -1,6 +1,6 @@
using System.Collections.Generic;
using System.ServiceModel;
using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
namespace BeWo.Service.ServiceContracts

2
Service/ServiceContracts/IStreamingService.cs
View File

@@ -3,7 +3,7 @@ using System.IO;
using System.ServiceModel;
using BeWo.Service.MessageContracts;
using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.ServiceContracts

1
Service/ServiceContracts/IUserService.cs
View File

@@ -6,6 +6,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared;
using BS.Shared.Attributes;
using BS.Shared.Core;
namespace BeWo.Service.ServiceContracts
{

1
Service/ServiceContracts/IValueListService.cs
View File

@@ -2,6 +2,7 @@
using System.ServiceModel;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.ServiceContracts

8
Service/ServiceImplementations/EmployeeServiceImp.cs
View File

@@ -22,6 +22,8 @@ using BS.Shared.Extensions;
using NHibernate;
using BeWo.ServiceUtils.History;
using BeWoFault = BS.Shared.Core.BeWoFault;
using BeWoFaultType = BS.Shared.Core.BeWoFaultType;
namespace BeWo.Service.ServiceImplementations
{
@@ -507,7 +509,7 @@ namespace BeWo.Service.ServiceImplementations
}
catch (Exception e)
{
throw new FaultException<BeWoFault>(new BeWoFault(String.Format("Mitarbeiter mit Id {0} wurde nicht gefunden!", pPersonOid)));
throw new FaultException<BS.Shared.Core.BeWoFault>(new BS.Shared.Core.BeWoFault(String.Format("Mitarbeiter mit Id {0} wurde nicht gefunden!", pPersonOid)));
}
}
@@ -795,7 +797,7 @@ namespace BeWo.Service.ServiceImplementations
}
catch (Exception e)
{
throw new FaultException<BeWoFault>(new BeWoFault(e), e.Message);
throw new FaultException<BS.Shared.Core.BeWoFault>(new BeWoFault(e), e.Message);
}
}
@@ -809,7 +811,7 @@ namespace BeWo.Service.ServiceImplementations
}
catch (Exception e)
{
throw new FaultException<BeWoFault>(new BeWoFault(e), e.Message);
throw new FaultException<BS.Shared.Core.BeWoFault>(new BS.Shared.Core.BeWoFault(e), e.Message);
}
}

1
Service/ServiceImplementations/StreamingServiceImp.cs
View File

@@ -14,6 +14,7 @@ using BeWo.Service.Plugins;
using BeWo.Service.ServiceContracts;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using Utils = BeWo.Service.Core.Utils;

3
Service/ServiceImplementations/UserServiceImp.cs
View File

@@ -28,6 +28,9 @@ using BeWo.Service.Plugins;
using BeWo.Data.Security;
using System.Collections.Specialized;
using BeWoFault = BS.Shared.Core.BeWoFault;
using BeWoFaultType = BS.Shared.Core.BeWoFaultType;
namespace BeWo.Service.ServiceImplementations
{
[ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, ConcurrencyMode = ConcurrencyMode.Single)]

114
Service/ServiceContracts/BeWoFault.cs → Shared/Core/BeWoFault.cs
View File

@@ -1,58 +1,58 @@
using System;
using System.Runtime.Serialization;
namespace BeWo.Service.ServiceContracts
{
public enum BeWoFaultType
{
Unknown,
Concurrency,
DeleteNotPossible,
LoginNameTaken,
CustomWithoutDetails
}
[DataContract]
public class BeWoFault
{
public BeWoFault(Exception ex)
{
this.Message = ex.Message;
this.StackTrace = ex.StackTrace;
if (ex.InnerException != null)
{
this.InnerExceptionMessage = ex.InnerException.Message;
this.InnerExceptionStackTrace = ex.InnerException.StackTrace;
}
this.FaultType = BeWoFaultType.Unknown;
}
public BeWoFault(string pMessage)
: this(pMessage, BeWoFaultType.Unknown)
{
}
public BeWoFault(string pMessage, BeWoFaultType pFaultType)
{
this.Message = pMessage;
this.FaultType = pFaultType;
}
[DataMember]
public BeWoFaultType FaultType { get; set; }
[DataMember]
public string InnerExceptionMessage { get; set; }
[DataMember]
public string InnerExceptionStackTrace { get; set; }
[DataMember]
public string Message { get; set; }
[DataMember]
public string StackTrace { get; set; }
}
using System;
using System.Runtime.Serialization;
namespace BS.Shared.Core
{
public enum BeWoFaultType
{
Unknown,
Concurrency,
DeleteNotPossible,
LoginNameTaken,
CustomWithoutDetails
}
[DataContract]
public class BeWoFault
{
public BeWoFault(Exception ex)
{
this.Message = ex.Message;
this.StackTrace = ex.StackTrace;
if (ex.InnerException != null)
{
this.InnerExceptionMessage = ex.InnerException.Message;
this.InnerExceptionStackTrace = ex.InnerException.StackTrace;
}
this.FaultType = BeWoFaultType.Unknown;
}
public BeWoFault(string pMessage)
: this(pMessage, BeWoFaultType.Unknown)
{
}
public BeWoFault(string pMessage, BeWoFaultType pFaultType)
{
this.Message = pMessage;
this.FaultType = pFaultType;
}
[DataMember]
public BeWoFaultType FaultType { get; set; }
[DataMember]
public string InnerExceptionMessage { get; set; }
[DataMember]
public string InnerExceptionStackTrace { get; set; }
[DataMember]
public string Message { get; set; }
[DataMember]
public string StackTrace { get; set; }
}
}

1
Shared/Shared.csproj
View File

@@ -142,6 +142,7 @@
<Compile Include="BeWoEntityEnums.cs" />
<Compile Include="Core\AppError.cs" />
<Compile Include="Core\AppSettingReader.cs" />
<Compile Include="Core\BeWoFault.cs" />
<Compile Include="Core\ComplexWohnheimbuchungsRelationHelper.cs" />
<Compile Include="Core\AbstractIDSpecificDefaultClass.cs" />
<Compile Include="Core\JsonUtils.cs" />