From 504e36d97bb4e04c9fc477053f5139223283401e Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Wed, 10 Apr 2024 10:21:34 +0200 Subject: [PATCH] Fixed small issues when creating a new ship --- src/BreCalClient/EditShipDialog.xaml.cs | 4 ++-- src/BreCalClient/ShipListDialog.xaml.cs | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/BreCalClient/EditShipDialog.xaml.cs b/src/BreCalClient/EditShipDialog.xaml.cs index 750f034..db0799a 100644 --- a/src/BreCalClient/EditShipDialog.xaml.cs +++ b/src/BreCalClient/EditShipDialog.xaml.cs @@ -28,7 +28,7 @@ namespace BreCalClient private void buttonOK_Click(object sender, RoutedEventArgs e) { - this.Ship.Name = this.textBoxName.Text.Trim(); + this.Ship.Name = this.textBoxName.Text.ToUpper().Trim(); if (this.comboBoxParticipants.SelectedItem != null) { @@ -40,7 +40,7 @@ namespace BreCalClient this.Ship.IsTug = false; } this.Ship.Imo = this.integerUpDownIMO.Value; - this.Ship.Callsign = this.textBoxCallsign.Text.Trim(); + this.Ship.Callsign = this.textBoxCallsign.Text.ToUpper().Trim(); this.Ship.Length = (float?) this.doubleUpDownLength.Value; this.Ship.Width = (float?) this.doubleUpDownWidth.Value; this.DialogResult = true; diff --git a/src/BreCalClient/ShipListDialog.xaml.cs b/src/BreCalClient/ShipListDialog.xaml.cs index d50ef32..b08d6f7 100644 --- a/src/BreCalClient/ShipListDialog.xaml.cs +++ b/src/BreCalClient/ShipListDialog.xaml.cs @@ -83,7 +83,7 @@ namespace BreCalClient } } - private void DataGridShips_CreateRequested() + private async void DataGridShips_CreateRequested() { ShipModel shipModel = new ShipModel(new Ship()); EditShipDialog esd = new() @@ -96,11 +96,15 @@ namespace BreCalClient { try { - this.ShipApi?.ShipsCreateAsync(shipModel.Ship); - this.dataGridShips.ItemsSource = null; - BreCalLists.AllShips.Add(shipModel); - BreCalLists.Ships.Add(shipModel); - this.dataGridShips.ItemsSource = BreCalLists.AllShips; + if (this.ShipApi != null) + { + Id id = await this.ShipApi.ShipsCreateAsync(shipModel.Ship); + shipModel.Ship.Id = id.VarId; + this.dataGridShips.ItemsSource = null; + BreCalLists.AllShips.Add(shipModel); + BreCalLists.Ships.Add(shipModel); + this.dataGridShips.ItemsSource = BreCalLists.AllShips; + } } catch (Exception ex) {