commit latest
This commit is contained in:
+1
-1
Submodule Common/LaaPackages updated: c2c6de72b4...e7aa3e2723
@@ -1,7 +1,4 @@
|
||||
using Xylem.Common.Ui.GenesisToolBox.Ctls;
|
||||
using Xylem.Common.Ui.GenesisToolBox.Infrastructure;
|
||||
|
||||
namespace Xylem.Common.Ui.GenesisToolBox
|
||||
namespace Xylem.Common.Ui.GenesisToolBox
|
||||
{
|
||||
using global::GenesisToolBox;
|
||||
|
||||
@@ -12,6 +9,8 @@ namespace Xylem.Common.Ui.GenesisToolBox
|
||||
using System.Windows.Forms;
|
||||
|
||||
using CommonCore.Consts;
|
||||
using Ctls;
|
||||
using Infrastructure;
|
||||
using Utils.Logging;
|
||||
using System.Collections.Generic;
|
||||
|
||||
@@ -28,8 +27,8 @@ namespace Xylem.Common.Ui.GenesisToolBox
|
||||
InitializeComponent();
|
||||
InitializeFormState();
|
||||
|
||||
menuItemOptions.Text = Software.UserName;
|
||||
Text = $@"{Text} {SoftwareVersion.Current.VersionString}";
|
||||
optionsMenuItem.Text = Software.UserName;
|
||||
Text = $"{Text} {SoftwareVersion.Current.VersionString}";
|
||||
var logger = NLogHelper.CreateOrGetLogger("GenesisToolBox");
|
||||
logger.Info($"GenesisToolBox {SoftwareVersion.Current}");
|
||||
|
||||
@@ -90,8 +89,9 @@ namespace Xylem.Common.Ui.GenesisToolBox
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show(@"GenesisToolBox" +
|
||||
@"Network Connection Error!" +
|
||||
MessageBox.Show("GenesisToolBox\n\n" +
|
||||
"Starting in OfflineMode\n\n" +
|
||||
"Your version (NA) could not be verified!\n\n" +
|
||||
ex.Message);
|
||||
|
||||
Close();
|
||||
@@ -107,8 +107,8 @@ namespace Xylem.Common.Ui.GenesisToolBox
|
||||
}
|
||||
if (!access)
|
||||
{
|
||||
MessageBox.Show(@"GenesisToolBox" +
|
||||
@"Your version licence is expired!" +
|
||||
MessageBox.Show("GenesisToolBox\n\n" +
|
||||
"Your version licence is expired!\n\n" +
|
||||
SoftwareVersion.Current);
|
||||
|
||||
Close();
|
||||
@@ -304,7 +304,7 @@ namespace Xylem.Common.Ui.GenesisToolBox
|
||||
|
||||
private void btnLegacyTestApp_Click(Object sender, EventArgs e)
|
||||
{
|
||||
var form = new FrmLegacyTestApp();
|
||||
var form = new FrmManCalibration();
|
||||
form.Show();
|
||||
form.Closed += Form_Closed;
|
||||
Hide();
|
||||
@@ -419,9 +419,7 @@ namespace Xylem.Common.Ui.GenesisToolBox
|
||||
/// </summary>
|
||||
private void SetSoftwareFunctions()
|
||||
{
|
||||
menuItemChangePwd.Enabled = Software.IsAutenticated;
|
||||
menuItemLogout.Enabled = Software.IsAutenticated;
|
||||
menuItemLogin.Enabled = !Software.IsAutenticated;
|
||||
changePassword.Enabled = Software.IsAutenticated;
|
||||
|
||||
btnSetup.Tag = SoftwareFunctions.GENERAL_SETUP;
|
||||
btnAlarm.Tag = SoftwareFunctions.GENERAL_ALARM;
|
||||
@@ -454,7 +452,7 @@ namespace Xylem.Common.Ui.GenesisToolBox
|
||||
Controls.Add(new Label()
|
||||
{
|
||||
Dock = DockStyle.Fill,
|
||||
Text = @"Genesis toolbox is currently not available.",
|
||||
Text = "Genesis toolbox is currently not available.",
|
||||
TextAlign = ContentAlignment.MiddleCenter,
|
||||
Font = new Font(FontFamily.GenericSansSerif, 10, FontStyle.Bold),
|
||||
ForeColor = Color.DarkRed,
|
||||
@@ -498,7 +496,7 @@ namespace Xylem.Common.Ui.GenesisToolBox
|
||||
}
|
||||
}
|
||||
|
||||
menuItemOptions.Text = Software.UserName;
|
||||
optionsMenuItem.Text = Software.UserName;
|
||||
}
|
||||
|
||||
private void ShowAvailableMenuItems(ToolStripMenuItem toolStripMenuItem)
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
namespace LaaProductionWeb.Blazor.Components.CSD.Models
|
||||
{
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
public readonly struct UIElement(string value)
|
||||
{
|
||||
public string UIId { get; } = Regex.Replace($"{value}", "[^a-zA-Z0-9]", "_").ToLower();
|
||||
|
||||
public string Value { get; } = value;
|
||||
|
||||
public override string ToString()
|
||||
=> this.Value;
|
||||
|
||||
public static implicit operator UIElement(string value)
|
||||
=> new (value);
|
||||
|
||||
public static implicit operator string(UIElement basis)
|
||||
=> basis.Value;
|
||||
}
|
||||
}
|
||||
@@ -40,7 +40,7 @@
|
||||
this.Bezeichnungen = [];
|
||||
this.Charcodes = [];
|
||||
|
||||
foreach (UIElement basis in this.vakoMerkmaleDbContext.GetBasisCodesForCSD(this.CSD))
|
||||
foreach (var basis in this.vakoMerkmaleDbContext.GetBasisCodesForCSD(this.CSD))
|
||||
{
|
||||
this.BasisCodes.Add(basis);
|
||||
}
|
||||
@@ -54,7 +54,7 @@
|
||||
this.Bezeichnungen = [];
|
||||
this.Charcodes = this.vakoMerkmaleDbContext.GetCharcodesForBezeichnung(this.Basis, this.Bezeichnung);
|
||||
|
||||
foreach (UIElement bezeichnung in this.vakoMerkmaleDbContext.GetBezeichnungenForBasis(this.Basis))
|
||||
foreach (var bezeichnung in this.vakoMerkmaleDbContext.GetBezeichnungenForBasis(this.Basis))
|
||||
{
|
||||
this.Bezeichnungen.Add(bezeichnung);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user