src/BreCalClient/MainWindow.xaml.cs

@@ -582,45 +582,12 @@ namespace BreCalClient
 
             if(sfm.EtaFrom != null)
             {
-                _ = this._visibleControlModels.RemoveAll(x =>
+                _ = this._visibleControlModels.RemoveAll(x => x.Shipcall?.Eta < sfm.EtaFrom);
-                {
-                    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)
             {
-                _ = this._visibleControlModels.RemoveAll(x =>
+                _ = this._visibleControlModels.RemoveAll(x => x.Shipcall?.Eta > sfm.EtaTo);
-                {
-                    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

src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml

@@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.1.6.1</ApplicationVersion>
+    <ApplicationVersion>1.1.6.0</ApplicationVersion>
     <BootstrapperEnabled>False</BootstrapperEnabled>
     <Configuration>Release</Configuration>
     <CreateWebPageOnPublish>True</CreateWebPageOnPublish>