From a74869de04edd7781dadfb45c9c9dc20a3104474 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 16 Oct 2020 13:02:29 +0200 Subject: [PATCH 1/2] CB, bugfixing neue Version --- BeWo/BeWo.csproj | 1 + BeWo/BeWoApp.xaml.cs | 4 +- BeWo/Core/Service/Cache.cs | 22 + BeWo/Core/Service/GoalService.cs | 1 + BeWo/LoginControl.xaml.cs | 8 +- .../Report/FlexibleReportEntryDetail.xaml | 2 +- .../Detail/Report/FlexibleReportView.xaml | 28 +- .../Detail/Report/FlexibleReportView.xaml.cs | 18 +- BeWo/ViewModel/SupportConceptVM.cs | 5 + ...hanges_2020_10_15_ServiceRecord Betrag.txt | 1 + ReportImp/BeWoWalzPaiva/BeWoWalzPaiva.csproj | 10 + .../SettlementReport2.Designer.cs | 1022 +++++++++++++++++ ReportImp/BeWoWalzPaiva/SettlementReport2.cs | 51 + .../BeWoWalzPaiva/SettlementReport2.resx | 808 +++++++++++++ .../SabGmbH/Export/CustomDataExporter.cs | 4 + ReportImp/SabGmbH/Export/EGeckoExporter.cs | 15 +- Service/Plugins/PluginLoader.cs | 6 +- 17 files changed, 1969 insertions(+), 37 deletions(-) create mode 100644 Model/Changes_2020_10_15_ServiceRecord Betrag.txt create mode 100644 ReportImp/BeWoWalzPaiva/SettlementReport2.Designer.cs create mode 100644 ReportImp/BeWoWalzPaiva/SettlementReport2.cs create mode 100644 ReportImp/BeWoWalzPaiva/SettlementReport2.resx diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index d29fd0693..c8d251d5d 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -116,6 +116,7 @@ + diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 3f601d337..358813904 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -43,8 +43,8 @@ namespace BeWo public static LoginControl LoginControl; public static MainControl MainControl; - - public static string Version = "Version 2.4.8 Test"; + public static string ShortVersion = "3"; + public static string Version = "Version 3.0 TEST"; public static int RenderTier = 0; diff --git a/BeWo/Core/Service/Cache.cs b/BeWo/Core/Service/Cache.cs index 1e7184a8c..9fe1669e2 100644 --- a/BeWo/Core/Service/Cache.cs +++ b/BeWo/Core/Service/Cache.cs @@ -352,6 +352,28 @@ namespace BeWo.Core.Service return ve; } + public void AddGoalEntry(ValueListEntryDC newdc) + { + if (newdc.ValueListEntryOid.HasValue) + { + var ve = GetGoalEntry(newdc.ValueListEntryOid.Value); + if (ve == null || !ve.ValueListEntryOid.HasValue) + { + if (mValueListEntryDict != null) + { + if (!mValueListEntryDict.ContainsKey(newdc.Type)) + { + mValueListEntryDict[newdc.Type] = new List(); + } + mValueListEntryDict[newdc.Type].Add(newdc); + + } + } + } + + + } + public ValueListEntryDC GetValueListEntry(ValueListEntryType type, long oid) { if (mValueListEntryDict == null || !mValueListEntryDict.ContainsKey(type)) diff --git a/BeWo/Core/Service/GoalService.cs b/BeWo/Core/Service/GoalService.cs index 93380853a..533f43abd 100644 --- a/BeWo/Core/Service/GoalService.cs +++ b/BeWo/Core/Service/GoalService.cs @@ -284,6 +284,7 @@ namespace BeWo.Core.Service public static void RecursiveSynchronousSCValueListEntrySave(SupportConceptGoalTreeItem treeItem) { var neuerDC = ServiceFacade.DoValueListServiceSync(s => s.InsertNewValueListEntry(treeItem.GoalEntryVM.CommitToDataContract())); + Cache.GetInstance().AddGoalEntry(neuerDC); InsertedGoals.Add(neuerDC); treeItem.GoalEntryVM = new ValueListEntryVM(neuerDC); treeItem.GoalEntryDC = neuerDC; diff --git a/BeWo/LoginControl.xaml.cs b/BeWo/LoginControl.xaml.cs index 171623dd5..91c826215 100644 --- a/BeWo/LoginControl.xaml.cs +++ b/BeWo/LoginControl.xaml.cs @@ -41,7 +41,7 @@ namespace BeWo private String GETSERVER_URL = "https://support.bewoplaner.de/api/getserver.php?k={0}&t=1"; - private String GETSTATUSMESSAGE_URL = "https://support.bewoplaner.de/api/getstate.php?k={0}&t=1"; + private String GETSTATUSMESSAGE_URL = "https://support.bewoplaner.de/api/getstate.php?k={0}&t=1&v={1}"; private String GETNETMESSAGE_URL = "https://support.bewoplaner.de/api/getxmlstate.php?k={0}&t=1"; @@ -760,19 +760,19 @@ namespace BeWo if (!isNet45OrNewer) { - if (!CheckStatusMessage(profile, String.Format(GETNETMESSAGE_URL, profile.Tenant))) + if (!CheckStatusMessage(profile, String.Format(GETNETMESSAGE_URL, profile.Tenant, BeWoApp.Version))) { return; } } #if DEBUG - if (!CheckStatusMessage(profile, String.Format(GETNETMESSAGE_URL, profile.Tenant))) + if (!CheckStatusMessage(profile, String.Format(GETSTATUSMESSAGE_URL, profile.Tenant, BeWoApp.ShortVersion))) { return; } #else - if (!CheckStatusMessage(profile, String.Format(GETSTATUSMESSAGE_URL, profile.Tenant))) + if (!CheckStatusMessage(profile, String.Format(GETSTATUSMESSAGE_URL, profile.Tenant, BeWoApp.Version))) { return; } diff --git a/BeWo/View/Detail/Report/FlexibleReportEntryDetail.xaml b/BeWo/View/Detail/Report/FlexibleReportEntryDetail.xaml index 5de402570..8c3fb0d44 100644 --- a/BeWo/View/Detail/Report/FlexibleReportEntryDetail.xaml +++ b/BeWo/View/Detail/Report/FlexibleReportEntryDetail.xaml @@ -23,7 +23,7 @@ - + diff --git a/BeWo/View/Detail/Report/FlexibleReportView.xaml b/BeWo/View/Detail/Report/FlexibleReportView.xaml index ca2d6ce7c..22530aee7 100644 --- a/BeWo/View/Detail/Report/FlexibleReportView.xaml +++ b/BeWo/View/Detail/Report/FlexibleReportView.xaml @@ -52,11 +52,11 @@