Merge branch 'bugfix/ui_fixes_1.1.2' into release/1.1.1

This commit is contained in:
Daniel Schick 2023-12-29 14:49:58 +01:00
commit 0f313e2c21
4 changed files with 14 additions and 2 deletions

View File

@ -93,6 +93,10 @@ namespace BreCalClient
{ {
this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPierside.SelectedIndex == 0) ? true : false; this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPierside.SelectedIndex == 0) ? true : false;
} }
else
{
this.ShipcallModel.Shipcall.PierSide = null;
}
this.Times.BerthInfo = this.textBoxBerthRemarks.Text.Trim(); this.Times.BerthInfo = this.textBoxBerthRemarks.Text.Trim();
this.Times.BerthId = (int?)this.comboBoxArrivalBerth.SelectedValue; this.Times.BerthId = (int?)this.comboBoxArrivalBerth.SelectedValue;

View File

@ -91,7 +91,11 @@ namespace BreCalClient
{ {
this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPierside.SelectedIndex == 0) ? true : false; this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPierside.SelectedIndex == 0) ? true : false;
} }
else
{
this.ShipcallModel.Shipcall.PierSide = null;
}
this.Times.BerthId = (int?)this.comboBoxDepartureBerth.SelectedValue; this.Times.BerthId = (int?)this.comboBoxDepartureBerth.SelectedValue;
this.Times.BerthInfo = this.textBoxBerthRemarks.Text.Trim(); this.Times.BerthInfo = this.textBoxBerthRemarks.Text.Trim();

View File

@ -94,6 +94,10 @@ namespace BreCalClient
{ {
this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPiersideArrival.SelectedIndex == 0) ? true : false; this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPiersideArrival.SelectedIndex == 0) ? true : false;
} }
else
{
this.ShipcallModel.Shipcall.PierSide = null;
}
this.Times.BerthInfo = this.textBoxBerthRemarksArrival.Text.Trim(); this.Times.BerthInfo = this.textBoxBerthRemarksArrival.Text.Trim();
this.Times.BerthId = (int?)this.comboBoxArrivalBerth.SelectedValue; this.Times.BerthId = (int?)this.comboBoxArrivalBerth.SelectedValue;

View File

@ -424,7 +424,7 @@
<data name="textPort" xml:space="preserve"> <data name="textPort" xml:space="preserve">
<value>Backbord</value> <value>Backbord</value>
</data> </data>
<data name="textStarBoard" xml:space="preserve"> <data name="textStarboard" xml:space="preserve">
<value>Steuerbord</value> <value>Steuerbord</value>
</data> </data>
</root> </root>