ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kleines Mergechen

Browse Source 
Merge branch 'feature_rene_18_ai'

# Conflicts:
#	BeWo/BeWo.csproj
#	BeWo/BeWoApp.xaml.cs
#	BeWo/ServiceProxy/GeneratedCustomerService.cs
#	BeWo/ServiceProxy/GeneratedEmployeeService.cs
#	BeWo/ServiceProxy/GeneratedOperationsService.cs
#	BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
#	BeWo/View/Detail/EmployeeView.xaml
#	BeWo/app.config
#	BeWoAllReports.sln
#	BeWoPlanerMobil.sln
#	Data/Access/SearchDAO.cs
#	Data/Data.csproj
#	Data/Security/UserRightHelper.cs
#	Server/Components/AICore/Prompt/SystemPrompts/Examples/TranscriptionService.cs
#	Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs
#	Service/ServiceImplementations/EmployeeServiceImp.cs
#	Shared/BeWoEntityEnums.cs
#	Shared/Core/EnumTranslations.cs
#	Shared/Core/GkvValidator.cs
#	Shared/Core/ValidatorExtended.cs
#	Shared/Shared.csproj
This commit is contained in:
Rene Evertz
2026-02-20 16:36:41 +01:00
parent c2738f1ead 9279d503b7
commit c5ba4bd0ad
566 changed files with 37369 additions and 21474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
BeWo/BeWoApp.xaml.cs
View File

@@ -36,6 +36,7 @@ using DevExpress.Xpf.Scheduling;
using DevExpress.XtraScheduler;
using System.ServiceModel;
using BeWo.View.Windows;
using System.Diagnostics;
namespace BeWo
{
@@ -51,18 +52,14 @@ namespace BeWo
private static EmployeeDC _LoggedOnEmployee;
private static UserDC _LoggedOnUser;
private static MandatorDC _Mandator;
private static bool _IsInDeveloperMode;
public static LoginControl LoginControl;
public static MainControl MainControl;
public static string ShortVersion = "3.30";
public static string Version = "Version 3.30";
public static string ShortVersion = "3.29";
public static string Version => BeWoAppInfo.BeWoAppVersion.ToString();
public static int RenderTier = 0;
public static bool IsInDesignMode = DesignerProperties.GetIsInDesignMode(new DependencyObject());
internal static string IpAddress = string.Empty;
internal static string Tenant = string.Empty;
internal static string ServerName = string.Empty;
@@ -82,17 +79,7 @@ namespace BeWo
public static BeWoApp CurrentBeWo => Current as BeWoApp;
public static Dictionary<string, string> ICD10Diagnosis { get; set; }
public static bool IsInDeveloperMode {
get => _IsInDeveloperMode;
set
{
if (IsInDeveloperMode == value)
return;
_IsInDeveloperMode = value;
CurrentBeWo.FirePropertyChanged(nameof(IsInDeveloperMode));
}
}
public static bool IsInDesignMode = DesignerProperties.GetIsInDesignMode(new DependencyObject());
public static EmployeeDC LoggedOnEmployee
{
@@ -675,8 +662,6 @@ namespace BeWo
//AppSettings.AllowGkvAbrechnung = true;
//AppSettings.AllowGkvAbrechnung = false;
//showInfoButtonInCalender = true;
//IsInDeveloperMode = true;
//IsInDeveloperMode = false;
//AppSettings.ModuleAiEnabled = true;
//AppSettings.ModuleAiSettingsEnabled = false;
AppSettings.IsSchedulerAllowed = true;
@@ -720,7 +705,7 @@ namespace BeWo
BS.Shared.Settings.ApplicationSettings.SupportConceptExpirationLimitInMonths = AppSettings.HilfeplanAuslaufAuswahl;
if (IsInDeveloperMode)
if (BeWoAppInfo.IsInAiDeveloperMode)
{
applyDeveloperMode();
}
@@ -793,9 +778,9 @@ namespace BeWo
//{
// url += "/service45";
//}
if (url.IndexOf("/service") < 0)
if (url.IndexOf("/service_ai") < 0)
{
url += "/service";
url += "/service_ai";
}
return new Uri(String.Format("https://{0}", url));
@@ -1081,6 +1066,17 @@ namespace BeWo
};
FrameworkElement.LanguageProperty.OverrideMetadata(typeof(FrameworkElement), new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag)));
BeWoAppInfo.BeWoAppVersion.TryActiveDeveloperMode(e.Args);
//if(e.Args.LastOrDefault(x => x.StartsWith("/timeout:") || x.StartsWith("--timeout:")) is string str)
//{
// var valuePart = str.Substring(str.IndexOf(':') + 1);
// if(int.TryParse(valuePart, out int parsedTimeout))
// {
// AiTimeout = parsedTimeout;
// }
//}
}
public static void ShowInfoMessage(string message)
@@ -1095,6 +1091,9 @@ namespace BeWo
public static void ShowErrorMessage(Exception e)
{
if (IsInDesignMode)
return;
if (e is FaultException<BeWoFault>)
{
var lBeWoFault = (e as FaultException<BeWoFault>).Detail;