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

CB hat etwas aufgeräumt

Browse Source
This commit is contained in:
Christian
2022-04-25 15:45:02 +02:00
parent 3c47dfcfd1
commit ba9cef33bf
37 changed files with 12303 additions and 11148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
BeWo/BeWo.csproj
View File

@@ -317,6 +317,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Detail\Zeiterfassung\ServiceRecordCreationView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\UrlaubskontoView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -496,7 +500,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Detail\ServiceRecordRTFWindowView.xaml">
<Page Include="View\Detail\Zeiterfassung\ServiceRecordRTFWindowView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -640,7 +644,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Detail\ServiceRecordRebookingView.xaml">
<Page Include="View\Detail\Zeiterfassung\ServiceRecordRebookingView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -648,7 +652,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\ServiceRecordHistoryView.xaml">
<Page Include="View\Detail\Zeiterfassung\ServiceRecordHistoryView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
@@ -1049,6 +1053,9 @@
<Compile Include="View\Detail\DebugMessageLogView.xaml.cs">
<DependentUpon>DebugMessageLogView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Zeiterfassung\ServiceRecordCreationView.xaml.cs">
<DependentUpon>ServiceRecordCreationView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\UrlaubskontoView.xaml.cs">
<DependentUpon>UrlaubskontoView.xaml</DependentUpon>
</Compile>
@@ -1190,7 +1197,7 @@
<Compile Include="View\Controls\TextModuleTreeViewControl.xaml.cs">
<DependentUpon>TextModuleTreeViewControl.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\ServiceRecordRTFWindowView.xaml.cs">
<Compile Include="View\Detail\Zeiterfassung\ServiceRecordRTFWindowView.xaml.cs">
<DependentUpon>ServiceRecordRTFWindowView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\TextbausteinView.xaml.cs">
@@ -1301,13 +1308,13 @@
<Compile Include="View\Detail\ProfileEditView.xaml.cs">
<DependentUpon>ProfileEditView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\ServiceRecordRebookingView.xaml.cs">
<Compile Include="View\Detail\Zeiterfassung\ServiceRecordRebookingView.xaml.cs">
<DependentUpon>ServiceRecordRebookingView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Report\AccountingReportView.xaml.cs">
<DependentUpon>AccountingReportView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\ServiceRecordHistoryView.xaml.cs">
<Compile Include="View\Detail\Zeiterfassung\ServiceRecordHistoryView.xaml.cs">
<DependentUpon>ServiceRecordHistoryView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\SchedulerSettingsView.xaml.cs">
@@ -1573,7 +1580,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\ServiceRecordGroupEditView.xaml">
<Page Include="View\Detail\Zeiterfassung\ServiceRecordGroupEditView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -1615,13 +1622,13 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\ServiceRecordEditView.xaml">
<Page Include="View\Detail\Zeiterfassung\ServiceRecordEditView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\ServiceRecordView2.xaml">
<Page Include="View\Detail\Zeiterfassung\ServiceRecordView2.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
@@ -2131,7 +2138,7 @@
<Compile Include="View\Detail\NewsItemView.xaml.cs">
<DependentUpon>NewsItemView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\ServiceRecordGroupEditView.xaml.cs">
<Compile Include="View\Detail\Zeiterfassung\ServiceRecordGroupEditView.xaml.cs">
<DependentUpon>ServiceRecordGroupEditView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\MandatorView.xaml.cs">
@@ -2152,10 +2159,10 @@
<Compile Include="View\Detail\BookingView.xaml.cs">
<DependentUpon>BookingView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\ServiceRecordEditView.xaml.cs">
<Compile Include="View\Detail\Zeiterfassung\ServiceRecordEditView.xaml.cs">
<DependentUpon>ServiceRecordEditView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\ServiceRecordView2.xaml.cs">
<Compile Include="View\Detail\Zeiterfassung\ServiceRecordView2.xaml.cs">
<DependentUpon>ServiceRecordView2.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Report\ServicesReportView.xaml.cs">

1
BeWo/Core/BeWoUtils.cs
View File

@@ -59,6 +59,7 @@ using RestSharp;
using Control = System.Windows.Controls.Control;
using Utils = BS.Shared.Core.Utils;
using Brush = System.Windows.Media.Brush;
using BeWo.View.Detail.Zeiterfassung;
namespace BeWo.Core
{

1
BeWo/MainControl.xaml.cs
View File

@@ -21,6 +21,7 @@ using BeWo.SchulbegleitenderDienst;
using BeWo.ServiceProxy;
using BeWo.View;
using BeWo.View.Detail;
using BeWo.View.Detail.Zeiterfassung;
using BeWo.View.Master;
using BeWo.View.Navigation;
using BeWo.ViewModel;

218
BeWo/ServiceProxy/Generated.cs
View File

@@ -224,6 +224,11 @@ namespace BeWo.ServiceProxy
"Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactEmployeeDC> GetActiveCompactEmployeesForEmployee(long employeeOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAllAuthorizedCompactEmployees", ReplyAction="http://tempuri.org/IEmployeeService/GetAllAuthorizedCompactEmployeesResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllAuthorizedCompactEmployeesBeWoFaultFaul" +
"t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactEmployeeDC> GetAllAuthorizedCompactEmployees();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetTeamRelatedCustomerOids", ReplyAction="http://tempuri.org/IEmployeeService/GetTeamRelatedCustomerOidsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetTeamRelatedCustomerOidsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<long> GetTeamRelatedCustomerOids(long employeeOid, System.Nullable<long> teamOid);
@@ -772,6 +777,11 @@ namespace BeWo.ServiceProxy
return base.Channel.GetActiveCompactEmployeesForEmployee(employeeOid);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactEmployeeDC> GetAllAuthorizedCompactEmployees()
{
return base.Channel.GetAllAuthorizedCompactEmployees();
}
public System.Collections.Generic.List<long> GetTeamRelatedCustomerOids(long employeeOid, System.Nullable<long> teamOid)
{
return base.Channel.GetTeamRelatedCustomerOids(employeeOid, teamOid);
@@ -1517,8 +1527,8 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.WohnheimEmployeeRelationDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimEmployeeRelationDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentCategoryDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactOrganisationDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactPersonDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactOrganisationDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactWohnheimDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactWohnheimDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.QBFilterEnum))]
@@ -1568,6 +1578,30 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Employee2SchedulerAppointmentDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.ValueListEntryDC, System.Collections.Generic.List<BS.Shared.DataContracts.ResourceDC>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<System.DateTime, System.Collections.Generic.List<BS.Shared.Core.DateTimeSpan>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.SignatureType, System.Collections.Generic.List<long>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<System.Collections.Generic.Dictionary<int, long>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, long>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, BS.Shared.DataContracts.DienstInfoDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<string, string>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.Compact.CompactCustomerDC, System.Collections.Generic.List<BS.Shared.DataContracts.AccountingTransactionDC>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.UserRightType, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.ServiceRecordDC, System.Collections.Generic.List<BS.Shared.ServiceRecordValidationResult>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<System.DateTime, BS.Shared.DataContracts.Compact.CompactCustomerDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.Compact.CompactCustomerDC, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordValidationResult))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SchulbegleitenderZugehoerigkeitsTyp))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.MessageType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.HomeViewPanelType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.ServiceRecordValidationResult>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UiElementType))]
[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.StatementType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ConfirmationReceiptSignatureDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ConfirmationReceiptSignatureDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.VorlagentabelleDC>))]
@@ -1601,6 +1635,9 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AbwesenheitsInformationDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AbwesenheitsInformationDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordValidationResultDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.VertretungsKlientAccountingsListeItemsDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AccountingTransactionDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AccountingTransactionDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.TextbausteinDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.TextbausteinDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SbdConfigDC))]
@@ -1622,6 +1659,8 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ReportTemplateDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ReportTemplateDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ReportTypes))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AdditionalServiceBookingDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AdditionalServiceRegionDC))]
@@ -1654,9 +1693,6 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.TokenDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.VertretungsListeMitarbeiterItemsDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.VertretungsListeMitarbeiterItemsDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.VertretungsKlientAccountingsListeItemsDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AccountingTransactionDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AccountingTransactionDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.InvoiceDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Settlement2DC>))]
@@ -1687,32 +1723,6 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordHistoryDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordValidationResult))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SchulbegleitenderZugehoerigkeitsTyp))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.MessageType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.HomeViewPanelType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.ServiceRecordValidationResult>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UiElementType))]
[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.StatementType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.SignatureType, System.Collections.Generic.List<long>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<System.Collections.Generic.Dictionary<int, long>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, long>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, BS.Shared.DataContracts.DienstInfoDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<string, string>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.UserRightType, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.ServiceRecordDC, System.Collections.Generic.List<BS.Shared.ServiceRecordValidationResult>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<System.DateTime, BS.Shared.DataContracts.Compact.CompactCustomerDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.Compact.CompactCustomerDC, System.Collections.Generic.List<BS.Shared.DataContracts.AccountingTransactionDC>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.Compact.CompactCustomerDC, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTokenDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Reports.AuslastungAnalysisRootDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Reports.AuslastungAnalysisEmployeeDC>))]
@@ -1788,6 +1798,21 @@ namespace BeWo.ServiceProxy
"lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Nullable<long> GetActiveMedVerListOidForCustomer(long customerOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactSupportConcepts", ReplyAction="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactSupportConceptsRespons" +
"e")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactSupportConceptsBeWoFau" +
"ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactSupportConceptDC> GetAllAuthorizedCompactSupportConcepts();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactCustomers", ReplyAction="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactCustomersResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactCustomersBeWoFaultFaul" +
"t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC> GetAllAuthorizedCompactCustomers();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactPersons", ReplyAction="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactPersonsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactPersonsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactPersonDC> GetAllAuthorizedCompactPersons();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveCustomers", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveCustomersResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveCustomersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.CustomerDC> GetAllActiveCustomers();
@@ -2616,6 +2641,21 @@ namespace BeWo.ServiceProxy
return base.Channel.GetActiveMedVerListOidForCustomer(customerOid);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactSupportConceptDC> GetAllAuthorizedCompactSupportConcepts()
{
return base.Channel.GetAllAuthorizedCompactSupportConcepts();
}
public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC> GetAllAuthorizedCompactCustomers()
{
return base.Channel.GetAllAuthorizedCompactCustomers();
}
public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactPersonDC> GetAllAuthorizedCompactPersons()
{
return base.Channel.GetAllAuthorizedCompactPersons();
}
public System.Collections.Generic.List<BS.Shared.DataContracts.CustomerDC> GetAllActiveCustomers()
{
return base.Channel.GetAllActiveCustomers();
@@ -5073,6 +5113,20 @@ namespace BeWo.ServiceProxy
public interface IOperationsService
{
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignaturesByEmployeeA" +
"ndServiceRecords", ReplyAction="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignaturesByEmployeeA" +
"ndServiceRecordsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignaturesByEmployeeA" +
"ndServiceRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
bool HasConfirmationReceiptSignaturesByEmployeeAndServiceRecords(long employeeOid, System.Collections.Generic.List<long> serviceRecordOids);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignatureByDateAndCus" +
"tomer", ReplyAction="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignatureByDateAndCus" +
"tomerResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignatureByDateAndCus" +
"tomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
bool HasConfirmationReceiptSignatureByDateAndCustomer(long customerOid, BS.Shared.Core.DateTimeSpan timeSpan, BS.Shared.SignatureType signatureType);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/LoadServiceCategory", ReplyAction="http://tempuri.org/IOperationsService/LoadServiceCategoryResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/LoadServiceCategoryBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.ServiceCategoryDC LoadServiceCategory(long serviceCategoryOid);
@@ -5320,6 +5374,14 @@ namespace BeWo.ServiceProxy
"iterBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.DienstplanerMonthlySummaryDC BerechneSollSaldoUndIstFuerEinzelnenMitarbeiter(out long stundenBeiAbwesenheitKey, out decimal stundenBeiAbwesenheitValue, System.DateTime date, long empOid, System.Collections.Generic.List<BS.Shared.DataContracts.DienstEintragDC> dienstEintraege, System.Collections.Generic.List<BS.Shared.DataContracts.DienstvertretungDC> dienstvertretungen, System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> absenceTimes, System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> overtimes);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/KlientenAbschlagsInfoListe", ReplyAction="http://tempuri.org/IOperationsService/KlientenAbschlagsInfoListeResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/KlientenAbschlagsInfoListeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.VertretungsKlientAccountingsListeItemsDC KlientenAbschlagsInfoListe(System.DateTime start, System.DateTime end);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DoTokenWunschOperation", ReplyAction="http://tempuri.org/IOperationsService/DoTokenWunschOperationResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DoTokenWunschOperationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DoTokenWunschOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerWunschToken, string token);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DoTokenAusschlussOperation", ReplyAction="http://tempuri.org/IOperationsService/DoTokenAusschlussOperationResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DoTokenAusschlussOperationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DoTokenAusschlussOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerAusschlussToken, string token);
@@ -5676,19 +5738,11 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetOwnChatSettingsUrlBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
string GetOwnChatSettingsUrl();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignaturesByEmployeeA" +
"ndServiceRecords", ReplyAction="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignaturesByEmployeeA" +
"ndServiceRecordsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignaturesByEmployeeA" +
"ndServiceRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
bool HasConfirmationReceiptSignaturesByEmployeeAndServiceRecords(long employeeOid, System.Collections.Generic.List<long> serviceRecordOids);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignatureByDateAndCus" +
"tomer", ReplyAction="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignatureByDateAndCus" +
"tomerResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignatureByDateAndCus" +
"tomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
bool HasConfirmationReceiptSignatureByDateAndCustomer(long customerOid, BS.Shared.Core.DateTimeSpan timeSpan, BS.Shared.SignatureType signatureType);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeople", ReplyAction="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeopleRes" +
"ponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeopleBeW" +
"oFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> pGroups);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceBookings", ReplyAction="http://tempuri.org/IOperationsService/GetAllAdditionalServiceBookingsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceBookingsBeWoFaultFau" +
@@ -5928,6 +5982,10 @@ namespace BeWo.ServiceProxy
"ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.OrganisationPersonRelationDC> LoadOrganisationPersonRelationsByOid(System.Collections.Generic.List<long> pOids);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/LoadArbeitszeitenForObject", ReplyAction="http://tempuri.org/IOperationsService/LoadArbeitszeitenForObjectResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/LoadArbeitszeitenForObjectBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.ArbeitszeitDC> LoadArbeitszeitenForObject(BS.Shared.TableID objectTid, long objectOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/LoadBargeldkassenForObject", ReplyAction="http://tempuri.org/IOperationsService/LoadBargeldkassenForObjectResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/LoadBargeldkassenForObjectBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.BargeldkassenDC> LoadBargeldkassenForObject(BS.Shared.TableID objectTid, long objectOid);
@@ -6069,14 +6127,6 @@ namespace BeWo.ServiceProxy
"FaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.VertretungsListeMitarbeiterItemsDC> VertretungsMitarbeiterListeWoechentlich(System.DateTime start, System.DateTime ende);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/KlientenAbschlagsInfoListe", ReplyAction="http://tempuri.org/IOperationsService/KlientenAbschlagsInfoListeResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/KlientenAbschlagsInfoListeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.VertretungsKlientAccountingsListeItemsDC KlientenAbschlagsInfoListe(System.DateTime start, System.DateTime end);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DoTokenWunschOperation", ReplyAction="http://tempuri.org/IOperationsService/DoTokenWunschOperationResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DoTokenWunschOperationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DoTokenWunschOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerWunschToken, string token);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateInvoices", ReplyAction="http://tempuri.org/IOperationsService/DeactivateInvoicesResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateInvoicesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices);
@@ -6337,6 +6387,12 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateDefaultServiceRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
string CreateDefaultServiceRecords(System.DateTime monat, System.Collections.Generic.List<long> oids);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateDefaultCustomerServiceRecords", ReplyAction="http://tempuri.org/IOperationsService/CreateDefaultCustomerServiceRecordsResponse" +
"")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateDefaultCustomerServiceRecordsBeWoFaul" +
"tFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
string CreateDefaultCustomerServiceRecords(System.DateTime start, System.DateTime end, System.Collections.Generic.List<long> cb2scOids);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/IsAlive", ReplyAction="http://tempuri.org/IOperationsService/IsAliveResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/IsAliveBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
bool IsAlive();
@@ -6457,12 +6513,6 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateAdditionalServiceGroupOfPeopleBeWoFau" +
"ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC UpdateAdditionalServiceGroupOfPeople(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC pAdditionalServiceGroupOfPeople);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeople", ReplyAction="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeopleRes" +
"ponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeopleBeW" +
"oFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> pGroups);
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -6499,6 +6549,16 @@ namespace BeWo.ServiceProxy
{
}
public bool HasConfirmationReceiptSignaturesByEmployeeAndServiceRecords(long employeeOid, System.Collections.Generic.List<long> serviceRecordOids)
{
return base.Channel.HasConfirmationReceiptSignaturesByEmployeeAndServiceRecords(employeeOid, serviceRecordOids);
}
public bool HasConfirmationReceiptSignatureByDateAndCustomer(long customerOid, BS.Shared.Core.DateTimeSpan timeSpan, BS.Shared.SignatureType signatureType)
{
return base.Channel.HasConfirmationReceiptSignatureByDateAndCustomer(customerOid, timeSpan, signatureType);
}
public BS.Shared.DataContracts.ServiceCategoryDC LoadServiceCategory(long serviceCategoryOid)
{
return base.Channel.LoadServiceCategory(serviceCategoryOid);
@@ -6749,6 +6809,16 @@ namespace BeWo.ServiceProxy
return base.Channel.BerechneSollSaldoUndIstFuerEinzelnenMitarbeiter(out stundenBeiAbwesenheitKey, out stundenBeiAbwesenheitValue, date, empOid, dienstEintraege, dienstvertretungen, absenceTimes, overtimes);
}
public BS.Shared.DataContracts.VertretungsKlientAccountingsListeItemsDC KlientenAbschlagsInfoListe(System.DateTime start, System.DateTime end)
{
return base.Channel.KlientenAbschlagsInfoListe(start, end);
}
public void DoTokenWunschOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerWunschToken, string token)
{
base.Channel.DoTokenWunschOperation(art, Oid, zugehoerigkeitsTyp, verfuegbarerWunschToken, token);
}
public void DoTokenAusschlussOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerAusschlussToken, string token)
{
base.Channel.DoTokenAusschlussOperation(art, Oid, zugehoerigkeitsTyp, verfuegbarerAusschlussToken, token);
@@ -7164,14 +7234,9 @@ namespace BeWo.ServiceProxy
return base.Channel.GetOwnChatSettingsUrl();
}
public bool HasConfirmationReceiptSignaturesByEmployeeAndServiceRecords(long employeeOid, System.Collections.Generic.List<long> serviceRecordOids)
public System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> pGroups)
{
return base.Channel.HasConfirmationReceiptSignaturesByEmployeeAndServiceRecords(employeeOid, serviceRecordOids);
}
public bool HasConfirmationReceiptSignatureByDateAndCustomer(long customerOid, BS.Shared.Core.DateTimeSpan timeSpan, BS.Shared.SignatureType signatureType)
{
return base.Channel.HasConfirmationReceiptSignatureByDateAndCustomer(customerOid, timeSpan, signatureType);
return base.Channel.InsertNewAdditionalServiceGroupsOfPeople(pGroups);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> GetAllAdditionalServiceBookings(System.Nullable<long> regionOid, System.DateTime start, System.DateTime end)
@@ -7429,6 +7494,11 @@ namespace BeWo.ServiceProxy
return base.Channel.LoadOrganisationPersonRelationsByOid(pOids);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.ArbeitszeitDC> LoadArbeitszeitenForObject(BS.Shared.TableID objectTid, long objectOid)
{
return base.Channel.LoadArbeitszeitenForObject(objectTid, objectOid);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.BargeldkassenDC> LoadBargeldkassenForObject(BS.Shared.TableID objectTid, long objectOid)
{
return base.Channel.LoadBargeldkassenForObject(objectTid, objectOid);
@@ -7589,16 +7659,6 @@ namespace BeWo.ServiceProxy
return base.Channel.VertretungsMitarbeiterListeWoechentlich(start, ende);
}
public BS.Shared.DataContracts.VertretungsKlientAccountingsListeItemsDC KlientenAbschlagsInfoListe(System.DateTime start, System.DateTime end)
{
return base.Channel.KlientenAbschlagsInfoListe(start, end);
}
public void DoTokenWunschOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerWunschToken, string token)
{
base.Channel.DoTokenWunschOperation(art, Oid, zugehoerigkeitsTyp, verfuegbarerWunschToken, token);
}
public void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices)
{
base.Channel.DeactivateInvoices(invoices);
@@ -7894,6 +7954,11 @@ namespace BeWo.ServiceProxy
return base.Channel.CreateDefaultServiceRecords(monat, oids);
}
public string CreateDefaultCustomerServiceRecords(System.DateTime start, System.DateTime end, System.Collections.Generic.List<long> cb2scOids)
{
return base.Channel.CreateDefaultCustomerServiceRecords(start, end, cb2scOids);
}
public bool IsAlive()
{
return base.Channel.IsAlive();
@@ -8018,11 +8083,6 @@ namespace BeWo.ServiceProxy
{
return base.Channel.UpdateAdditionalServiceGroupOfPeople(pAdditionalServiceGroupOfPeople);
}
public System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> pGroups)
{
return base.Channel.InsertNewAdditionalServiceGroupsOfPeople(pGroups);
}
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]

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

@@ -19,6 +19,7 @@ using BeWo.Core.Service;
using BeWo.ServiceProxy;
using BeWo.Validation;
using BeWo.View.Controls;
using BeWo.View.Detail.Zeiterfassung;
using BeWo.ViewModel;
using BeWo.ViewModel.ListViewModel;

4
BeWo/View/Detail/CustomerView.xaml.cs
View File

@@ -160,6 +160,10 @@ namespace BeWo.View.Detail
}
#if DEBUG
tabitem_stundenplan.Visibility = Visibility.Visible;
#endif
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings) || !BeWoApp.AppSettings.ShowOwnChat)
{
tabitem_chatservice.Visibility = Visibility.Collapsed;

83
BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml Normal file
View File

@@ -0,0 +1,83 @@
<view:BeWoView x:Class="BeWo.View.Detail.Zeiterfassung.ServiceRecordCreationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:view="clr-namespace:BeWo.View"
xmlns:controls="clr-namespace:BeWo.View.Controls"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:validation="clr-namespace:BeWo.Validation"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
Height="Auto" Width="Auto">
<GroupBox Name="root" Header="{markup:Translate Zeiterfassung erstellen}" Style="{StaticResource ObjectEditGroupBox}" Margin="3">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" Margin="3,3,3,3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Startdatum:" />
<dxe:DateEdit Grid.Column="1" Grid.Row="0" x:Name="datepicker_StartDate" Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" Width="150"
EditValue="{validation:ValidationBinding Path=StartDatum}"/>
<Label Grid.Column="2" Grid.Row="0" Content="Enddatum:" />
<dxe:DateEdit Grid.Column="3" Grid.Row="0" x:Name="datepicker_EndDate" Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" Width="150"
EditValue="{validation:ValidationBinding Path=EndDatum}"/>
</Grid>
<Grid Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" Margin="3,3,3,3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Folgende Einträge werden im ausgewählten Zeitraum in der Zeiterfassung angelegt:" />
</Grid>
<dxg:GridControl Name="grid_Arbeitszeiten" Grid.Row="2" Tag="{Binding}" ItemsSource="{Binding Path=SelectedArbeitszeitVM.ArbeitszeitEintraege.VMList, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}">
<dxg:GridControl.Columns>
<dxg:GridColumn Header="Tag" FieldName="Tag" SortOrder="Ascending" SortMode="Custom" ReadOnly="True">
</dxg:GridColumn>
<dxg:GridColumn Header="Uhrzeit von" FieldName="UhrzeitVon" ReadOnly="True">
<dxg:GridColumn.EditSettings>
<dxe:TextEditSettings MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" MaskShowPlaceHolders="True" MaskUseAsDisplayFormat="True" />
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn Header="Uhrzeit bis" FieldName="UhrzeitBis" ReadOnly="True">
<dxg:GridColumn.EditSettings>
<dxe:TextEditSettings MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" MaskShowPlaceHolders="True" MaskUseAsDisplayFormat="True" />
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn Header="{markup:Translate Mitarbeiter/in}" FieldName="Employee" ReadOnly="True">
</dxg:GridColumn>
<dxg:GridColumn Header="Bemerkungen" FieldName="Notice" ReadOnly="True"/>
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView NavigationStyle="Cell" Margin="2,2,2,2" AllowBestFit="True" BestFitMode="AllRows" AutoWidth="True" ShowGroupPanel="False" ShowGroupedColumns="False" ShowTotalSummary="False" HorizontalContentAlignment="Left" />
</dxg:GridControl.View>
</dxg:GridControl>
</Grid>
</GroupBox>
</view:BeWoView>

58
BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs Normal file
View File

@@ -0,0 +1,58 @@
using System;
using System.Collections.Generic;
using BeWo.ServiceProxy;
using BeWo.Validation;
using BeWo.ViewModel;
using BeWo.ViewModel.ListViewModel;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace BeWo.View.Detail.Zeiterfassung
{
public partial class ServiceRecordCreationView
{
public DateTime StartDatum { get; set; }
public DateTime EndDatum { get; set; }
public SupportConceptCostBearerRelDC SupportConceptCostBearerRel { get; set; }
public ArbeitszeitListVM ArbeitszeitListVM { get; set; }
public ArbeitszeitVM SelectedArbeitszeitVM { get; set; }
public ServiceRecordCreationView(SupportConceptCostBearerRelDC c2s, List<ArbeitszeitDC> arbeitszeiten)
{
InitializeComponent();
SupportConceptCostBearerRel = c2s;
ArbeitszeitListVM = new ArbeitszeitListVM(arbeitszeiten);
StartDatum = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
EndDatum = StartDatum.AddMonths(1).AddDays(-1);
UpdateSelectedArbeitszeitVm();
DataContext = this;
}
private void UpdateSelectedArbeitszeitVm()
{
SelectedArbeitszeitVM = ArbeitszeitListVM.VMList[0];
}
public void Save(Action<String> pCallBack)
{
List<long> oids = new List<long>();
oids.Add(SupportConceptCostBearerRel.CostBearer2SupportConceptOid.Value);
ServiceFacade.DoOperationsServiceAsync(s => s.CreateDefaultCustomerServiceRecords(StartDatum, EndDatum, oids), result => pCallBack(result));
}
}
}

2105
BeWo/View/Detail/ServiceRecordEditView.xaml → BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml
View File

File diff suppressed because it is too large Load Diff

2014
BeWo/View/Detail/ServiceRecordEditView.xaml.cs → BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml.cs
View File

File diff suppressed because it is too large Load Diff

1826
BeWo/View/Detail/ServiceRecordGroupEditView.xaml → BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml
View File

File diff suppressed because it is too large Load Diff

2234
BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs → BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml.cs
View File

File diff suppressed because it is too large Load Diff

333
BeWo/View/Detail/ServiceRecordHistoryView.xaml → BeWo/View/Detail/Zeiterfassung/ServiceRecordHistoryView.xaml
View File

@@ -1,167 +1,168 @@
<localView:BeWoView x:Class="BeWo.View.Detail.ServiceRecordHistoryView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:localView="clr-namespace:BeWo.View"
xmlns:detail="clr-namespace:BeWo.View.Detail"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup">
<localView:BeWoView.Resources>
<DataTemplate x:Key="DetailCoreTemplate">
<dx:MeasurePixelSnapper>
<Border BorderThickness="0,1,0,0" BorderBrush="#FFD2D2D2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="8" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<!-- <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />-->
</Grid.ColumnDefinitions>
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<!-- <TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice2}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice3}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice4}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice5}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />-->
</Grid>
</Border>
</dx:MeasurePixelSnapper>
</DataTemplate>
<ControlTemplate x:Key="DetailContainerTemplate" TargetType="{x:Type ContentControl}">
<Border BorderThickness="0,0,0,0" BorderBrush="{TemplateBinding BorderBrush}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="0" Background="{TemplateBinding Background}">
<ContentPresenter />
</Border>
</ControlTemplate>
<DataTemplate x:Key="RowDetailTemplate">
<StackPanel Orientation="Vertical">
<dx:MeasurePixelSnapper>
<ContentPresenter x:Name="defaultRowPresenter" Content="{Binding}" ContentTemplate="{Binding View.DefaultDataRowTemplate}" />
</dx:MeasurePixelSnapper>
<detail:RowDetailContainerControl Template="{StaticResource DetailContainerTemplate}" Content="{Binding}" ContentTemplate="{DynamicResource DetailCoreTemplate}" />
</StackPanel>
</DataTemplate>
</localView:BeWoView.Resources>
<Grid Width="Auto" Height="Auto" x:Name="root">
<GroupBox Style="{StaticResource PopUpWindowStyle}">
<GroupBox.Header>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0">
<Image Source="..\..\Ressources\Icons\HistoryDisabled.png" RenderTransformOrigin="0.5,0.5" Width="Auto" Height="28" Margin="0,0,0,0">
<Image.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="1" ScaleY="1" />
<SkewTransform AngleX="0" AngleY="0" />
<RotateTransform Angle="0" />
<TranslateTransform X="0" Y="0" />
</TransformGroup>
</Image.RenderTransform>
</Image>
<TextBox Text="Änderungshistorie" Margin="10,4,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="20" BorderBrush="{x:Null}" VerticalAlignment="Stretch" BorderThickness="0,0,0,0" Padding="0,0,0,0" />
</StackPanel>
</GroupBox.Header>
<Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Rectangle Fill="{DynamicResource ServiceRecordContentBrush}" Height="6" />
<Grid x:Name="rootGrid" Grid.Row="1" Margin="10,10,10,0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid Grid.Row="1" Margin="0,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<dxg:GridControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" x:Name="datagrid_ServiceRecordHistory">
<dxg:GridControl.Columns>
<dxg:GridColumn AllowEditing="False" FieldName="TimeStamp" Header="Änderungsdatum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy HH:mm}" x:Name="AenderungsdatumColumn" />
<dxg:GridColumn AllowEditing="False" FieldName="InsUser" Header="Geändert von" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Employee" Header="{markup:Translate Mitarbeiter}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="HistoryTypeString" Header="Art der Änderung" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Start" Header="Datum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy}"/>
<dxg:GridColumn AllowEditing="False" FieldName="StartDate" Header="Start" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=HH:mm}"/>
<dxg:GridColumn AllowEditing="False" FieldName="EndDate" Header="Ende" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=HH:mm}"/>
<dxg:GridColumn AllowEditing="False" FieldName="RoundedDuration" Header="Dauer" ReadOnly="True" EditSettings="{dxe:TextSettings DisplayFormat=0}" x:Name="RoundedDHeader"/>
<dxg:GridColumn AllowEditing="False" FieldName="DurationInStunden" Header="Art (Dauer)" ReadOnly="True" x:Name="DurationInSTDHeader" />
<dxg:GridColumn AllowEditing="False" FieldName="Customer" Header="{markup:Translate Klient/in}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="SupportConcept" Header="{markup:Translate Hilfeplan}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Organisation.Name" Header="{markup:Translate Kostenträger}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription.Category" Header="Leistungskategorie" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription" Header="Leistung" ReadOnly="True" />
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView x:Name="GridView" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Row"
AllowPerPixelScrolling="True" UseLightweightTemplates="None"
DataRowTemplate="{DynamicResource RowDetailTemplate}"/>
</dxg:GridControl.View>
</dxg:GridControl>
</Grid>
</Grid>
</Grid>
<Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,10,0,0" VerticalAlignment="Stretch" Background="#FF000000">
<Border.OpacityMask>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#19000000" Offset="0" />
<GradientStop Color="#33FFFFFF" Offset="1" />
</LinearGradientBrush>
</Border.OpacityMask>
</Border>
<StackPanel Grid.ColumnSpan="3" Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Height="Auto" Margin="5,10,0,0" HorizontalAlignment="Right">
<Button x:Name="btnClose" Content="Schließen" Margin="0,0,3,0" Command="ApplicationCommands.Close" Height="25" />
</StackPanel>
</Grid>
</GroupBox>
</Grid>
<localView:BeWoView x:Class="BeWo.View.Detail.Zeiterfassung.ServiceRecordHistoryView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:localView="clr-namespace:BeWo.View"
xmlns:detail="clr-namespace:BeWo.View.Detail"
xmlns:zeit="clr-namespace:BeWo.View.Detail.Zeiterfassung"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup">
<localView:BeWoView.Resources>
<DataTemplate x:Key="DetailCoreTemplate">
<dx:MeasurePixelSnapper>
<Border BorderThickness="0,1,0,0" BorderBrush="#FFD2D2D2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="8" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<!-- <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />-->
</Grid.ColumnDefinitions>
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<!-- <TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice2}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice3}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice4}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice5}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />-->
</Grid>
</Border>
</dx:MeasurePixelSnapper>
</DataTemplate>
<ControlTemplate x:Key="DetailContainerTemplate" TargetType="{x:Type ContentControl}">
<Border BorderThickness="0,0,0,0" BorderBrush="{TemplateBinding BorderBrush}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="0" Background="{TemplateBinding Background}">
<ContentPresenter />
</Border>
</ControlTemplate>
<DataTemplate x:Key="RowDetailTemplate">
<StackPanel Orientation="Vertical">
<dx:MeasurePixelSnapper>
<ContentPresenter x:Name="defaultRowPresenter" Content="{Binding}" ContentTemplate="{Binding View.DefaultDataRowTemplate}" />
</dx:MeasurePixelSnapper>
<zeit:RowDetailContainerControl Template="{StaticResource DetailContainerTemplate}" Content="{Binding}" ContentTemplate="{DynamicResource DetailCoreTemplate}" />
</StackPanel>
</DataTemplate>
</localView:BeWoView.Resources>
<Grid Width="Auto" Height="Auto" x:Name="root">
<GroupBox Style="{StaticResource PopUpWindowStyle}">
<GroupBox.Header>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0">
<Image Source="..\..\Ressources\Icons\HistoryDisabled.png" RenderTransformOrigin="0.5,0.5" Width="Auto" Height="28" Margin="0,0,0,0">
<Image.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="1" ScaleY="1" />
<SkewTransform AngleX="0" AngleY="0" />
<RotateTransform Angle="0" />
<TranslateTransform X="0" Y="0" />
</TransformGroup>
</Image.RenderTransform>
</Image>
<TextBox Text="Änderungshistorie" Margin="10,4,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="20" BorderBrush="{x:Null}" VerticalAlignment="Stretch" BorderThickness="0,0,0,0" Padding="0,0,0,0" />
</StackPanel>
</GroupBox.Header>
<Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Rectangle Fill="{DynamicResource ServiceRecordContentBrush}" Height="6" />
<Grid x:Name="rootGrid" Grid.Row="1" Margin="10,10,10,0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid Grid.Row="1" Margin="0,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<dxg:GridControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" x:Name="datagrid_ServiceRecordHistory">
<dxg:GridControl.Columns>
<dxg:GridColumn AllowEditing="False" FieldName="TimeStamp" Header="Änderungsdatum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy HH:mm}" x:Name="AenderungsdatumColumn" />
<dxg:GridColumn AllowEditing="False" FieldName="InsUser" Header="Geändert von" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Employee" Header="{markup:Translate Mitarbeiter}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="HistoryTypeString" Header="Art der Änderung" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Start" Header="Datum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy}"/>
<dxg:GridColumn AllowEditing="False" FieldName="StartDate" Header="Start" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=HH:mm}"/>
<dxg:GridColumn AllowEditing="False" FieldName="EndDate" Header="Ende" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=HH:mm}"/>
<dxg:GridColumn AllowEditing="False" FieldName="RoundedDuration" Header="Dauer" ReadOnly="True" EditSettings="{dxe:TextSettings DisplayFormat=0}" x:Name="RoundedDHeader"/>
<dxg:GridColumn AllowEditing="False" FieldName="DurationInStunden" Header="Art (Dauer)" ReadOnly="True" x:Name="DurationInSTDHeader" />
<dxg:GridColumn AllowEditing="False" FieldName="Customer" Header="{markup:Translate Klient/in}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="SupportConcept" Header="{markup:Translate Hilfeplan}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Organisation.Name" Header="{markup:Translate Kostenträger}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription.Category" Header="Leistungskategorie" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription" Header="Leistung" ReadOnly="True" />
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView x:Name="GridView" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Row"
AllowPerPixelScrolling="True" UseLightweightTemplates="None"
DataRowTemplate="{DynamicResource RowDetailTemplate}"/>
</dxg:GridControl.View>
</dxg:GridControl>
</Grid>
</Grid>
</Grid>
<Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,10,0,0" VerticalAlignment="Stretch" Background="#FF000000">
<Border.OpacityMask>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#19000000" Offset="0" />
<GradientStop Color="#33FFFFFF" Offset="1" />
</LinearGradientBrush>
</Border.OpacityMask>
</Border>
<StackPanel Grid.ColumnSpan="3" Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Height="Auto" Margin="5,10,0,0" HorizontalAlignment="Right">
<Button x:Name="btnClose" Content="Schließen" Margin="0,0,3,0" Command="ApplicationCommands.Close" Height="25" />
</StackPanel>
</Grid>
</GroupBox>
</Grid>
</localView:BeWoView>

84
BeWo/View/Detail/ServiceRecordHistoryView.xaml.cs → BeWo/View/Detail/Zeiterfassung/ServiceRecordHistoryView.xaml.cs
View File

@@ -1,43 +1,43 @@
using System.Collections.Generic;
using System.Windows;
using System.Windows.Controls;
using BS.Shared.DataContracts;
using DevExpress.Xpf.Core;
namespace BeWo.View.Detail
{
public partial class ServiceRecordHistoryView
{
public ServiceRecordHistoryView()
{
InitializeComponent();
}
public void InitView(List<ServiceRecordHistoryDC> historyList)
{
AenderungsdatumColumn.Visible = !BeWoApp.AppSettings.HideServiceRecordInsertedByAndInsertedOn;
InitializeComponent();
datagrid_ServiceRecordHistory.ItemsSource = historyList;
GridView.BestFitColumns();
Focus();
if (!BeWoApp.AppSettings.IsEndDateVisible && !BeWoApp.AppSettings.IsOnlyYearMonthVisible)
{
RoundedDHeader.Header = "Minuten";
DurationInSTDHeader.Visible = false;
}
}
}
public class RowDetailContainerControl : ContentControl
{
public RowDetailContainerControl()
{
this.SetDefaultStyleKey(typeof(RowDetailContainerControl));
}
}
using System.Collections.Generic;
using System.Windows;
using System.Windows.Controls;
using BS.Shared.DataContracts;
using DevExpress.Xpf.Core;
namespace BeWo.View.Detail.Zeiterfassung
{
public partial class ServiceRecordHistoryView
{
public ServiceRecordHistoryView()
{
InitializeComponent();
}
public void InitView(List<ServiceRecordHistoryDC> historyList)
{
AenderungsdatumColumn.Visible = !BeWoApp.AppSettings.HideServiceRecordInsertedByAndInsertedOn;
InitializeComponent();
datagrid_ServiceRecordHistory.ItemsSource = historyList;
GridView.BestFitColumns();
Focus();
if (!BeWoApp.AppSettings.IsEndDateVisible && !BeWoApp.AppSettings.IsOnlyYearMonthVisible)
{
RoundedDHeader.Header = "Minuten";
DurationInSTDHeader.Visible = false;
}
}
}
public class RowDetailContainerControl : ContentControl
{
public RowDetailContainerControl()
{
this.SetDefaultStyleKey(typeof(RowDetailContainerControl));
}
}
}

2
BeWo/View/Detail/ServiceRecordRTFWindowView.xaml → BeWo/View/Detail/Zeiterfassung/ServiceRecordRTFWindowView.xaml
View File

@@ -1,4 +1,4 @@
<Window x:Class="BeWo.View.Detail.ServiceRecordRTFWindowView"
<Window x:Class="BeWo.View.Detail.Zeiterfassung.ServiceRecordRTFWindowView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
BeWo/View/Detail/ServiceRecordRTFWindowView.xaml.cs → BeWo/View/Detail/Zeiterfassung/ServiceRecordRTFWindowView.xaml.cs
View File

@@ -10,7 +10,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
namespace BeWo.View.Detail
namespace BeWo.View.Detail.Zeiterfassung
{
public partial class ServiceRecordRTFWindowView
{

100
BeWo/View/Detail/ServiceRecordRebookingView.xaml → BeWo/View/Detail/Zeiterfassung/ServiceRecordRebookingView.xaml
View File

@@ -1,50 +1,50 @@
<view:BeWoView x:Class="BeWo.View.Detail.ServiceRecordRebookingView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:view="clr-namespace:BeWo.View"
xmlns:controls="clr-namespace:BeWo.View.Controls"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:validation="clr-namespace:BeWo.Validation"
Height="Auto" Width="Auto">
<GroupBox Name="root" Header="Einträge umbuchen" Style="{StaticResource ObjectEditGroupBox}">
<Grid VerticalAlignment="Stretch">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid Grid.Column="0" Grid.Row="0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Content="Neuer Hilfeplan" />
<controls:SingleSupportConceptSelectionControl x:Name="supportConceptSelectionControl" Grid.Row="1"
ItemSelected="supportConceptSelectionControl_ItemSelected" Height="62" VerticalAlignment="Top"
HorizontalContentAlignment="Stretch" Width="250" />
</Grid>
<Grid Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" Margin="0,25,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Von" />
<dxe:DateEdit Grid.Column="1" Grid.Row="0" x:Name="datepicker_StartDate" Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" Width="150"
EditValue="{validation:ValidationBinding Path=StartDatum}"/>
<Label Grid.Column="0" Grid.Row="1" Content="Bis" />
<dxe:DateEdit Grid.Column="1" Grid.Row="1" x:Name="datepicker_EndDate" Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" Width="150"
EditValue="{validation:ValidationBinding Path=EndDatum}"/>
</Grid>
</Grid>
</Grid>
</GroupBox>
</view:BeWoView>
<view:BeWoView x:Class="BeWo.View.Detail.Zeiterfassung.ServiceRecordRebookingView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:view="clr-namespace:BeWo.View"
xmlns:controls="clr-namespace:BeWo.View.Controls"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:validation="clr-namespace:BeWo.Validation"
Height="Auto" Width="Auto">
<GroupBox Name="root" Header="Einträge umbuchen" Style="{StaticResource ObjectEditGroupBox}">
<Grid VerticalAlignment="Stretch">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid Grid.Column="0" Grid.Row="0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Content="Neuer Hilfeplan" />
<controls:SingleSupportConceptSelectionControl x:Name="supportConceptSelectionControl" Grid.Row="1"
ItemSelected="supportConceptSelectionControl_ItemSelected" Height="62" VerticalAlignment="Top"
HorizontalContentAlignment="Stretch" Width="250" />
</Grid>
<Grid Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" Margin="0,25,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Von" />
<dxe:DateEdit Grid.Column="1" Grid.Row="0" x:Name="datepicker_StartDate" Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" Width="150"
EditValue="{validation:ValidationBinding Path=StartDatum}"/>
<Label Grid.Column="0" Grid.Row="1" Content="Bis" />
<dxe:DateEdit Grid.Column="1" Grid.Row="1" x:Name="datepicker_EndDate" Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" Width="150"
EditValue="{validation:ValidationBinding Path=EndDatum}"/>
</Grid>
</Grid>
</Grid>
</GroupBox>
</view:BeWoView>

150
BeWo/View/Detail/ServiceRecordRebookingView.xaml.cs → BeWo/View/Detail/Zeiterfassung/ServiceRecordRebookingView.xaml.cs
View File

@@ -1,75 +1,75 @@
using System;
using System.Collections.Generic;
using BeWo.ServiceProxy;
using BeWo.Validation;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace BeWo.View.Detail
{
public partial class ServiceRecordRebookingView
{
[ValidationAttribute(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public DateTime StartDatum { get; set; }
[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public DateTime EndDatum { get; set; }
public CompactSupportConceptDC Zielhilfeplan { get; set; }
public SupportConceptCostBearerRelDC ZielhilfeplanKostentraegerRelDC { get; set; }
public SupportConceptCostBearerRelDC SupportConceptCostBearerRelDC { get; set; }
public ServiceRecordRebookingView(SupportConceptCostBearerRelDC supportConceptCostBearerRelDC)
{
InitializeComponent();
StartDatum = DateTime.Now;
EndDatum = DateTime.Now.AddDays(1);
SupportConceptCostBearerRelDC = supportConceptCostBearerRelDC;
DataContext = this;
}
public void SetSearchText(String text)
{
supportConceptSelectionControl.SearchText = text;
}
private void supportConceptSelectionControl_ItemSelected(object sender, EventArgs<FlatSupportConceptTreeNodeDC> e)
{
Zielhilfeplan = e.Data.SupportConceptTreeNodeDC.SupportConcept;
ZielhilfeplanKostentraegerRelDC = e.Data.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC;
}
public void Save(Action<List<ServiceRecordDC>> pCallBack)
{
var x = new DateTimeSpan
{
StartDate = StartDatum,
StartHours = 0,
StartMinutes = 0,
EndDate = EndDatum,
EndHours = 23,
EndMinutes = 59
};
ServiceFacade.DoOperationsServiceAsync(s => s.FindServiceRecordsInSpan(SupportConceptCostBearerRelDC.CostBearer2SupportConceptOid.Value, x),
records2Rebook =>
{
foreach (var record in records2Rebook)
{
record.SupportConcept = Zielhilfeplan;
record.CostBearer = ZielhilfeplanKostentraegerRelDC.CostBearer;
record.CostBearer2SupportConceptOid = ZielhilfeplanKostentraegerRelDC.CostBearer2SupportConceptOid;
record.Customer = Zielhilfeplan.Customer;
}
pCallBack(records2Rebook);
});
}
}
}
using System;
using System.Collections.Generic;
using BeWo.ServiceProxy;
using BeWo.Validation;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace BeWo.View.Detail.Zeiterfassung
{
public partial class ServiceRecordRebookingView
{
[ValidationAttribute(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public DateTime StartDatum { get; set; }
[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public DateTime EndDatum { get; set; }
public CompactSupportConceptDC Zielhilfeplan { get; set; }
public SupportConceptCostBearerRelDC ZielhilfeplanKostentraegerRelDC { get; set; }
public SupportConceptCostBearerRelDC SupportConceptCostBearerRelDC { get; set; }
public ServiceRecordRebookingView(SupportConceptCostBearerRelDC supportConceptCostBearerRelDC)
{
InitializeComponent();
StartDatum = DateTime.Now;
EndDatum = DateTime.Now.AddDays(1);
SupportConceptCostBearerRelDC = supportConceptCostBearerRelDC;
DataContext = this;
}
public void SetSearchText(String text)
{
supportConceptSelectionControl.SearchText = text;
}
private void supportConceptSelectionControl_ItemSelected(object sender, EventArgs<FlatSupportConceptTreeNodeDC> e)
{
Zielhilfeplan = e.Data.SupportConceptTreeNodeDC.SupportConcept;
ZielhilfeplanKostentraegerRelDC = e.Data.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC;
}
public void Save(Action<List<ServiceRecordDC>> pCallBack)
{
var x = new DateTimeSpan
{
StartDate = StartDatum,
StartHours = 0,
StartMinutes = 0,
EndDate = EndDatum,
EndHours = 23,
EndMinutes = 59
};
ServiceFacade.DoOperationsServiceAsync(s => s.FindServiceRecordsInSpan(SupportConceptCostBearerRelDC.CostBearer2SupportConceptOid.Value, x),
records2Rebook =>
{
foreach (var record in records2Rebook)
{
record.SupportConcept = Zielhilfeplan;
record.CostBearer = ZielhilfeplanKostentraegerRelDC.CostBearer;
record.CostBearer2SupportConceptOid = ZielhilfeplanKostentraegerRelDC.CostBearer2SupportConceptOid;
record.Customer = Zielhilfeplan.Customer;
}
pCallBack(records2Rebook);
});
}
}
}

3487
BeWo/View/Detail/ServiceRecordView2.xaml → BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml
View File

File diff suppressed because it is too large Load Diff

9740
BeWo/View/Detail/ServiceRecordView2.xaml.cs → BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
View File

File diff suppressed because it is too large Load Diff

148
BeWo/View/Master/DokumenteView.xaml.cs
View File

@@ -135,7 +135,7 @@ namespace BeWo.View.Master
{
switch (dcNodeConfig.TableID)
{
case TableID.FinanzDokumente: Finanzen_Expended(node); break;
case TableID.FinanzDokumente: SubNode_Expended(node); break;
case TableID.SupportConcept: SupportConcepts_Expended(node); break;
case TableID.Customer: Customers_Expended(node); break;
case TableID.Organisation: Organisations_Expended(node); break;
@@ -161,52 +161,66 @@ namespace BeWo.View.Master
private void SubNode_Expended(TreeListNode node)
{
var parentNode = node.ParentNode;
var parentContent = parentNode.Content as DocumentTreeItemVM;
var childContent = node.Content as DocumentTreeItemVM;
List<BeWoFolderDC> folderDCs = new List<BeWoFolderDC>();
if (parentContent.DocTreeItemOid == 1 && parentContent.Name.Equals("Hilfepläne"))
var config = node.Tag as DocumentRootNodeConfig;
if (config != null && config.TableID == TableID.FinanzDokumente)
{
//SupportConcept
folderDCs = VMFactory.CreateFolderList(TableID.SupportConcept, (long)childContent.DocTreeItemOid);
folderDCs = VMFactory.CreateFolderList(TableID.FinanzDokumente, 0);
}
else if (parentContent.DocTreeItemOid == 2 && parentContent.Name.Equals("Klienten"))
else
{
//Customer
folderDCs = VMFactory.CreateFolderList(TableID.Customer, (long)childContent.DocTreeItemOid);
}
else if (parentContent.DocTreeItemOid == 3 && parentContent.Name.Equals("Organisationen"))
{
//Organisation
folderDCs = VMFactory.CreateFolderList(TableID.Organisation, (long)childContent.DocTreeItemOid);
}
else if (parentContent.DocTreeItemOid == 4 && parentContent.Name.Equals("Personen"))
{
//Person
folderDCs = VMFactory.CreateFolderList(TableID.Person, (long)childContent.DocTreeItemOid);
}
else if (parentContent.DocTreeItemOid == 5 && parentContent.Name.Equals("Mitarbeiter"))
{
//Employee
folderDCs = VMFactory.CreateFolderList(TableID.Employee, (long)childContent.DocTreeItemOid);
}
else if (parentContent.DocTreeItemOid == 6 && parentContent.Name.Equals("Teams"))
{
//Team
folderDCs = VMFactory.CreateFolderList(TableID.Team, (long)childContent.DocTreeItemOid);
}
else if (parentContent.DocTreeItemOid == 7 && parentContent.Name.Equals("Benutzer"))
{
//User
folderDCs = VMFactory.CreateFolderList(TableID.ApplicationUser, (long)childContent.DocTreeItemOid);
}
else if (parentContent.DocTreeItemOid == 8 && parentContent.Name.Equals("Benutzergruppen"))
{
//UserGroup
folderDCs = VMFactory.CreateFolderList(TableID.UserGroup, (long)childContent.DocTreeItemOid);
var treeItemVm = node.Content as DocumentTreeItemVM;
var parentNode = node.ParentNode;
var parentContent = parentNode.Content as DocumentTreeItemVM;
var parentConfig = parentNode.Tag as DocumentRootNodeConfig;
if (parentConfig != null && parentConfig.TableID == TableID.SupportConcept)
{
//SupportConcept
folderDCs = VMFactory.CreateFolderList(TableID.SupportConcept, (long)treeItemVm.DocTreeItemOid);
}
else if (parentConfig != null && parentConfig.TableID == TableID.Customer)
{
//Customer
folderDCs = VMFactory.CreateFolderList(TableID.Customer, (long)treeItemVm.DocTreeItemOid);
}
else if (parentConfig != null && parentConfig.TableID == TableID.Organisation)
{
//Organisation
folderDCs = VMFactory.CreateFolderList(TableID.Organisation, (long)treeItemVm.DocTreeItemOid);
}
else if (parentConfig != null && parentConfig.TableID == TableID.Person)
{
//Person
folderDCs = VMFactory.CreateFolderList(TableID.Person, (long)treeItemVm.DocTreeItemOid);
}
else if (parentConfig != null && parentConfig.TableID == TableID.Employee)
{
//Employee
folderDCs = VMFactory.CreateFolderList(TableID.Employee, (long)treeItemVm.DocTreeItemOid);
}
else if (parentConfig != null && parentConfig.TableID == TableID.Team)
{
//Team
folderDCs = VMFactory.CreateFolderList(TableID.Team, (long)treeItemVm.DocTreeItemOid);
}
else if (parentConfig != null && parentConfig.TableID == TableID.ApplicationUser)
{
//User
folderDCs = VMFactory.CreateFolderList(TableID.ApplicationUser, (long)treeItemVm.DocTreeItemOid);
}
else if (parentConfig != null && parentConfig.TableID == TableID.UserGroup)
{
//UserGroup
folderDCs = VMFactory.CreateFolderList(TableID.UserGroup, (long)treeItemVm.DocTreeItemOid);
}
}
GenerateFolderStructureForSelectedNode(node, folderDCs);
}
@@ -272,12 +286,6 @@ namespace BeWo.View.Master
//Alle Hilfepläne in eine Liste holen
var liste = VMFactory.CreateSupportConceptList();
if (liste.Count == 0)
{
MessageBox.Show("Sie verfügen nicht über die Benutzerrechte, die zum Anzeigen der Hilfepläne benötigt werden. " +
"\nWenden Sie sich an den administrierenden Mitarbeiter.", "Information", MessageBoxButton.OK, MessageBoxImage.Information);
return;
}
//Liste durchlaufen und für jedes Elemement ein entsprechendes DocumentTreeItemDC/VM erstellen
List<DocumentTreeItemVM> docTreeItemVMs = new List<DocumentTreeItemVM>();
@@ -317,7 +325,7 @@ namespace BeWo.View.Master
if (node.Nodes.Count == 0)
{
//Alle Hilfepläne in eine Liste holen
var liste = ServiceFacade.DoCustomerServiceSync(s => s.GetAllSupportConceptsCompact(BeWoApp.LoggedOnUser.Employee.EmployeeOid));
var liste = ServiceFacade.DoCustomerServiceSync(s => s.GetAllAuthorizedCompactSupportConcepts());
//Liste durchlaufen und für jedes Elemement ein entsprechendes DocumentTreeItemDC/VM erstellen
@@ -357,14 +365,8 @@ namespace BeWo.View.Master
if (node.Nodes.Count == 0)
{
//Alle Klienten in eine Liste holen
var liste = VMFactory.CreateCustomerList();
if (liste.Count == 0)
{
MessageBox.Show("Sie verfügen nicht über die Benutzerrechte, die zum Anzeigen der Klienten benötigt werden. " +
"\nWenden Sie sich an den administrierenden Mitarbeiter.", "Information", MessageBoxButton.OK, MessageBoxImage.Information);
return;
}
var liste = ServiceFacade.DoCustomerServiceSync(s => s.GetAllAuthorizedCompactCustomers());
//Liste durchlaufen und für jedes Elemement ein entsprechendes DocumentTreeItemDC/VM erstellen
List<DocumentTreeItemVM> docTreeItemVMs = new List<DocumentTreeItemVM>();
@@ -402,15 +404,9 @@ namespace BeWo.View.Master
if (node.Nodes.Count == 0)
{
//Alle Klienten in eine Liste holen
var liste = VMFactory.CreateOrganisationList();
if (liste.Count == 0)
{
MessageBox.Show("Sie verfügen nicht über die Benutzerrechte, die zum Anzeigen der Organisationen benötigt werden. " +
"\nWenden Sie sich an den administrierenden Mitarbeiter.", "Information", MessageBoxButton.OK, MessageBoxImage.Information);
return;
}
var liste = VMFactory.CreateOrganisationList().OrderBy(o => o.Name).ToList();
//Liste durchlaufen und für jedes Elemement ein entsprechendes DocumentTreeItemDC/VM erstellen
List<DocumentTreeItemVM> docTreeItemVMs = new List<DocumentTreeItemVM>();
var parentNode = node.Content as DocumentTreeItemVM;
@@ -447,7 +443,8 @@ namespace BeWo.View.Master
if (node.Nodes.Count == 0)
{
//Alle Klienten in eine Liste holen
var liste = VMFactory.CreatePeopleList();
//var liste = VMFactory.CreatePeopleList();
var liste = ServiceFacade.DoCustomerServiceSync(s => s.GetAllAuthorizedCompactPersons());
//Liste durchlaufen und für jedes Elemement ein entsprechendes DocumentTreeItemDC/VM erstellen
List<DocumentTreeItemVM> docTreeItemVMs = new List<DocumentTreeItemVM>();
@@ -458,7 +455,7 @@ namespace BeWo.View.Master
{
DocTreeItemOid = item.PersonOid,
ParentOid = parentNode.DocTreeItemOid,
Name = item.FullName,
Name = item.DetailDescription,
Table = TableID.Person,
ObjectOid = item.PersonOid
};
@@ -485,7 +482,7 @@ namespace BeWo.View.Master
if (node.Nodes.Count == 0)
{
//Alle Klienten in eine Liste holen
var liste = VMFactory.CreateEmployeeList();
var liste = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllAuthorizedCompactEmployees());
//Liste durchlaufen und für jedes Elemement ein entsprechendes DocumentTreeItemDC/VM erstellen
List<DocumentTreeItemVM> docTreeItemVMs = new List<DocumentTreeItemVM>();
@@ -523,7 +520,7 @@ namespace BeWo.View.Master
if (node.Nodes.Count == 0)
{
//Alle Hilfepläne in eine Liste holen
var liste = VMFactory.CreateTeamList();
var liste = VMFactory.CreateTeamList().OrderBy(t => t.Name).ToList();
//Liste durchlaufen und für jedes Elemement ein entsprechendes DocumentTreeItemDC/VM erstellen
@@ -864,6 +861,7 @@ namespace BeWo.View.Master
var selectedTreeViewRow = DocumentsTreeView.SelectedRows[0] as DocumentTreeItemVM;
var selectedFolder = selectedTreeViewRow.DataContract.BeWoFolderDC;
long? bewoFolderOid = selectedFolder.BeWoFolderOid;
TableID tableID = selectedFolder.ObjectTid;
long? objectOid = selectedFolder.ObjectOid;
@@ -1512,7 +1510,7 @@ namespace BeWo.View.Master
if (row == null)
return;
if (MessageBox.Show("ACHTUNG: Das Löschen von Ordnern kann nicht rückgängig gemacht werden!\nWollen Sie den Ordner '" + folder.Name + "' mit allen" +
" sich in diesem befindlichen Dateien und Ordnern wirklich löschen?", "Löschen bestätigen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
" enthaltenen Dateien und Unterordnern wirklich löschen?", "Löschen bestätigen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
return;
TemplateExecuteDelete(folder);
@@ -1957,7 +1955,17 @@ namespace BeWo.View.Master
private void button_OpenUploadDocument_Click(object sender, RoutedEventArgs e)
{
popup_UploadFiles.IsOpen = true;
var item = documents_treeview_control.SelectedItem as DocumentTreeItemVM;
if (item != null && item.DataContract != null && item.DataContract.BeWoFolderDC != null)
{
popup_UploadFiles.IsOpen = true;
}
else
{
MessageBox.Show(Translator.Translate("Bitte wählen Sie einen geeigneten Ordner aus!"), "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
}
}
private void popupedit_file_PopUpClick_1(object sender, RoutedEventArgs e)

1
BeWo/ownChat/ChatDokumentationsView.xaml.cs
View File

@@ -16,6 +16,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using ChatController.ChatKlassen;
using DevExpress.XtraScheduler;
using BeWo.View.Detail.Zeiterfassung;
namespace BeWo.ownChat
{

17
Data/Access/SearchDAO.cs
View File

@@ -1993,6 +1993,23 @@ namespace BeWo.Data.Access
return c.List<Bargeldkasse>().ToList();
}
public IEnumerable<Arbeitszeit> FindArbeitszeiten(TableID objectTid, long objectOid)
{
var c = CreateCriteriaIsActive<Arbeitszeit>();
if (objectTid == TableID.Employee)
{
c.Add(Restrictions.Eq(Arbeitszeit.PropertyName_EmployeeOid, objectOid));
}
else
{
c.Add(Restrictions.Eq("Customer", DAOFactory.GenericDAO.GetByID<Customer>(objectOid)));
}
return c.List<Arbeitszeit>().ToList();
}
public IList<NotizenKategorie> FindNotizenKategorien(TableID objectTid, long objectOid)
{
var c = CreateCriteriaIsActiveOrArchived<NotizenKategorie>()

3
ReportImp/ApiBerlin/ApiBerlin.csproj
View File

@@ -34,6 +34,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="DevExpress.Pdf.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

133
ReportImp/ApiBerlin/MitarbeiterstundenkontoBerechnungTagesansicht.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using BeWo.Data.Entities;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using BS.Shared.Extensions;
@@ -35,5 +35,136 @@ namespace ApiBerlin
dd.BreakMinutes2 = null;
return dd;
}
public override void CalculateAbsenceTimesForDay(MitarbeiterstundenkontoRO.DayDetail dd, MitarbeiterstundenkontoRO.EmployeeDetail ed)
{
var absenceTimes = ed.Employee.AbsenceTimes;
if (absenceTimes != null)
{
foreach (var absenceTime in absenceTimes)
{
if (IsUrlaubAbsenceTime(absenceTime) || IsKrankheitAbsenceTime(absenceTime))
{
DateTimeSpan span = new DateTimeSpan();
span.StartDate = dd.Date;
if (absenceTime.Start.HasValue && absenceTime.Start.Value > span.StartDate)
{
span.StartDate = absenceTime.Start.Value;
}
if (absenceTime.End.HasValue && absenceTime.End.Value.Date == span.StartDate.Date &&
absenceTime.End.Value.Hour > 0)
{
span.EndDate = absenceTime.End.Value;
}
else
{
span.EndDate = dd.Date.AddDays(1);
if (absenceTime.End.HasValue && absenceTime.End.Value.Date.AddDays(1) < span.EndDate)
{
span.EndDate = absenceTime.End.Value.Date.AddDays(1);
}
}
if (span.EndDate > dd.Date && span.StartDate < dd.Date.AddDays(1))
{
DateTime day = span.StartDate;
var faktor = GetFeiertagsFaktor(day);
if (faktor < 1 && day.DayOfWeek != DayOfWeek.Sunday)
{
var sollDiesenTag = ed.SollProTag;
var c = ed.Employee.GetValidContractForDate(dd.Date);
if (c != null)
{
decimal wth = 0;
int apw = 5;
if (c.WeeklyTotalHours.HasValue)
{
wth = c.WeeklyTotalHours.Value;
}
if (c.WeeklyDays.HasValue && c.WeeklyDays.Value > 0)
{
apw = c.WeeklyDays.Value;
}
sollDiesenTag = wth / apw;
}
if (span.StartDate.Hour > 0 && span.EndDate.Hour > 0)
{
var ts = span.EndDate.Subtract(span.StartDate);
sollDiesenTag -= ts.Hours;
faktor = 1; // Keine halben Feiertag berücksichtigen, wenn die Abwesenheit in Stunden angegeben wurde
}
if (ed.AbsenceTimeDays != null && ed.AbsenceTimeDays.TageProWocheDict != null)
{
if (ed.AbsenceTimeDays.RestStundenProWocheDict == null)
{
ed.AbsenceTimeDays.RestStundenProWocheDict = new Dictionary<DateTimeSpan, decimal>();
}
foreach (var week in ed.AbsenceTimeDays.TageProWocheDict.Keys)
{
if (!ed.AbsenceTimeDays.RestStundenProWocheDict.ContainsKey(week))
{
ed.AbsenceTimeDays.RestStundenProWocheDict.Add(week, ed.SollProWoche);
}
if (day.Date >= week.StartDate && day.Date <= week.EndDate)
{
var rest = ed.AbsenceTimeDays.RestStundenProWocheDict[week];
if (rest < sollDiesenTag)
{
sollDiesenTag = rest;
}
rest -= sollDiesenTag;
if (rest < 0)
{
rest = 0;
}
ed.AbsenceTimeDays.RestStundenProWocheDict[week] = rest;
}
}
}
decimal maxSoll = sollDiesenTag;
if (faktor != 0)
{
sollDiesenTag *= faktor; //halbe Feiertage etc. berücksichtigen
}
if (IsKrankheitAbsenceTime(absenceTime))
{ // Vermutlich diese Methode in CustomMitarbeiterStundenKontoBerechnung überschreiben und hier Prüfung machen, ob absenceReason ohne Fortzahlung ist
//und wenn ja, HoursSick oder Soll oder so für den Tag auf 0 setzen
dd.HoursSick = sollDiesenTag;
}
else if (IsUrlaubAbsenceTime(absenceTime))
{
dd.HoursInVacation = sollDiesenTag;
}
if (dd.AbsenceTimes == null)
{
dd.AbsenceTimes = new List<AbsenceTime>();
}
dd.AbsenceTimes.Add(absenceTime);
dd.MinutesTotal += sollDiesenTag * 60;
}
}
}
//}
}
}
}
}
}

3
ReportImp/BeWoWalzPaiva/BeWoWalzPaiva.csproj
View File

@@ -32,6 +32,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="DevExpress.Printing.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraPrinting.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

1
Service/Dokumentverwaltung/DokumentManager.cs
View File

@@ -187,7 +187,6 @@ namespace BeWo.Service.Dokumentverwaltung
}
public static List<FileAttachmentDC> SearchForFiles(string nutzereingabe)
{
List<FileAttachmentDC> allFiles = MapperFactory.FileAttachmentDC_FileAttachment.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive<FileAttachment>());
var list = DAOFactory.SearchDAO.FindFileattachmentOids(nutzereingabe);
List<FileAttachmentDC> files = new List<FileAttachmentDC>();

214
Service/Plugins/CustomerService.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.Core;
@@ -222,6 +222,218 @@ namespace BeWo.Service.Plugins
return dc;
}
public virtual List<CompactSupportConceptDC> GetAllAuthorizedCompactSupportConcepts()
{
var user = GetLoggedInUser();
var result = new List<CompactSupportConceptDC>();
var list = DAOFactory.SearchDAO.GetAllSupportConceptsCompact();
var scProcessed = new Dictionary<long, bool>();
var teamOids = new Dictionary<long, long>();
bool darfAlleSehen = false;
bool darfAlleDesTeamsSehen = false;
bool darfAlleEigenenSehen = false;
if (Core.Utils.UserHasRight(user, UserRightType.SupportConceptView_View))
{
darfAlleEigenenSehen = true;
}
if (Core.Utils.UserHasRight(user, UserRightType.SupportConcept_ViewAllSupportConcepts))
{
darfAlleSehen = true;
}
if (Core.Utils.UserHasRight(user, UserRightType.SupportConcept_ViewMyTeams))
{
darfAlleDesTeamsSehen = true;
}
//if (FetchTeamsForSupportConcepts())
//{
teamOids = CreateTeamOidDict(user.Employee.Oid.Value);
//}
foreach (var item in list)
{
if (item != null && item.Oid != null && !scProcessed.ContainsKey(item.Oid.Value))
{
var dc = CreateCompactSupportConceptDC(item, user.Employee.Oid.Value, teamOids);
//Supportconcepts können mehrfach vom SearchDAO zurückgeliefert werden, daher prüfen ob bereits verarbeitet
scProcessed.Add(item.Oid.Value, true);
if (dc.ActivationType == ActivationTypeId.Active)
{
if (darfAlleSehen)
{
result.Add(dc);
}
else if (darfAlleDesTeamsSehen)
{
if (dc.Customer.IsRelatedToEmployee || dc.Customer.IsRelatedToTeam)
{
result.Add(dc);
}
}
else if (darfAlleEigenenSehen)
{
if (dc.IsRelatedToEmployee)
{
result.Add(dc);
}
}
}
}
}
return result.OrderBy(a => a.CustomerName).ToList();
}
public virtual List<CompactCustomerDC> GetAllAuthorizedCompactCustomers()
{
var user = GetLoggedInUser();
IEnumerable<Customer> customers = DAOFactory.SearchDAO.GetAllActiveAndArchivedCustomersWithRelatedEmployee();
var result = new List<CompactCustomerDC>();
var cProcessed = new Dictionary<long, bool>();
var teamOids = new Dictionary<long, long>();
bool darfAlleSehen = false;
bool darfAlleDesTeamsSehen = false;
bool darfAlleEigenenSehen = false;
if (Core.Utils.UserHasRight(user, UserRightType.Customer_ViewMyCustomers))
{
darfAlleEigenenSehen = true;
}
if (Core.Utils.UserHasRight(user, UserRightType.CustomerView_View))
{
darfAlleSehen = true;
}
if (Core.Utils.UserHasRight(user, UserRightType.Customer_ViewMyTeams))
{
darfAlleDesTeamsSehen = true;
}
if (FetchTeams())
{
teamOids = CreateTeamOidDict(user.Employee.Oid.Value);
}
foreach (Customer customer in customers)
{
if (!cProcessed.ContainsKey(customer.Oid.Value))
{
CompactCustomerDC dc = CreateCompactCustomerDCWithEmployeeRelation(customer, false, false, user.Employee.Oid.Value, teamOids);
cProcessed.Add(customer.Oid.Value, true);
if (dc.ActivationType == ActivationTypeId.Active)
{
if (darfAlleSehen)
{
result.Add(dc);
}
else if (darfAlleDesTeamsSehen)
{
if (dc.IsRelatedToEmployee || dc.IsRelatedToTeam)
{
result.Add(dc);
}
}
else if (darfAlleEigenenSehen)
{
if (dc.IsRelatedToEmployee)
{
result.Add(dc);
}
}
}
}
}
return result.OrderBy(a => a.LastNameFirstName).ToList();
}
public virtual List<CompactPersonDC> GetAllAuthorizedCompactPersons()
{
var user = GetLoggedInUser();
var result = new List<CompactPersonDC>();
var alleList = new List<CompactPersonDC>();
var cProcessed = new Dictionary<long, bool>();
bool darfPersonenSehen = false;
bool darfFamilieSehen = false;
if (Core.Utils.UserHasRight(user, UserRightType.PersonView_View))
{
darfPersonenSehen = true;
}
if (Core.Utils.UserHasRight(user, UserRightType.Person_FamilyView))
{
darfFamilieSehen = true;
}
IList<Person> persons = DAOFactory.GenericDAO.GetAllActive<Person>().Where(p => p.Type == PersonType.Others).ToList();
foreach (var person in persons)
{
var dc = MapperFactory.CompactPersonDC_Person.MapToNewDC(person);
alleList.Add(dc);
}
if (darfPersonenSehen && darfFamilieSehen)
{
result = alleList;
}
else if (darfPersonenSehen && !darfFamilieSehen)
{
result = alleList.Where(p => !p.IsFamilyMember).ToList();
}
else if (!darfPersonenSehen && darfFamilieSehen)
{
result = alleList.Where(p => p.IsFamilyMember).ToList();
}
return result.OrderBy(p => p.ToString()).ToList();
}
private void SetFamilyMemberStatus(List<CompactPersonDC> result)
{
var familyOids = DAOFactory.SearchDAO.FindFamilyMemberOids();
foreach (var p in result)
{
if (familyOids.Contains(p.PersonOid))
{
p.IsFamilyMember = true;
}
}
}
private ApplicationUser GetLoggedInUser()
{
if (LoggedInUserOperationContextExt.Current != null &&
LoggedInUserOperationContextExt.Current.User != null)
{
return LoggedInUserOperationContextExt.Current.User;
}
else
{
return SessionFacade.LoggedInUser;
}
return null;
}
public virtual List<CompactSupportConceptDC> GetAllSupportConceptsCompact(long currentEmployeeOid)
{

88
Service/Plugins/EmployeeService.cs
View File

@@ -111,5 +111,93 @@ namespace BeWo.Service.Plugins
return dcs;
}
public virtual List<CompactEmployeeDC> GetAllAuthorizedCompactEmployees()
{
var user = GetLoggedInUser();
var employees = DAOFactory.GenericDAO.GetAllActive<Employee>();
//var dcs = MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(employees);
var result = new List<CompactEmployeeDC>();
bool darfAlleSehen = false;
bool darfAlleDesTeamsSehen = false;
bool darfAlleEigenenSehen = false;
if (Core.Utils.UserHasRight(user, UserRightType.Employee_AllowViewOwnEmployees))
{
darfAlleEigenenSehen = true;
}
if (Core.Utils.UserHasRight(user, UserRightType.EmployeeView_View))
{
darfAlleSehen = true;
}
if (Core.Utils.UserHasRight(user, UserRightType.Employee_AllowViewOwnTeam))
{
darfAlleDesTeamsSehen = true;
}
List<long> teamMemberOids = new List<long>();
foreach (var item in user.Employee.LeadingTeams)
{
foreach (var member in item.MemberList)
{
teamMemberOids.Add(member.Oid.Value);
}
}
foreach (var emp in employees)
{
if (darfAlleSehen)
{
result.Add(MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(emp));
}
else if (darfAlleDesTeamsSehen)
{
if (emp.Oid == user.Employee.Oid || teamMemberOids.Contains(emp.Oid.Value))
{
result.Add(MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(emp));
}
}
else if (darfAlleEigenenSehen)
{
if (emp.Oid == user.Employee.Oid)
{
result.Add(MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(emp));
}
}
}
return result.OrderBy(e => e.LastName).ToList();
}
private ApplicationUser GetLoggedInUser()
{
if (LoggedInUserOperationContextExt.Current != null &&
LoggedInUserOperationContextExt.Current.User != null)
{
return LoggedInUserOperationContextExt.Current.User;
}
else
{
return SessionFacade.LoggedInUser;
}
return null;
}
}
}

223
Service/Plugins/OperationService.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
@@ -16,7 +16,224 @@ namespace BeWo.Service.Plugins
{
public class OperationService : AbstractIDSpecificDefaultClass<OperationService>
{
protected String ReturnMessage { get; set; }
public String CreateDefaultCustomerServiceRecords(DateTime start, DateTime end, IList<long> cb2scOids)
{
var vs = PluginLoader.FindClass<VacationService>();
ReturnMessage = "";
DateTimeSpan span = new DateTimeSpan();
span.StartDateTime = start;
span.EndDateTime = end.AddDays(1).AddTicks(-1);
var c2sList = DAOFactory.GenericDAO.LoadByIDs<CostBearer2SupportConcept>(cb2scOids);
foreach (var c2s in c2sList)
{
var srList = DAOFactory.SearchDAO.FindServiceRecordsInSpan(c2s.Oid.Value, span).ToList();
if (srList.Count == 0)
{
srList = ErstelleStundenplanEintraege(span.StartDateTime.Date, span.EndDate.Date, c2s, vs);
DAOFactory.GenericDAO.Insert(srList);
ReturnMessage += String.Format("Es wurden {0} Einträge erstellt.", srList.Count);
}
else
{
if (srList.Count > 1)
{
ReturnMessage = String.Format("In dem ausgewählten Zeitraum sind bereits {0} Einträge vorhanden, daher können keine weiteren Einträge automatisch erstellt werden.", srList.Count);
}
else
{
ReturnMessage = String.Format("In dem ausgewählten Zeitraum ist bereits ein Eintrag vorhanden, daher können keine weiteren Einträge automatisch erstellt werden.");
}
}
}
return ReturnMessage;
}
private List<ServiceRecord> ErstelleStundenplanEintraege(DateTime start, DateTime ende, CostBearer2SupportConcept c2s, VacationService vs)
{
var customer = c2s.SupportConcept.Customer;
var stundenplan = GetStundenplan(customer, start, ende);
List<ServiceRecord> serviceRecords = new List<ServiceRecord>();
var defaultSd = GetDefaultServiceDescription(c2s);
if (defaultSd == null)
{
ReturnMessage = "Es konnte keine passende Leistung ermittelt werden.";
return serviceRecords;
}
while (start <= ende)
{
//var ferien = vs.GetFerien(start, "nrw");
var ft = vs.GetFeiertag(start);
//if (ferien == null && ft == null)
if (ft == null)
{
var newServiceRecords = CreateServiceRecords(stundenplan, start, customer, c2s, defaultSd);
serviceRecords.AddRange(newServiceRecords);
}
start = start.AddDays(1);
}
return serviceRecords;
}
protected virtual IList<ServiceRecord> CreateServiceRecords(Arbeitszeit arbeitszeit, DateTime datum, Customer c, CostBearer2SupportConcept c2s, ServiceDescription defaultSd)
{
var records = new List<ServiceRecord>();
if (arbeitszeit != null && arbeitszeit.ArbeitszeitEintraege != null)
{
foreach (var ae in arbeitszeit.ArbeitszeitEintraege)
{
if (IsSameWeekday(ae, datum.DayOfWeek))
{
ServiceRecord sr = new ServiceRecord();
sr.Start = GetDateTime(ae.UhrzeitVon, datum);
sr.End = GetDateTime(ae.UhrzeitBis, datum);
sr.RoundedDuration = (decimal)sr.End.Value.Subtract(sr.Start.Value).TotalMinutes;
if (ae.Employee != null)
{
sr.Employee = ae.Employee;
}
else
{
sr.Employee = LoggedInUserOperationContextExt.Current.User.Employee;
}
sr.Customer = c;
sr.SupportConcept = c2s.SupportConcept;
sr.CostBearer2SupportConcept = c2s;
sr.ServiceDescription = defaultSd;
sr.ServiceRecordType = ServiceRecordTypeId.DefaultActivity;
sr.DistanceInMeter = 0;
sr.DurationInStunden = ZeiterfassungsDauer.Minuten;
sr.ServiceRecordFormat = ServiceRecordFormate.OriginaleZeiterfassung;
sr.Relevance = 0;
records.Add(sr);
}
}
}
return records;
}
public virtual ServiceDescription GetDefaultServiceDescription(CostBearer2SupportConcept c2s)
{
foreach (var ap in c2s.ApprovalPeriodList)
{
if (ap.ServiceCategory != null)
{
var desc = DAOFactory.SearchDAO.FindServiceDescriptionForCategory(ap.ServiceCategory.Oid.Value);
var sd = desc.OrderBy(a => a.Position).FirstOrDefault();
if (sd != null)
{
return sd;
}
}
}
return GetDefaultServiceDescription();
}
public virtual ServiceDescription GetDefaultServiceDescription()
{
return null;
}
private Arbeitszeit GetStundenplan(Customer customer, DateTime start, DateTime ende)
{
if (customer == null)
{
return null;
}
var stundenplan = SucheStundenplan(customer.Arbeitszeiten, start, ende);
return stundenplan;
}
private static Arbeitszeit SucheStundenplan(IList<Arbeitszeit> arbeitszeiten, DateTime start, DateTime ende)
{
if (arbeitszeiten != null && arbeitszeiten.Count > 0)
{
foreach (var az in arbeitszeiten)
{
if ((!az.GueltigVon.HasValue || az.GueltigVon <= ende) && (!az.GueltigBis.HasValue || az.GueltigBis >= start))
{
return az;
}
}
}
return null;
}
public static bool IsSameWeekday(ArbeitszeitEintrag ae, DayOfWeek day)
{
if (day == DayOfWeek.Monday && ae.Tag == AppointmentDayOfWeek.Montag)
{
return true;
}
if (day == DayOfWeek.Tuesday && ae.Tag == AppointmentDayOfWeek.Dienstag)
{
return true;
}
if (day == DayOfWeek.Wednesday && ae.Tag == AppointmentDayOfWeek.Mittwoch)
{
return true;
}
if (day == DayOfWeek.Thursday && ae.Tag == AppointmentDayOfWeek.Donnerstag)
{
return true;
}
if (day == DayOfWeek.Friday && ae.Tag == AppointmentDayOfWeek.Freitag)
{
return true;
}
if (day == DayOfWeek.Saturday && ae.Tag == AppointmentDayOfWeek.Samstag)
{
return true;
}
return false;
}
public static DateTime? GetDateTime(String timeAsString, DateTime date)
{
String dateStr = String.Format("{0:dd.MM.yyyy} {1}", date, timeAsString);
DateTime dateOut;
if (DateTime.TryParse(dateStr, out dateOut))
{
return dateOut;
}
return null;
}
}
}

4
Service/Plugins/PluginLoader.cs
View File

@@ -24,7 +24,7 @@ namespace BeWo.Service.Plugins
//t = "1234567890"; // Präsentationsdatenbank
//t = "5687373602"; // LH Duisburg
//t = "5509064354"; // LH Duisburg Service Plus
t = "5620636022"; // GPZ Biberach
//t = "5620636022"; // GPZ Biberach
//t = "8562233401"; // Sozialwirkstatt Schmitz
//t = "1076891970"; // Assistenza
//t = "0216265667"; // LH Hannover
@@ -36,7 +36,7 @@ namespace BeWo.Service.Plugins
//t = "1352143437"; // Sewo
//t = "7107514623"; // BeWo Neuss
//t = "9098141768"; // Fib e.V. Marburg
//t = "1505148718"; // VSD Hamm
t = "1505148718"; // VSD Hamm
//t = "5926081834"; // Spektrum
//t = "1378137009"; // BeWo Direkt+
//t = "3010479871"; // Aachener Verein

12
Service/ServiceContracts/ICustomerService.cs
View File

@@ -736,5 +736,17 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
long? GetActiveMedVerListOidForCustomer(long customerOid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<CompactSupportConceptDC> GetAllAuthorizedCompactSupportConcepts();
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<CompactCustomerDC> GetAllAuthorizedCompactCustomers();
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<CompactPersonDC> GetAllAuthorizedCompactPersons();
}
}

6
Service/ServiceContracts/IEmployeeService.cs
View File

@@ -405,6 +405,10 @@ namespace BeWo.Service.ServiceContracts
[OperationContract]
List<CompactEmployeeDC> GetActiveCompactEmployeesForEmployee(long employeeOid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<CompactEmployeeDC> GetAllAuthorizedCompactEmployees();
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<long> GetTeamRelatedCustomerOids(long employeeOid, long? teamOid);
@@ -476,5 +480,7 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
Dictionary<long?, decimal> BerechneAnzEinerAbwesenheitFuerMehrereMitarbeiter(List<long?> empOids, int year, string reason);
}
}

8
Service/ServiceContracts/IOperationsService.cs
View File

@@ -251,6 +251,10 @@ namespace BeWo.Service.ServiceContracts
[OperationContract]
String CreateDefaultServiceRecords(DateTime monat, IList<long> oids);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
String CreateDefaultCustomerServiceRecords(DateTime start, DateTime end, IList<long> cb2scOids);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
bool IsAlive();
@@ -571,6 +575,10 @@ namespace BeWo.Service.ServiceContracts
[OperationContract]
List<OrganisationPersonRelationDC> LoadOrganisationPersonRelationsByOid(IEnumerable<long> pOids);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<ArbeitszeitDC> LoadArbeitszeitenForObject(TableID objectTid, long objectOid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<BargeldkassenDC> LoadBargeldkassenForObject(TableID objectTid, long objectOid);

66
Service/ServiceImplementations/CustomerServiceImp.cs
View File

@@ -553,6 +553,72 @@ namespace BeWo.Service.ServiceImplementations
return result;
}
public List<CompactSupportConceptDC> GetAllAuthorizedCompactSupportConcepts()
{
try
{
try
{
var s = PluginLoader.FindClass<CustomerService>();
return s.GetAllAuthorizedCompactSupportConcepts();
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public List<CompactCustomerDC> GetAllAuthorizedCompactCustomers()
{
try
{
try
{
var s = PluginLoader.FindClass<CustomerService>();
return s.GetAllAuthorizedCompactCustomers();
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public List<CompactPersonDC> GetAllAuthorizedCompactPersons()
{
try
{
try
{
var s = PluginLoader.FindClass<CustomerService>();
return s.GetAllAuthorizedCompactPersons();
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
private List<CompactSupportConceptDC> BuildCompactSupportConceptList(IList<ListedSupportConcept> list, long? currentEmployeeOid)
{
var result = new List<CompactSupportConceptDC>();

22
Service/ServiceImplementations/EmployeeServiceImp.cs
View File

@@ -278,6 +278,28 @@ namespace BeWo.Service.ServiceImplementations
}
public List<CompactEmployeeDC> GetAllAuthorizedCompactEmployees()
{
try
{
try
{
var s = PluginLoader.FindClass<EmployeeService>();
return s.GetAllAuthorizedCompactEmployees();
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public List<CompactEmployeeDC> GetAllTeamMember(CompactEmployeeDC employee)
{
try

28
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -3628,6 +3628,20 @@ namespace BeWo.Service.ServiceImplementations
}
}
public String CreateDefaultCustomerServiceRecords(DateTime start, DateTime end, IList<long> customerOids)
{
try
{
var s = PluginLoader.FindClass<OperationService>();
return s.CreateDefaultCustomerServiceRecords(start, end, customerOids);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public List<OrganisationPersonRelationDC> LoadOrganisationPersonRelationsByOid(IEnumerable<long> pOids)
{
try
@@ -3642,6 +3656,20 @@ namespace BeWo.Service.ServiceImplementations
}
}
public List<ArbeitszeitDC> LoadArbeitszeitenForObject(TableID objectTid, long objectOid)
{
try
{
var arbeitszeiten = DAOFactory.SearchDAO.FindArbeitszeiten(objectTid, objectOid);
return MapperFactory.ArbeitszeitDC_Arbeitszeit.MapToNewDCs(arbeitszeiten);
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public List<BargeldkassenDC> LoadBargeldkassenForObject(TableID objectTid, long objectOid)
{
try