diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index f809bea92..081177412 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -763,9 +763,9 @@ namespace BeWo //{ // url += "/service45"; //} - if (url.IndexOf("/service") < 0) + if (url.IndexOf("/service_ai") < 0) { - url += "/service2"; + url += "/service_ai"; } return new Uri(String.Format("https://{0}", url)); diff --git a/BeWo/BeWoAppInfo.cs b/BeWo/BeWoAppInfo.cs index c8e1f1d42..0b4dc842c 100644 --- a/BeWo/BeWoAppInfo.cs +++ b/BeWo/BeWoAppInfo.cs @@ -14,8 +14,8 @@ namespace BeWo static BeWoAppInfo() { var baseVersion = new Version(BeWoApp.ShortVersion); - var stage = BeWoClientReleaseStage.ProofOfConcept; - var stageVersion = new Version("1.5"); + var stage = BeWoClientReleaseStage.Sandbox; + var stageVersion = new Version("2.0"); var feature = BeWoClientFeature.AI; BeWoAppVersion = new BeWoAppVersion(baseVersion, stage, stageVersion, feature); diff --git a/BeWo/Core/BeWoAppVersion.cs b/BeWo/Core/BeWoAppVersion.cs index 867029ee1..5cca698f9 100644 --- a/BeWo/Core/BeWoAppVersion.cs +++ b/BeWo/Core/BeWoAppVersion.cs @@ -11,7 +11,7 @@ namespace BeWo.Core { public Version BaseVersion { get; } public BeWoClientReleaseStage Stage { get; } - public Version StageVersion { get; } + public Version FeatureVersion { get; } public BeWoClientFeature Feature { get; } public static bool IsInDeveloperMode { get; private set; } @@ -19,7 +19,7 @@ namespace BeWo.Core { BaseVersion = baseVersion; Stage = stage; - StageVersion = stageVersion; + FeatureVersion = stageVersion; Feature = feature; } @@ -41,24 +41,32 @@ namespace BeWo.Core public override string ToString() { - string result = $"Version {BaseVersion}"; + var sb = new StringBuilder(); + + sb.Append($"Version {BaseVersion}"); if (Stage == BeWoClientReleaseStage.Release) - return result; + return sb.ToString(); - result += $" {Stage.ToString().ToLower()} {StageVersion}"; + sb.Append(" "); if (Feature != BeWoClientFeature.None) { - result += $" ({Feature})"; + // https://stackoverflow.com/questions/9684619/label-doesnt-display-character + sb.Append(Feature.ToString().ToLower()); + sb.Append("__"); + sb.Append(FeatureVersion); + sb.Append("__"); } - if (Stage == BeWoClientReleaseStage.Sandbox) + sb.Append($"{Stage.ToString().ToLower()}"); + + if (Stage == BeWoClientReleaseStage.Sandbox || Stage == BeWoClientReleaseStage.ProofOfConcept) { - result += $" dev:{(IsInDeveloperMode ? "1" : "0")}"; + sb.Append($" (dev:{(IsInDeveloperMode ? "1" : "0")})"); } - return result; + return sb.ToString(); } } } diff --git a/BeWo/app.config b/BeWo/app.config index 55003482e..dc7575256 100644 --- a/BeWo/app.config +++ b/BeWo/app.config @@ -13,19 +13,19 @@ - + - + - + diff --git a/Host/Web.Deploy.config b/Host/Web.Deploy.config index f25f603bd..ce4eda5eb 100644 --- a/Host/Web.Deploy.config +++ b/Host/Web.Deploy.config @@ -400,5 +400,11 @@ + + + + + + \ No newline at end of file diff --git a/Server/Components/AICore/Context/SummaryParser/CsvContextSummaryParser.cs b/Server/Components/AICore/Context/SummaryParser/CsvContextSummaryParser.cs index 2a33e9d6f..40b6436f8 100644 --- a/Server/Components/AICore/Context/SummaryParser/CsvContextSummaryParser.cs +++ b/Server/Components/AICore/Context/SummaryParser/CsvContextSummaryParser.cs @@ -71,7 +71,7 @@ namespace AICore.Context.SummaryParser sb.AppendLine("#### **Zeiterfassungseinträge**"); sb.AppendLine(ToCsvString(fcs.ServiceRecords)); sb.AppendLine(); - sb.AppendLine("#### **Dokumentation**"); + sb.AppendLine("#### **Dokumentationfelder**"); sb.AppendLine(fcs.Dokutext); sb.AppendLine(); return sb.ToString(); diff --git a/Service/BeWoServiceEnums.cs b/Service/BeWoServiceEnums.cs index 5f47877c5..5e29c60f4 100644 --- a/Service/BeWoServiceEnums.cs +++ b/Service/BeWoServiceEnums.cs @@ -20,7 +20,6 @@ namespace BeWo.Service JsonErrorLogFilePath, ApiServiceTestFilePath, AiServiceLogFilePath, - AiRootPath, BeWoPlanerServiceRoot } diff --git a/Service/Core/PathHelper.cs b/Service/Core/PathHelper.cs index 3bb039fc2..4f27bac23 100644 --- a/Service/Core/PathHelper.cs +++ b/Service/Core/PathHelper.cs @@ -16,7 +16,6 @@ namespace BeWo.Service.Core => Path.Combine(GetAiPath(), "systemPrompts"); #endregion - private static string getRoot() => MergedConfig.GetSetting(WebConfigSetting.BeWoPlanerServiceRoot); }