From f76bcf3cbbc86df7753159fe262d33c32e043baa Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Tue, 26 Dec 2023 17:43:54 +0100 Subject: [PATCH] Changed strings labels and colors for test version --- misc/BreCalApi.cs | 4 ++-- src/BreCalClient/App.config | 2 +- src/BreCalClient/BreCalClient.csproj | 2 +- src/BreCalClient/Properties/Settings.Designer.cs | 2 +- src/BreCalClient/Properties/Settings.settings | 2 +- src/BreCalClient/ShipcallControl.xaml | 2 +- src/BreCalClient/ShipcallControl.xaml.cs | 12 ++++++------ src/server/BreCal/local_db.py | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs index 741fbf4..6cdda11 100644 --- a/misc/BreCalApi.cs +++ b/misc/BreCalApi.cs @@ -3582,7 +3582,7 @@ namespace BreCalClient.misc.Client { Proxy = null; UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.0.0/csharp"); - BasePath = "https://brecaldevel.bsmd-emswe.eu"; + BasePath = "https://brecaltest.bsmd-emswe.eu"; DefaultHeaders = new ConcurrentDictionary(); ApiKey = new ConcurrentDictionary(); ApiKeyPrefix = new ConcurrentDictionary(); @@ -3590,7 +3590,7 @@ namespace BreCalClient.misc.Client { { new Dictionary { - {"url", "https://brecaldevel.bsmd-emswe.eu"}, + {"url", "https://brecaltest.bsmd-emswe.eu"}, {"description", "Test server hosted on vcup"}, } } diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config index 97e0e29..dd4db10 100644 --- a/src/BreCalClient/App.config +++ b/src/BreCalClient/App.config @@ -11,7 +11,7 @@ - #1D751F + #751D1F !!Bremen calling Testversion!! diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj index 3d05079..375d49a 100644 --- a/src/BreCalClient/BreCalClient.csproj +++ b/src/BreCalClient/BreCalClient.csproj @@ -13,7 +13,7 @@ Bremen calling client A Windows WPF client for the Bremen calling API. containership.ico - BreCalDevelClient + BreCalTestClient diff --git a/src/BreCalClient/Properties/Settings.Designer.cs b/src/BreCalClient/Properties/Settings.Designer.cs index f965487..4e6806f 100644 --- a/src/BreCalClient/Properties/Settings.Designer.cs +++ b/src/BreCalClient/Properties/Settings.Designer.cs @@ -25,7 +25,7 @@ namespace BreCalClient.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("#1D751F")] + [global::System.Configuration.DefaultSettingValueAttribute("#751D1F")] public string BG_COLOR { get { return ((string)(this["BG_COLOR"])); diff --git a/src/BreCalClient/Properties/Settings.settings b/src/BreCalClient/Properties/Settings.settings index c5c4c3a..d80dbf9 100644 --- a/src/BreCalClient/Properties/Settings.settings +++ b/src/BreCalClient/Properties/Settings.settings @@ -3,7 +3,7 @@ - #1D751F + #751D1F !!Bremen calling Testversion!! diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml index 3aee29c..1e642d4 100644 --- a/src/BreCalClient/ShipcallControl.xaml +++ b/src/BreCalClient/ShipcallControl.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:p = "clr-namespace:BreCalClient.Resources" xmlns:sets="clr-namespace:BreCalClient.Properties" - xmlns:db="clr-namespace:BreCalClient;assembly=BreCalDevelClient" + xmlns:db="clr-namespace:BreCalClient;assembly=BreCalTestClient" mc:Ignorable="d" d:DesignHeight="120" d:DesignWidth="800" Loaded="UserControl_Loaded"> diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs index 6ce8681..ef76b8a 100644 --- a/src/BreCalClient/ShipcallControl.xaml.cs +++ b/src/BreCalClient/ShipcallControl.xaml.cs @@ -210,13 +210,13 @@ namespace BreCalClient switch (this.ShipcallControlModel?.Shipcall?.Type) { case 1: // incoming - this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_down_red.png")); + this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_down_red.png")); break; case 2: // outgoing - this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_up_blue.png")); + this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_up_blue.png")); break; case 3: // shifting - this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_right_green.png")); + this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_right_green.png")); break; default: break; @@ -225,13 +225,13 @@ namespace BreCalClient switch(this.ShipcallControlModel?.LightMode) { case ShipcallControlModel.TrafficLightMode.GREEN: - this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/check.png")); + this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/check.png")); break; case ShipcallControlModel.TrafficLightMode.YELLOW: - this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/sign_warning.png")); + this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/sign_warning.png")); break; case ShipcallControlModel.TrafficLightMode.RED: - this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/delete2.png")); + this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/delete2.png")); break; default: break; diff --git a/src/server/BreCal/local_db.py b/src/server/BreCal/local_db.py index 85dff68..baa0499 100644 --- a/src/server/BreCal/local_db.py +++ b/src/server/BreCal/local_db.py @@ -11,7 +11,7 @@ def initPool(instancePath): try: global config_path if(config_path == None): - config_path = os.path.join(instancePath,'../../../secure/connection_data_devel.json'); + config_path = os.path.join(instancePath,'../../../secure/connection_data_test.json'); print (config_path)