dschick/git_brcal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a bug where complete shiplist was selectable instead of only non-deleted ships after closing the shiplist editor

Browse Source
This commit is contained in:
Daniel Schick 2024-04-22 09:18:54 +02:00
parent 82c9b14f73
commit d54140e397
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BreCalClient/EditShipcallControl.xaml.cs
View File

@ -396,7 +396,7 @@ namespace BreCalClient
// reload combobox // reload combobox
this.comboBoxShip.ItemsSource = null; this.comboBoxShip.ItemsSource = null;
this.comboBoxShip.ItemsSource = BreCalLists.AllShips; this.comboBoxShip.ItemsSource = BreCalLists.Ships;
} }
#endregion #endregion

16
src/BreCalClient/MainWindow.xaml.cs
View File

@ -269,9 +269,13 @@ namespace BreCalClient
// if this was an arrival, create the matching departure call and open it // if this was an arrival, create the matching departure call and open it
if (esc.ShipcallModel.Shipcall?.Type == ShipcallType.Arrival) if (esc.ShipcallModel.Shipcall?.Type == ShipcallType.Arrival)
{ {
ShipcallControlModel scmOut = new(); ShipcallControlModel scmOut = new()
scmOut.Shipcall = new(); {
scmOut.Shipcall.Type = ShipcallType.Departure; Shipcall = new()
{
Type = ShipcallType.Departure
}
};
scmOut.Shipcall.ShipId = esc.ShipcallModel.Shipcall.ShipId; scmOut.Shipcall.ShipId = esc.ShipcallModel.Shipcall.ShipId;
scmOut.Ship = esc.ShipcallModel.Ship; scmOut.Ship = esc.ShipcallModel.Ship;
DateTime eta = esc.ShipcallModel.Shipcall?.Eta ?? DateTime.Now; DateTime eta = esc.ShipcallModel.Shipcall?.Eta ?? DateTime.Now;
@ -292,8 +296,10 @@ namespace BreCalClient
private void buttonInfo_Click(object sender, RoutedEventArgs e) private void buttonInfo_Click(object sender, RoutedEventArgs e)
{ {
AboutDialog ad = new(); AboutDialog ad = new()
ad.LoginResult = this._loginResult; {
LoginResult = this._loginResult
};
ad.ChangePasswordRequested += async (oldPw, newPw) => ad.ChangePasswordRequested += async (oldPw, newPw) =>
{ {
if (_loginResult != null) if (_loginResult != null)

2
src/BreCalClient/ShipListDialog.xaml.cs
View File

@ -90,7 +90,7 @@ namespace BreCalClient
private async void DataGridShips_CreateRequested() private async void DataGridShips_CreateRequested()
{ {
ShipModel shipModel = new ShipModel(new Ship()); ShipModel shipModel = new(new Ship());
EditShipDialog esd = new() EditShipDialog esd = new()
{ {
Ship = shipModel.Ship Ship = shipModel.Ship