diff --git a/BeWo.sln b/BeWo.sln index 5c6c640fa..5803629ce 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -417,6 +417,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiBerlin", "ReportImp\ApiB EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoNordeifel", "ReportImp\BeWoNordeifel\BeWoNordeifel.csproj", "{CF08D1BE-588E-4A0F-8FC4-B7D6F69091B0}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetreuungsbueroFrankRoehrig", "ReportImp\BetreuungsbueroFrankRoehrig\BetreuungsbueroFrankRoehrig.csproj", "{C252012D-4EE1-4262-B599-28297AE41E9C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVZMedikusGmbH", "ReportImp\MVZMedikusGmbH\MVZMedikusGmbH.csproj", "{D71875ED-CD52-43D9-B066-843E891EDA0E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -3136,6 +3140,38 @@ Global {CF08D1BE-588E-4A0F-8FC4-B7D6F69091B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU {CF08D1BE-588E-4A0F-8FC4-B7D6F69091B0}.Release|x86.ActiveCfg = Release|Any CPU {CF08D1BE-588E-4A0F-8FC4-B7D6F69091B0}.Release|x86.Build.0 = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|.NET.ActiveCfg = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|.NET.Build.0 = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|x86.ActiveCfg = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Debug|x86.Build.0 = Debug|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|.NET.ActiveCfg = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|.NET.Build.0 = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|Any CPU.Build.0 = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|x86.ActiveCfg = Release|Any CPU + {C252012D-4EE1-4262-B599-28297AE41E9C}.Release|x86.Build.0 = Release|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|.NET.ActiveCfg = Debug|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|.NET.Build.0 = Debug|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|x86.ActiveCfg = Debug|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Debug|x86.Build.0 = Debug|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|.NET.ActiveCfg = Release|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|.NET.Build.0 = Release|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|Any CPU.Build.0 = Release|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|x86.ActiveCfg = Release|Any CPU + {D71875ED-CD52-43D9-B066-843E891EDA0E}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3340,6 +3376,8 @@ Global {57B95F8E-BF79-4106-AE98-C9B14CE949BA} = {D8A691C5-146D-4613-86CC-438F02FE9106} {B4E9D5AF-7B46-47F8-B918-052D341A378B} = {D8A691C5-146D-4613-86CC-438F02FE9106} {CF08D1BE-588E-4A0F-8FC4-B7D6F69091B0} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {C252012D-4EE1-4262-B599-28297AE41E9C} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {D71875ED-CD52-43D9-B066-843E891EDA0E} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 1d398b0bf..a19582f39 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -310,6 +310,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -864,6 +868,7 @@ + @@ -984,6 +989,9 @@ OwnChatSettingsView.xaml + + VorlageEditView.xaml + RatingTypeView.xaml @@ -1240,7 +1248,6 @@ MiniChatView.xaml - WohnheimNavigationView.xaml diff --git a/BeWo/MainControl.xaml.cs b/BeWo/MainControl.xaml.cs index e19ff4847..b9d1251ea 100644 --- a/BeWo/MainControl.xaml.cs +++ b/BeWo/MainControl.xaml.cs @@ -93,6 +93,8 @@ namespace BeWo BeWoApp.InitAutoUILocking(); + AufOffeneTerminePruefen(); + //BeWoApp.InitBlubb(); #if !DEBUG @@ -1698,11 +1700,11 @@ namespace BeWo public void InitOffeneTermine() { - if (!_TermineInitialized && BeWoApp.LoggedOnEmployee != null) - { - AufOffeneTerminePruefen(); - _TermineInitialized = true; - } + //if (!_TermineInitialized && BeWoApp.LoggedOnEmployee != null) + //{ + // AufOffeneTerminePruefen(); + // _TermineInitialized = true; + //} } public void AufOffeneTerminePruefen() diff --git a/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs b/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs index 881b9756c..19f6a9f5a 100644 --- a/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs +++ b/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs @@ -183,6 +183,7 @@ namespace BeWo.Scheduler.ViewModel var message = string.Empty; + ServiceFacade.DoResourceServiceSync( s => message = s.ValidateSchedulerAppointment(start, end, employeeOids, customerOids, resourceOids, originatorOid, schedulerAppointmentOid, recurrenceInfoId, recurrenceIndex, shouldSkipResourceAvailablityCheck)); if(!string.IsNullOrWhiteSpace(message)) @@ -284,7 +285,8 @@ namespace BeWo.Scheduler.ViewModel var message = string.Empty; - ServiceFacade.DoResourceServiceSync(s => message = s.ValidateSchedulerAppointment(start, end, employeeOids, customerOids, resourceOids, originatorOid, schedulerAppointmentOid, recurrenceInfoId, recurrenceIndex, false)); + + ServiceFacade.DoResourceServiceSync(s => message = s.ValidateSchedulerAppointment(start, end, employeeOids, customerOids, resourceOids, originatorOid, schedulerAppointmentOid, recurrenceInfoId, recurrenceIndex, false)); if(!string.IsNullOrWhiteSpace(message)) { diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index 9ba409a7a..8a79490ff 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. // //------------------------------------------------------------------------------ @@ -309,6 +309,11 @@ namespace BeWo.ServiceProxy "ault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetAllActiveCompactTeamsForEmployee(System.Nullable employeeOid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetActiveSupportConceptsForEmployee", ReplyAction="http://tempuri.org/IEmployeeService/GetActiveSupportConceptsForEmployeeResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetActiveSupportConceptsForEmployeeBeWoFaultF" + + "ault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetActiveSupportConceptsForEmployee(System.Nullable employeeOid, BeWo.View.Navigation.Filter.CustomerFilterEnum supportConceptFilter); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/ArchiveEmployee", ReplyAction="http://tempuri.org/IEmployeeService/ArchiveEmployeeResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/ArchiveEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void ArchiveEmployee(long pOid, long pVersion); @@ -780,6 +785,11 @@ namespace BeWo.ServiceProxy return base.Channel.GetAllActiveCompactTeamsForEmployee(employeeOid); } + public System.Collections.Generic.List GetActiveSupportConceptsForEmployee(System.Nullable employeeOid, BeWo.View.Navigation.Filter.CustomerFilterEnum supportConceptFilter) + { + return base.Channel.GetActiveSupportConceptsForEmployee(employeeOid, supportConceptFilter); + } + public void ArchiveEmployee(long pOid, long pVersion) { base.Channel.ArchiveEmployee(pOid, pVersion); @@ -1323,6 +1333,7 @@ namespace BeWo.ServiceProxy [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/ConvertToNewSubstitutionType", ReplyAction="http://tempuri.org/ICustomerService/ConvertToNewSubstitutionTypeResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/ConvertToNewSubstitutionTypeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BeWo.View.Navigation.Filter.CustomerFilterEnum))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ActivationTypeId))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ValueListEntryType))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ContactType))] @@ -1334,9 +1345,21 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SubstitutionNeed))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AppointmentDayOfWeek))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.TokenTyp))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SupportConceptApprovalInterval))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Bewilligungsart))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SystemEntryID))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingIntervalType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingvisibilityType))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ScopeTypeId))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GroupTypeId))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.CostBearer2SupportConceptStatus))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SettingsType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UserRightType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ZeiterfassungsDauer))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceUnit))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordFormate))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordTypeId))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.GroupTypeId))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactTeamDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactOrganisationDC))] @@ -1347,10 +1370,11 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactVertreterEmployeeDC))] [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.Compact.CompactPersonDC))] [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.CompactGroupOfPeopleDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] @@ -1398,64 +1422,16 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.TeamDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AssessmentSheetCategoryDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AssessmentSheetValueDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AssessmentSheetEntryDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.NewsItemDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GroupOfPeopleDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingIntervalType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AccountingvisibilityType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SupportConceptApprovalInterval))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Bewilligungsart))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SystemEntryID))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceUnit))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ZeiterfassungsDauer))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordFormate))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordTypeId))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SettingsType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UserRightType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Behinderungsart))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Merkzeichen))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Pflegegrad))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.FileAttachmentType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.TableID))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Priority))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Status))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.QBFilterEnum))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactPersonDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactWohnheimDC))] - [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.Dictionary>))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimbuchungDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceCategoryDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Wohnheimbuchung2Costbearer2SupportConceptRelationDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptCostBearerRelDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptApprovalPeriodDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BudgetDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceCategoryDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptApprovalPeriodEmployeeRelDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimbuchungEmployeeRelationDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceDescriptionDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SupportConceptDC))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.UserDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ResetPasswordInfoDC))] @@ -1468,8 +1444,43 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GoalRatingDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.RatingTypeDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceDescriptionDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceAccountingDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AssessmentSheetCategoryDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AssessmentSheetValueDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AssessmentSheetEntryDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.NewsItemDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.GroupOfPeopleDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Behinderungsart))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Merkzeichen))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Pflegegrad))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.FileAttachmentType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.TableID))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Priority))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Status))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.QBFilterEnum))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactWohnheimDC))] + [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.Dictionary>))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimbuchungDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Wohnheimbuchung2Costbearer2SupportConceptRelationDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimbuchungEmployeeRelationDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.CustomerPersonRelationDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -1584,6 +1595,12 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.DienstBlockDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.DienstEintragDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AbsenceOverviewFilterDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.VorlagentabelleDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.DokumentvorlageDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.PlatzhalterDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BargeldkassenDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -3575,24 +3592,24 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UpdateBeWoFoldersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] void UpdateBeWoFolders(System.Collections.Generic.List dcs); - // CODEGEN: Generating message contract since the wrapper name (UploadPackage) of message UploadPackage does not match the default value (UploadDocument) + // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadPackage) von Nachricht "UploadPackage" nicht mit dem Standardwert (UploadDocument) übereinstimmt. [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UploadDocument", ReplyAction="http://tempuri.org/IStreamingService/UploadDocumentResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UploadDocumentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BeWo.ServiceProxy.UploadResult UploadDocument(BeWo.ServiceProxy.UploadPackage request); - // CODEGEN: Generating message contract since the wrapper name (UpdatePackage) of message UpdatePackage does not match the default value (UpdateDocument) + // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UpdatePackage) von Nachricht "UpdatePackage" nicht mit dem Standardwert (UpdateDocument) übereinstimmt. [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UpdateDocument", ReplyAction="http://tempuri.org/IStreamingService/UpdateDocumentResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UpdateDocumentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BeWo.ServiceProxy.UploadResult UpdateDocument(BeWo.ServiceProxy.UpdatePackage request); - // CODEGEN: Generating message contract since the wrapper name (UploadChatPackage) of message UploadChatPackage does not match the default value (CreateNewSpeziallStreamChatMessagesDC) + // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadChatPackage) von Nachricht "UploadChatPackage" nicht mit dem Standardwert (CreateNewSpeziallStreamChatMessagesDC) übereinstimmt. [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDC", ReplyAction="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDCRespons" + "e")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDCBeWoFau" + "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BeWo.ServiceProxy.UploadChatResult CreateNewSpeziallStreamChatMessagesDC(BeWo.ServiceProxy.UploadChatPackage request); - // CODEGEN: Generating message contract since the wrapper name (UploadPackage) of message UploadPackage does not match the default value (UploadImportFile) + // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadPackage) von Nachricht "UploadPackage" nicht mit dem Standardwert (UploadImportFile) übereinstimmt. [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UploadImportFile", ReplyAction="http://tempuri.org/IStreamingService/UploadImportFileResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UploadImportFileBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BeWo.ServiceProxy.UploadImportFileResult UploadImportFile(BeWo.ServiceProxy.UploadPackage request); @@ -4983,10 +5000,38 @@ namespace BeWo.ServiceProxy "AndServiceRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List FindConfirmationReceiptSignaturesByEmployeeAndServiceRecords(long employeeOid, System.Collections.Generic.List serviceRecordOids); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetVorlagentabelleDCs", ReplyAction="http://tempuri.org/IOperationsService/GetVorlagentabelleDCsResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetVorlagentabelleDCsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetVorlagentabelleDCs(); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertTemplate", ReplyAction="http://tempuri.org/IOperationsService/InsertTemplateResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertTemplateBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void InsertTemplate(BS.Shared.DataContracts.DokumentvorlageDC dc); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetPlatzhalterForCustomer", ReplyAction="http://tempuri.org/IOperationsService/GetPlatzhalterForCustomerResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetPlatzhalterForCustomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetPlatzhalterForCustomer(); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetFolderById", ReplyAction="http://tempuri.org/IOperationsService/GetFolderByIdResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetFolderByIdBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + BS.Shared.DataContracts.BeWoFolderDC GetFolderById(long oid); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetVorlagentabelleById", ReplyAction="http://tempuri.org/IOperationsService/GetVorlagentabelleByIdResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetVorlagentabelleByIdBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + BS.Shared.DataContracts.VorlagentabelleDC GetVorlagentabelleById(long oid); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetDokumentvorlagenInFolder", ReplyAction="http://tempuri.org/IOperationsService/GetDokumentvorlagenInFolderResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetDokumentvorlagenInFolderBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetDokumentvorlagenInFolder(long folderOid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetSupportConceptsById", ReplyAction="http://tempuri.org/IOperationsService/GetSupportConceptsByIdResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetSupportConceptsByIdBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetSupportConceptsById(System.Collections.Generic.List idList); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteTemplates", ReplyAction="http://tempuri.org/IOperationsService/DeleteTemplatesResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteTemplatesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void DeleteTemplates(System.Collections.Generic.List vorlagen); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCResponse" + "")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCBeWoFaul" + @@ -6102,11 +6147,46 @@ namespace BeWo.ServiceProxy return base.Channel.FindConfirmationReceiptSignaturesByEmployeeAndServiceRecords(employeeOid, serviceRecordOids); } + public System.Collections.Generic.List GetVorlagentabelleDCs() + { + return base.Channel.GetVorlagentabelleDCs(); + } + + public void InsertTemplate(BS.Shared.DataContracts.DokumentvorlageDC dc) + { + base.Channel.InsertTemplate(dc); + } + + public System.Collections.Generic.List GetPlatzhalterForCustomer() + { + return base.Channel.GetPlatzhalterForCustomer(); + } + + public BS.Shared.DataContracts.BeWoFolderDC GetFolderById(long oid) + { + return base.Channel.GetFolderById(oid); + } + + public BS.Shared.DataContracts.VorlagentabelleDC GetVorlagentabelleById(long oid) + { + return base.Channel.GetVorlagentabelleById(oid); + } + + public System.Collections.Generic.List GetDokumentvorlagenInFolder(long folderOid) + { + return base.Channel.GetDokumentvorlagenInFolder(folderOid); + } + public System.Collections.Generic.List GetSupportConceptsById(System.Collections.Generic.List idList) { return base.Channel.GetSupportConceptsById(idList); } + public void DeleteTemplates(System.Collections.Generic.List vorlagen) + { + base.Channel.DeleteTemplates(vorlagen); + } + public void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType) { base.Channel.UpdateIsChatActiveCustomerAPPCodeDC(customerOid, activeType); diff --git a/BeWo/View/Detail/RatingEditView.xaml.cs b/BeWo/View/Detail/RatingEditView.xaml.cs index e7b201cf6..1cdc5eee9 100644 --- a/BeWo/View/Detail/RatingEditView.xaml.cs +++ b/BeWo/View/Detail/RatingEditView.xaml.cs @@ -92,6 +92,7 @@ namespace BeWo.View.Detail richEditControl1.RtfText = rating.RTFNotice; richEditControl1.BarManager = barManager; + FontSizeComboBox.OfficeFontSizeProvider = richEditControl1; RichEditStyleComboBox.RichEditControl = richEditControl1; diff --git a/BeWo/View/Detail/VorlageEditView.xaml b/BeWo/View/Detail/VorlageEditView.xaml new file mode 100644 index 000000000..f437e8e2a --- /dev/null +++ b/BeWo/View/Detail/VorlageEditView.xaml @@ -0,0 +1,617 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +