diff --git a/.gitignore b/.gitignore index eac96fd63..25de44304 100644 --- a/.gitignore +++ b/.gitignore @@ -417,3 +417,4 @@ FodyWeavers.xsd /ReportImp/RatPlusTat/CustomBudgetnachweisAnhangRO.cs /.claude/worktrees /.claude +/CLAUDE.md diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 723fb83f0..9fd9e03c9 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -16,7 +16,7 @@ true Internet true - false + true 8E3A8E81F1C6F67A1C6D239593544EA33D8AC6A7 @@ -43,12 +43,12 @@ de-DE BeWoPlaner ownSoft GmbH - 2.0.1.293 + 2.0.1.297 true publish.htm false true - 294 + 298 2.0.1.%2a false true @@ -222,6 +222,12 @@ DeveloperView.xaml + + CustomerWohneinheitenView.xaml + + + CustomerWohneinheitBelegungEditPopup.xaml + TeamFolderRightView.xaml @@ -374,6 +380,14 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + MSBuild:Compile Designer diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index bf48c71a8..76223f6f4 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -57,7 +57,7 @@ namespace BeWo public static LoginControl LoginControl; public static MainControl MainControl; - public static string ShortVersion = "3.31"; + public static string ShortVersion = "3.32"; public static string Version => BeWoAppInfo.BeWoAppVersion.ToString(); public static int RenderTier = 0; diff --git a/BeWo/BeWoAppInfo.cs b/BeWo/BeWoAppInfo.cs index f36d29bfb..3d417df12 100644 --- a/BeWo/BeWoAppInfo.cs +++ b/BeWo/BeWoAppInfo.cs @@ -15,12 +15,12 @@ namespace BeWo { var baseVersion = new Version(BeWoApp.ShortVersion); var stage = BeWoClientReleaseStage.Sandbox; - var stageVersion = new Version("5.1.4"); + var stageVersion = new Version("5.1.6"); var feature = BeWoClientFeature.AI; #if !DEBUG - //stage = BeWoClientReleaseStage.Release; - //feature = BeWoClientFeature.None; + stage = BeWoClientReleaseStage.Release; + feature = BeWoClientFeature.None; #endif BeWoAppVersion = new BeWoAppVersion(baseVersion, stage, stageVersion, feature); diff --git a/BeWo/Converter/TestDebugConverter.cs b/BeWo/Converter/TestDebugConverter.cs index a44afd236..c2108f959 100644 --- a/BeWo/Converter/TestDebugConverter.cs +++ b/BeWo/Converter/TestDebugConverter.cs @@ -13,7 +13,7 @@ namespace BeWo.Converter if (value is null) return null; - var t = ((DelegateCommand)value).CanExecute(null); + //var t = ((DelegateCommand)value).CanExecute(null); return value; } diff --git a/BeWo/Scheduler/Utils/AppointmentExtensions.cs b/BeWo/Scheduler/Utils/AppointmentExtensions.cs index 4897b5fbd..6ad35c327 100644 --- a/BeWo/Scheduler/Utils/AppointmentExtensions.cs +++ b/BeWo/Scheduler/Utils/AppointmentExtensions.cs @@ -17,7 +17,15 @@ namespace BeWo.Scheduler.Utils public static CustomFieldStorage GetCustomFieldStorage(this Appointment appointment) { - return appointment.CustomFields[nameof(CustomFieldStorage)] as CustomFieldStorage; + try + { + return appointment.CustomFields[nameof(CustomFieldStorage)] as CustomFieldStorage; + } + catch (Exception) + { + + } + return new CustomFieldStorage(); } public static bool CF_IsTask(this Appointment appointment) diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs index ac37696a4..7e2cb7c13 100644 --- a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs +++ b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs @@ -7,6 +7,7 @@ using System.Globalization; using System.IO; using System.Linq; using System.Text; +using System.Threading; using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; @@ -419,13 +420,11 @@ namespace BeWo.Scheduler.View private DateTime? _SelectedAppointmentStartDate; - private readonly SchedulerAppointmentDC _SelectedAppointmentFromHomePanelView; - private bool _IsComingFromHomeDragPanel; - + private SchedulerAppointmentDC _SelectedAppointmentFromHomePanelView; + public NewSchedulerView(DateTime pIntervalStartDate, SchedulerAppointmentDC pAppointment) { - _IsComingFromHomeDragPanel = true; - + _SelectedAppointmentFromHomePanelView = pAppointment; _SelectedAppointmentStartDate = pIntervalStartDate; @@ -500,11 +499,14 @@ namespace BeWo.Scheduler.View if(_IstErsterAufruf) { - if(MainControl.HatNeueTermine && !_IsComingFromHomeDragPanel) + if(MainControl.HatNeueTermine && _SelectedAppointmentFromHomePanelView == null) { FensterOeffnen(); } - + else + { + OpenAppointmentFromHomePanel(); + } _IstErsterAufruf = false; } }); @@ -512,7 +514,7 @@ namespace BeWo.Scheduler.View private void InitScheduler() { - if(_IsComingFromHomeDragPanel && _SelectedAppointmentStartDate.HasValue) + if(_SelectedAppointmentFromHomePanelView != null && _SelectedAppointmentStartDate.HasValue) { var monday = _SelectedAppointmentStartDate.Value.FirstDateOfWeek(_SelectedAppointmentStartDate.Value.GetIso8601WeekOfYear()); @@ -530,7 +532,7 @@ namespace BeWo.Scheduler.View Scheduler.DayView.AppointmentDisplayOptions.ShowReminder = true; Scheduler.DayView.ResourcesPerPage = 1; - Scheduler.WorkWeekView.ShowFullWeek = _IsComingFromHomeDragPanel && Scheduler.Start.DayOfWeek.Equals(DayOfWeek.Saturday) || Scheduler.Start.DayOfWeek.Equals(DayOfWeek.Sunday); + Scheduler.WorkWeekView.ShowFullWeek = _SelectedAppointmentFromHomePanelView != null && (Scheduler.Start.DayOfWeek.Equals(DayOfWeek.Saturday) || Scheduler.Start.DayOfWeek.Equals(DayOfWeek.Sunday)); Scheduler.WorkWeekView.ShowWorkTimeOnly = false; Scheduler.WorkWeekView.NavigationButtonVisibility = NavigationButtonVisibility.Always; @@ -2250,41 +2252,6 @@ namespace BeWo.Scheduler.View Scheduler.Storage.RefreshData(); Scheduler.Storage.RefreshUI(); - if(_IsComingFromHomeDragPanel && _SelectedAppointmentFromHomePanelView != null) - { - var apps = Scheduler.ActiveView.GetAppointments().ToList(); - - var oid = _SelectedAppointmentFromHomePanelView.SchedulerAppointmentOid; - Appointment appointmentToOpen; - - if(oid != null) - { - appointmentToOpen = apps.FirstOrDefault(app => - { - var oidValue = app.CF_SchedulerAppointmentOid(); - - return oidValue.HasValue && oidValue.Value == oid; - }); - - - if(appointmentToOpen != null) - { - Scheduler.ShowEditAppointmentForm(appointmentToOpen); - } - } - else if(_SelectedAppointmentFromHomePanelView.RecurrenceId != null && _SelectedAppointmentFromHomePanelView.RecurrenceIndex > 0) - { - appointmentToOpen = apps.FirstOrDefault(appointment => appointment.RecurrenceInfo.Id.ToString().Equals(_SelectedAppointmentFromHomePanelView.RecurrenceId)); - - if(appointmentToOpen != null) - { - Scheduler.ShowEditAppointmentForm(appointmentToOpen); - } - } - - _IsComingFromHomeDragPanel = false; - } - callback?.Invoke(); }); }); @@ -2298,6 +2265,54 @@ namespace BeWo.Scheduler.View } }); } + public void OpenAppointmentFromHomePanel() + { + if (_SelectedAppointmentFromHomePanelView != null) + { + var apps = Scheduler.ActiveView.GetAppointments().ToList(); + + var oid = _SelectedAppointmentFromHomePanelView.SchedulerAppointmentOid; + Appointment appointmentToOpen = null; + + if (oid != null) + { + appointmentToOpen = apps.FirstOrDefault(app => + { + var oidValue = app.CF_SchedulerAppointmentOid(); + + return oidValue.HasValue && oidValue.Value == oid; + }); + + + //if(appointmentToOpenFormHomePanel != null) + //{ + // Scheduler.ShowEditAppointmentForm(appointmentToOpenFormHomePanel); + //} + } + else if (_SelectedAppointmentFromHomePanelView.RecurrenceId != null && _SelectedAppointmentFromHomePanelView.RecurrenceIndex > 0) + { + appointmentToOpen = apps.FirstOrDefault(appointment => appointment.RecurrenceInfo.Id.ToString().Equals(_SelectedAppointmentFromHomePanelView.RecurrenceId)); + + //if(appointmentToOpenFormHomePanel != null) + //{ + // Scheduler.ShowEditAppointmentForm(appointmentToOpenFormHomePanel); + //} + } + + if (appointmentToOpen != null) + { + Scheduler.ShowEditAppointmentForm(appointmentToOpen); + + } + _SelectedAppointmentFromHomePanelView = null; + } + + //while (_IsComingFromHomeDragPanel) + //{ + //Thread.Sleep(100); + //} + + } private void ExportButton_OnClick(object sender, RoutedEventArgs e) { diff --git a/BeWo/ServiceProxy/GeneratedCustomerService.cs b/BeWo/ServiceProxy/GeneratedCustomerService.cs index ab03b684f..000af2135 100644 --- a/BeWo/ServiceProxy/GeneratedCustomerService.cs +++ b/BeWo/ServiceProxy/GeneratedCustomerService.cs @@ -17,6 +17,22 @@ namespace BeWo.ServiceProxy public interface ICustomerService { + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/SetVertretungGewuenscht", ReplyAction="http://tempuri.org/ICustomerService/SetVertretungGewuenschtResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/SetVertretungGewuenschtBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] + void SetVertretungGewuenscht(long pCustomerOid, bool vertWunsch); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/SetVertretungDringendErforderlich", ReplyAction="http://tempuri.org/ICustomerService/SetVertretungDringendErforderlichResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/SetVertretungDringendErforderlichBeWoFaultFau" + + "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] + void SetVertretungDringendErforderlich(long pCustomerOid, bool vertDringendEr); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetActiveCompactCustomerEmployeeRelationsByEm" + + "ployeeId", ReplyAction="http://tempuri.org/ICustomerService/GetActiveCompactCustomerEmployeeRelationsByEm" + + "ployeeIdResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/GetActiveCompactCustomerEmployeeRelationsByEm" + + "ployeeIdBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] + System.Collections.Generic.List GetActiveCompactCustomerEmployeeRelationsByEmployeeId(long empOid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/SetBenutzerPasswortChatAppCode", ReplyAction="http://tempuri.org/ICustomerService/SetBenutzerPasswortChatAppCodeResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/SetBenutzerPasswortChatAppCodeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] void SetBenutzerPasswortChatAppCode(long pCustomerOid, string benutzerName, string passwort); @@ -48,11 +64,27 @@ namespace BeWo.ServiceProxy [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/ConvertToNewSubstitutionType", ReplyAction="http://tempuri.org/ICustomerService/ConvertToNewSubstitutionTypeResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/ConvertToNewSubstitutionTypeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerPersonRelationDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCustomerDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactOrganisationDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactPersonDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactEmployeeDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactSupportConceptDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCostBearerDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactTeamDC))] + [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.DataContracts.Compact.CompactTokenDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AbsenceTimeDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AbsenceReasonDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerPersonRelationDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CostRatePeriodDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ValueListEntryDC))] @@ -113,7 +145,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerVermittlungArbeitDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BeWoDataContract))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerVgaAuftragsherkunft))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerVermittlungBearbeitungsstatus))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerVgaVerlauf))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerVgaVermittlungsGrundlage))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerOrganisationRelationDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -180,22 +215,6 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ImageDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCustomerDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactOrganisationDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactPersonDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactEmployeeDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactSupportConceptDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactCostBearerDC))] - [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.CompactTeamDC))] - [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.DataContracts.Compact.CompactTokenDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AbsenceReasonVisibilityType))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ActivationTypeId))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Sex))] @@ -340,6 +359,18 @@ namespace BeWo.ServiceProxy "ultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] BS.Shared.DataContracts.SupportConceptCostBearerRelDC GetSupportConceptCostBearerRelationById(long oid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadCompactSupportConceptDC", ReplyAction="http://tempuri.org/ICustomerService/LoadCompactSupportConceptDCResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadCompactSupportConceptDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] + BS.Shared.DataContracts.Compact.CompactSupportConceptDC LoadCompactSupportConceptDC(long pOid, System.Nullable currentEmployeeOid); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetCompactCustomerDC", ReplyAction="http://tempuri.org/ICustomerService/GetCompactCustomerDCResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/GetCompactCustomerDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] + BS.Shared.DataContracts.Compact.CompactCustomerDC GetCompactCustomerDC(long pOid); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveCompactCustomers", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveCompactCustomersResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveCompactCustomersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] + System.Collections.Generic.List GetAllActiveCompactCustomers(); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/ServiceRecordOutOfSupportConcept", ReplyAction="http://tempuri.org/ICustomerService/ServiceRecordOutOfSupportConceptResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/ServiceRecordOutOfSupportConceptBeWoFaultFaul" + "t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] @@ -696,22 +727,6 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/SetAbWelchenKrankheitsTagBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] void SetAbWelchenKrankheitsTag(long pCustomerOid, int abWelcherKt); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/SetVertretungGewuenscht", ReplyAction="http://tempuri.org/ICustomerService/SetVertretungGewuenschtResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/SetVertretungGewuenschtBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] - void SetVertretungGewuenscht(long pCustomerOid, bool vertWunsch); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/SetVertretungDringendErforderlich", ReplyAction="http://tempuri.org/ICustomerService/SetVertretungDringendErforderlichResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/SetVertretungDringendErforderlichBeWoFaultFau" + - "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] - void SetVertretungDringendErforderlich(long pCustomerOid, bool vertDringendEr); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetActiveCompactCustomerEmployeeRelationsByEm" + - "ployeeId", ReplyAction="http://tempuri.org/ICustomerService/GetActiveCompactCustomerEmployeeRelationsByEm" + - "ployeeIdResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/GetActiveCompactCustomerEmployeeRelationsByEm" + - "ployeeIdBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] - System.Collections.Generic.List GetActiveCompactCustomerEmployeeRelationsByEmployeeId(long empOid); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/ArchiveCustomer", ReplyAction="http://tempuri.org/ICustomerService/ArchiveCustomerResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/ArchiveCustomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] void ArchiveCustomer(long pOid, long pVersion); @@ -893,6 +908,14 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateWohnheimBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] long UpdateWohnheim(BS.Shared.DataContracts.WohnheimDC dc, System.Collections.Generic.List employeeDCs); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateWohneinheitBelegungen", ReplyAction="http://tempuri.org/ICustomerService/UpdateWohneinheitBelegungenResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateWohneinheitBelegungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] + System.Collections.Generic.List UpdateWohneinheitBelegungen(System.Collections.Generic.List dcs); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/DeleteWohneinheitBelegungen", ReplyAction="http://tempuri.org/ICustomerService/DeleteWohneinheitBelegungenResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/DeleteWohneinheitBelegungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] + bool DeleteWohneinheitBelegungen(System.Collections.Generic.List dcs); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/InsertNewWohnheim", ReplyAction="http://tempuri.org/ICustomerService/InsertNewWohnheimResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/InsertNewWohnheimBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] long InsertNewWohnheim(BS.Shared.DataContracts.WohnheimDC pWohnheimDC); @@ -901,6 +924,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadWohnheimBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] BS.Shared.DataContracts.WohnheimDC LoadWohnheim(long pWohnheimOid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadWohneinheitenForCustomer", ReplyAction="http://tempuri.org/ICustomerService/LoadWohneinheitenForCustomerResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadWohneinheitenForCustomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] + System.Collections.Generic.List LoadWohneinheitenForCustomer(long customerOid, System.Nullable datum); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetCustomerWithPersonOid", ReplyAction="http://tempuri.org/ICustomerService/GetCustomerWithPersonOidResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/GetCustomerWithPersonOidBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] BS.Shared.DataContracts.CustomerDC GetCustomerWithPersonOid(long pPersonOid); @@ -1062,18 +1089,6 @@ namespace BeWo.ServiceProxy [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllCustomerGoals", ReplyAction="http://tempuri.org/ICustomerService/GetAllCustomerGoalsResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllCustomerGoalsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] System.Collections.Generic.List GetAllCustomerGoals(long pCustomerOid); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/LoadCompactSupportConceptDC", ReplyAction="http://tempuri.org/ICustomerService/LoadCompactSupportConceptDCResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/LoadCompactSupportConceptDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] - BS.Shared.DataContracts.Compact.CompactSupportConceptDC LoadCompactSupportConceptDC(long pOid, System.Nullable currentEmployeeOid); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetCompactCustomerDC", ReplyAction="http://tempuri.org/ICustomerService/GetCompactCustomerDCResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/GetCompactCustomerDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] - BS.Shared.DataContracts.Compact.CompactCustomerDC GetCompactCustomerDC(long pOid); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveCompactCustomers", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveCompactCustomersResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveCompactCustomersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] - System.Collections.Generic.List GetAllActiveCompactCustomers(); } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -1110,6 +1125,21 @@ namespace BeWo.ServiceProxy { } + public void SetVertretungGewuenscht(long pCustomerOid, bool vertWunsch) + { + base.Channel.SetVertretungGewuenscht(pCustomerOid, vertWunsch); + } + + public void SetVertretungDringendErforderlich(long pCustomerOid, bool vertDringendEr) + { + base.Channel.SetVertretungDringendErforderlich(pCustomerOid, vertDringendEr); + } + + public System.Collections.Generic.List GetActiveCompactCustomerEmployeeRelationsByEmployeeId(long empOid) + { + return base.Channel.GetActiveCompactCustomerEmployeeRelationsByEmployeeId(empOid); + } + public void SetBenutzerPasswortChatAppCode(long pCustomerOid, string benutzerName, string passwort) { base.Channel.SetBenutzerPasswortChatAppCode(pCustomerOid, benutzerName, passwort); @@ -1210,6 +1240,21 @@ namespace BeWo.ServiceProxy return base.Channel.GetSupportConceptCostBearerRelationById(oid); } + public BS.Shared.DataContracts.Compact.CompactSupportConceptDC LoadCompactSupportConceptDC(long pOid, System.Nullable currentEmployeeOid) + { + return base.Channel.LoadCompactSupportConceptDC(pOid, currentEmployeeOid); + } + + public BS.Shared.DataContracts.Compact.CompactCustomerDC GetCompactCustomerDC(long pOid) + { + return base.Channel.GetCompactCustomerDC(pOid); + } + + public System.Collections.Generic.List GetAllActiveCompactCustomers() + { + return base.Channel.GetAllActiveCompactCustomers(); + } + public bool ServiceRecordOutOfSupportConcept(BS.Shared.DataContracts.SupportConceptDC pSupportConcept) { return base.Channel.ServiceRecordOutOfSupportConcept(pSupportConcept); @@ -1620,21 +1665,6 @@ namespace BeWo.ServiceProxy base.Channel.SetAbWelchenKrankheitsTag(pCustomerOid, abWelcherKt); } - public void SetVertretungGewuenscht(long pCustomerOid, bool vertWunsch) - { - base.Channel.SetVertretungGewuenscht(pCustomerOid, vertWunsch); - } - - public void SetVertretungDringendErforderlich(long pCustomerOid, bool vertDringendEr) - { - base.Channel.SetVertretungDringendErforderlich(pCustomerOid, vertDringendEr); - } - - public System.Collections.Generic.List GetActiveCompactCustomerEmployeeRelationsByEmployeeId(long empOid) - { - return base.Channel.GetActiveCompactCustomerEmployeeRelationsByEmployeeId(empOid); - } - public void ArchiveCustomer(long pOid, long pVersion) { base.Channel.ArchiveCustomer(pOid, pVersion); @@ -1840,6 +1870,16 @@ namespace BeWo.ServiceProxy return base.Channel.UpdateWohnheim(dc, employeeDCs); } + public System.Collections.Generic.List UpdateWohneinheitBelegungen(System.Collections.Generic.List dcs) + { + return base.Channel.UpdateWohneinheitBelegungen(dcs); + } + + public bool DeleteWohneinheitBelegungen(System.Collections.Generic.List dcs) + { + return base.Channel.DeleteWohneinheitBelegungen(dcs); + } + public long InsertNewWohnheim(BS.Shared.DataContracts.WohnheimDC pWohnheimDC) { return base.Channel.InsertNewWohnheim(pWohnheimDC); @@ -1850,6 +1890,11 @@ namespace BeWo.ServiceProxy return base.Channel.LoadWohnheim(pWohnheimOid); } + public System.Collections.Generic.List LoadWohneinheitenForCustomer(long customerOid, System.Nullable datum) + { + return base.Channel.LoadWohneinheitenForCustomer(customerOid, datum); + } + public BS.Shared.DataContracts.CustomerDC GetCustomerWithPersonOid(long pPersonOid) { return base.Channel.GetCustomerWithPersonOid(pPersonOid); @@ -2044,20 +2089,5 @@ namespace BeWo.ServiceProxy { return base.Channel.GetAllCustomerGoals(pCustomerOid); } - - public BS.Shared.DataContracts.Compact.CompactSupportConceptDC LoadCompactSupportConceptDC(long pOid, System.Nullable currentEmployeeOid) - { - return base.Channel.LoadCompactSupportConceptDC(pOid, currentEmployeeOid); - } - - public BS.Shared.DataContracts.Compact.CompactCustomerDC GetCompactCustomerDC(long pOid) - { - return base.Channel.GetCompactCustomerDC(pOid); - } - - public System.Collections.Generic.List GetAllActiveCompactCustomers() - { - return base.Channel.GetAllActiveCompactCustomers(); - } } } diff --git a/BeWo/ServiceProxy/GeneratedOperationsService.cs b/BeWo/ServiceProxy/GeneratedOperationsService.cs index 0e8e00812..ff0f74c33 100644 --- a/BeWo/ServiceProxy/GeneratedOperationsService.cs +++ b/BeWo/ServiceProxy/GeneratedOperationsService.cs @@ -584,7 +584,10 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerCostBearerRelationDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerVermittlungArbeitDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerVgaAuftragsherkunft))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerVermittlungBearbeitungsstatus))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerVgaVerlauf))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerVgaVermittlungsGrundlage))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerOrganisationRelationDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] diff --git a/BeWo/Styles/ControlStyles/TextEditStyles.xaml b/BeWo/Styles/ControlStyles/TextEditStyles.xaml index bb6897e87..0c84bfc30 100644 --- a/BeWo/Styles/ControlStyles/TextEditStyles.xaml +++ b/BeWo/Styles/ControlStyles/TextEditStyles.xaml @@ -42,6 +42,12 @@ TargetType="{x:Type dxe:TextEdit}"> + @functions { - string GetParticipationColor(ParticipationAnswer participationAnswer) - { - var background = ""; + static string GetParticipationColor(ParticipationAnswer participationAnswer) + { + var background = ""; - switch(participationAnswer) - { - case ParticipationAnswer.Zusage: - background = "#48D44E"; - break; - case ParticipationAnswer.Vorbehalt: - background = "#B927D9"; - break; - case ParticipationAnswer.Absage: - background = "#AB0030"; - break; - } + switch(participationAnswer) + { + case ParticipationAnswer.Zusage: + background = "#48D44E"; + break; + case ParticipationAnswer.Vorbehalt: + background = "#B927D9"; + break; + case ParticipationAnswer.Absage: + background = "#AB0030"; + break; + } - return background; - } + return background; + } } -