From e90029cdc1ccfd107a0c7b1b20ae9a8fe5b57861 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Wed, 13 Jan 2021 11:21:51 +0100 Subject: [PATCH] MH: Dokumente und Vorlagen --- BeWo/BeWo.csproj | 173 +-- BeWo/ServiceProxy/Generated.cs | 62 +- BeWo/View/Detail/Suchergebnis.xaml | 30 + BeWo/View/Detail/Suchergebnis.xaml.cs | 69 ++ .../View/Detail/SuchergebnisMasterMenuItem.cs | 21 + BeWo/View/Detail/TemplatePrintSelection.xaml | 102 ++ .../Detail/TemplatePrintSelection.xaml.cs | 321 +++++ BeWo/View/Detail/VorlageEditView.xaml | 14 +- BeWo/View/Detail/VorlageEditView.xaml.cs | 70 +- BeWo/View/Master/DokumenteView.xaml | 85 +- BeWo/View/Master/DokumenteView.xaml.cs | 507 +++++++- BeWo/ViewModel/DocumentTreeItemVM.cs | 2 +- BeWo/ViewModel/PrintSelectionVM.cs | 33 + BeWo/ViewModel/SuchergebnisVM.cs | 20 + Data/Access/SearchDAO.cs | 20 +- Host/ReportView.aspx.cs | 18 + Report/AbstractReportCreator.cs | 5 +- Report/DefaultReportCreator.cs | 32 + .../DefaultReports/JahresReport.designer.cs | 1 - .../DefaultReports/VorlageReport.Designer.cs | 117 ++ Report/DefaultReports/VorlageReport.cs | 18 + Report/DefaultReports/VorlageReport.resx | 126 ++ Report/Report.csproj | 11 + Report/ReportObjects/VorlageRO.cs | 22 + .../ServiceContracts/IOperationsService.cs | 26 +- .../OperationsServiceImp.cs | 1095 ++++++++++++++++- Shared/DataContracts/PlatzhalterDC.cs | 8 +- Shared/DataContracts/ReportTypes.cs | 3 +- 28 files changed, 2755 insertions(+), 256 deletions(-) create mode 100644 BeWo/View/Detail/Suchergebnis.xaml create mode 100644 BeWo/View/Detail/Suchergebnis.xaml.cs create mode 100644 BeWo/View/Detail/SuchergebnisMasterMenuItem.cs create mode 100644 BeWo/View/Detail/TemplatePrintSelection.xaml create mode 100644 BeWo/View/Detail/TemplatePrintSelection.xaml.cs create mode 100644 BeWo/ViewModel/PrintSelectionVM.cs create mode 100644 BeWo/ViewModel/SuchergebnisVM.cs create mode 100644 Report/DefaultReports/VorlageReport.Designer.cs create mode 100644 Report/DefaultReports/VorlageReport.cs create mode 100644 Report/DefaultReports/VorlageReport.resx create mode 100644 Report/ReportObjects/VorlageRO.cs diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index a95ec86f8..bf470a35a 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -310,6 +310,14 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -869,6 +877,7 @@ + @@ -900,6 +909,7 @@ + @@ -989,6 +999,13 @@ OwnChatSettingsView.xaml + + + Suchergebnis.xaml + + + TemplatePrintSelection.xaml + VorlageEditView.xaml @@ -2436,392 +2453,392 @@ False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly False + Include + True - Include - True Assembly diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs index a4068491f..9b7154d51 100644 --- a/BeWo/ServiceProxy/Generated.cs +++ b/BeWo/ServiceProxy/Generated.cs @@ -4995,12 +4995,21 @@ namespace BeWo.ServiceProxy [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); + BS.Shared.DataContracts.DokumentvorlageDC InsertTemplate(BS.Shared.DataContracts.DokumentvorlageDC dc); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConcept", ReplyAction="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConceptResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetPlatzhalterForSupportConceptBeWoFaultFau" + + "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetPlatzhalterForSupportConcept(); [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/GetPlatzhalterForEmployee", ReplyAction="http://tempuri.org/IOperationsService/GetPlatzhalterForEmployeeResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetPlatzhalterForEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + System.Collections.Generic.List GetPlatzhalterForEmployee(); + [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); @@ -5021,6 +5030,23 @@ namespace BeWo.ServiceProxy [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/ReplacePlaceholdersInTemplate", ReplyAction="http://tempuri.org/IOperationsService/ReplacePlaceholdersInTemplateResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/ReplacePlaceholdersInTemplateBeWoFaultFault" + + "", 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/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); + [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" + @@ -6141,9 +6167,14 @@ namespace BeWo.ServiceProxy return base.Channel.GetVorlagentabelleDCs(); } - public void InsertTemplate(BS.Shared.DataContracts.DokumentvorlageDC dc) + public BS.Shared.DataContracts.DokumentvorlageDC InsertTemplate(BS.Shared.DataContracts.DokumentvorlageDC dc) { - base.Channel.InsertTemplate(dc); + return base.Channel.InsertTemplate(dc); + } + + public System.Collections.Generic.List GetPlatzhalterForSupportConcept() + { + return base.Channel.GetPlatzhalterForSupportConcept(); } public System.Collections.Generic.List GetPlatzhalterForCustomer() @@ -6151,6 +6182,11 @@ namespace BeWo.ServiceProxy return base.Channel.GetPlatzhalterForCustomer(); } + public System.Collections.Generic.List GetPlatzhalterForEmployee() + { + return base.Channel.GetPlatzhalterForEmployee(); + } + public BS.Shared.DataContracts.BeWoFolderDC GetFolderById(long oid) { return base.Channel.GetFolderById(oid); @@ -6176,6 +6212,26 @@ namespace BeWo.ServiceProxy base.Channel.DeleteTemplates(vorlagen); } + public string ReplacePlaceholdersInTemplate(BS.Shared.DataContracts.DokumentvorlageDC template, System.Nullable objectOid, System.Nullable tableOid) + { + 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 string GetObjectForFilePath(BS.Shared.TableID table, System.Nullable oid) + { + return base.Channel.GetObjectForFilePath(table, oid); + } + public void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType) { base.Channel.UpdateIsChatActiveCustomerAPPCodeDC(customerOid, activeType); diff --git a/BeWo/View/Detail/Suchergebnis.xaml b/BeWo/View/Detail/Suchergebnis.xaml new file mode 100644 index 000000000..87133ac68 --- /dev/null +++ b/BeWo/View/Detail/Suchergebnis.xaml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + +