From 15c91ecaec7a8fd5f55ea0a698f8b17d7b53c2c3 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 14 Sep 2017 19:03:26 +0200 Subject: [PATCH] dies und das --- BeWo/LoginControl.xaml.cs | 6 + BeWo/Styles/OrangeBlack.xaml | 1 + BeWo/View/Detail/ServiceRecordView2.xaml | 6 +- BeWo/View/Detail/ServiceRecordView2.xaml.cs | 40 +- Data/Access/SearchDAO.cs | 15 +- Model/Changes_2017_09_05.txt | 2 +- Report/DefaultReportCreator.cs | 8 +- .../KassenbuchReport.Designer.cs | 19 +- Report/DefaultReports/SupportConceptReport.cs | 4 + Report/ReportObjects/InvoiceCustomerRO.cs | 3 + .../ReportObjects/MitarbeiterauslastungRO.cs | 124 +- Report/ReportObjects/ServiceInvoiceRO.cs | 6 +- Report/ReportObjects/ServiceRecordListRO.cs | 123 +- Report/ReportObjects/ServicesOverviewRO.cs | 3 + Report/ReportObjects/Settlement2RO.cs | 3 + Report/ReportObjects/SupportConceptListRO.cs | 15 +- .../InvoiceCustomerReport.Designer.cs | 1296 ++++---- ReportImp/AdikKleve/InvoiceCustomerReport.cs | 36 +- ReportImp/AdikKleve/Properties/licenses.licx | 1 + .../ServiceInvoiceReport.Designer.cs | 1533 ++++----- ReportImp/AdikKleve/ServiceInvoiceReport.cs | 71 +- .../AdikKleve/SettlementReport.Designer.cs | 1920 ++++++------ ReportImp/AdikKleve/SettlementReport.cs | 39 +- .../AdikKleve/SettlementReport2.Designer.cs | 1744 +++++------ ReportImp/AdikKleve/SettlementReport2.cs | 44 + ReportImp/ApiBerlin/ApiBerlin.csproj | 1 + .../BetreutesWohnenAmRheinReports.csproj | 11 +- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 831 +++-- .../ServicesOverviewReport.cs | 20 +- ReportImp/Club74/Properties/licenses.licx | 1 + .../Club74/SupportConceptReport.Designer.cs | 13 +- ReportImp/DerKarren/Properties/licenses.licx | 1 + .../FaerberReports/FaerberReports.csproj | 38 +- ReportImp/FaerberReports/SollIstAuswertung.cs | 93 - .../SollIstAuswertung.designer.cs | 510 --- .../FaerberReports/SollIstAuswertung.resx | 123 - .../FlingernMobilReports.csproj | 10 + .../AuswertungEingliederungshilfe.cs | 8 +- .../AuswertungSelbstzahler.cs | 16 +- .../HphBersenbrueckFreizeitUndReisen.csproj | 10 + .../ServiceRecordListReport.Designer.cs | 59 +- .../IntegraReports/Properties/licenses.licx | 1 + .../SettlementReport.Designer.cs | 2743 +++++++++-------- .../SettlementReport2.designer.cs | 17 +- .../KetteReports/Properties/licenses.licx | 1 + .../KetteReports/QueryListReport.Designer.cs | 105 +- ReportImp/KetteReports/QueryListReport.cs | 135 +- .../SozPsychErfassungBeratungRO.cs | 8 +- .../LebenshilfeAhrweiler.csproj | 4 + .../Properties/licenses.licx | 1 + .../Sammelrechnung.Designer.cs | 546 ++-- .../LebenshilfeAhrweiler/Sammelrechnung.cs | 4 + .../ServicesOverviewReport.cs | 547 ++-- .../LebenshilfeDuisburgServicePlus.csproj | 2 + .../PsychosozialerTraegervereinReports.csproj | 1 + ReportImp/SPZLeverkusen/SPZLeverkusen.csproj | 10 + .../ServiceInvoiceReport.Designer.cs | 29 +- .../SPZLeverkusen/ServiceInvoiceReport.cs | 29 +- .../SPZLeverkusen/ServiceInvoiceReport.resx | 2 +- ReportImp/SeWo/OverlappingServiceRecords.cs | 73 +- .../OverlappingServiceRecords.designer.cs | 787 ++--- ReportImp/SeWo/Properties/licenses.licx | 1 + .../InvoiceCustomerReport.Designer.cs | 35 +- .../SigncomReports/InvoiceCustomerReport.resx | 2083 ++----------- .../SigncomReports/Properties/licenses.licx | 1 + .../SettlementReport.Designer.cs | 10 +- .../SigncomReports/SettlementReport.resx | 2079 +------------ .../SDNHomeContentGenerator.cs | 8 + .../SozialeDiensteNiederrhein.csproj | 1 + .../FlsAuswertungJh.cs | 64 +- .../FlsAuswertungJh.designer.cs | 2 +- .../Properties/licenses.licx | 1 + ...ozialeDienstleistungenBeckerReports.csproj | 1 + .../Properties/licenses.licx | 1 + ...zialeDienstleistungenGessnerReports.csproj | 9 + .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 1253 ++++---- .../ServicesOverviewReport.cs | 20 +- .../ReportServiceImp.cs | 15 +- .../IBPLVRSettlementInvoiceCreation.cs | 1 - Service/Plugins/HomeContentGenerator.cs | 36 +- Service/Plugins/PluginLoader.cs | 46 +- .../ServiceRecordDurationCalculator.cs | 4 + Service/Plugins/ServiceRecordValidator.cs | 137 +- .../Plugins/SupportConceptAnalysisCreator.cs | 534 ++-- .../AnalysisServiceImp.cs | 4 +- .../ServiceImplementations/UserServiceImp.cs | 9 +- 88 files changed, 8501 insertions(+), 11708 deletions(-) delete mode 100644 ReportImp/FaerberReports/SollIstAuswertung.cs delete mode 100644 ReportImp/FaerberReports/SollIstAuswertung.designer.cs delete mode 100644 ReportImp/FaerberReports/SollIstAuswertung.resx diff --git a/BeWo/LoginControl.xaml.cs b/BeWo/LoginControl.xaml.cs index a904c7ece..5f39bb30f 100644 --- a/BeWo/LoginControl.xaml.cs +++ b/BeWo/LoginControl.xaml.cs @@ -272,6 +272,12 @@ namespace BeWo gridLogin.Height += 25; } + private bool IsNet45OrNewer() + { + // Class "ReflectionContext" exists from .NET 4.5 onwards. + return Type.GetType("System.Reflection.ReflectionContext", false) != null; + } + private bool CheckStatusMessage(BeWoProfile profile) { diff --git a/BeWo/Styles/OrangeBlack.xaml b/BeWo/Styles/OrangeBlack.xaml index 230ac45a1..2b0139cd7 100644 --- a/BeWo/Styles/OrangeBlack.xaml +++ b/BeWo/Styles/OrangeBlack.xaml @@ -130,6 +130,7 @@ -->