Compare commits
2 Commits
754d6a78f4
...
58a3b735d7
| Author | SHA1 | Date | |
|---|---|---|---|
| 58a3b735d7 | |||
| be0753281d |
@ -582,12 +582,45 @@ namespace BreCalClient
|
|||||||
|
|
||||||
if(sfm.EtaFrom != null)
|
if(sfm.EtaFrom != null)
|
||||||
{
|
{
|
||||||
_ = this._visibleControlModels.RemoveAll(x => x.Shipcall?.Eta < sfm.EtaFrom);
|
_ = this._visibleControlModels.RemoveAll(x =>
|
||||||
|
{
|
||||||
|
Times? t = x.GetTimesForParticipantType(ParticipantType.AGENCY);
|
||||||
|
switch (x.Shipcall?.Type)
|
||||||
|
{
|
||||||
|
case (int)Extensions.TypeEnum.Incoming:
|
||||||
|
{
|
||||||
|
if ((t != null) && t.EtaBerth.HasValue) return t.EtaBerth.Value < sfm.EtaFrom;
|
||||||
|
return x.Shipcall?.Eta < sfm.EtaFrom;
|
||||||
|
}
|
||||||
|
default: // Shifting / Departing
|
||||||
|
{
|
||||||
|
if ((t != null) && t.EtdBerth.HasValue) return t.EtdBerth.Value < sfm.EtaFrom;
|
||||||
|
return x.Shipcall?.Etd < sfm.EtaFrom;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if(sfm.EtaTo != null)
|
if(sfm.EtaTo != null)
|
||||||
{
|
{
|
||||||
_ = this._visibleControlModels.RemoveAll(x => x.Shipcall?.Eta > sfm.EtaTo);
|
_ = this._visibleControlModels.RemoveAll(x =>
|
||||||
|
{
|
||||||
|
Times? t = x.GetTimesForParticipantType(ParticipantType.AGENCY);
|
||||||
|
DateTime refValue = sfm.EtaTo.Value.AddMinutes(1439); // 23:59
|
||||||
|
switch (x.Shipcall?.Type)
|
||||||
|
{
|
||||||
|
case (int)Extensions.TypeEnum.Incoming:
|
||||||
|
{
|
||||||
|
if ((t != null) && t.EtaBerth.HasValue) return t.EtaBerth.Value > refValue;
|
||||||
|
return x.Shipcall?.Eta > refValue;
|
||||||
|
}
|
||||||
|
default: // Shifting / Departing
|
||||||
|
{
|
||||||
|
if ((t != null) && t.EtdBerth.HasValue) return t.EtdBerth.Value > refValue;
|
||||||
|
return x.Shipcall?.Etd > refValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!_showCanceled ?? true) // canceled calls are filtered by default
|
if(!_showCanceled ?? true) // canceled calls are filtered by default
|
||||||
|
|||||||
@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
|||||||
-->
|
-->
|
||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ApplicationRevision>0</ApplicationRevision>
|
<ApplicationRevision>1</ApplicationRevision>
|
||||||
<ApplicationVersion>1.1.6.0</ApplicationVersion>
|
<ApplicationVersion>1.1.6.1</ApplicationVersion>
|
||||||
<BootstrapperEnabled>False</BootstrapperEnabled>
|
<BootstrapperEnabled>False</BootstrapperEnabled>
|
||||||
<Configuration>Release</Configuration>
|
<Configuration>Release</Configuration>
|
||||||
<CreateWebPageOnPublish>True</CreateWebPageOnPublish>
|
<CreateWebPageOnPublish>True</CreateWebPageOnPublish>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user