diff --git a/.gitignore b/.gitignore
index bbd7a3a..83afcd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,44 +1,3 @@
-
-Skip to content
-Pull requests
-Issues
-Codespaces
-Marketplace
-Explore
-@danielschick
-github /
-gitignore
-Public
-
-Fork your own copy of github/gitignore
-
-Code
-Pull requests 371
-Actions
-Security
-
-    Insights
-
-Beta Try the new code view
-gitignore/VisualStudio.gitignore
-@n0099
-n0099 [VisualStudio.gitignore] remove a trailing space
-Latest commit 491040e Jan 26, 2022
-History
-165 contributors
-@shiftkey
-@arcresu
-@aroben
-@bbodenmiller
-@HassanHashemi
-@haacked
-@niik
-@AArnott
-@sayedihashimi
-@saschanaz
-@bdougie
-@OsirisTerje
-398 lines (319 sloc) 6.7 KB
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
@@ -75,40 +34,11 @@ bld/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# Visual Studio 2017 auto generated files
-Generated\ Files/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-# NUnit
-*.VisualState.xml
-TestResult.xml
-nunit-*.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# Benchmark Results
-BenchmarkDotNet.Artifacts/
-
-# .NET Core
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-# ASP.NET Scaffolding
-ScaffoldingReadMe.txt
-
-# StyleCop
-StyleCopReport.xml
-
 # Files built by Visual Studio
 *_i.c
 *_p.c
@@ -139,20 +69,6 @@ StyleCopReport.xml
 *.svclog
 *.scc
 
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
 # Visual Studio profiler
 *.psess
 *.vsp
@@ -162,108 +78,9 @@ ipch/
 # Visual Studio Trace Files
 *.e2e
 
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# AxoCover is a Code Coverage Tool
-.axoCover/*
-!.axoCover/settings.json
-
-# Coverlet is a free, cross platform Code Coverage Tool
-coverage*.json
-coverage*.xml
-coverage*.info
-
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
 # Click-Once directory
 publish/
 
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
-# *.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# NuGet Symbol Packages
-*.snupkg
-# The packages folder can be ignored because of Package Restore
-**/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-*.appx
-*.appxbundle
-*.appxupload
-
 # Visual Studio cache files
 # files ending in .cache can be ignored
 *.[Cc]ache
@@ -279,158 +96,33 @@ ClientBin/
 *.jfm
 *.pfx
 *.publishsettings
-orleans.codegen.cs
-
-# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-ServiceFabricBackup/
-*.rptproj.bak
 
 # SQL Server files
 *.mdf
 *.ldf
 *.ndf
 
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-*.rptproj.rsuser
-*- [Bb]ackup.rdl
-*- [Bb]ackup ([0-9]).rdl
-*- [Bb]ackup ([0-9][0-9]).rdl
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
 node_modules/
 
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
-
-# Visual Studio 6 auto-generated project file (contains which files were open etc.)
-*.vbp
-
-# Visual Studio 6 workspace and project file (working project files containing files to include in project)
-*.dsw
-*.dsp
-
-# Visual Studio 6 technical files
-*.ncb
-*.aps
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# CodeRush personal settings
-.cr/personal
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
 *.pyc
 
-# Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
-
-# Tabs Studio
-*.tss
-
-# Telerik's JustMock configuration file
-*.jmconfig
-
-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
-
-# OpenCover UI analysis results
-OpenCover/
-
-# Azure Stream Analytics local run output
-ASALocalRun/
-
-# MSBuild Binary and Structured Log
-*.binlog
-
-# NVidia Nsight GPU debugger configuration file
-*.nvuser
-
-# MFractors (Xamarin productivity tool) working folder
-.mfractor/
-
-# Local History for Visual Studio
-.localhistory/
 
 # Visual Studio History (VSHistory) files
 .vshistory/
 
-# BeatPulse healthcheck temp database
-healthchecksdb
-
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
-
-# Ionide (cross platform F# VS Code tools) working folder
-.ionide/
-
-# Fody - auto-generated XML schema
-FodyWeavers.xsd
-
 # VS Code files for those working on multiple tools
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-*.code-workspace
+.vscode/
+
+#!.vscode/settings.json
+#!.vscode/tasks.json
+#!.vscode/launch.json
+#!.vscode/extensions.json
+#*.code-workspace
 
 # Local History for Visual Studio Code
 .history/
-
-# Windows Installer files from build outputs
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
diff --git a/misc/copyprod.sh b/misc/copyprod.sh
index afa5092..2083bce 100644
--- a/misc/copyprod.sh
+++ b/misc/copyprod.sh
@@ -2,8 +2,8 @@
 # This script replaces all references to the development version with the test version
 # 1) Database references and paths
 
-git grep -I "connection_data_test.json"
-git grep -I "/var/www/brecal_test/"
+git grep -I "connection_data_test.json" -- '..' ':(exclude)*.sh'
+git grep -I "/var/www/brecal_test/" -- '..' ':(exclude)*.sh'
 
 # 2) Color references
 # Bar colors in client: (BG_COLOR)
@@ -11,11 +11,11 @@ git grep -I "/var/www/brecal_test/"
 # Test: #751D1F
 # Prod: #203864
 
-git grep -I "#751D1F" 
+git grep -I "#751D1F" -- '..' ':(exclude)*.sh'
 
 # 3) Assembly name references
 
-git grep -I "BreCalTestClient"
+git grep -I "BreCalTestClient" -- '..' ':(exclude)*.sh'
 
 echo "Proceed? [N/y]"
 read proceed
@@ -25,18 +25,18 @@ read proceed
 if [ "${proceed}" = "y" ]; then
 
     # 1. for database references and paths
-    git grep -I "connection_data_test.json" | xargs sed --in-place -e "s/connection_data_test.json/connection_data_prod.json/g"
-    git add $(git grep -I "connection_data_prod.json")
-    git grep -I "/var/www/brecal_test/" | xargs sed --in-place -e "s/\/var\/www\/brecal_test\//\/var\/www\/brecal\//g"
-    git add $(git grep -I "/var/www/brecal/")
+    git grep -I "connection_data_test.json" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/connection_data_test.json/connection_data_prod.json/g"
+    git add $(git grep -Il "connection_data_prod.json" -- '..' ':(exclude)*.sh')
+    git grep -I "/var/www/brecal_test/" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/\/var\/www\/brecal_test\//\/var\/www\/brecal\//g"
+    git add $(git grep -Il "/var/www/brecal/" -- '..' ':(exclude)*.sh')
 
     # 2. for color
-    git grep -Il "#751D1F" | xargs sed --in-place -e "s/#751D1F/#203864/g"
-    git add $(git grep -Il "#203864")
+    git grep -Il "#751D1F" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/#751D1F/#203864/g"
+    git add $(git grep -Il "#203864" -- '..' ':(exclude)*.sh')
 
     # 3. for assembly name
 
-    git grep -I "BreCalTestClient" | xargs sed --in-place -e "s/BreCalTestClient/BreCalClient/g"
-    git add $(git grep -I "BreCalClient")
+    git grep -I "BreCalTestClient" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/BreCalTestClient/BreCalClient/g"
+    git add $(git grep -Il "BreCalClient" -- '..' ':(exclude)*.sh')
 
 fi
diff --git a/misc/copytest.sh b/misc/copytest.sh
index 2cea439..d7bbd87 100644
--- a/misc/copytest.sh
+++ b/misc/copytest.sh
@@ -2,8 +2,8 @@
 # This script replaces all references to the development version with the test version
 # 1) Database references and paths
 
-git grep -I "connection_data_devel.json"
-git grep -I "/var/www/brecal_devel/"
+git grep -I "connection_data_devel.json" -- '..' ':(exclude)*.sh'
+git grep -I "/var/www/brecal_devel/" -- '..' ':(exclude)*.sh'
 
 # 2) Color references
 # Bar colors in client: (BG_COLOR)
@@ -11,11 +11,11 @@ git grep -I "/var/www/brecal_devel/"
 # Test: #751D1F
 # Prod: #203864
 
-git grep -I "#1D751F" 
+git grep -I "#1D751F" -- '..' ':(exclude)*.sh'
 
 # 3) Assembly name references
 
-git grep -I "BreCalDevelClient"
+git grep -I "BreCalDevelClient" -- '..' ':(exclude)*.sh'
 
 echo "Proceed? [N/y]"
 read proceed
@@ -25,18 +25,18 @@ read proceed
 if [ "${proceed}" = "y" ]; then
 
     # 1. for database references and paths
-    git grep -I "connection_data_devel.json" | xargs sed --in-place -e "s/connection_data_devel.json/connection_data_test.json/g"
-    git add $(git grep -I "connection_data_test.json")
-    git grep -I "/var/www/brecal_devel/" | xargs sed --in-place -e "s/\/var\/www\/brecal_devel\//\/var\/www\/brecal_test\//g"
-    git add $(git grep -I "/var/www/brecal_test/")
+    git grep -Il "connection_data_devel.json" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/connection_data_devel.json/connection_data_test.json/g"
+    git add $(git grep -Il "connection_data_test.json" -- '..' ':(exclude)*.sh')
+    git grep -Il "/var/www/brecal_devel/" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/\/var\/www\/brecal_devel\//\/var\/www\/brecal_test\//g"
+    git add $(git grep -Il "/var/www/brecal_test/" -- '..' ':(exclude)*.sh')
 
     # 2. for color
-    git grep -Il "#1D751F" | xargs sed --in-place -e "s/#1D751F/#751D1F/g"
-    git add $(git grep -Il "#751D1F")
+    git grep -Il "#1D751F" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/#1D751F/#751D1F/g"
+    git add $(git grep -Il "#751D1F" -- '..' ':(exclude)*.sh')
 
     # 3. for assembly name
 
-    git grep -I "BreCalDevelClient" | xargs sed --in-place -e "s/BreCalDevelClient/BreCalTestClient/g"
-    git add $(git grep -I "BreCalTestClient")
+    git grep -Il "BreCalDevelClient" -- '..' ':(exclude)*.sh' | xargs sed --in-place -e "s/BreCalDevelClient/BreCalTestClient/g"
+    git add $(git grep -Il "BreCalTestClient" -- '..' ':(exclude)*.sh')
 
 fi
diff --git a/src/BreCalClient/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index ffd82ee..0ed9c54 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -66,14 +66,14 @@
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
 
-            <ComboBox Name="comboBoxArrivalBerth" Grid.Column="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+            <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
                 <ComboBox.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemArrivalBerth" Click="contextMenuItemArrivalBerth_Click" />
                     </ContextMenu>
                 </ComboBox.ContextMenu>
             </ComboBox>
-            <ComboBox Name="comboBoxDepartureBerth" Grid.Column="0" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id">
+            <ComboBox Name="comboBoxArrivalBerth" Grid.Column="0" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id">
                 <ComboBox.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemDepartureBerth" Click="contextMenuItemDepartureBerth_Click" />
diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 041d16a..9c157e7 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -158,9 +158,17 @@ namespace BreCalClient
 
                 this.ShipcallModel.Shipcall.ShipId = ((Ship)this.comboBoxShip.SelectedItem).Id;
                 this.ShipcallModel.Ship = (Ship)this.comboBoxShip.SelectedItem;
-                this.ShipcallModel.Shipcall.ArrivalBerthId = (this.comboBoxArrivalBerth.SelectedItem != null) ? ((Berth)this.comboBoxArrivalBerth.SelectedItem).Id : null;
-                this.ShipcallModel.Shipcall.DepartureBerthId = (this.comboBoxDepartureBerth.SelectedItem != null) ? ((Berth)this.comboBoxDepartureBerth.SelectedItem).Id : null;
-                
+
+                if (this.ShipcallModel.Shipcall.Type != 3) // incoming, outgoing
+                {
+                    this.ShipcallModel.Shipcall.ArrivalBerthId = (this.comboBoxArrivalBerth.SelectedItem != null) ? ((Berth)this.comboBoxArrivalBerth.SelectedItem).Id : null;
+                    this.ShipcallModel.Shipcall.DepartureBerthId = (this.comboBoxDepartureBerth.SelectedItem != null) ? ((Berth)this.comboBoxDepartureBerth.SelectedItem).Id : null;
+                } 
+                else // shifting
+                {
+                    this.ShipcallModel.Shipcall.DepartureBerthId = (this.comboBoxArrivalBerth.SelectedItem != null) ? ((Berth)this.comboBoxArrivalBerth.SelectedItem).Id : null;
+                    this.ShipcallModel.Shipcall.ArrivalBerthId = (this.comboBoxDepartureBerth.SelectedItem != null) ? ((Berth)this.comboBoxDepartureBerth.SelectedItem).Id : null;
+                }
 
                 Participant? participant;
                 participant = (Participant?)this.comboBoxAgency.SelectedItem;
@@ -224,8 +232,17 @@ namespace BreCalClient
                 // this.textBoxVoyage.Text = this.ShipcallModel.Shipcall.Voyage;
                 this.datePickerETD.Value = this.ShipcallModel.Shipcall.Etd;
                 this.comboBoxShip.SelectedValue = this.ShipcallModel.Shipcall.ShipId;
-                this.comboBoxArrivalBerth.SelectedValue = this.ShipcallModel.Shipcall.ArrivalBerthId;
-                this.comboBoxDepartureBerth.SelectedValue = this.ShipcallModel.Shipcall.DepartureBerthId;
+
+                if (this.ShipcallModel.Shipcall.Type != 3) // incoming, outgoing
+                {
+                    this.comboBoxArrivalBerth.SelectedValue = this.ShipcallModel.Shipcall.ArrivalBerthId;
+                    this.comboBoxDepartureBerth.SelectedValue = this.ShipcallModel.Shipcall.DepartureBerthId;
+                }
+                else // shifting
+                {
+                    this.comboBoxArrivalBerth.SelectedValue = this.ShipcallModel.Shipcall.DepartureBerthId;
+                    this.comboBoxDepartureBerth.SelectedValue = this.ShipcallModel.Shipcall.ArrivalBerthId;
+                }
 
                 if (this.ShipcallModel.Shipcall.Participants == null) this.ShipcallModel.Shipcall.Participants = new();