From d9a77f1d3532454e67033d5317e0e7e8cd01d534 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Mon, 15 Mar 2021 13:30:34 +0100 Subject: [PATCH] =?UTF-8?q?MH:=20=C3=84nderungen=20im=20Dienstplaner=20und?= =?UTF-8?q?=20Anpassungen=20f=C3=BCr=20Bewegt=20Systemische=20Beratung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + BeWo.sln | 38 + BeWo/ServiceProxy/Generated.cs | 99 +- BeWo/View/Controls/DPCtrlDay.cs | 4 +- BeWo/View/Controls/DPCtrlDienstTooltip.xaml | 7 +- .../View/Controls/DPCtrlDienstTooltip.xaml.cs | 10 +- BeWo/View/Detail/Report/DienstplanerView.xaml | 18 +- .../Detail/Report/DienstplanerView.xaml.cs | 94 +- Data/Entities/DienstEintrag.cs | 30 + Data/Entities/Dienstvertretung.cs | 30 + Data/Mappings/DienstEintrag.hbm.xml | 4 +- Data/Mappings/Dienstvertretung.hbm.xml | 2 + ...021_03_11_DienstEintrag_und_Vertretung.txt | 11 + .../BewegtSystemischeBeratung.csproj | 105 ++ .../Properties/AssemblyInfo.cs | 36 + .../Properties/licenses.licx | 1 + .../Quittierungsbeleg.Designer.cs | 1066 +++++++++++++++++ .../Quittierungsbeleg.cs | 163 +++ .../Quittierungsbeleg.resx | 135 +++ .../ServiceInvoiceReport.Designer.cs | 735 ++++++++++++ .../ServiceInvoiceReport.cs | 32 + .../ServiceInvoiceReport.resx | 135 +++ .../SettlementReport.Designer.cs | 1006 ++++++++++++++++ .../SettlementReport.cs | 222 ++++ .../SettlementReport.resx | 139 +++ .../DienstEintragDC_DienstEintrag.cs | 4 + .../DienstvertretungDC_Dienstvertretung.cs | 4 + .../Dienstplanung/DienstplanungsManager.cs | 32 +- Service/Plugins/PluginLoader.cs | 1 + .../ServiceContracts/IOperationsService.cs | 9 + .../OperationsServiceImp.cs | 22 + Shared/DataContracts/DienstEintragDC.cs | 5 + Shared/DataContracts/DienstvertretungDC.cs | 6 + 33 files changed, 4122 insertions(+), 84 deletions(-) create mode 100644 Model/Changes_2021_03_11_DienstEintrag_und_Vertretung.txt create mode 100644 ReportImp/BewegtSystemischeBeratung/BewegtSystemischeBeratung.csproj create mode 100644 ReportImp/BewegtSystemischeBeratung/Properties/AssemblyInfo.cs create mode 100644 ReportImp/BewegtSystemischeBeratung/Properties/licenses.licx create mode 100644 ReportImp/BewegtSystemischeBeratung/Quittierungsbeleg.Designer.cs create mode 100644 ReportImp/BewegtSystemischeBeratung/Quittierungsbeleg.cs create mode 100644 ReportImp/BewegtSystemischeBeratung/Quittierungsbeleg.resx create mode 100644 ReportImp/BewegtSystemischeBeratung/ServiceInvoiceReport.Designer.cs create mode 100644 ReportImp/BewegtSystemischeBeratung/ServiceInvoiceReport.cs create mode 100644 ReportImp/BewegtSystemischeBeratung/ServiceInvoiceReport.resx create mode 100644 ReportImp/BewegtSystemischeBeratung/SettlementReport.Designer.cs create mode 100644 ReportImp/BewegtSystemischeBeratung/SettlementReport.cs create mode 100644 ReportImp/BewegtSystemischeBeratung/SettlementReport.resx diff --git a/.gitignore b/.gitignore index 47a3c0137..ab8ec4c58 100644 --- a/.gitignore +++ b/.gitignore @@ -496,3 +496,4 @@ /ReportImp/CaritasverbandDürenJülichEV/obj/Debug /ReportImp/CaritasverbandDuerenJuelichEV/obj/Debug /ReportImp/KoelnerBeWoSelbstbestimmtLeben/obj/Debug +/ReportImp/BewegtSystemischeBeratung/obj/Debug diff --git a/BeWo.sln b/BeWo.sln index 9dbff4d78..9e87cf735 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -451,6 +451,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaritasverbandDuerenJuelich EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KoelnerBeWoSelbstbestimmtLeben", "ReportImp\KoelnerBeWoSelbstbestimmtLeben\KoelnerBeWoSelbstbestimmtLeben.csproj", "{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BewegtSystemischeBeratung", "ReportImp\BewegtSystemischeBeratung\BewegtSystemischeBeratung.csproj", "{976CC5EF-26C9-4415-84C6-33A450222F04}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoFuerDich", "ReportImp\BeWoFuerDich\BeWoFuerDich.csproj", "{BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -3446,6 +3450,38 @@ Global {FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|Mixed Platforms.Build.0 = Release|Any CPU {FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|x86.ActiveCfg = Release|Any CPU {FE240F9F-CC85-4F7D-9080-BEEBE76B0735}.Release|x86.Build.0 = Release|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Debug|.NET.ActiveCfg = Debug|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Debug|.NET.Build.0 = Debug|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Debug|Any CPU.Build.0 = Debug|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Debug|x86.ActiveCfg = Debug|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Debug|x86.Build.0 = Debug|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Release|.NET.ActiveCfg = Release|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Release|.NET.Build.0 = Release|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Release|Any CPU.ActiveCfg = Release|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Release|Any CPU.Build.0 = Release|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Release|x86.ActiveCfg = Release|Any CPU + {976CC5EF-26C9-4415-84C6-33A450222F04}.Release|x86.Build.0 = Release|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Debug|.NET.ActiveCfg = Debug|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Debug|.NET.Build.0 = Debug|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Debug|x86.ActiveCfg = Debug|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Debug|x86.Build.0 = Debug|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Release|.NET.ActiveCfg = Release|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Release|.NET.Build.0 = Release|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Release|Any CPU.Build.0 = Release|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Release|x86.ActiveCfg = Release|Any CPU + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3667,6 +3703,8 @@ Global {48324B9E-4EC0-47B9-BBA7-6FD61384D25A} = {D8A691C5-146D-4613-86CC-438F02FE9106} {86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB} = {D8A691C5-146D-4613-86CC-438F02FE9106} {FE240F9F-CC85-4F7D-9080-BEEBE76B0735} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {976CC5EF-26C9-4415-84C6-33A450222F04} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {BFEE49FD-BCFB-4B6D-BE98-0019A568DE85} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index f4e5cc38e..884ecb9a8 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -1571,27 +1571,6 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Employee2SchedulerAppointmentDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.HomeViewPanelType))] - [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.SchulbegleitenderZugehoerigkeitsTyp))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.MessageType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.StatementType))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordValidationResult))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] - [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UiElementType))] - [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(BS.Shared.DataContracts.FlexibleReportFilterDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.FlexibleReportResultDC))] @@ -1615,6 +1594,8 @@ 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.DienstBlockDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AbsenceOverviewFilterDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.VorlagentabelleDC))] @@ -1697,6 +1678,27 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.FLSAnalysisDataDetailDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordFLSOverviewDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.HomeViewPanelType))] + [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.SchulbegleitenderZugehoerigkeitsTyp))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.MessageType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.StatementType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordValidationResult))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UiElementType))] + [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.List))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Reports.AuslastungAnalysisRootDC))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] @@ -4820,6 +4822,14 @@ namespace BeWo.ServiceProxy public interface IOperationsService { + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertFileAttachment", ReplyAction="http://tempuri.org/IOperationsService/InsertFileAttachmentResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertFileAttachmentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + void InsertFileAttachment(BS.Shared.DataContracts.FileAttachmentDC fileAttachmentDC); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/SearchForFiles", ReplyAction="http://tempuri.org/IOperationsService/SearchForFilesResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/SearchForFilesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List SearchForFiles(string nutzereingabe); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetObjectForFilePath", ReplyAction="http://tempuri.org/IOperationsService/GetObjectForFilePathResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetObjectForFilePathBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] string GetObjectForFilePath(BS.Shared.TableID table, System.Nullable oid); @@ -5010,6 +5020,15 @@ namespace BeWo.ServiceProxy [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetDienstEintraegeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetDienstEintraege(long wOid, int year, int month); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllDienstEintraegeAsList", ReplyAction="http://tempuri.org/IOperationsService/GetAllDienstEintraegeAsListResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllDienstEintraegeAsListBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetAllDienstEintraegeAsList(long wOid, int year, int month); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllDienstvertretungenAsList", ReplyAction="http://tempuri.org/IOperationsService/GetAllDienstvertretungenAsListResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllDienstvertretungenAsListBeWoFaultFaul" + + "t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetAllDienstvertretungenAsList(long wOid, int year, int month); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetDienstvertretungen", ReplyAction="http://tempuri.org/IOperationsService/GetDienstvertretungenResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetDienstvertretungenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] System.Collections.Generic.List GetDienstvertretungen(long wOid, int year, int month); @@ -5137,14 +5156,6 @@ namespace BeWo.ServiceProxy "", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] string ReplacePlaceholdersInTemplate(BS.Shared.DataContracts.DokumentvorlageDC template, System.Nullable objectOid, System.Nullable tableOid); - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertFileAttachment", ReplyAction="http://tempuri.org/IOperationsService/InsertFileAttachmentResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertFileAttachmentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - void InsertFileAttachment(BS.Shared.DataContracts.FileAttachmentDC fileAttachmentDC); - - [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/SearchForFiles", ReplyAction="http://tempuri.org/IOperationsService/SearchForFilesResponse")] - [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/SearchForFilesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List SearchForFiles(string nutzereingabe); - [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" + @@ -6045,6 +6056,16 @@ namespace BeWo.ServiceProxy { } + public void InsertFileAttachment(BS.Shared.DataContracts.FileAttachmentDC fileAttachmentDC) + { + base.Channel.InsertFileAttachment(fileAttachmentDC); + } + + public System.Collections.Generic.List SearchForFiles(string nutzereingabe) + { + return base.Channel.SearchForFiles(nutzereingabe); + } + public string GetObjectForFilePath(BS.Shared.TableID table, System.Nullable oid) { return base.Channel.GetObjectForFilePath(table, oid); @@ -6250,6 +6271,16 @@ namespace BeWo.ServiceProxy return base.Channel.GetDienstEintraege(wOid, year, month); } + public System.Collections.Generic.List GetAllDienstEintraegeAsList(long wOid, int year, int month) + { + return base.Channel.GetAllDienstEintraegeAsList(wOid, year, month); + } + + public System.Collections.Generic.List GetAllDienstvertretungenAsList(long wOid, int year, int month) + { + return base.Channel.GetAllDienstvertretungenAsList(wOid, year, month); + } + public System.Collections.Generic.List GetDienstvertretungen(long wOid, int year, int month) { return base.Channel.GetDienstvertretungen(wOid, year, month); @@ -6390,16 +6421,6 @@ namespace BeWo.ServiceProxy return base.Channel.ReplacePlaceholdersInTemplate(template, objectOid, tableOid); } - public void InsertFileAttachment(BS.Shared.DataContracts.FileAttachmentDC fileAttachmentDC) - { - base.Channel.InsertFileAttachment(fileAttachmentDC); - } - - public System.Collections.Generic.List SearchForFiles(string nutzereingabe) - { - return base.Channel.SearchForFiles(nutzereingabe); - } - public void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType) { base.Channel.UpdateIsChatActiveCustomerAPPCodeDC(customerOid, activeType); diff --git a/BeWo/View/Controls/DPCtrlDay.cs b/BeWo/View/Controls/DPCtrlDay.cs index 4587cad4d..b4ea59c7b 100644 --- a/BeWo/View/Controls/DPCtrlDay.cs +++ b/BeWo/View/Controls/DPCtrlDay.cs @@ -59,7 +59,7 @@ namespace BeWo.View.Controls c.Background = bg; c.Foreground = grey < 70 ? Brushes.White : Brushes.Black; - c.ToolTip = new DPCtrlDienstTooltip(dc); + c.ToolTip = new DPCtrlDienstTooltip(dc, info.Bemerkung, info.Zeiten); } else { @@ -172,6 +172,8 @@ namespace BeWo.View.Controls public bool IsLastColumn { get; set; } public DayOfWeek DayOfWeek { get; set; } public StatusInformation StatusInformation { get; set; } + public string Bemerkung { get; set; } + public string[] Zeiten { get; set; } } public class StatusInformation diff --git a/BeWo/View/Controls/DPCtrlDienstTooltip.xaml b/BeWo/View/Controls/DPCtrlDienstTooltip.xaml index 8f1e8698d..1a34b9c03 100644 --- a/BeWo/View/Controls/DPCtrlDienstTooltip.xaml +++ b/BeWo/View/Controls/DPCtrlDienstTooltip.xaml @@ -18,7 +18,8 @@ - + + @@ -26,9 +27,9 @@ - + diff --git a/BeWo/View/Controls/DPCtrlDienstTooltip.xaml.cs b/BeWo/View/Controls/DPCtrlDienstTooltip.xaml.cs index d49766b06..55ac124a5 100644 --- a/BeWo/View/Controls/DPCtrlDienstTooltip.xaml.cs +++ b/BeWo/View/Controls/DPCtrlDienstTooltip.xaml.cs @@ -16,15 +16,17 @@ namespace BeWo.View.Controls /// public partial class DPCtrlDienstTooltip : UserControl { - public DPCtrlDienstTooltip(DienstInfoDC dienst) + public DPCtrlDienstTooltip(DienstInfoDC dienst, string bemerkung, string[] zeiten) { InitializeComponent(); TxtDienst.Text = $"{dienst.DienstName} ({dienst.Kurz})"; - TxtEnde.Text = dienst.Ende.ToString("HH:mm"); + TxtEnde.Text = zeiten[1]; + TxtEnde.Foreground = dienst.Ende.ToString("HH:mm").Equals(zeiten[1]) ? TxtDienst.Foreground : Brushes.OrangeRed; TxtPausendauer.Text = dienst.Pause.ToString(); - TxtStart.Text = dienst.Start.ToString("HH:mm"); - //TxtBemerkung.Text = dienst.Notice; + TxtStart.Text = zeiten[0]; + TxtStart.Foreground = dienst.Start.ToString("HH:mm").Equals(zeiten[0]) ? TxtDienst.Foreground : Brushes.OrangeRed; + TxtBemerkung.Text = bemerkung; } } } \ No newline at end of file diff --git a/BeWo/View/Detail/Report/DienstplanerView.xaml b/BeWo/View/Detail/Report/DienstplanerView.xaml index 7fbe8f981..e8d40c1be 100644 --- a/BeWo/View/Detail/Report/DienstplanerView.xaml +++ b/BeWo/View/Detail/Report/DienstplanerView.xaml @@ -141,13 +141,14 @@ + - + @@ -157,6 +158,8 @@ + + @@ -164,10 +167,17 @@ -