From e772aa7ac3cad65c126cb61d78cd841e669c88f9 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 27 Oct 2020 12:29:59 +0100 Subject: [PATCH] CB new reports und Betrag in ServiceRecord --- BeWo/BeWo.csproj | 10 +- BeWo/BeWoApp.xaml.cs | 12 +- BeWo/Core/BeWoUtils.cs | 8 +- BeWo/Core/Config/AppSettings.cs | 2 + ...rtView.xaml => ServicesReportViewAlt.xaml} | 398 +- ....xaml.cs => ServicesReportViewAlt.xaml.cs} | 1474 +- BeWo/View/Detail/ServiceRecordEditView.xaml | 20 + .../View/Detail/ServiceRecordEditView.xaml.cs | 3 + .../Detail/ServiceRecordGroupEditView.xaml | 21 +- .../Detail/ServiceRecordGroupEditView.xaml.cs | 4 + BeWo/View/Detail/ServiceRecordView2.xaml | 32 +- BeWo/View/Detail/ServiceRecordView2.xaml.cs | 12 + .../SupportConceptGoalRatingView.xaml.cs | 2 +- BeWo/View/Detail/SupportConceptView.xaml.cs | 8 +- BeWo/View/Master/AdministrationView.xaml.cs | 9 + BeWo/View/Master/ReportView.xaml | 1 + BeWo/View/Master/ReportView.xaml.cs | 14 +- .../Employee/EmployeeHourReportView.xaml.cs | 2 +- .../KilometerauslastungsView.xaml | 9 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj.user | 2 +- .../Mitarbeiterstundenkonto.designer.cs | 3 +- Report/ReportObjects/InvoiceCustomerRO.cs | 2 +- .../BeWoDellbrueck/BeWoDellbrueck.csproj | 10 + .../SupportConceptReport.Designer.cs | 960 + .../BeWoDellbrueck/SupportConceptReport.cs | 27 + .../BeWoDellbrueck/SupportConceptReport.resx | 123 + .../InvoiceCustomerReport.resx | 2 +- .../ServiceInvoiceReport.resx | 2 +- .../SettlementReport.Designer.cs | 92 +- .../BeWoMobilReports/SettlementReport.resx | 2 +- .../SettlementReport2.designer.cs | 138 +- .../BeWoMobilReports/SettlementReport2.resx | 2 +- ReportImp/BellaDonna/BellaDonna.csproj | 21 + ReportImp/BellaDonna/CustomReportCreator.cs | 23 +- .../Invoicing/CustomInvoiceNumberGenerator.cs | 37 + .../QuittierungsbelegJa.Designer.cs | 4 +- ReportImp/BellaDonna/QuittierungsbelegJa.cs | 22 + ReportImp/BellaDonna/Rechnung67.Designer.cs | 309 + ReportImp/BellaDonna/Rechnung67.cs | 61 + ReportImp/BellaDonna/Rechnung67.resx | 129 + .../ServiceInvoiceReport.Designer.cs | 86 +- .../BellaDonna/ServiceInvoiceReport.resx | 2 +- .../BellaDonna/SettlementReport.Designer.cs | 1142 + ReportImp/BellaDonna/SettlementReport.cs | 228 + ReportImp/BellaDonna/SettlementReport.resx | 127 + ...Club74MitarbeiterstundenkontoBerechnung.cs | 54 +- ReportImp/Club74/GeneralReport.resx | 34661 +++++++++++++--- ReportImp/Club74/InvoiceCustomerReport.resx | 34661 +++++++++++++--- .../Club74/Mitarbeiterauslastung.designer.cs | 20 +- .../Mitarbeiterstundenkonto.designer.cs | 97 +- ReportImp/Club74/ServiceInvoiceReport.resx | 34661 +++++++++++++--- ReportImp/Club74/ServicesOverviewReport.resx | 2324 +- ReportImp/Club74/SettlementReport.resx | 34661 +++++++++++++--- ReportImp/Club74/SettlementReport2.resx | 34661 +++++++++++++--- .../Validation/ServiceRecordValidator.cs | 4 + ReportImp/Club74/briefbogenOkt2020.jpg | Bin 0 -> 1787387 bytes ReportImp/Club74/logoOkt2020.png | Bin 0 -> 77317 bytes .../GenderBeWoReports.csproj | 9 + .../SettlementReport.Designer.cs | 686 +- .../GenderBeWoReports/SettlementReport.cs | 142 + .../GenderBeWoReports/SettlementReport.resx | 201 +- .../GenderBeWoReports/SettlementReport2.cs | 64 + .../SettlementReport2.designer.cs | 1012 + .../GenderBeWoReports/SettlementReport2.resx | 128 + .../Invoicing/DefaultInvoiceCreation.cs | 31 +- .../KuKLWLSettlementInvoiceCreation.cs | 525 +- .../Reporting/CustomReportCreator.cs | 21 +- .../Invoicing/CustomInvoiceFactory.cs | 2 +- ...CustomMitarbeiterstundenkontoBerechnung.cs | 76 + .../Mitarbeiterstundenkonto.cs | 28 + .../Mitarbeiterstundenkonto.designer.cs | 717 + .../Mitarbeiterstundenkonto.resx | 123 + .../SozialbueroBorggreve.csproj | 29 + .../SozialbueroBorggreve/Teamstundenkonto.cs | 28 + .../Teamstundenkonto.designer.cs | 897 + .../Teamstundenkonto.resx | 123 + .../Validation/ServiceRecordValidator.cs | 25 + .../InvoiceCustomerReport.Designer.cs | 114 +- .../InvoiceCustomerReport.cs | 34 + .../InvoiceCustomerReport.resx | 2 +- Service/Plugins/PluginLoader.cs | 8 +- .../OperationsServiceImp.cs | 1 + 82 files changed, 159276 insertions(+), 27151 deletions(-) rename BeWo/View/Detail/Report/{ServicesReportView.xaml => ServicesReportViewAlt.xaml} (98%) rename BeWo/View/Detail/Report/{ServicesReportView.xaml.cs => ServicesReportViewAlt.xaml.cs} (96%) create mode 100644 ReportImp/BeWoDellbrueck/SupportConceptReport.Designer.cs create mode 100644 ReportImp/BeWoDellbrueck/SupportConceptReport.cs create mode 100644 ReportImp/BeWoDellbrueck/SupportConceptReport.resx create mode 100644 ReportImp/BellaDonna/Invoicing/CustomInvoiceNumberGenerator.cs create mode 100644 ReportImp/BellaDonna/Rechnung67.Designer.cs create mode 100644 ReportImp/BellaDonna/Rechnung67.cs create mode 100644 ReportImp/BellaDonna/Rechnung67.resx create mode 100644 ReportImp/BellaDonna/SettlementReport.Designer.cs create mode 100644 ReportImp/BellaDonna/SettlementReport.cs create mode 100644 ReportImp/BellaDonna/SettlementReport.resx create mode 100644 ReportImp/Club74/briefbogenOkt2020.jpg create mode 100644 ReportImp/Club74/logoOkt2020.png create mode 100644 ReportImp/GenderBeWoReports/SettlementReport2.cs create mode 100644 ReportImp/GenderBeWoReports/SettlementReport2.designer.cs create mode 100644 ReportImp/GenderBeWoReports/SettlementReport2.resx create mode 100644 ReportImp/SozialbueroBorggreve/CustomMitarbeiterstundenkontoBerechnung.cs create mode 100644 ReportImp/SozialbueroBorggreve/Mitarbeiterstundenkonto.cs create mode 100644 ReportImp/SozialbueroBorggreve/Mitarbeiterstundenkonto.designer.cs create mode 100644 ReportImp/SozialbueroBorggreve/Mitarbeiterstundenkonto.resx create mode 100644 ReportImp/SozialbueroBorggreve/Teamstundenkonto.cs create mode 100644 ReportImp/SozialbueroBorggreve/Teamstundenkonto.designer.cs create mode 100644 ReportImp/SozialbueroBorggreve/Teamstundenkonto.resx create mode 100644 ReportImp/SozialbueroBorggreve/Validation/ServiceRecordValidator.cs diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index f90c09a7b..54c9676bc 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -43,12 +43,12 @@ de-DE BeWoPlaner beyondSoft GmbH - 2.0.1.186 + 2.0.1.187 true publish.htm false true - 187 + 188 2.0.1.%2a false true @@ -1512,7 +1512,7 @@ MSBuild:Compile Designer - + Designer MSBuild:Compile MSBuild:Compile @@ -2037,8 +2037,8 @@ ServiceRecordView2.xaml - - ServicesReportView.xaml + + ServicesReportViewAlt.xaml ViewMailView.xaml diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 358813904..b7427ad98 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -186,6 +186,7 @@ namespace BeWo bool isServiceRecordNoticeMandatory = true; bool isPasswordSecurityActiv = false; bool showServiceRecordsDistanceFields = false; + bool showBetrag = false; bool showHilfeplanBezeichnung = false; bool showArbeitszeiten = false; bool showCustomerDistanceFields = false; @@ -313,6 +314,12 @@ namespace BeWo showServiceRecordsDistanceFields = true; } + val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowBetrag"); + if (val != null && val.Equals("1")) + { + showBetrag = true; + } + val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, "ShowHilfeplanBezeichnung"); if (val != null && val.Equals("1")) { @@ -486,6 +493,7 @@ namespace BeWo AppSettings.ZeiterfassungsSchwellwert = zeiterfassungsSchwellwert; AppSettings.TimeRecordingMenuName = timeRecordingMenuName; AppSettings.ShowDistanceFields = showServiceRecordsDistanceFields; + AppSettings.ShowBetrag = showBetrag; AppSettings.ShowHilfeplanBezeichnung = showHilfeplanBezeichnung; AppSettings.ShowArbeitszeiten = showArbeitszeiten; AppSettings.ShowSignatures = showSignatures; @@ -538,9 +546,9 @@ namespace BeWo //{ // url += "/service45"; //} - if (url.IndexOf("/servicesbd") < 0) + if (url.IndexOf("/service") < 0) { - url += "/servicesbd"; + url += "/service"; } return new Uri(String.Format("https://{0}", url)); diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs index 90f7c997f..af5de27b2 100644 --- a/BeWo/Core/BeWoUtils.cs +++ b/BeWo/Core/BeWoUtils.cs @@ -1305,8 +1305,8 @@ namespace BeWo.Core UpdateSearchViewObjectList(fls2.customerSearchView, updatedCustomer); } - var serv2 = serv as ServicesReportView; - if(serv != null) + var serv2 = serv as ServicesReportViewAlt; + if(serv2 != null) { if(serv2.Customer != null) { @@ -1371,7 +1371,7 @@ namespace BeWo.Core UpdateSearchViewObjectList(fls2.employeeSearchView, updatedEmployee); } - if(serv is ServicesReportView serv2) + if(serv is ServicesReportViewAlt serv2) { if(serv2.Employee != null) { @@ -1390,7 +1390,7 @@ namespace BeWo.Core var updatedOrganisation = new CompactOrganisationDC(); ServiceFacade.DoCustomerServiceSync(s => updatedOrganisation = s.LoadOrganisationCompact((pUpdatedObject as CompactOrganisationDC).OrganisationOid)); - if(serv is ServicesReportView serv2) + if(serv is ServicesReportViewAlt serv2) { if(serv2.Organisation != null) { diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs index 697fe98f4..814287163 100644 --- a/BeWo/Core/Config/AppSettings.cs +++ b/BeWo/Core/Config/AppSettings.cs @@ -315,6 +315,8 @@ namespace BeWo.Core.Config public bool ShowDistanceFields { get; set; } + public bool ShowBetrag { get; set; } + public bool ShowHilfeplanBezeichnung { get; set; } public bool ShowArbeitszeiten { get; set; } diff --git a/BeWo/View/Detail/Report/ServicesReportView.xaml b/BeWo/View/Detail/Report/ServicesReportViewAlt.xaml similarity index 98% rename from BeWo/View/Detail/Report/ServicesReportView.xaml rename to BeWo/View/Detail/Report/ServicesReportViewAlt.xaml index e62b24960..ca5556dbd 100644 --- a/BeWo/View/Detail/Report/ServicesReportView.xaml +++ b/BeWo/View/Detail/Report/ServicesReportViewAlt.xaml @@ -1,200 +1,200 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -