diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 1844d47c9..4528bb82c 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -317,6 +317,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -496,7 +500,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -640,7 +644,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -648,7 +652,7 @@ MSBuild:Compile Designer - + MSBuild:Compile Designer @@ -1049,6 +1053,9 @@ DebugMessageLogView.xaml + + ServiceRecordCreationView.xaml + UrlaubskontoView.xaml @@ -1190,7 +1197,7 @@ TextModuleTreeViewControl.xaml - + ServiceRecordRTFWindowView.xaml @@ -1301,13 +1308,13 @@ ProfileEditView.xaml - + ServiceRecordRebookingView.xaml AccountingReportView.xaml - + ServiceRecordHistoryView.xaml @@ -1573,7 +1580,7 @@ MSBuild:Compile Designer - + MSBuild:Compile Designer MSBuild:Compile @@ -1615,13 +1622,13 @@ MSBuild:Compile Designer - + Designer MSBuild:Compile MSBuild:Compile Designer - + Designer MSBuild:Compile MSBuild:Compile @@ -2131,7 +2138,7 @@ NewsItemView.xaml - + ServiceRecordGroupEditView.xaml @@ -2152,10 +2159,10 @@ BookingView.xaml - + ServiceRecordEditView.xaml - + ServiceRecordView2.xaml diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs index 583cbe2da..7c82910c2 100644 --- a/BeWo/Core/BeWoUtils.cs +++ b/BeWo/Core/BeWoUtils.cs @@ -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 { diff --git a/BeWo/MainControl.xaml.cs b/BeWo/MainControl.xaml.cs index b4e7a9acc..67d8dc8ba 100644 --- a/BeWo/MainControl.xaml.cs +++ b/BeWo/MainControl.xaml.cs @@ -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; diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index 7489e2cf9..271bc8f61 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -224,6 +224,11 @@ namespace BeWo.ServiceProxy "Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List 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 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 GetTeamRelatedCustomerOids(long employeeOid, System.Nullable teamOid); @@ -772,6 +777,11 @@ namespace BeWo.ServiceProxy return base.Channel.GetActiveCompactEmployeesForEmployee(employeeOid); } + public System.Collections.Generic.List GetAllAuthorizedCompactEmployees() + { + return base.Channel.GetAllAuthorizedCompactEmployees(); + } + public System.Collections.Generic.List GetTeamRelatedCustomerOids(long employeeOid, System.Nullable teamOid) { return base.Channel.GetTeamRelatedCustomerOids(employeeOid, teamOid); @@ -1517,8 +1527,8 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimEmployeeRelationDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [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>))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List>))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(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))] + [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))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ConfirmationReceiptSignatureDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -1601,6 +1635,9 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [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))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AccountingTransactionDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [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))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ReportTemplateDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ReportTypes))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [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))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.VertretungsListeMitarbeiterItemsDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.VertretungsKlientAccountingsListeItemsDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AccountingTransactionDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.InvoiceDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -1687,32 +1723,6 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordHistoryDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [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))] - [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>))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List>))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Reports.AuslastungAnalysisRootDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -1788,6 +1798,21 @@ namespace BeWo.ServiceProxy "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Nullable 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 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 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 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 GetAllActiveCustomers(); @@ -2616,6 +2641,21 @@ namespace BeWo.ServiceProxy return base.Channel.GetActiveMedVerListOidForCustomer(customerOid); } + public System.Collections.Generic.List GetAllAuthorizedCompactSupportConcepts() + { + return base.Channel.GetAllAuthorizedCompactSupportConcepts(); + } + + public System.Collections.Generic.List GetAllAuthorizedCompactCustomers() + { + return base.Channel.GetAllAuthorizedCompactCustomers(); + } + + public System.Collections.Generic.List GetAllAuthorizedCompactPersons() + { + return base.Channel.GetAllAuthorizedCompactPersons(); + } + public System.Collections.Generic.List 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 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 dienstEintraege, System.Collections.Generic.List dienstvertretungen, System.Collections.Generic.List absenceTimes, System.Collections.Generic.List 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 Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary 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 Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary 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 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 InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List 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 LoadOrganisationPersonRelationsByOid(System.Collections.Generic.List 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 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 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 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 Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary 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 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 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 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 InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List 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 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 Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary verfuegbarerWunschToken, string token) + { + base.Channel.DoTokenWunschOperation(art, Oid, zugehoerigkeitsTyp, verfuegbarerWunschToken, token); + } + public void DoTokenAusschlussOperation(int art, System.Nullable Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary 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 serviceRecordOids) + public System.Collections.Generic.List InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List 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 GetAllAdditionalServiceBookings(System.Nullable regionOid, System.DateTime start, System.DateTime end) @@ -7429,6 +7494,11 @@ namespace BeWo.ServiceProxy return base.Channel.LoadOrganisationPersonRelationsByOid(pOids); } + public System.Collections.Generic.List LoadArbeitszeitenForObject(BS.Shared.TableID objectTid, long objectOid) + { + return base.Channel.LoadArbeitszeitenForObject(objectTid, objectOid); + } + public System.Collections.Generic.List 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 Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary verfuegbarerWunschToken, string token) - { - base.Channel.DoTokenWunschOperation(art, Oid, zugehoerigkeitsTyp, verfuegbarerWunschToken, token); - } - public void DeactivateInvoices(System.Collections.Generic.List 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 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 InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List pGroups) - { - return base.Channel.InsertNewAdditionalServiceGroupsOfPeople(pGroups); - } } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] diff --git a/BeWo/View/Detail/AdditionalServiceView.xaml.cs b/BeWo/View/Detail/AdditionalServiceView.xaml.cs index 53b44cf9b..7120005ca 100644 --- a/BeWo/View/Detail/AdditionalServiceView.xaml.cs +++ b/BeWo/View/Detail/AdditionalServiceView.xaml.cs @@ -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; diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs index 5097712db..f4e02d4dc 100644 --- a/BeWo/View/Detail/CustomerView.xaml.cs +++ b/BeWo/View/Detail/CustomerView.xaml.cs @@ -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; diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml new file mode 100644 index 000000000..1bf7a24ca --- /dev/null +++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs b/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs new file mode 100644 index 000000000..0e600dd2c --- /dev/null +++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs @@ -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 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 pCallBack) + { + List oids = new List(); + oids.Add(SupportConceptCostBearerRel.CostBearer2SupportConceptOid.Value); + ServiceFacade.DoOperationsServiceAsync(s => s.CreateDefaultCustomerServiceRecords(StartDatum, EndDatum, oids), result => pCallBack(result)); + } + } +} diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml similarity index 98% rename from BeWo/View/Detail/ServiceRecordEditView.xaml rename to BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml index 1caa7a58b..b901ade59 100644 --- a/BeWo/View/Detail/ServiceRecordEditView.xaml +++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml @@ -1,1053 +1,1054 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Liste - - - Tabelle - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -