Notification endpoint now filters for participant_id and fixed parsing of event type enumeration array

Release pool connection handle und all circumstances especially also when a query fails
before the call is finished. This should avoid connection starvation.

fix prod. link

production fix

Fixed application path

.vscode/launch.json

@@ -12,12 +12,13 @@
             "env": {
                 "FLASK_APP": "src/server/BreCal",
                 "FLASK_DEBUG": "1",
-                "SECRET_KEY" : "zdiTz8P3jXOc7jztIQAoelK4zztyuCpJ" // https://randomkeygen.com/
+                "SECRET_KEY" : "zdiTz8P3jXOc7jztIQAoelK4zztyuCpJ", // https://randomkeygen.com/
+                "FLASK_RUN_PORT": "5000"
             },
             "args": [
-                "run" //,
-//                "--no-debugger",
-                //"--no-reload"
+                "run",
+                // "--no-debugger",
+                "--no-reload"
             ],
             "jinja": true,
             "justMyCode": true

docs/ApiValidationRules.md

@@ -0,0 +1,237 @@
+# Rest-API validation rules for the backend
+
+___
+
+* Rules defined here only apply to calls that change data (POST / PUT /DELETE requests)
+* Violation of these rules should result in 400 bad request
+* These are not high-level rules that change color of a data entry in the app
+
+## Change history
+
+|Date|Edit|Author|
+|--|--|--|
+| 2.2.24 | Document created, first draft | Daniel Schick |
+| 25.7.24 | Update for BC 1.4 and other changes | Daniel Schick |
+
+## Global constants and definitions
+
+### Participant type
+
+The participant type is a bit flag that encodes which user groups a participant belongs to. Note: A participant may belong to **multiple** groups so this flag has to be bitwise evaluated.
+
+|Value|Group|
+|-----|-----|
+| 1 | BSMD |
+| 2 | Terminal |
+| 4 | Pilot |
+| 8 | Agency |
+| 16 | Mooring |
+| 32 | Port authority |
+| 64 | Tug |
+
+### Participant flag
+
+The participant data record contains a field called "flag" which is also bitwise encoded. The purpose of this flag is to allow user authorization on a finer level. Currently the following flag(s) are defined:
+
+| Value | Significance |
+| ------|--------------|
+| 1 | If this flag is set on a shipcall record with participant type Agency (8), all participants of type BSMD (1) may edit the record.
+
+### Shipcall type
+
+The shipcall type which is set in the shipcall record may have the following values
+
+| Value | Meaning |
+|-------|---------|
+| 1 | Incoming |
+| 2 | Outgoing |
+| 3 | Shifting (changing berths) |
+
+## All queries
+
+### Token evaluation
+
+The identity of the caller can be retrieved from the token. This contains an id (="user id") and more importantly, the "participant_id". Every call is only allow if the user is properly authorized to perform the call or modify the dataset.
+
+At this time, authorization is performed on a participant level. This means that all users that belong to a particular participant have the same rights.
+
+### Modifying unknown entities
+
+PUT / DELETE calls referencing entities that are not found in the database will receive an 404 reply. This is already implemented in the underlying code and therefore not mentioned in this document. This evaluation should precede the API validation so in this document we assume the entities are existing.
+
+### Return value
+
+If a validation rule fails the call should return 400 (Bad request) including an error message in the following format:
+
+```json
+{
+    "error_field" : "A reference to the respective field(s) which have caused the error",
+    "error_description" : "Reason why this call failed"
+}
+```
+
+### Time values
+
+Date and date+time values are specified as text formatted in [RFC 3339](https://www.rfc-editor.org/rfc/rfc3339#section-5.6), e.g.
+
+```json
+{
+    "created" : "2024-01-27T18:00:21Z"
+}
+```
+
+Usually the "Z" is missing at the end indicating local time.
+
+Generally, times may not be updated to a value in the past. There are exception (see SHIPCALL PUT below).
+
+Times should also not be set to a value more than 1 year in the future. The reasoning is to prevent shipcalls to stick to the top of the list by implausible (or for the workings of Bremen calling irrelevant) values too far in the future.
+
+## /shipcall POST
+
+1. The call may only be performed by a user belonging to participant group type BSMD.
+2. Reference checking: The dataset includes multiple fields referring other tables. The validation must make sure the referenced entities exist. This includes the following fields:
+    | Field | Referenced table | Notes |
+    |-------|------------------| ----- |
+    | ship_id | ship |  |
+    | arrival_berth_id | berth | required if type is "arrival" (1) |
+    | departure_berth_id | berth | required if type is "departure" or "shifting" (2 or 3) |
+    | participants | participant | This is a list containing participant_id and type pairs with the following rules: 1. participant_id values may appear more once 2. types may only appear once, therefore there are a maximum of 7 elements in this list. |
+
+3. Check for reasonable values for the following fields:
+
+    | Field | Validation |
+    |-------|------------|
+    | eta | value must be in the future |
+    | type | value must be one of the values defined above |
+    | voyage | if set must be <= 16 chars and no special characters |
+    | etd | must be in the future |
+    | flags | must be a combination of the flags defined above |
+    | draft | 0 <= value <= 20 |
+    | tidal_window_from | value must be in the future |
+    | tidal_window_to | value must be in the future, value must be > tidal_window_from |
+    | recommended_tugs | 0 < value < 10 |
+    | canceled | optional on POST |
+    | evaluation | may not be set |
+    | evaluation_message | may not be set |
+    | created / modified | may not be set |
+
+#### Required fields
+
+* eta / etd (depending on value of type: 1: eta, 2: etd, 3: etd)
+* type
+* ship_id
+* arrival_berth_id / departure_berth_id (depending on type, see above)
+* assigned participant for agency
+
+## /shipcall PUT
+
+1. The call may only be performed by a user belonging to participant group type BSMD.
+2. If a agency is selected via the shipcall_participant_map entry, users of this agency may also edit the shipcall. Care has to be taken: The agency must have been set _before_ a member of the group may edit the record.
+In other words: no setting the agency and editing the record by a member of the agency within the same call.
+3. See value rules in /shipcall POST.
+   Exceptions:
+   a) Canceled may be set but only if not already set.
+   b) ETA/ETD may be in the past. This can happen if an agency has entered an ETA/ETD (times) in the future but
+      wants to edit fields of the shipcall record (e.g. the draft) but the shipcall was originally created with an ETA/ETD in the past
+4. A cancelled shipcall may not be changed (is logical delete)
+
+#### Required fields
+
+The id field is required, missing fields will not be updated.
+
+## /times POST
+
+1. A new dataset may only be created by a user _not_ belonging to participant group BSMD.
+2. A new dataset may only be created if a dataset of this type is not already present for the participant type.
+3. A new dataset may only be created if the user belongs to the participant group assigned to the shipcall with the appropriate type (see shipcall_participant_map). This actually trumps rule #1 but may return a different error message.
+4. Reference checking: The dataset includes multiple fields referring other tables. The validation must make sure the referenced entities exist. This includes the following fields:
+    | Field | Referenced table |
+    |-------|------------------|
+    | shipcall_id | shipcall |
+    | participant_id | participant |
+    | berth_id | berth |
+
+5. Check for reasonable values for the following fields:
+
+    | Field | Validation |
+    |-------|------------|
+    | eta_berth, etd_berth, lock_time, zone_entry, operations_start, operations_end | if set these values must be in the future|
+    | eta_interval_end, etd_interval_end | if set these values must be in the future. They must be larger than their ETA/ETD counterparts. |
+    | remarks, berth_info | must be <= 512 chars |
+    | participant_type | must not be BSMD |
+
+#### Required fields
+
+This depends on the shipcall and participant type:
+
+##### Incoming
+
+AGENCY, PILOT, PORT_AUTHORITY, MOORING, TUG:
+
+shipcall_id, participant_id, participant_type
+
+TERMINAL:
+
+shipcall_id, participant_id, participant_type
+
+##### Outgoing
+
+AGENCY, PILOT, PORT_AUTHORITY, MOORING, TUG:
+
+shipcall_id, participant_id, participant_type
+
+TERMINAL:
+
+shipcall_id, participant_id, participant_type
+
+##### Shifting
+
+AGENCY, PILOT, PORT_AUTHORITY, MOORING, TUG:
+
+shipcall_id, participant_id, participant_type
+
+TERMINAL:
+
+shipcall_id, participant_id, participant_type
+
+## /times PUT
+
+1. A dataset may only be changed by a user belonging to the same participant as the times dataset is referring to.
+2. See reference and value checking as specified in /times POST.
+3. The shipcall type may not be changed.
+
+#### Required fields
+
+The id field is required, missing fields will not be updated
+
+## /times DELETE
+
+1. A dataset may only be changed by a user belonging to the same participant as the times dataset is referring to.
+2. The dataset may not be deleted already.
+
+## /ship POST
+
+1. The call may only be performed by a user belonging to participant group type BSMD.
+2. A ship may only be added if there is no other ship with the same IMO number already present in the database.
+3. Check for reasonable values for the following fields:
+
+    | Field | Validation |
+    |-------|------------|
+    | name | Length < 64, no special characters |
+    | IMO | 7-digit number. See [here](https://de.wikipedia.org/wiki/IMO-Nummer) for clarification. |
+    | callsign | Length <= 8, no special characters |
+    | Length | 0 < value < 1000 |
+    | Width | 0 < value < 100 |
+    | bollard_pull | 0 < value < 500, only allowed if is_tug = 1 |
+
+## /ship PUT
+
+1. The call may only be performed by a user belonging to participant group type BSMD.
+2. The IMO number field may not be changed since it serves the purpose of a primary (matching) key.
+3. See value rules in /ship POST
+4. The id field is required, missing fields will not be updated
+
+## /ship DELETE
+
+1. The call may only be performed by a user belonging to participant group type BSMD.
+2. The dataset may not be deleted already.

misc/Ampelfunktion.md

@@ -0,0 +1,46 @@
+<img style="float: right;" src="logo_bremen_calling.png" />
+
+# Ampelfunktion Bremen Calling
+
+## Einleitung
+
+
+
+## Regeln
+
+[Zurück](../README.md)
+
+___
+
+
+| Ampelfunktionen | Beschreibung                                                          | Definition                                                                                                                                                                                                                                                                                                                                                        | Bemerkungen |
+|-----------------|-----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
+|                 |                                                                       |                                                                                                                                                                                                                                                                                                                                            |             |
+| 0001            | Nicht alle Zeiten sind zugeordnet                                     | Bedingungen:<br/> - Header der Zeile ist zugeordnet (Agentur, Festmacher usw.)<br/> - Zugeordnete Zeit ist leer                                                                                                                                                                                                                                                   |             |
+| 0001 - A        | Agentur / einkommend                                                  | times_agency:<br/> - participant_id = ausgefüllt<br/> - ETA Berth = leer<br/>___zum Zeitpunkt 20 Std vor___<br/> shipcall:<br/> - eta                                                                                                                                                                                                                             | gelb        |
+| 0001 - B        | Agentur / ausgehend + Verholung                                       | times_agency:<br/> - participant_id = ausgefüllt<br/> - ETD Berth = leer<br/>___zum Zeitpunkt 20 Std vor___<br/> shipcall:<br/> - etd                                                                                                                                                                                                                             | gelb        |
+| 0001 - C        | Festmacher / einkommend                                               | times_mooring:<br/> - participant_id = ausgefüllt<br/> - ETA Berth = leer<br/>___zum Zeitpunkt 16 Std vor___<br/> times_agency:<br/> - ETA Berth                                                                                                                                                                                                                  | gelb        |
+| 0001 - D        | Festmacher / ausgehend + Verholung                                    | times_mooring:<br/> - participant_id = ausgefüllt<br/> - ETD Berth = leer<br/>___zum Zeitpunkt 16 Std vor___<br/> times_agency:<br/> - ETD Berth                                                                                                                                                                                                                  | gelb        |
+| 0001 - F        | Hafenamt / einkommend                                                 | times_portauthority:<br/> - participant_id = ausgefüllt<br/> - ETA Berth = leer<br/>___zum Zeitpunkt 16 Std vor___<br/> times_agency:<br/> - ETA Berth                                                                                                                                                                                                            | gelb        |
+| 0001 - G        | Hafenamt / ausgehend + Verholung                                      | times_portauthority:<br/> - participant_id = ausgefüllt<br/> - ETD Berth = leer<br/>___zum Zeitpunkt 16 Std vor___<br/> times_agency:<br/> - ETD Berth                                                                                                                                                                                                            | gelb        |
+| 0001 - H        | Lotsen / einkommend                                                   | times_pilot:<br/> - participant_id = ausgefüllt<br/> - ETA Berth = leer<br/>______<br/> times_agency:<br/> - ETA Berth < 16 Stunden entfernt                                                                                                                                                                                                                      | gelb        |
+| 0001 - I        | Lotsen / ausgehend + Verholung                                        | times_pilot:<br/> - participant_id = ausgefüllt<br/> - ETD Berth = leer<br/>______<br/> times_agency:<br/> - ETD Berth < 16 Stunden entfernt                                                                                                                                                                                                                      | gelb        |
+| 0001 - J        | Schlepper / einkommend                                                | times_tug:<br/> - participant_id = ausgefüllt<br/> - ETA Berth = leer<br/>______<br/> times_agency:<br/> - ETA Berth < 16 Stunden entfernt                                                                                                                                                                                                                        | gelb        |
+| 0001 - K        | Schlepper / ausgehend + Verholung                                     | times_tug:<br/> - participant_id = ausgefüllt<br/> - ETD Berth = leer<br/>___zum Zeitpunkt 16 Std vor___<br/> times_agency:<br/> - ETD Berth | gelb        |
+| 0001 - L        | Terminal / einkommend                                                 | times_terminal:<br/> - participant_id = ausgefüllt<br/> - Operation Start = leer<br/>___zum Zeitpunkt 16 Std vor___<br/> times_agency:<br/> - ETA Berth | gelb, aktuell __deaktiviert__! |
+| 0001 - M        | Terminal / ausgehend + Verholung                                      | times_terminal:<br/> - participant_id = ausgefüllt<br/> - Operation Ende = leer<br/>___zum Zeitpunkt 16 Std vor___<br/> times_agency:<br/> - ETD Berth  | gelb, aktuell __deaktiviert__!       |
+| 0002            | Zeiten für einen Eintrag weichen voneinander ab                       | Bedingungen:<br/> - Header der Zeile ist zugeordnet (Agentur, Festmacher usw. - außer BSMD-Spalte)<br/> - Zeiten ungleich (leere Einträge nicht berücksichtigen => 0001)                                                                                                                                                                                          |             |
+| 0002 - A        | Agentur + Festmacher + Hafenamt + Lotsen + Schlepper / einkommend     |  Schnittmenge aus:<br/>times_agency:<br/> - ETA Berth <br/>____und____<br/>times_mooring:<br/> - ETA Berth <br/>____und____<br/>times_portauthority:<br/>- ETA Berth <br/>____und____<br/>times_pilot:<br/> - ETA Berth <br/>____und____<br/>times_tug:<br/> - ETA Berth                                                                                            | rot         |
+| 0002 - B        | Agentur + Festmacher + Hafenamt + Lotsen + Schlepper / ausgehend      |  Schnittmenge aus:<br/>times_agency:<br/> - ETD Berth <br/>____und____<br/>times_mooring:<br/> - ETD Berth <br/>____und____<br/>times_portauthority:<br/>- ETD Berth <br/>____und____<br/>times_pilot:<br/> - ETD Berth <br/>____und____<br/>times_tug:<br/> - ETD Berth                                                                                            | rot         |
+| 0002 - C        | Agentur + Festmacher + Hafenamt + Lotsen + Schlepper / Verholung      |  Schnittmenge aus:<br/>times_agency:<br/> - ETD Berth <br/>____und____<br/>times_mooring:<br/> - ETD Berth <br/>____und____<br/>times_portauthority:<br/>- ETD Berth <br/>____und____<br/>times_pilot:<br/> - ETD Berth <br/>____und____<br/>times_tug:<br/> - ETD Berth  | rot         |
+| 0003            | Arbeitszeit überschneidet sich mit Fahrtzeit                          | Bedingungen:<br/> - Header der Zeile ist zugeordnet (Terminal)<br/> - Zeiten passt nicht zu Ankunft / Abfahrt (leere Einträge nicht berücksichtigen => 0001)                                                                                                                                                                                                      |             |
+| 0003 - A        | Terminal / einkommend                                                 | times_terminal:<br/> - Operation Start<br/>___vor (kleiner als)____<br/> times_agency:<br/> - ETA Berth | rot, aktuell __deaktiviert__! |
+| 0003 - B        | Terminal / ausgehend + Verholung                                      | times_terminal:<br/> - Operation Ende<br/>___nach (größer als)____<br/> times_agency:<br/> - ETD Berth  | rot, aktuell __deaktiviert__! |
+| 0004            | Tidezeiten passen nicht zu Fahrzeiten                                 | Bedingungen:<br/> - Header der Zeile ist zugeordnet (Agentur)<br/> - Tidezeit ausgefüllt                                                                                                                                                                                                                                                                          |             |
+| 0004 - A        | Agentur / einkommend                                                  |  times_agency:<br/> - ETA Berth <br/>___vor (kleiner als)____<br/> times_agency:<br/> - Tidefenster von <br/>___und/oder___nach (größer als)____<br/> times_agency:<br/> - Tidefenster bis                                                                                                                                                                        | rot         |
+| 0004 - B        | Agentur / ausgehend + Verholung                                       |  times_agency:<br/> - ETD Berth <br/>___vor (kleiner als)____<br/> times_agency:<br/> - Tidefenster von <br/>___und/oder___nach (größer als)____<br/> times_agency:<br/> - Tidefenster bis                                                                                                                                                                        | rot         |
+| 0005            | Zu viele Schiffe mit gleicher Fahrtzeit                               | Bedingungen:<br/> - Header der Zeile ist zugeordnet (Agentur)<br/>- Übergreifend über die Einträge                                                                                                                                                                                                                                                                |             |
+| 0005 - A        | Agentur / einkommend + ausgehend + Verholung                          | ____Zählen wenn gleich:____<br/> times_agency:<br/> - ETA Berth <br/>___und____<br/> times_agency:<br/> - ETD Berth<br/>___mehr als 3____<br/>                                                                                                                                                                                                                    | gelb        |
+| 0006            | Agentur und Terminal planen mit unterschiedlichen Liegeplätzen        | Bedingungen:<br/> - Header der Zeile ist zugeordnet (Agentur / Terminal)<br/>- LP jeweils ausgefüllt                                                                                                                                                                                                                                                              |             |
+| 0006 - A        | Agentur + Terminal (Liegeplatz) / einkommend + ausgehend + Verholung  |  times_agency:<br/> - Liegeplatz<br/>____ungleich____<br/>times_terminal:<br/> - Liegeplatz                                                                                                                                                                                                                                                                       | gelb        |
+| 0006 - B        | Agentur + Terminal (Anlegeseite) / einkommend + ausgehend + Verholung |  times_agency:<br/> - Anlegeseite<br/>____ungleich____<br/>times_terminal:<br/> - Anlegeseite                                                                                                                                                                                                                                                                     | gelb        |

misc/BreCal.postman_collection.json

@@ -18,7 +18,8 @@
 							"pm.environment.set(\"LOGON_TOKEN\", responseData.token)\r",
 							"console.log(\"Id: \" + responseData.id)"
 						],
-						"type": "text/javascript"
+						"type": "text/javascript",
+						"packages": {}
 					}
 				}
 			],
@@ -76,6 +77,39 @@
 			},
 			"response": []
 		},
+		{
+			"name": "History GET",
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{LOGON_TOKEN}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "{{SCHEMA}}{{PATH}}/history?shipcall_id=79",
+					"host": [
+						"{{SCHEMA}}{{PATH}}"
+					],
+					"path": [
+						"history"
+					],
+					"query": [
+						{
+							"key": "shipcall_id",
+							"value": "79"
+						}
+					]
+				}
+			},
+			"response": []
+		},
 		{
 			"name": "Shipcalls GET",
 			"request": {
@@ -120,7 +154,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n    \"ship_id\" : 1,\r\n    \"type\" : 1,\r\n    \"eta\" : \"2023-07-23T07:18:19\",\r\n    \"voyage\" : \"43B\",\r\n    \"tug_required\" : false,\r\n    \"pilot_required\" : true,\r\n    \"flags\" : 0,\r\n    \"pier_side\" : false,\r\n    \"bunkering\" : true,\r\n    \"recommended_tugs\" : 2\r\n}",
+					"raw": "{\r\n    \"anchored\": null,\r\n    \"arrival_berth_id\": 144,\r\n    \"bunkering\": null,\r\n    \"canceled\": false,\r\n    \"created\": \"0001-01-01T00:00:00\",\r\n    \"departure_berth_id\": null,\r\n    \"draft\": null,\r\n    \"eta\": \"2024-04-10T12:29:09.174\",\r\n    \"etd\": null,\r\n    \"evaluation\": null,\r\n    \"evaluation_message\": null,\r\n    \"flags\": null,\r\n    \"id\": 0,\r\n    \"modified\": null,\r\n    \"moored_lock\": null,\r\n    \"participants\": [\r\n        {\r\n            \"participant_id\": 136,\r\n            \"type\": 8\r\n        },\r\n        {\r\n            \"participant_id\": 11,\r\n            \"type\": 32\r\n        },\r\n        {\r\n            \"participant_id\": 1,\r\n            \"type\": 1\r\n        }\r\n    ],\r\n    \"pier_side\": null,\r\n    \"pilot_required\": null,\r\n    \"rain_sensitive_cargo\": null,\r\n    \"recommended_tugs\": null,\r\n    \"replenishing_lock\": null,\r\n    \"replenishing_terminal\": null,\r\n    \"ship_id\": 14,\r\n    \"tidal_window_from\": null,\r\n    \"tidal_window_to\": null,\r\n    \"time_ref_point\": 0,\r\n    \"tug_required\": null,\r\n    \"type\": \"arrival\",\r\n    \"voyage\": null\r\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -156,7 +190,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n    \"id\" : 2,    \r\n    \"recommended_tugs\" : 3\r\n}",
+					"raw": "{\"type\": \"shifting\", \"evaluation\": \"green\", \"id\": 33, \"ship_id\": 2, \"eta\": \"2024-01-27T18:00:21\", \"etd\": \"2024-01-25T17:00:45\", \"arrival_berth_id\": 168, \"departure_berth_id\": 184,  \"rain_sensitive_cargo\": \"False\",  \"time_ref_point\": 1, \"participants\": [{\"participant_id\": 6, \"type\": 8}, {\"participant_id\": 11, \"type\": 32}, {\"participant_id\": 9, \"type\": 64}, {\"participant_id\": 1, \"type\": 1}], \"created\": \"2023-10-24T11:41:16\", \"modified\": \"2024-02-23T14:50:07\"}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -218,7 +252,7 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "{{SCHEMA}}{{PATH}}/notifications?participant_id=1",
+					"raw": "{{SCHEMA}}{{PATH}}/notifications?shipcall_id=4",
 					"host": [
 						"{{SCHEMA}}{{PATH}}"
 					],
@@ -227,8 +261,8 @@
 					],
 					"query": [
 						{
-							"key": "participant_id",
-							"value": "1"
+							"key": "shipcall_id",
+							"value": "4"
 						}
 					]
 				}
@@ -262,6 +296,99 @@
 			},
 			"response": []
 		},
+		{
+			"name": "Ships PUT",
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{LOGON_TOKEN}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "PUT",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\r\n    \"id\": 17,\r\n        \"name\": \"Testschiff 1\",\r\n        \"imo\": 1231231,\r\n        \"callsign\": \"TEST1\",\r\n        \"participant_id\": null,\r\n        \"length\": 202.0,\r\n        \"width\": 25.0,\r\n        \"is_tug\": 0,\r\n        \"bollard_pull\": null,\r\n        \"eni\": null,\r\n        \"created\": \"2024-04-03T07:49:29\",\r\n        \"modified\": null,\r\n        \"deleted\": 0\r\n}"
+				},
+				"url": {
+					"raw": "{{SCHEMA}}{{PATH}}/ships",
+					"host": [
+						"{{SCHEMA}}{{PATH}}"
+					],
+					"path": [
+						"ships"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Ships POST",
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{LOGON_TOKEN}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "POST",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\r\n        \"name\": \"Testschiff 02\",\r\n        \"imo\": 9999992,\r\n        \"length\": 100.2,\r\n        \"width\": 16.5,\r\n        \"is_tug\": 0,\r\n        \"bollard_pull\": 42,\r\n        \"callsign\": \"9992\",\r\n        \"participant_id\": null,\r\n        \"eni\": 1\r\n    }"
+				},
+				"url": {
+					"raw": "{{SCHEMA}}{{PATH}}/ships",
+					"host": [
+						"{{SCHEMA}}{{PATH}}"
+					],
+					"path": [
+						"ships"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Ships DELETE",
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{LOGON_TOKEN}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "DELETE",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\r\n        \"id\": 15,\r\n        \"name\": \"Testschiff 01\",\r\n        \"imo\": 9999991\r\n    }"
+				},
+				"url": {
+					"raw": "{{SCHEMA}}{{PATH}}/ships",
+					"host": [
+						"{{SCHEMA}}{{PATH}}"
+					],
+					"path": [
+						"ships"
+					]
+				}
+			},
+			"response": []
+		},
 		{
 			"name": "Times GET",
 			"request": {
@@ -278,7 +405,7 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "{{SCHEMA}}{{PATH}}/times?shipcall_id=3",
+					"raw": "{{SCHEMA}}{{PATH}}/times?shipcall_id=112",
 					"host": [
 						"{{SCHEMA}}{{PATH}}"
 					],
@@ -288,7 +415,7 @@
 					"query": [
 						{
 							"key": "shipcall_id",
-							"value": "3"
+							"value": "112"
 						}
 					]
 				}
@@ -348,7 +475,12 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n    \"start_planned\" : \"2023-05-18T07:18:19\",\r\n    \"end_planned\" : \"2023-05-18T09:18:19\",        \r\n    \"id\" : 1\r\n}"
+					"raw": "{\r\n    \"etd_berth\" : \"2023-01-09T05:00:39\",        \r\n    \"id\" : 11,\r\n    \"participant_id\": 2,\r\n    \"remarks\": \"test 23\",\r\n    \"shipcall_id\" : 4,\r\n    \"pier_side\" : 0\r\n    \r\n}\r\n\r\n",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
 				},
 				"url": {
 					"raw": "{{SCHEMA}}{{PATH}}/times",
@@ -378,7 +510,7 @@
 				"method": "DELETE",
 				"header": [],
 				"url": {
-					"raw": "{{SCHEMA}}{{PATH}}/times?id=3",
+					"raw": "{{SCHEMA}}{{PATH}}/times?id=118",
 					"host": [
 						"{{SCHEMA}}{{PATH}}"
 					],
@@ -388,12 +520,43 @@
 					"query": [
 						{
 							"key": "id",
-							"value": "3"
+							"value": "118"
 						}
 					]
 				}
 			},
 			"response": []
+		},
+		{
+			"name": "User PUT",
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{LOGON_TOKEN}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "PUT",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\r\n    \"id\": 2,    \r\n    \"old_password\" : \"Gurkensalat\",\r\n    \"new_password\" : \"Hallowach\"\r\n}"
+				},
+				"url": {
+					"raw": "{{SCHEMA}}{{PATH}}/user",
+					"host": [
+						"{{SCHEMA}}{{PATH}}"
+					],
+					"path": [
+						"user"
+					]
+				}
+			},
+			"response": []
 		}
 	],
 	"auth": {

misc/BreCalApi.md

@@ -0,0 +1,537 @@
+# Bremen calling API
+Version: _1.7.0_
+Last change: _Nov 14, 2025_
+
+## Introduction
+
+This API allows users to interact with "Bremen calling" without an UI. Apart vom querying data via _GET_ endpoints users may create and update shipcalls, assign participants and update participant times for shipcalls. 
+
+Creating and updating times and shipcalls depend on the participant roles a user is assigned to. For example, if a participant has the role "AGENCY" they may change assignments _and_ create and update agency times. A participant with the role "PILOT" on the other hand may not change the assigments and only create/update times for the pilot.
+
+### Authentication
+- **ApiKey**: API key in `header` header named `Authorization`. This is a JWT Token that the caller receives upon login.
+
+### Notes on this version
+
+This version refers to _1.7_ whereas the public client currently has version _1.6_. This means that there is some functionality available in the API that cannot be accessed through the UI yet, specifically notifications.
+
+There is no documentation for the structures returned by _GET_ requests but these can easily be determined via a single query.
+
+## Ship Endpoints
+
+### `DELETE /ships`
+**Summary:** Delete a ship (logically).
+A ship can only be logically deleted, since it is possible to have been used in previous shipcalls. On logical delete, the ship can no longer be selected in a new ship call.
+
+#### Parameters
+
+| Name | In | Type | Required | Description |
+|------|----|------|----------|-------------|
+| id | query | integer | Yes | **Id of ship**. *Example: 42*. Id of ship to be deleted. |
+
+#### Responses
+
+- **200**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `GET /ships`
+**Summary:** gets a list of ships
+Gets a list of ships including logically deleted ships to be used with shipcalls
+
+#### Responses
+
+- **200**: list of ships
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `POST /ships`
+**Summary:** create a new ship entry
+adds a new non-existing ship to the database. The ships IMO number is the unique identifier.
+
+#### Request Body
+Ship details. **Do not** provide id parameter.
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| name | string | No |  |
+| imo | integer | No |  |
+| callsign | string | No |  |
+| participant_id | integer | No | Optional reference to participant (tug role) |
+| length | number | No |  |
+| width | number | No |  |
+| is_tug | boolean | No |  |
+| bollard_pull | integer | No |  |
+| eni | integer | No | BSMD internal use |
+| created | string | No | Readonly field set by the database when ship was created |
+| modified | string | No | Readonly field set by the database when ship was last modified |
+| deleted | boolean | No | marks the ship as logically deleted |
+
+#### Responses
+
+- **201**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `PUT /ships`
+**Summary:** Update a ship entry
+Updating a ship entry. Please do not modify the IMO number. In that case please add a new entry.
+
+#### Request Body
+Updated ship entry. The id parameter is **required**.
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| name | string | No |  |
+| imo | integer | No |  |
+| callsign | string | No |  |
+| participant_id | integer | No | Optional reference to participant (tug role) |
+| length | number | No |  |
+| width | number | No |  |
+| is_tug | boolean | No |  |
+| bollard_pull | integer | No |  |
+| eni | integer | No | BSMD internal use |
+| created | string | No | Readonly field set by the database when ship was created |
+| modified | string | No | Readonly field set by the database when ship was last modified |
+| deleted | boolean | No | marks the ship as logically deleted |
+
+#### Responses
+
+- **200**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+## Shipcall Endpoints
+
+### `GET /shipcalls`
+**Summary:** Gets a list of ship calls
+Get current ship calls
+
+#### Parameters
+
+| Name | In | Type | Required | Description |
+|------|----|------|----------|-------------|
+| past_days | query | integer | No | number of days in the past to include in the result. *Example: 7*. |
+
+#### Responses
+
+- **200**: ship call list
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `POST /shipcalls`
+**Summary:** Create a new ship call
+A new shipcall is created without times at this point. This is ususally done by the BSMD or a participant with that particular role.
+
+#### Request Body
+Creates a new ship call. **Do not** provide id parameter.
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| ship_id | integer | Yes |  |
+| port_id | integer | No |  |
+| type | string | Yes | Type of ship call |
+| eta | string | No |  |
+| voyage | string | No |  |
+| etd | string | No |  |
+| arrival_berth_id | integer | No |  |
+| departure_berth_id | integer | No |  |
+| tug_required | boolean | No |  |
+| pilot_required | boolean | No |  |
+| flags | integer | No |  |
+| pier_side | boolean | No |  |
+| bunkering | boolean | No |  |
+| replenishing_terminal | boolean | No |  |
+| replenishing_lock | boolean | No |  |
+| draft | number | No |  |
+| tidal_window_from | string | No |  |
+| tidal_window_to | string | No |  |
+| rain_sensitive_cargo | boolean | No |  |
+| recommended_tugs | integer | No |  |
+| anchored | boolean | No |  |
+| moored_lock | boolean | No |  |
+| canceled | boolean | No |  |
+| evaluation | string | No | Evaluation of the ship call |
+| evaluation_message | string | No |  |
+| time_ref_point | integer | No | Physical reference point for all times given in shipcall and depending times entries |
+| participants | array<object> | No |  |
+| created | string | No | Readonly field set by the database when shipcall was created |
+| modified | string | No | Readonly field set by the database when shipcall was last modified |
+
+#### Responses
+
+- **201**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `PUT /shipcalls`
+**Summary:** Updates a ship call
+Updates a shipcall. Usually done if the participant assignments change.
+
+#### Request Body
+Creates a new ship call. The id parameter is **required**.
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| ship_id | integer | Yes |  |
+| port_id | integer | No |  |
+| type | string | Yes | Type of ship call |
+| eta | string | No |  |
+| voyage | string | No |  |
+| etd | string | No |  |
+| arrival_berth_id | integer | No |  |
+| departure_berth_id | integer | No |  |
+| tug_required | boolean | No |  |
+| pilot_required | boolean | No |  |
+| flags | integer | No |  |
+| pier_side | boolean | No |  |
+| bunkering | boolean | No |  |
+| replenishing_terminal | boolean | No |  |
+| replenishing_lock | boolean | No |  |
+| draft | number | No |  |
+| tidal_window_from | string | No |  |
+| tidal_window_to | string | No |  |
+| rain_sensitive_cargo | boolean | No |  |
+| recommended_tugs | integer | No |  |
+| anchored | boolean | No |  |
+| moored_lock | boolean | No |  |
+| canceled | boolean | No |  |
+| evaluation | string | No | Evaluation of the ship call |
+| evaluation_message | string | No |  |
+| time_ref_point | integer | No | Physical reference point for all times given in shipcall and depending times entries |
+| participants | array<object> | No |  |
+| created | string | No | Readonly field set by the database when shipcall was created |
+| modified | string | No | Readonly field set by the database when shipcall was last modified |
+
+#### Responses
+
+- **200**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+## Static Endpoints
+
+### `GET /berths`
+**Summary:** Gets a list of all berths registered
+Returns a list of berths, including berths that are (logically) deleted
+
+#### Responses
+
+- **200**: list of berths
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `GET /history`
+**Summary:** History data
+This endpoint returns a list of changes made to the specific shipcall
+
+#### Parameters
+
+| Name | In | Type | Required | Description |
+|------|----|------|----------|-------------|
+| shipcall_id | query | integer | Yes | **Id of ship call**. *Example: 3*. Id given in ship call list |
+
+#### Responses
+
+- **200**: list of history entries
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `GET /notifications`
+**Summary:** Gets a list of notifications pursuant to a specified participant and ship call
+List of notifications (tbd)
+
+#### Parameters
+
+| Name | In | Type | Required | Description |
+|------|----|------|----------|-------------|
+| shipcall_id | query | integer | No | **Id of ship call**. *Example: 52*. Id given in ship call list |
+
+#### Responses
+
+- **200**: notification list
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `GET /participants`
+**Summary:** gets one or all participants
+If no parameter is given, all participants are returned. The list can be used to display participant information in the context of ship calls.
+
+#### Parameters
+
+| Name | In | Type | Required | Description |
+|------|----|------|----------|-------------|
+| user_id | query | integer | No | **Id of user**. *Example: 2*. User id returned by verify call. |
+
+#### Responses
+
+- **200**: one or all participants as list
+- **400**
+- **401**
+- **404**
+- **500**
+- **503**
+---
+
+### `GET /ports`
+**Summary:** Your GET endpoint
+Returns a list of ports
+
+#### Responses
+
+- **200**: list of ports
+- **401**
+- **403**
+- **500**
+- **503**
+---
+
+## Times Endpoints
+
+### `DELETE /times`
+**Summary:** Delete a times entry for a ship call.
+A times entry is typically deleted if the agent for example changes or removes the participant assignment for a particular role.
+
+#### Parameters
+
+| Name | In | Type | Required | Description |
+|------|----|------|----------|-------------|
+| id | query | integer | Yes | **Id of times**. *Example: 42*. Id of times entry to be deleted. |
+
+#### Responses
+
+- **200**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `GET /times`
+**Summary:** Gets list of times
+Get all times assigned to a shipcall. These might not be complete.
+
+#### Parameters
+
+| Name | In | Type | Required | Description |
+|------|----|------|----------|-------------|
+| shipcall_id | query | integer | No | **Id**. *Example: 42*. Id of referenced ship call. |
+
+#### Responses
+
+- **200**: list of recorded times
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `POST /times`
+**Summary:** Create a new times entry for a ship call
+The times entry for a shipcall is created with reference to a participant. For each participant type there should be only one times data record.
+
+#### Request Body
+Times entry that will be added to the ship call. **Do not** provide id parameter.
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| eta_berth | string | No | Arrival time at berth |
+| eta_berth_fixed | boolean | No | If true, the eta is fixed and cannot be changed |
+| etd_berth | string | No | departure time from berth |
+| etd_berth_fixed | boolean | No | If true, the etd is fixed and cannot be changed |
+| lock_time | string | No | arrival time at lock |
+| lock_time_fixed | boolean | No | If true, the lock time is fixed and cannot be changed |
+| zone_entry | string | No | Expected time of entry into the zone |
+| zone_entry_fixed | boolean | No | If true, the zone entry time is fixed and cannot be changed |
+| operations_start | string | No | Start time for terminal operations |
+| operations_end | string | No | End time for terminal operations |
+| remarks | string | No | Additional remarks |
+| shipcall_id | integer | Yes | Reference to a shipcall id |
+| participant_id | integer | Yes | Reference to a participant id |
+| berth_id | integer | No | Reference to a berth id |
+| berth_info | string | No | Additional info text for berth |
+| pier_side | boolean | No | true if ship is rotated, false otherwise |
+| participant_type | integer | No |  |
+| ata | string | No | ata can be set by mooring if actual times are different from planned |
+| atd | string | No | atd can be set by mooring if actual times are different from planned |
+| eta_interval_end | string | No | Optional end of the interval for the times eta entry |
+| etd_interval_end | string | No | Optional end of the interval for the times etd entry |
+| created | string | No | Readonly field set by the database when times record was created |
+| modified | string | No | Readonly field set by the database when times record was last modified |
+
+#### Responses
+
+- **201**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `PUT /times`
+**Summary:** Update a times entry for a ship call
+Updating a times entry for a ship for a particular participant. The times entries are required for a shipcall to pass the validation rules.
+
+#### Request Body
+Times entry that will be added to the ship call. The id parameter is **required**.
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| eta_berth | string | No | Arrival time at berth |
+| eta_berth_fixed | boolean | No | If true, the eta is fixed and cannot be changed |
+| etd_berth | string | No | departure time from berth |
+| etd_berth_fixed | boolean | No | If true, the etd is fixed and cannot be changed |
+| lock_time | string | No | arrival time at lock |
+| lock_time_fixed | boolean | No | If true, the lock time is fixed and cannot be changed |
+| zone_entry | string | No | Expected time of entry into the zone |
+| zone_entry_fixed | boolean | No | If true, the zone entry time is fixed and cannot be changed |
+| operations_start | string | No | Start time for terminal operations |
+| operations_end | string | No | End time for terminal operations |
+| remarks | string | No | Additional remarks |
+| shipcall_id | integer | Yes | Reference to a shipcall id |
+| participant_id | integer | Yes | Reference to a participant id |
+| berth_id | integer | No | Reference to a berth id |
+| berth_info | string | No | Additional info text for berth |
+| pier_side | boolean | No | true if ship is rotated, false otherwise |
+| participant_type | integer | No |  |
+| ata | string | No | ata can be set by mooring if actual times are different from planned |
+| atd | string | No | atd can be set by mooring if actual times are different from planned |
+| eta_interval_end | string | No | Optional end of the interval for the times eta entry |
+| etd_interval_end | string | No | Optional end of the interval for the times etd entry |
+| created | string | No | Readonly field set by the database when times record was created |
+| modified | string | No | Readonly field set by the database when times record was last modified |
+
+#### Responses
+
+- **200**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+## User Endpoints
+
+### `POST /login`
+**Summary:** Returns a JWT session token and user data if successful
+Perform login
+
+#### Request Body
+Login credentials
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| username | string | Yes |  |
+| password | string | Yes |  |
+
+#### Responses
+
+- **200**: Successful response
+- **400**
+- **403**
+- **500**
+- **503**
+
+**Response 200 JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| participant_id | integer | No |  |
+| first_name | string | No |  |
+| last_name | string | No |  |
+| user_name | string | No |  |
+| user_phone | string | No |  |
+| user_email | string | No |  |
+| notify_email | boolean | No |  |
+| notify_whatsapp | boolean | No |  |
+| notify_signal | boolean | No |  |
+| notify_popup | boolean | No |  |
+| exp | number | No |  |
+| token | string | No |  |
+| notify_on | array<string> | No |  |
+
+---
+
+### `PUT /user`
+**Summary:** Update user details (first/last name, phone, password)
+Update user information
+
+#### Request Body
+User details
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| old_password | string | No |  |
+| new_password | string | No |  |
+| first_name | string | No |  |
+| last_name | string | No |  |
+| user_phone | string | No |  |
+| user_email | string | No |  |
+| notify_email | boolean | No |  |
+| notify_popup | boolean | No |  |
+| notify_whatsapp | boolean | No |  |
+| notify_signal | boolean | No |  |
+| notify_on | array<string> | No |  |
+
+#### Responses
+
+- **200**
+- **400**
+- **401**
+- **500**
+- **503**
+---

misc/Readme.md

@@ -48,3 +48,156 @@ DROP TABLE IF EXISTS `shipcall`;
 SET FOREIGN_KEY_CHECKS = 1;
 ```
 
+## Schema
+
+```mermaid
+erDiagram
+    participant {
+        INT id PK
+        VARCHAR name
+        VARCHAR street
+        VARCHAR postal_code
+        VARCHAR city
+        INT type
+        INT flags
+    }
+    port {
+        INT id PK
+        VARCHAR name
+        CHAR locode
+    }
+    berth {
+        INT id PK
+        VARCHAR name
+        BIT lock
+        INT owner_id FK
+        INT authority_id FK
+        INT port_id FK
+        BIT deleted
+    }
+    ship {
+        INT id PK
+        VARCHAR name
+        INT imo
+        VARCHAR callsign
+        INT participant_id FK
+        FLOAT length
+        FLOAT width
+        BIT is_tug
+        INT bollard_pull
+        INT eni
+        BIT deleted
+    }
+    shipcall {
+        INT id PK
+        INT ship_id FK
+        TINYINT type
+        DATETIME eta
+        DATETIME etd
+        INT arrival_berth_id FK
+        INT departure_berth_id FK
+        INT port_id FK
+        INT flags
+        BIT tug_required
+        BIT pilot_required
+    }
+    times {
+        INT id PK
+        INT shipcall_id FK
+        INT participant_id FK
+        INT berth_id FK
+        INT participant_type
+        DATETIME eta_berth
+        DATETIME etd_berth
+        DATETIME lock_time
+        DATETIME zone_entry
+    }
+    notification {
+        INT id PK
+        INT shipcall_id FK
+        INT participant_id FK
+        TINYINT level
+        TINYINT type
+    }
+    history {
+        INT id PK
+        INT participant_id FK
+        INT user_id FK
+        INT shipcall_id FK
+        DATETIME timestamp
+        DATETIME eta
+        INT type
+        INT operation
+    }
+    shipcall_participant_map {
+        INT id PK
+        INT shipcall_id FK
+        INT participant_id FK
+        INT type
+    }
+    shipcall_tug_map {
+        INT id PK
+        INT shipcall_id FK
+        INT ship_id FK
+    }
+    participant_port_map {
+        INT id PK
+        INT participant_id FK
+        INT port_id FK
+    }
+    user {
+        INT id PK
+        INT participant_id FK
+        VARCHAR first_name
+        VARCHAR last_name
+        VARCHAR user_name
+        VARCHAR user_email
+    }
+    role {
+        INT id PK
+        VARCHAR name
+        VARCHAR description
+    }
+    securable {
+        INT id PK
+        VARCHAR name
+    }
+    role_securable_map {
+        INT id PK
+        INT role_id FK
+        INT securable_id FK
+    }
+    user_role_map {
+        INT id PK
+        INT user_id FK
+        INT role_id FK
+    }
+
+    participant ||--o{ berth : owner_id
+    participant ||--o{ berth : authority_id
+    port ||--o{ berth : port_id
+    participant ||--o{ ship : participant_id
+    ship ||--o{ shipcall : ship_id
+    berth ||--o{ shipcall : arrival_berth_id
+    berth ||--o{ shipcall : departure_berth_id
+    port ||--o{ shipcall : port_id
+    shipcall ||--|| times : shipcall_id
+    participant ||--|| times : participant_id
+    berth ||--o{ times : berth_id
+    shipcall ||--o{ notification : shipcall_id
+    participant ||--o{ notification : participant_id
+    participant ||--o{ history : participant_id
+    user ||--o{ history : user_id
+    shipcall ||--o{ history : shipcall_id
+    shipcall ||--o{ shipcall_participant_map : shipcall_id
+    participant ||--o{ shipcall_participant_map : participant_id
+    shipcall ||--o{ shipcall_tug_map : shipcall_id
+    ship ||--o{ shipcall_tug_map : ship_id
+    participant ||--o{ participant_port_map : participant_id
+    port ||--o{ participant_port_map : port_id
+    participant ||--o{ user : participant_id
+    user ||--o{ user_role_map : user_id
+    role ||--o{ user_role_map : role_id
+    role ||--o{ role_securable_map : role_id
+    securable ||--o{ role_securable_map : securable_id
+```

misc/Readme_yaml.md

@@ -0,0 +1,27 @@
+# Bremen Calling Open API spec
+
+## Infos zur Generierung der CS Wrapper / Mapping Datei aus YAML
+
+Verwendung von "OpenAPIGenerator" aus dem [Rest API Client Code Generator 2022](https://marketplace.visualstudio.com/items?itemName=ChristianResmaHelle.ApiClientCodeGenerator2022).
+Die automatisch generierte Datei muss leider noch nachgearbeitet werden:
+
+1) #pragma warning disable CS8073 (direkt nach der NS declaration).
+2) #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null' (am Schluss vor der schließenden Klammer des NS)
+3) Für readOnly Properties wird bei einem Enum kein korrekter Code emittiert. Daher muss aktuell folgende Funktion ergänzt werden, damit beim Speichern das "evaluation" Flag nicht mitgesendet wird:
+
+```C++
+public bool ShouldSerializeEvaluation()
+{
+    return false;
+}
+```
+
+Witziger(!)weise funktioniert es für das Property EvaluationMessage korrekt.
+
+### Vacuum Yaml Linter
+
+Example Usage:
+
+```bash
+vacuum lint -d .\misc\BreCalApi.yaml --fail-severity warn
+```

misc/ReleaseNotes.md

@@ -0,0 +1,16 @@
+# Versionshistorie
+
+## 1.7
+
+### YAML / API
+
+1. Notifications GET: Der Parameter "shipcall_id" ist jetzt optional für den Abruf von Benachrichtigungen.
+
+2. Notification: Enthält jetzt ein neues Feld "participant_id". Ist dieses gesetzt, richtet sich die Benachrichtigung an diesen Teilnehmer. Ist das Feld nicht vorhanden, richtet sich die Benachrichtigung an alle Beteiligten des shipcall
+
+3. Die Benutzerdaten (login_result) enthalten jetzt die Felder (Flags) der Zuordnung für die verschiedenen Benachrichtigungs-Wege, aktuell implementiert ist notify_email und notify_popup. Diese können auch über user_details analog zu Telefonnummer, Name etc. gesetzt werden.
+
+4. Die Enumeration NotificationType enthält jetzt nicht mehr den Benachrichtigungsweg, sondern den Typ des Ereignisses, das die Benachrichtigung ausgelöst hat. Aktuell werden 7 Ereignisse unterschieden.
+
+5. Die Benutzerdaten enthalten eine Liste NotifyOn vom Typ NotificationType. In dieser Aufzählung sind die Ereignisse enthalten, über die der Benutzer benachrichtigt werden will. Wenn diese Liste leer oder nicht vorhanden ist erhält der Benutzer keine Nachrichten, auch wenn er einen Benachrichtigungsweg ausgewählt hat.
+

misc/check_clear_double_times_entries.sql

@@ -0,0 +1,46 @@
+-- Inspect duplicates first
+WITH duplicate_participants AS (
+    SELECT
+        shipcall_id,
+        participant_type,
+        COUNT(*) AS cnt
+    FROM times
+    GROUP BY shipcall_id, participant_type
+    HAVING COUNT(*) > 1
+)
+SELECT
+    t.*
+FROM times AS t
+JOIN duplicate_participants AS d
+    ON d.shipcall_id = t.shipcall_id
+   AND (d.participant_type <=> t.participant_type)
+ORDER BY t.shipcall_id, t.participant_type, t.id;
+
+-- Delete all but the highest-id entry per (shipcall_id, participant_type)
+WITH ordered_times AS (
+    SELECT
+        id,
+        ROW_NUMBER() OVER (
+            PARTITION BY shipcall_id, participant_type
+            ORDER BY id DESC
+        ) AS rn
+    FROM times
+)
+DELETE FROM times
+WHERE id IN (
+    SELECT id
+    FROM ordered_times
+    WHERE rn > 1
+);
+
+-- Optional: re-check that no duplicates remain
+WITH duplicate_participants AS (
+    SELECT
+        shipcall_id,
+        participant_type,
+        COUNT(*) AS cnt
+    FROM times
+    GROUP BY shipcall_id, participant_type
+    HAVING COUNT(*) > 1
+)
+SELECT COUNT(*) AS remaining_duplicates FROM duplicate_participants;

misc/clear_data.sql

@@ -0,0 +1,37 @@
+-- This script clears all data from the database tables related to the port management system.
+
+DELETE FROM notification WHERE id > 0;
+
+DELETE FROM history WHERE id > 0;
+
+DELETE FROM notification WHERE id > 0;
+
+DELETE FROM shipcall_participant_map WHERE id > 0;
+
+DELETE FROM participant_port_map WHERE id > 0;
+
+DELETE FROM shipcall_tug_map WHERE id > 0;
+
+DELETE FROM times WHERE id > 0;
+
+DELETE FROM shipcall WHERE id > 0;
+
+DELETE FROM user_role_map WHERE id > 0;
+
+DELETE FROM role_securable_map WHERE id > 0;
+
+DELETE FROM user_role_map WHERE id > 0;
+
+DELETE FROM securable WHERE id > 0;
+
+DELETE FROM role WHERE id > 0;
+
+DELETE FROM user WHERE id > 0;
+
+delete FROM ship WHERE id > 0;
+
+DELETE FROM berth WHERE id > 0;
+
+DELETE FROM participant WHERE id > 0;
+
+DELETE FROM port WHERE id > 0;

misc/clear_entries_for_participant.sql

@@ -0,0 +1,23 @@
+DELETE FROM times WHERE
+times.shipcall_id IN
+(
+	SELECT s.id FROM shipcall s
+    JOIN shipcall_participant_map spm ON s.id = spm.shipcall_id
+    JOIN participant p ON spm.participant_id = p.id
+    WHERE p.id = 10
+);
+
+DELETE `history` FROM `history`
+JOIN shipcall s on `history`.shipcall_id = s.id
+JOIN shipcall_participant_map spm ON s.id = spm.shipcall_id
+WHERE spm.participant_id = 10;
+
+-- damit das hier funktioniert muss der FK in shipcall_participant_map von "RESTRICT" auf "SET NULL" 
+-- geändert werden
+
+DELETE shipcall FROM shipcall
+INNER JOIN shipcall_participant_map spm ON shipcall.id = spm.shipcall_id
+JOIN participant p ON spm.participant_id = p.id
+WHERE p.id = 10;
+
+DELETE FROM shipcall_participant_map WHERE participant_id = 10;

misc/create_schema.sql

@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 8.0.33, for Win64 (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.43, for Win64 (x86_64)
 --
 -- Host: localhost    Database: bremen_calling_test
 -- ------------------------------------------------------
--- Server version	8.0.34-0ubuntu0.22.04.1
+-- Server version	8.0.42-0ubuntu0.24.10.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -28,17 +28,65 @@ CREATE TABLE `berth` (
   `lock` bit(1) DEFAULT NULL COMMENT 'The lock must be used',
   `owner_id` int unsigned DEFAULT NULL,
   `authority_id` int unsigned DEFAULT NULL,
+  `port_id` int unsigned DEFAULT NULL,
   `created` datetime DEFAULT CURRENT_TIMESTAMP,
   `modified` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
   `deleted` bit(1) DEFAULT b'0',
   PRIMARY KEY (`id`),
   KEY `FK_OWNER_PART_idx` (`owner_id`),
-  KEY `FK_AUTHORITY_PART_idx` (`authority_id`),
+  KEY `FK_AUTHORITY_PART_idx` (`authority_id`) /*!80000 INVISIBLE */,
+  KEY `FK_PORT_PART_idx` (`port_id`),
   CONSTRAINT `FK_AUTHORITY_PART` FOREIGN KEY (`authority_id`) REFERENCES `participant` (`id`),
-  CONSTRAINT `FK_OWNER_PART` FOREIGN KEY (`owner_id`) REFERENCES `participant` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=195 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Berth of ship for a ship call';
+  CONSTRAINT `FK_OWNER_PART` FOREIGN KEY (`owner_id`) REFERENCES `participant` (`id`),
+  CONSTRAINT `FK_PORT` FOREIGN KEY (`port_id`) REFERENCES `port` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE=InnoDB AUTO_INCREMENT=205 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Berth of ship for a ship call';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `history`
+--
+
+DROP TABLE IF EXISTS `history`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `history` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `participant_id` int unsigned NOT NULL,
+  `user_id` int unsigned DEFAULT NULL,
+  `shipcall_id` int unsigned NOT NULL,
+  `timestamp` datetime NOT NULL COMMENT 'Time of saving',
+  `eta` datetime DEFAULT NULL COMMENT 'Current ETA / ETD value (depends if shipcall or times were saved)',
+  `type` int NOT NULL COMMENT 'shipcall or times',
+  `operation` int NOT NULL COMMENT 'insert, update or delete',
+  PRIMARY KEY (`id`),
+  KEY `FK_HISTORY_PARTICIPANT_idx` (`participant_id`),
+  KEY `FK_HISTORY_SHIPCALL_idx` (`shipcall_id`),
+  KEY `FK_HISTORY_USER` (`user_id`),
+  CONSTRAINT `FK_HISTORY_PARTICIPANT` FOREIGN KEY (`participant_id`) REFERENCES `participant` (`id`),
+  CONSTRAINT `FK_HISTORY_SHIPCALL` FOREIGN KEY (`shipcall_id`) REFERENCES `shipcall` (`id`),
+  CONSTRAINT `FK_HISTORY_USER` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=23537 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='This table stores a history of changes made to shipcalls so that everyone can see who changed what and when';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+CREATE TABLE `history` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `participant_id` int unsigned NOT NULL,
+  `user_id` int unsigned DEFAULT NULL,
+  `shipcall_id` int unsigned NOT NULL,
+  `timestamp` datetime NOT NULL COMMENT 'Time of saving',
+  `eta` datetime DEFAULT NULL COMMENT 'Current ETA / ETD value (depends if shipcall or times were saved)',
+  `type` int NOT NULL COMMENT 'shipcall or times',
+  `operation` int NOT NULL COMMENT 'insert, update or delete',
+  PRIMARY KEY (`id`),
+  KEY `FK_HISTORY_PARTICIPANT_idx` (`participant_id`),
+  KEY `FK_HISTORY_SHIPCALL_idx` (`shipcall_id`),
+  KEY `FK_HISTORY_USER` (`user_id`),
+  CONSTRAINT `FK_HISTORY_PARTICIPANT` FOREIGN KEY (`participant_id`) REFERENCES `participant` (`id`),
+  CONSTRAINT `FK_HISTORY_SHIPCALL` FOREIGN KEY (`shipcall_id`) REFERENCES `shipcall` (`id`),
+  CONSTRAINT `FK_HISTORY_USER` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=29292 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='This table stores a history of changes made to shipcalls so that everyone can see who changed what and when';
+
+
 --
 -- Table structure for table `notification`
 --
@@ -48,20 +96,19 @@ DROP TABLE IF EXISTS `notification`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `notification` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `times_id` int unsigned NOT NULL COMMENT 'times record that caused the notification',
-  `participant_id` int unsigned NOT NULL COMMENT 'participant ref',
-  `acknowledged` bit(1) DEFAULT b'0' COMMENT 'true if UI acknowledged',
+  `shipcall_id` int unsigned DEFAULT NULL,
+  `participant_id` int unsigned DEFAULT NULL,
   `level` tinyint DEFAULT NULL COMMENT 'severity of the notification',
   `type` tinyint DEFAULT NULL COMMENT 'Email/UI/Other',
-  `message` varchar(256) DEFAULT NULL COMMENT 'individual message',
+  `message` varchar(512) DEFAULT NULL COMMENT 'individual message',
   `created` datetime DEFAULT CURRENT_TIMESTAMP,
   `modified` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
-  KEY `FK_NOT_TIMES` (`times_id`),
-  KEY `FK_NOT_PART` (`participant_id`),
-  CONSTRAINT `FK_NOT_PART` FOREIGN KEY (`participant_id`) REFERENCES `participant` (`id`),
-  CONSTRAINT `FK_NOT_TIMES` FOREIGN KEY (`times_id`) REFERENCES `times` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='An entry corresponds to an alarm given by a violated rule during times update';
+  KEY `FK_NOTIFICATION_SHIPCALL_idx` (`shipcall_id`),
+  KEY `FK_NOTIFICATION_PARTICIPANT_idx` (`participant_id`),
+  CONSTRAINT `FK_NOTIFICATION_PARTICIPANT` FOREIGN KEY (`participant_id`) REFERENCES `participant` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+  CONSTRAINT `FK_NOTIFICATION_SHIPCALL` FOREIGN KEY (`shipcall_id`) REFERENCES `shipcall` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=10398 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='An entry corresponds to an alarm given by a violated rule during times update';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -83,7 +130,46 @@ CREATE TABLE `participant` (
   `modified` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
   `deleted` bit(1) DEFAULT b'0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=137 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='An organization taking part';
+) ENGINE=InnoDB AUTO_INCREMENT=160 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='An organization taking part';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `participant_port_map`
+--
+
+DROP TABLE IF EXISTS `participant_port_map`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `participant_port_map` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `participant_id` int unsigned NOT NULL COMMENT 'Ref to participant',
+  `port_id` int unsigned NOT NULL COMMENT 'Ref to port',
+  `created` datetime DEFAULT CURRENT_TIMESTAMP,
+  `modified` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `FK_PP_PARTICIPANT` (`participant_id`),
+  KEY `FK_PP_PORT` (`port_id`),
+  CONSTRAINT `FK_PP_PARTICIPANT` FOREIGN KEY (`participant_id`) REFERENCES `participant` (`id`),
+  CONSTRAINT `FK_PP_PORT` FOREIGN KEY (`port_id`) REFERENCES `port` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=86 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Mapping table that assigns participants to a port';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `port`
+--
+
+DROP TABLE IF EXISTS `port`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `port` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(128) NOT NULL COMMENT 'Name of port',
+  `locode` char(5) DEFAULT NULL COMMENT 'UNECE locode',
+  `created` datetime DEFAULT CURRENT_TIMESTAMP,
+  `modified` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  `deleted` bit(1) DEFAULT b'0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Port as reference for shipcalls and berths';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -166,7 +252,7 @@ CREATE TABLE `ship` (
   PRIMARY KEY (`id`),
   KEY `FK_SHIP_PARTICIPANT` (`participant_id`),
   CONSTRAINT `FK_SHIP_PARTICIPANT` FOREIGN KEY (`participant_id`) REFERENCES `participant` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=485 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -202,16 +288,25 @@ CREATE TABLE `shipcall` (
   `canceled` bit(1) DEFAULT NULL,
   `evaluation` int unsigned DEFAULT NULL,
   `evaluation_message` varchar(512) DEFAULT NULL,
+  `evaluation_time` datetime DEFAULT NULL,
+  `evaluation_notifications_sent` bit(1) DEFAULT NULL,
+  `port_id` int unsigned NOT NULL DEFAULT '1' COMMENT 'Selected port for this shipcall',
+  `time_ref_point` int DEFAULT '0' COMMENT 'Index of a location which is the reference point for all time value entries, e.g. berth or Geeste',
   `created` datetime DEFAULT CURRENT_TIMESTAMP,
   `modified` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   KEY `FK_SHIPCALL_SHIP` (`ship_id`),
   KEY `FK_SHIPCALL_BERTH_ARRIVAL` (`arrival_berth_id`),
   KEY `FK_SHIPCALL_BERTH_DEPARTURE` (`departure_berth_id`),
+  KEY `idx_shipcall_type` (`type`),
+  KEY `idx_shipcall_eta` (`eta`),
+  KEY `idx_shipcall_etd` (`etd`),
+  KEY `FK_SHIPCALL_PORT_idx` (`port_id`),
   CONSTRAINT `FK_SHIPCALL_BERTH_ARRIVAL` FOREIGN KEY (`arrival_berth_id`) REFERENCES `berth` (`id`),
   CONSTRAINT `FK_SHIPCALL_BERTH_DEPARTURE` FOREIGN KEY (`departure_berth_id`) REFERENCES `berth` (`id`),
+  CONSTRAINT `FK_SHIPCALL_PORT` FOREIGN KEY (`port_id`) REFERENCES `port` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `FK_SHIPCALL_SHIP` FOREIGN KEY (`ship_id`) REFERENCES `ship` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Incoming, outgoing or moving to another berth';
+) ENGINE=InnoDB AUTO_INCREMENT=2789 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Incoming, outgoing or moving to another berth';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -225,15 +320,15 @@ CREATE TABLE `shipcall_participant_map` (
   `id` int NOT NULL AUTO_INCREMENT,
   `shipcall_id` int unsigned DEFAULT NULL,
   `participant_id` int unsigned DEFAULT NULL,
-  `type` int unsigned DEFAULT NULL COMMENT 'Type of participant role',
+  `type` int unsigned DEFAULT NULL,
   `created` datetime DEFAULT CURRENT_TIMESTAMP,
   `modified` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   KEY `FK_MAP_PARTICIPANT_SHIPCALL` (`shipcall_id`),
   KEY `FK_MAP_SHIPCALL_PARTICIPANT` (`participant_id`),
-  CONSTRAINT `FK_MAP_PARTICIPANT_SHIPCALL` FOREIGN KEY (`shipcall_id`) REFERENCES `shipcall` (`id`),
+  CONSTRAINT `FK_MAP_PARTICIPANT_SHIPCALL` FOREIGN KEY (`shipcall_id`) REFERENCES `shipcall` (`id`) ON DELETE SET NULL,
   CONSTRAINT `FK_MAP_SHIPCALL_PARTICIPANT` FOREIGN KEY (`participant_id`) REFERENCES `participant` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=128 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Associates a participant with a shipcall';
+) ENGINE=InnoDB AUTO_INCREMENT=8933 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Associates a participant with a shipcall';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -285,13 +380,20 @@ CREATE TABLE `times` (
   `berth_info` varchar(512) DEFAULT NULL,
   `pier_side` bit(1) DEFAULT NULL,
   `participant_type` int unsigned DEFAULT NULL,
+  `ata` datetime DEFAULT NULL COMMENT 'Relevant only for mooring, this field can be used to record actual ATA',
+  `atd` datetime DEFAULT NULL COMMENT 'Relevant only for mooring, this field can be used to record actual ATD',
+  `eta_interval_end` datetime DEFAULT NULL COMMENT 'If this value is set the times are given as interval instead of a single point in time. The start time value depends on the participant type.',
+  `etd_interval_end` datetime DEFAULT NULL COMMENT 'If this value is set the times are given as interval instead of a single point in time. The start time value depends on the participant type.',
   PRIMARY KEY (`id`),
+  UNIQUE KEY `uniq_shipcall_participant` (`shipcall_id`,`participant_type`),
   KEY `FK_TIME_SHIPCALL` (`shipcall_id`),
   KEY `FK_TIME_PART` (`participant_id`) /*!80000 INVISIBLE */,
   KEY `FK_TIME_BERTH` (`berth_id`) /*!80000 INVISIBLE */,
+  KEY `idx_times_eta_berth` (`eta_berth`),
+  KEY `idx_times_etd_berth` (`etd_berth`),
   CONSTRAINT `FK_TIME_BERTH` FOREIGN KEY (`berth_id`) REFERENCES `berth` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `FK_TIME_PART` FOREIGN KEY (`participant_id`) REFERENCES `participant` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=44 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='the planned time for the participants work';
+) ENGINE=InnoDB AUTO_INCREMENT=7863 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='the planned time for the participants work';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -303,7 +405,7 @@ DROP TABLE IF EXISTS `user`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `user` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `participant_id` int unsigned DEFAULT NULL,
+  `participant_id` int unsigned NOT NULL,
   `first_name` varchar(45) DEFAULT NULL,
   `last_name` varchar(45) DEFAULT NULL,
   `user_name` varchar(45) DEFAULT NULL,
@@ -311,12 +413,17 @@ CREATE TABLE `user` (
   `user_phone` varchar(128) DEFAULT NULL,
   `password_hash` varchar(128) DEFAULT NULL,
   `api_key` varchar(256) DEFAULT NULL,
+  `notify_email` bit(1) DEFAULT NULL,
+  `notify_whatsapp` bit(1) DEFAULT NULL,
+  `notify_signal` bit(1) DEFAULT NULL,
+  `notify_popup` bit(1) DEFAULT NULL,
+  `notify_event` int DEFAULT NULL COMMENT 'Bitflag of selected notification event types that the user wants to be notified of',
   `created` datetime DEFAULT CURRENT_TIMESTAMP,
   `modified` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   KEY `FK_USER_PART` (`participant_id`),
   CONSTRAINT `FK_USER_PART` FOREIGN KEY (`participant_id`) REFERENCES `participant` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='member of a participant';
+) ENGINE=InnoDB AUTO_INCREMENT=55 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='member of a participant';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -339,6 +446,57 @@ CREATE TABLE `user_role_map` (
   CONSTRAINT `FK_USER_ROLE` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Assigns a user to a role';
 /*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping routines for database 'bremen_calling_test'
+--
+/*!50003 DROP PROCEDURE IF EXISTS `delete_data` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_0900_ai_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`ds`@`localhost` PROCEDURE `delete_data`()
+BEGIN
+	DECLARE shipcall_id_var int;
+    DECLARE done INT DEFAULT FALSE;
+
+	DECLARE shipcall_iter CURSOR FOR
+		SELECT shipcall.id FROM shipcall
+			LEFT JOIN times ON
+				times.shipcall_id = shipcall.id AND times.participant_type = 8
+			WHERE
+				-- ARRIVAL
+				(type = 1 AND GREATEST(shipcall.eta, COALESCE(times.eta_berth, 0)) <= CURRENT_DATE() - INTERVAL 1 MONTH) OR
+                -- DEPARTURE / SHIFTING
+                (type != 1 AND GREATEST(shipcall.etd, COALESCE(times.etd_berth, 0)) <= CURRENT_DATE() - INTERVAL 1 MONTH);
+
+    DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+	OPEN shipcall_iter;
+
+    delete_loop: LOOP
+		FETCH shipcall_iter INTO shipcall_id_var;
+		IF done THEN
+			LEAVE delete_loop;
+		END IF;
+        DELETE FROM shipcall_participant_map WHERE shipcall_id = shipcall_id_var;
+		DELETE FROM shipcall_tug_map WHERE shipcall_id = shipcall_id_var;
+        DELETE FROM times WHERE shipcall_id = shipcall_id_var;
+        DELETE FROM history WHERE shipcall_id = shipcall_id_var;
+		DELETE FROM shipcall WHERE id = shipcall_id_var;
+    END LOOP;
+	CLOSE shipcall_iter;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -349,4 +507,4 @@ CREATE TABLE `user_role_map` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-10-06 14:52:04
+-- Dump completed on 2025-11-17  8:26:36

misc/disclaimer.html

@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <title>Information gemäß Art. 13 und Art. 14 DSGVO für Auftraggeber Software BremenCalling</title>
+<meta charset="UTF-8">
+</head>
+<body>
+<h1>Information gemäß Art. 13 und Art. 14 DSGVO für Auftraggeber
+Software BremenCalling</h1>
+<hr />
+Hier erhalten Sie Informationen gem. Art. 13 DSGVO über unseren Umgang mit Ihren Daten, wenn Sie die von uns betriebene Software „Bremen Calling“ nutzen.
+<p>
+<span style="text-decoration:underline;">Verantwortlicher:</span>
+</p>
+
+<p>
+BREMER SCHIFFSMELDEDIENST Kapt. P. Langbein e.K.<br />
+Vertreten durch die Geschäftsführer Bastian Güttner und Benjamin Wiese<br />
+Hafenkopf II / Überseetor 20, 28217 Bremen / Germany<br />
+Tel. +49 (0) 421 38 48 27<br />
+E-Mail : report@bsmd.de<br />
+</p>
+
+<h2>Zweck der Datenverarbeitung:</h2>
+<ul>
+<li>Bereitstellung der Software „Bremen Calling“ zur Nutzung für Kunden und Auftraggeber</li>
+</ul>
+<h2>Rechtsgrundlage für die Datenverarbeitung:</h2>
+Art. 6 Abs. 1 lit. b DSGVO (Vertrag, vorvertragliche Maßnahmen auf Anfrage der betroffenen Person)
+<h2>Berechtigte Interesse des Verantwortlichen:</h2>
+Hier nicht einschlägig.
+
+<h3>Wozu benötigen wir Ihre Daten? („Hintergründe für die Bereitstellung der Daten“):</h3>
+Wenn Sie unsere Software nutzen möchten, müssen wir Sie als Benutzer einrichten. Dies geschieht auf der Grundlage Ihrer (firmenbezogenen) E-Mail-Adresse und Ihres Namens.
+<h3>Holen wir bei anderen Stellen außer bei Ihnen selber Informationen über Sie ein?</h3>
+Nein.
+<h3>Empfänger der Daten:</h3>
+Wir verarbeiten Ihre Daten nur innerhalb des BSMD.
+<h3>Übermittlung in Drittländer:</h3>
+Eine Übermittlung Ihrer Daten in Staaten außerhalb der EU findet nicht statt.
+<h3>Dauer der Speicherung:</h3>
+Wir speichern Ihre Daten, solange wie Ihr Vertrag zur Nutzung unserer Software mit Ihnen besteht. Nach dem Ende unserer Geschäftsbeziehung stellen wir Ihre Benutzerdaten inaktiv und löschen sie nach sechs Monaten. Wir erarbeiten derzeit ein Löschkonzept, das ein systematisches Löschen von personenbezogenen Daten ermöglicht.
+<h3>Ihre Rechte in Bezug auf Ihre Daten:</h3>
+<p>
+Sie können von uns Auskunft verlangen ob wir persönliche Daten von Ihnen speichern, und wenn ja, welche das sind und was wir damit tun (Art. 15 DSGVO).
+</p>
+<p>
+Sollten wir unrichtige oder unvollständige Daten von Ihnen haben, können Sie die Berichtigung dieser Daten verlangen (Art. 16 DSGVO).
+</p>
+<p>
+Sie können auch die Löschung Ihrer Daten verlangen (Art. 17 DSGVO). Es kann jedoch Gründe geben, aus denen wir Ihre Daten trotz Ihres Wunsches nicht löschen dürfen oder löschen müssen. Diese Gründe bestimmt das Gesetz. Wenn Sie von uns die Löschung Ihrer Daten verlangen, werden wir prüfen, ob möglicherweise solche Gründe vorliegen. Wenn nicht, löschen wir Ihre Daten. Die Alternative zur Löschung Ihrer Daten ist in bestimmten Fällen die Einschränkung der Verarbeitung Ihrer personenbezogenen Daten (Art. 18 DSGVO). Auch dabei gilt: lassen Sie uns wissen, wie Sie verfahren wollen, dann prüfen wir die gesetzlichen Vorgaben und finden einen Weg, der Ihre und unsere Interessen ausgleicht.
+</p>
+<p>
+Art. 20 DSGVO sieht vor, dass wir Ihnen in bestimmten Fällen Ihre persönlichen Daten in einem strukturierten, gängigen und maschinenlesbaren Format zur Verfügung stellen müssen, wenn Sie es wünschen.
+</p>
+<p>
+Möchten Sie von Ihren hier beschriebenen Rechten Gebrauch machen, genügt eine E-Mail an bremencalling@bsmd.de.
+</p>
+<p>
+Wenn Sie der Meinung sind, dass wir die Datenschutzvorgaben für die Verarbeitung Ihrer Daten auf diesen Webseiten nicht einhalten, können Sie sich bei einer Datenschutz-Aufsichtsbehörde beschweren. Eine Liste der in Deutschland zuständigen Datenschutz-Aufsichtsbehörden finden Sie hier:
+<a href="https://www.bfdi.bund.de/DE/Infothek/Anschriften_Links/anschriften_links-node.html">https://www.bfdi.bund.de/DE/Infothek/Anschriften_Links/anschriften_links-node.html</a>.
+</p>
+<hr />
+<h4>
+Stand dieser Datenschutzinformationen: April 2024
+</h4>
+</body>

misc/index.html

@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+    <head>
+        <meta charset="UTF-8">
+        <title>Bremen Calling</title>
+        <link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
+    </head>
+    <body>
+
+    </body>
+</html>

misc/notifications.md

@@ -0,0 +1,113 @@
+# Benachrichtigungen
+
+___
+
+## Benachrichtigungs-Typen (Auslöser)
+
+### 1. Teilnehmer wird zugeordnet
+
+Ein Teilnehmer wird über die Anwendung einem Anlauf zugeordnet. Dies ist entweder die Agentur (durch BSMD zugeordnet) oder ein weiterer Teilnehmer außer dem Hafenamt, der durch die Agentur zugeordnet wird. Die Zuordnung des Hafenamts erfolgt automatisch bei Anlage des Anlaufs.
+
+### 2. Morgenrunde ist relevant
+
+Ein Teilnehmer ist einem Anlauf zugeordnet. Dieser Anlauf findet in den nächsten 24 Stunden statt und ist daher für die "Morgenrunde" relevant. Der Teilnehmer erhält dazu eine Benachrichtigung.
+
+### 3. Zeitlicher Konflikt ("Ampel")
+
+Durch unterschiedliche Zeitangaben der Teilnehmer wird die Ampel ausgelöst und stellt eine entsprechende Fehlermeldung dar. Die Benachrichtigung wird ausgelöst bei folgenden Ampel-Wechseln:
+
+* grün -> gelb
+* grün -> rot
+* gelb -> rot
+
+### 4. Auflösung zeitl. Konflikt
+
+* rot -> gelb
+* rot -> grün
+* gelb -> grün
+
+### 5. Abwählen eines Teilnehmer
+
+Der Teilnehmer ist nicht mehr länger dem Anlauf zugeordnet.
+
+### 6. Fehlende Daten
+
+Dienstleister, die 16 Stunden vor ETA/ETD und Agenturen, die 20 Stunden vor ETA/ETD keine Angaben gemacht haben.
+
+### 7. Storno
+
+Wird ein Anlauf storniert erhalten alle bis dahin zugeordneten Teilnehmer eine Benachrichtigung.
+
+## API
+
+```yaml
+    NotificationType:
+      type: string
+      description: Type of notification
+      enum:
+        - assignment
+        - next24h
+        - time_conflict
+        - time_conflict_resolved
+        - unassigned
+        - missing_data
+        - cancelled
+```
+
+## Entfernen von Benachrichtigungen
+
+Unter den folgenden Voraussetzungen werden Benachrichtigungen wieder aus dem System entfernt:
+
+* Die Benachrichtigung ist älter als 3 Tage (n.B.: Zeitraum definieren)
+* Ein Teilnehmer wird wieder abgewählt
+* Ein zeitlicher Konflikt wird aufgelöst
+
+## Ablauf der Benachrichtigungen
+
+Eine Benachrichtung enthält folgende Informationen:
+
+* Verweis auf den Anlauf (shipcall)
+* ein Erstell- und Änderungsdatum
+* einen Benachrichtigungs-Typ
+* einen Zustand ("level")
+
+Der Zustand steuert den Ablauf, wenn die Prüfungsfunktion die Anläufe durchsucht oder ein Anlauf gespeichert wird.
+
+Wird einer der Zustände 1-3 erkannt wird geprüft, ob bereits eine Benachrichtigung vorhanden ist. Ist dies nicht der Fall, wird eine Benachrichtigung neu erstellt im Zustand "0".
+
+Die Prüfungsfunktion durchläuft alle Benachrichtigungen. Abhängig vom Zustand (0-2) werden folgende Aktionen ausgeführt:
+
+* Ist die Benachrichtigung um Zustand "0" und sind mind. 10 Minuten vergangen, wird die Benachrichtigung in den Zustand "1" versetzt.
+
+* Ist die Benachrichtigung im Zustand "1" wird versucht, allen dafür eingetragenenen Benutzern eine E-Mail zu senden. Ist dies erfolgreich, wechselt die Benachrichtigung in den Zustand "2".
+
+* Ist die Benachrichtigung im Zustand "2" und sind mind. 3 Tage vergangen wird die Benachrichtigung gelöscht.
+
+```mermaid
+---
+title: Ablauf
+---
+stateDiagram-v2
+    state "Level 0" as lvl0
+    state "Level 1" as lvl1
+    state "Level 2" as lvl2
+    [*] --> lvl0: Zustand 1-3 erkannt
+    lvl0 --> lvl1: +10 min.
+    lvl1 --> lvl2: E-Mail Versand erfolgt
+    lvl2 --> [*]: +3 Tage ODER Zustand 1-3 nicht mehr relevant
+
+
+    lvl0 --> [*]: Zustand 1-3 nicht mehr relevant
+
+```
+
+## Bemerkungen
+
+Für die Zukunft sind ggf. auch Benachrichtigungen via Whatsapp/Signal geplant. Diese verhalten sich analog zu den E-Mail Benachrichtigungen und werden nur einmal versendet. Die Anzahl der Zustände wird dabei erhöht bzw. der Wechsel in den Endzustand ensprechend angepasst.
+
+## Benachrichtigungstext
+
+... TBD
+
+
+

misc/product_codes.txt

@@ -0,0 +1,14 @@
+Bremen calling Installer Upgrade Codes:
+======================================
+
+Test: 1C7FA3E4-BAB9-4911-9348-73094357FC7C
+Prod: 81A329F1-C663-48DA-9E15-DAF19F99B5AE
+
+Product codes v1.2.2.3:
+
+Test: 6F89CBAA-2189-456F-A347-0C0158325B61
+Prod: 0ED342DD-DC00-4CE4-8348-96BB3AB726B1
+
+Note:
+If you want the MSI to "upgrade" from one version to the other, the
+upgrade code must stay the same and the product code must change.

misc/requirements.txt

@@ -0,0 +1,37 @@
+bcrypt==4.2.0
+blinker==1.8.2
+cached-property==1.5.2
+click==8.1.7
+coro-context-manager==0.2.0
+coverage==7.6.1
+dsnparse==0.1.15
+Flask==3.0.3
+Flask-JWT-Extended==4.6.0
+iniconfig==2.0.0
+itsdangerous==2.2.0
+Jinja2==3.1.4
+MarkupSafe==2.1.5
+marshmallow==3.22.0
+marshmallow-enum==1.5.1
+marshmallow_dataclass==8.7.1
+mypy-extensions==1.0.0
+mysql-connector-python==9.0.0
+numpy==2.1.1
+packaging==24.1
+pandas==2.2.3
+pluggy==1.5.0
+pydapper==0.10.0
+PyJWT==2.9.0
+pytest==8.3.3
+pytest-cov==5.0.0
+python-dateutil==2.9.0.post0
+pytz==2024.2
+schedule==1.2.2
+six==1.16.0
+tqdm==4.66.5
+typeguard==4.3.0
+typing-inspect==0.9.0
+typing_extensions==4.12.2
+tzdata==2024.1
+webargs==8.6.0
+Werkzeug==3.0.4

misc/update_1.1_to_1.2.sql

@@ -0,0 +1,95 @@
+-- add notification handling columns to shipcall
+-- evaluation_time: Time when the "traffic light" was last changed
+-- evaluation_notifications_sent: Flag to indicate if notifications were sent for the current evaluation
+
+ALTER TABLE `bremen_calling_devel`.`shipcall`
+ADD COLUMN `evaluation_time` DATETIME NULL DEFAULT NULL AFTER `evaluation_message`,
+ADD COLUMN `evaluation_notifications_sent` BIT NULL AFTER `evaluation_time`,
+ADD COLUMN `time_ref_point` INT NULL DEFAULT 0 COMMENT 'Index of a location which is the reference point for all time value entries, e.g. berth or Geeste' AFTER `modified`;
+
+
+-- prepare notification table for historic notification data
+-- removed reference to participant and times and dropped unnecessary columns
+-- added reference to shipcall
+
+ALTER TABLE `bremen_calling_devel`.`notification`
+DROP FOREIGN KEY `FK_NOT_TIMES`,
+DROP FOREIGN KEY `FK_NOT_PART`;
+ALTER TABLE `bremen_calling_devel`.`notification`
+DROP COLUMN `deleted`,
+DROP COLUMN `acknowledged`,
+DROP COLUMN `participant_id`,
+DROP COLUMN `times_id`,
+ADD COLUMN `shipcall_id` INT UNSIGNED NULL AFTER `id`,
+ADD INDEX `FK_NOTIFICATION_SHIPCALL_idx` (`shipcall_id` ASC) VISIBLE,
+DROP INDEX `FK_NOT_PART` ,
+DROP INDEX `FK_NOT_TIMES` ;
+;
+ALTER TABLE `bremen_calling_devel`.`notification`
+ADD CONSTRAINT `FK_NOTIFICATION_SHIPCALL`
+  FOREIGN KEY (`shipcall_id`)
+  REFERENCES `bremen_calling_devel`.`shipcall` (`id`)
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION;
+
+
+-- added notification flags
+-- participant reference is now mandatory
+
+ALTER TABLE `bremen_calling_devel`.`user`
+DROP FOREIGN KEY `FK_USER_PART`;
+ALTER TABLE `bremen_calling_devel`.`user`
+ADD COLUMN `notify_email` BIT NULL DEFAULT NULL AFTER `api_key`,
+ADD COLUMN `notify_whatsapp` BIT NULL DEFAULT NULL AFTER `notify_email`,
+ADD COLUMN `notify_signal` BIT NULL DEFAULT NULL AFTER `notify_whatsapp`,
+ADD COLUMN `notify_popup` BIT NULL DEFAULT NULL AFTER `notify_signal`,
+CHANGE COLUMN `participant_id` `participant_id` INT UNSIGNED NOT NULL ;
+ALTER TABLE `bremen_calling_devel`.`user`
+ADD CONSTRAINT `FK_USER_PART`
+  FOREIGN KEY (`participant_id`)
+  REFERENCES `bremen_calling_devel`.`participant` (`id`);
+
+-- History table for change tracking
+
+CREATE TABLE `bremen_calling_devel`.`history` (
+  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `participant_id` INT UNSIGNED NOT NULL,
+  `user_id` INT UNSIGNED NOT NULL,
+  `shipcall_id` INT UNSIGNED NOT NULL,
+  `timestamp` DATETIME NOT NULL COMMENT 'Time of saving',
+  `eta` DATETIME NULL COMMENT 'Current ETA / ETD value (depends if shipcall or times were saved)',
+  `type` INT NOT NULL COMMENT 'shipcall or times',
+  `operation` INT NOT NULL COMMENT 'insert, update or delete',
+  PRIMARY KEY (`id`))
+COMMENT = 'This table stores a history of changes made to shipcalls so that everyone can see who changed what and when';
+
+-- and foreign keys
+
+ALTER TABLE `bremen_calling_devel`.`history`
+ADD INDEX `FK_HISTORY_PARTICIPANT_idx` (`participant_id` ASC) VISIBLE,
+ADD INDEX `FK_HISTORY_SHIPCALL_idx` (`shipcall_id` ASC) VISIBLE;
+;
+ALTER TABLE `bremen_calling_devel`.`history`
+ADD CONSTRAINT `FK_HISTORY_PARTICIPANT`
+  FOREIGN KEY (`participant_id`)
+  REFERENCES `bremen_calling_devel`.`participant` (`id`)
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION,
+ADD CONSTRAINT `FK_HISTORY_SHIPCALL`
+  FOREIGN KEY (`shipcall_id`)
+  REFERENCES `bremen_calling_devel`.`shipcall` (`id`)
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION,
+ADD CONSTRAINT `FK_HISTORY_USER`
+  FOREIGN KEY (`user_id`)
+  REFERENCES `bremen_calling_devel`.`user` (`id`)
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION;
+
+-- add additional fields to times
+
+ALTER TABLE `bremen_calling_devel`.`times`
+ADD COLUMN `ata` DATETIME NULL DEFAULT NULL COMMENT 'Relevant only for mooring, this field can be used to record actual ATA' AFTER `participant_type`,
+ADD COLUMN `atd` DATETIME NULL DEFAULT NULL COMMENT 'Relevant only for mooring, this field can be used to record actual ATD' AFTER `ata`,
+ADD COLUMN `eta_interval_end` DATETIME NULL DEFAULT NULL COMMENT 'If this value is set the times are given as interval instead of a single point in time. The start time value depends on the participant type.' AFTER `atd`;
+ADD COLUMN `etd_interval_end` DATETIME NULL DEFAULT NULL COMMENT 'If this value is set the times are given as interval instead of a single point in time. The start time value depends on the participant type.' AFTER `eta_interval_end`;

misc/update_1.5_to_1.6.sql

@@ -0,0 +1,57 @@
+CREATE TABLE `port` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(128) NOT NULL COMMENT 'Name of port',
+  `locode` char(5) DEFAULT NULL COMMENT 'UNECE locode',  
+  `created` datetime DEFAULT CURRENT_TIMESTAMP,
+  `modified` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  `deleted` bit(1) DEFAULT b'0',
+  PRIMARY KEY (`id`) 
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Port as reference for shipcalls and berths';
+
+-- Add default port to table
+INSERT INTO port (id, name, locode) VALUES (1, 'Bremen', 'DEBRE');
+
+-- Adding new ref column to berth
+ALTER TABLE `berth` 
+ADD COLUMN `port_id` INT UNSIGNED DEFAULT NULL AFTER `authority_id`;
+ALTER TABLE `berth` ALTER INDEX `FK_AUTHORITY_PART_idx` INVISIBLE;
+
+-- adding a foreign key berth.port_id -> port.id
+ALTER TABLE `berth` 
+ADD INDEX `FK_PORT_PART_idx` (`port_id` ASC) VISIBLE;
+
+ALTER TABLE `berth` 
+ADD CONSTRAINT `FK_PORT`
+  FOREIGN KEY (`port_id`)
+  REFERENCES `port` (`id`)
+  ON DELETE RESTRICT
+  ON UPDATE RESTRICT;
+
+-- adding new ref column to shipcall incl. foreign key
+ALTER TABLE `shipcall` 
+ADD COLUMN `port_id` INT UNSIGNED NOT NULL DEFAULT 1 COMMENT 'Selected port for this shipcall' AFTER `evaluation_notifications_sent`,
+CHANGE COLUMN `time_ref_point` `time_ref_point` INT NULL DEFAULT '0' COMMENT 'Index of a location which is the reference point for all time value entries, e.g. berth or Geeste' AFTER `port_id`,
+ADD INDEX `FK_SHIPCALL_PORT_idx` (`port_id` ASC) VISIBLE;
+;
+ALTER TABLE `shipcall` 
+ADD CONSTRAINT `FK_SHIPCALL_PORT`
+  FOREIGN KEY (`port_id`)
+  REFERENCES `port` (`id`)
+  ON DELETE RESTRICT
+  ON UPDATE RESTRICT;
+
+CREATE TABLE `participant_port_map` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `participant_id` int unsigned NOT NULL COMMENT 'Ref to participant',
+  `port_id` int unsigned NOT NULL COMMENT 'Ref to port',
+  `created` datetime DEFAULT CURRENT_TIMESTAMP,
+  `modified` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `FK_PP_PARTICIPANT` (`participant_id`),
+  KEY `FK_PP_PORT` (`port_id`),
+  CONSTRAINT `FK_PP_PARTICIPANT` FOREIGN KEY (`participant_id`) REFERENCES `participant` (`id`),
+  CONSTRAINT `FK_PP_PORT` FOREIGN KEY (`port_id`) REFERENCES `port` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Mapping table that assigns participants to a port';
+
+-- all existing berths shall default to "bremen"
+UPDATE berth SET port_id = 1 where port_id is null;

misc/update_1.6_to_1.7.sql

@@ -0,0 +1,13 @@
+ALTER TABLE `notification`
+ADD COLUMN `participant_id` INT UNSIGNED NULL DEFAULT NULL AFTER `shipcall_id`,
+ADD INDEX `FK_NOTIFICATION_PARTICIPANT_idx` (`participant_id` ASC) VISIBLE;
+;
+ALTER TABLE `notification`
+ADD CONSTRAINT `FK_NOTIFICATION_PARTICIPANT`
+  FOREIGN KEY (`participant_id`)
+  REFERENCES `participant` (`id`)
+  ON DELETE RESTRICT
+  ON UPDATE RESTRICT;
+
+ALTER TABLE `user`
+ADD COLUMN `notify_event` INT NULL COMMENT 'Bitflag of selected notification event types that the user wants to be notified of' AFTER `notify_popup`;

misc/version.txt

@@ -1 +1 @@
-1.1.0.0
+1.8.0.0

misc/weserport.md

@@ -0,0 +1,10 @@
+# Schnittstelle Weserport Anforderungen
+
+##
+
+Automatische Zuordnung:
+
+* Hafenamt
+* Festmacher
+* Lotsen (>120m l 13m br)
+

src/BreCalClient/AboutDialog.xaml

@@ -6,12 +6,13 @@
         xmlns:local="clr-namespace:BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:p = "clr-namespace:BreCalClient.Resources"
-        mc:Ignorable="d"
-        Title="Help" Height="374" Width="500" Loaded="Window_Loaded">
+        mc:Ignorable="d" Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
+        Title="Help" Height="512" Width="800" Loaded="Window_Loaded">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="180" />
-            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width=".5*" />
+            <ColumnDefinition Width=".5*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
@@ -26,6 +27,13 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
+            <RowDefinition Height="10" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="10" />
+            <RowDefinition Height="*" />
             <RowDefinition Height="28" />
                           
         </Grid.RowDefinitions>
@@ -42,21 +50,33 @@
                 Informatikbüro Daniel Schick
             </Hyperlink>
         </TextBlock>
-
+        <Border BorderThickness="0 0 0 2" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" BorderBrush="Gray"  />
         <Label FontWeight="DemiBold"  Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textChangeContactInfo}" HorizontalContentAlignment="Right"/>
         <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textEmail}" HorizontalContentAlignment="Right" />
         <Label Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textPhone}" HorizontalContentAlignment="Right" />
         <TextBox Name="textBoxUserEmail" Grid.Column="1" Grid.Row="4" Margin="2" VerticalContentAlignment="Center" />
         <TextBox Name="textBoxUserPhone" Grid.Column="1" Grid.Row="5" Margin="2" VerticalContentAlignment="Center" />
 
-        <Label FontWeight="DemiBold"  Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textChangePassword}" HorizontalContentAlignment="Right"/>
-        
-        <xctk:WatermarkPasswordBox Watermark="{x:Static p:Resources.textOldPassword}" Grid.Column="1" Grid.Row="7" Margin="2" x:Name="wpBoxOldPassword" TextChanged="wpBoxOldPassword_TextChanged"/>
-        <xctk:WatermarkPasswordBox Watermark="{x:Static p:Resources.textNewPassword}" Grid.Column="1" Grid.Row="8" Margin="2" x:Name="wpBoxNewPassword" TextChanged="wpBoxOldPassword_TextChanged"/>
-        <xctk:WatermarkPasswordBox Watermark="{x:Static p:Resources.textRepeatNewPassword}" Grid.Column="1" Grid.Row="9" Margin="2" x:Name="wpBoxNewPasswordRepeat" TextChanged="wpBoxOldPassword_TextChanged"/>
-        <Button x:Name="buttonChangePassword" Click="buttonChangePassword_Click" Grid.Column="1" Grid.Row="10" Margin="2" Content="{x:Static p:Resources.textChange}" Width="80" HorizontalAlignment="Left" IsEnabled="True" />
+        <Label FontWeight="DemiBold"  Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textNotifications}" HorizontalContentAlignment="Right"/>
+        <CheckBox HorizontalAlignment="Right" Margin="2" Grid.Column="0" Grid.Row="8" VerticalAlignment="Center" x:Name="checkboxEMailNotify" />
+        <Label Grid.Row="8" Grid.Column="1" Content="{x:Static p:Resources.textNotifyEmail}" />
+        <CheckBox HorizontalAlignment="Right" Margin="2" Grid.Column="0" Grid.Row="9" VerticalAlignment="Center" x:Name="checkboxPushNotify" />
+        <Label Grid.Row="9" Grid.Column="1" Content="{x:Static p:Resources.textNotifyPush}" />
+        <Label Grid.Row="7" Grid.Column="2" Content="{x:Static p:Resources.textNotifyOn}" />
+        <xctk:CheckListBox Grid.Column="2" Grid.Row="8" Grid.RowSpan="3" x:Name="checkListBoxEventSelection" Margin="2" />
+        <Button x:Name="buttonChangeUserFields" Click="buttonChangeUserFields_Click" Grid.Column="2" Grid.Row="11" Margin="2" Content="{x:Static p:Resources.textChange}" Width="80" HorizontalAlignment="Right" IsEnabled="True" />
 
-        <Button x:Name="buttonClose" Click="buttonClose_Click" Content="{x:Static p:Resources.textClose}" Width="80" Margin="2" Grid.Column="1" Grid.Row="12" HorizontalAlignment="Right" />
+        <Border BorderThickness="0 0 0 2" Grid.Row="12" Grid.Column="0" Grid.ColumnSpan="3" BorderBrush="Gray"  />
+        <Label FontWeight="DemiBold"  Grid.Row="13" Grid.Column="0" Content="{x:Static p:Resources.textChangePassword}" HorizontalContentAlignment="Right"/>
+        
+        <xctk:WatermarkPasswordBox Watermark="{x:Static p:Resources.textOldPassword}" Grid.Column="1" Grid.Row="13" Margin="2" x:Name="wpBoxOldPassword" TextChanged="wpBoxOldPassword_TextChanged"/>
+        <xctk:WatermarkPasswordBox Watermark="{x:Static p:Resources.textNewPassword}" Grid.Column="1" Grid.Row="14" Margin="2" x:Name="wpBoxNewPassword" TextChanged="wpBoxOldPassword_TextChanged"/>
+        <xctk:WatermarkPasswordBox Watermark="{x:Static p:Resources.textRepeatNewPassword}" Grid.Column="1" Grid.Row="15" Margin="2" x:Name="wpBoxNewPasswordRepeat" TextChanged="wpBoxOldPassword_TextChanged"/>
+        <Button x:Name="buttonChangePassword" Click="buttonChangePassword_Click" Grid.Column="1" Grid.Row="16" Margin="2" Content="{x:Static p:Resources.textChangePassword}" Width="120" HorizontalAlignment="Right" IsEnabled="False" />
+        <Border BorderThickness="0 0 0 2" Grid.Row="17" Grid.Column="0" Grid.ColumnSpan="3" BorderBrush="Gray"  />
+        
+
+        <Button x:Name="buttonClose" Click="buttonClose_Click" Content="{x:Static p:Resources.textClose}" Width="80" Margin="2" Grid.Column="2" Grid.Row="19" HorizontalAlignment="Right" />
 
     </Grid>
 </Window>

src/BreCalClient/AboutDialog.xaml.cs

@@ -34,6 +34,7 @@ namespace BreCalClient
         #region events
 
         public event Action<string, string>? ChangePasswordRequested;
+        public event Action? ChangeUserSettingsRequested;
 
         #endregion
 
@@ -45,14 +46,25 @@ namespace BreCalClient
         }
 
         private void buttonChangePassword_Click(object sender, RoutedEventArgs e)
+        {            
+            this.ChangePasswordRequested?.Invoke(this.wpBoxOldPassword.Password, this.wpBoxNewPassword.Password);
+        }
+
+        private void buttonChangeUserFields_Click(object sender, RoutedEventArgs e)
         {
             if (this.LoginResult != null)
             {
                 this.LoginResult.UserPhone = this.textBoxUserPhone.Text.Trim();
                 this.LoginResult.UserEmail = this.textBoxUserEmail.Text.Trim();
+                this.LoginResult.NotifyEmail = this.checkboxEMailNotify.IsChecked ?? false;
+                this.LoginResult.NotifyPopup = this.checkboxPushNotify.IsChecked ?? false;                
+                if ((this.checkListBoxEventSelection.SelectedItems.Count > 0) && (this.LoginResult.NotifyOn == null))
+                    this.LoginResult.NotifyOn = new();
+                this.LoginResult.NotifyOn.Clear();
+                foreach (NotificationType nt in this.checkListBoxEventSelection.SelectedItems)
+                    this.LoginResult.NotifyOn.Add(nt);
+                this.ChangeUserSettingsRequested?.Invoke();
             }
-
-            this.ChangePasswordRequested?.Invoke(this.wpBoxOldPassword.Password, this.wpBoxNewPassword.Password);
         }
 
         private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e)
@@ -73,13 +85,23 @@ namespace BreCalClient
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
+            this.checkListBoxEventSelection.ItemsSource = Enum.GetValues(typeof(BreCalClient.misc.Model.NotificationType));
+
             if(LoginResult != null)
             {
                 this.textBoxUserEmail.Text = LoginResult.UserEmail;
                 this.textBoxUserPhone.Text = LoginResult.UserPhone;
+                this.checkboxEMailNotify.IsChecked = LoginResult.NotifyEmail;
+                this.checkboxPushNotify.IsChecked = LoginResult.NotifyPopup;
+                if (LoginResult.NotifyOn != null)
+                {
+                    foreach (NotificationType nt in LoginResult.NotifyOn)
+                        this.checkListBoxEventSelection.SelectedItems.Add(nt);
+                }
             }
         }
 
         #endregion
+        
     }
 }

src/BreCalClient/App.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <configSections>
+		<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,Log4net"/>
         <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
             <section name="BreCalClient.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         </sectionGroup>
@@ -8,20 +9,37 @@
             <section name="BreCalClient.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
+	<log4net>
+		<root>
+			<level value="DEBUG"/>
+			<appender-ref ref="LogFileAppender"/>
+		</root>
+		<appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
+			<param name="File" value="log-BreCalClient.txt"/>
+			<param name="AppendToFile" value="true"/>
+			<rollingStyle value="Size"/>
+			<maxSizeRollBackups value="10"/>
+			<maximumFileSize value="10MB"/>
+			<staticLogFileName value="true"/>
+			<layout type="log4net.Layout.PatternLayout">
+				<param name="ConversionPattern" value="%date [%thread] %-5level [%logger] - %message%newline"/>
+			</layout>
+		</appender>
+	</log4net>
     <applicationSettings>
         <BreCalClient.Properties.Settings>
-            <setting name="API_URL" serializeAs="String">
-                <value>https://brecaldevel.bsmd-emswe.eu</value>
-            </setting>
             <setting name="BG_COLOR" serializeAs="String">
-                <value>#1D751F</value>
+                <value>#751D1F</value>
             </setting>
             <setting name="APP_TITLE" serializeAs="String">
-                <value>!!Bremen calling Testversion!!</value>
+                <value>!!Bremen calling Entwicklungsversion!!</value>
             </setting>
             <setting name="LOGO_IMAGE_URL" serializeAs="String">
                 <value>https://www.textbausteine.net/</value>
             </setting>
+            <setting name="API_URL" serializeAs="String">
+                <value>https://brecaltest.bsmd-emswe.eu</value>
+            </setting>
         </BreCalClient.Properties.Settings>
     </applicationSettings>
     <userSettings>
@@ -29,6 +47,51 @@
             <setting name="FilterCriteria" serializeAs="String">
                 <value />
             </setting>
+            <setting name="Width" serializeAs="String">
+                <value>800</value>
+            </setting>
+            <setting name="Height" serializeAs="String">
+                <value>450</value>
+            </setting>
+            <setting name="Left" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="Top" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="W1Left" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="W1Top" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="W2Left" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="W2Top" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="W3Left" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="W3Top" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="W4Left" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="W4Top" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="FilterCriteriaMap" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="W5Top" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="W5Left" serializeAs="String">
+                <value>0</value>
+            </setting>
         </BreCalClient.Properties.Settings>
     </userSettings>
 </configuration>

src/BreCalClient/App.xaml

@@ -2,16 +2,109 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:BreCalClient"
-             StartupUri="MainWindow.xaml">
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+             StartupUri="MainWindow.xaml" Exit="Application_Exit" Startup="Application_Startup" >
     <Application.Resources>
 
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                
-                
                 <ResourceDictionary Source="Resources\StringResources.xaml"/>
             </ResourceDictionary.MergedDictionaries>
+
+            <sys:Double x:Key="{x:Static SystemParameters.VerticalScrollBarWidthKey}">10</sys:Double>
+            <sys:Double x:Key="{x:Static SystemParameters.HorizontalScrollBarHeightKey}">10</sys:Double>
+
+            <Color x:Key="InformationColor">#147ec9</Color>
+            <SolidColorBrush x:Key="InformationColorBrush" Color="{StaticResource InformationColor}" options:Freeze="True" />
+
+            <Color x:Key="SuccessColor">#11ad45</Color>
+            <SolidColorBrush x:Key="SuccessColorBrush" Color="{StaticResource SuccessColor}" options:Freeze="True" />
+
+            <Color x:Key="ErrorColor">#e60914</Color>
+            <SolidColorBrush x:Key="ErrorColorBrush" Color="{StaticResource ErrorColor}" options:Freeze="True" />
+
+            <Color x:Key="WarningColor">#f5a300</Color>
+            <SolidColorBrush x:Key="WarningColorBrush" Color="{StaticResource WarningColor}" options:Freeze="True" />
+
+            <Canvas x:Key="InformationIcon"  Width="24" Height="24">
+                <Path Data="M11,9H13V7H11M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M11,17H13V11H11V17Z" Fill="White" />
+            </Canvas>
+
+            <Canvas x:Key="SuccessIcon"  Width="24" Height="24">
+                <Path Data="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" Fill="White" />
+            </Canvas>
+
+            <Canvas x:Key="ErrorIcon" Width="24" Height="24">
+                <Path Data="M11,15H13V17H11V15M11,7H13V13H11V7M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20Z" Fill="White" />
+            </Canvas>
+
+            <Canvas x:Key="WarningIcon" Width="24" Height="24">
+                <Path Data="M12,2L1,21H23M12,6L19.53,19H4.47M11,10V14H13V10M11,16V18H13V16" Fill="White" />
+            </Canvas>
+
+            <Canvas x:Key="CloseIcon" Width="76" Height="76" Clip="F1 M 0,0L 76,0L 76,76L 0,76L 0,0">
+                <Path Width="31.6666" Height="31.6667" Canvas.Left="22.1666" Canvas.Top="22.1667" Stretch="Fill" Fill="#FF000000" Data="F1 M 26.9166,22.1667L 37.9999,33.25L 49.0832,22.1668L 53.8332,26.9168L 42.7499,38L 53.8332,49.0834L 49.0833,53.8334L 37.9999,42.75L 26.9166,53.8334L 22.1666,49.0833L 33.25,38L 22.1667,26.9167L 26.9166,22.1667 Z "/>
+            </Canvas>
+
+            <Style TargetType="Border" x:Key="NotificationBorder">
+                <Setter Property="Padding" Value="5" />
+                <Setter Property="Effect">
+                    <Setter.Value>
+                        <DropShadowEffect Opacity="0.5" ShadowDepth="1" BlurRadius="2" />
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
+            <Style TargetType="Rectangle" x:Key="NotificationIcon">
+                <Setter Property="Width" Value="24"/>
+                <Setter Property="Height" Value="24"/>
+                <Setter Property="Margin" Value="0,5,5,5" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="Fill" Value="White"/>
+            </Style>
+
+            <Style TargetType="TextBlock" x:Key="NotificationText">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="HorizontalAlignment" Value="Stretch" />
+                <Setter Property="TextWrapping" Value="Wrap" />
+                <Setter Property="Margin" Value="5,0,0,0" />
+            </Style>
+
+            <Style TargetType="{x:Type Button}" x:Key="NotificationCloseButton">
+                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="Foreground" Value="#FFF" />
+                <Setter Property="FontSize" Value="15" />
+                <Setter Property="SnapsToDevicePixels" Value="True" />
+                <Setter Property="VerticalAlignment" Value="Top" />
+                <Setter Property="HorizontalAlignment" Value="Right" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Border Background="{TemplateBinding Background}">
+                                <ContentPresenter Content="{TemplateBinding Content}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,0" />
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter Property="Background" Value="#33000000" />
+                                </Trigger>
+                                <Trigger Property="IsPressed" Value="True">
+                                    <Setter Property="Background" Value="#77000000" />
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
+            <Style TargetType="Rectangle" x:Key="CloseButtonIcon">
+                <Setter Property="Width" Value="10"/>
+                <Setter Property="Height" Value="10"/>
+                <Setter Property="Fill" Value="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}" />
+            </Style>
+
         </ResourceDictionary>
-        
+
     </Application.Resources>
 </Application>

src/BreCalClient/App.xaml.cs

@@ -1,4 +1,5 @@
 using BreCalClient.misc.Model;
+using BreCalClient.Properties;
 using System.Windows;
 
 namespace BreCalClient
@@ -9,5 +10,25 @@ namespace BreCalClient
     public partial class App : Application
     {
         public static Participant Participant { get; set; } = new Participant();
+
+        private void Application_Exit(object sender, ExitEventArgs e)
+        {
+            BreCalClient.Properties.Settings.Default.Save();
+        }
+
+        private void Application_Startup(object sender, StartupEventArgs e)
+        {
+            // Window size sanity check
+            if(Settings.Default.Width == 0)
+            {
+                Settings.Default.Width = 800;
+                Settings.Default.Save();
+            }
+            if(Settings.Default.Height == 0)
+            {
+                Settings.Default.Height = 450;
+                Settings.Default.Save();
+            }
+        }
     }
 }

src/BreCalClient/AppNotification.cs

@@ -0,0 +1,207 @@
+// Copyright (c) 2024- schick Informatik
+// Description: Helper (static) class to handle polled API notifications
+// 
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using ToastNotifications.Core;
+using BreCalClient.misc.Model;
+
+namespace BreCalClient
+{
+    internal class AppNotification(int id)
+    {
+        private static readonly Dictionary<int, AppNotification> _notifications = [];
+        private static readonly ObservableCollection<AppNotification> _notificationsCollection = [];
+
+        #region Properties
+
+        public int Id { get { return id; } }
+
+        public string? NotificationType
+        {
+            get; private set;
+        }
+
+        public string? NotificationDisplay
+        {
+            get; private set;
+        }
+
+        public string? NotificationDate
+        {
+            get; private set;
+        }
+
+        public string? Ship
+        {
+            get; private set;
+        }
+
+        public string? ShipcallType
+        {
+            get; private set;
+        }
+
+        public string? Berth
+        {
+            get; private set;
+        }
+
+        public string? ETA
+        {
+            get; private set;
+        }
+
+        public string? Message
+        {
+            get; private set;
+        }
+    
+
+        public static ObservableCollection<AppNotification> AppNotifications { get { return _notificationsCollection; } }
+
+        #endregion
+
+        #region internal statics
+
+        internal static void LoadFromSettings()
+        {
+            _notifications.Clear();
+
+            if (Properties.Settings.Default.Notifications != null)
+            {
+                // load notification ids that have been processed
+                foreach (string? notification_id in Properties.Settings.Default.Notifications)
+                {
+                    if (Int32.TryParse(notification_id, out int result))
+                        _notifications.Add(result, new AppNotification(result));
+                }
+            }
+        }
+
+        internal static void Clear()
+        {
+            _notifications.Clear();
+            SaveNotifications();
+        }
+
+        internal static bool UpdateNotifications(List<Notification> notifications, System.Collections.Concurrent.ConcurrentDictionary<int, ShipcallControlModel> currentShipcalls, ToastViewModel vm, LoginResult loginResult)
+        {
+            bool result = false;
+
+            foreach (Notification notification in notifications)
+            {
+                if (notification.ParticipantId.HasValue && notification.ParticipantId.Value != App.Participant.Id) // not meant for us
+                    continue;
+
+                if (!currentShipcalls.ContainsKey(notification.ShipcallId)) // not one of our shipcalls (maybe for another port or filtered)
+                    continue;
+
+                // filter out notifications for shipcalls where we are not nomiated/assigned
+                if (!notification.ParticipantId.HasValue)
+                {
+                    bool iAmAssigned = false;
+                    foreach (ParticipantAssignment p in currentShipcalls[notification.ShipcallId].AssignedParticipants.Values)
+                    {
+                        if (p.ParticipantId.Equals(App.Participant.Id))
+                        {
+                            iAmAssigned = true; break;
+                        }
+                    }
+                    if (!iAmAssigned) continue;
+                }
+
+                // filter out notifications the user is not interested in                
+                if((notification.Type != null) && !loginResult.NotifyOn.Contains(notification.Type.Value))
+                    continue;
+
+                if (!_notificationsCollection.Where(x => x.Id == notification.Id).Any())
+                {
+                    List<AppNotification> newList = new(_notificationsCollection);
+
+                    AppNotification ap = new(notification.Id)
+                    {
+                        NotificationType = notification.Type.ToString(),
+                        NotificationDate = notification.Created.ToString(),
+                        Ship = currentShipcalls[notification.ShipcallId]?.Ship?.Name,
+                        ShipcallType = currentShipcalls[notification.ShipcallId]?.Shipcall?.Type.ToString(),
+                        ETA = currentShipcalls[notification.ShipcallId]?.GetETAETD(true)
+                    };
+                    Times? agencyTimes = currentShipcalls[notification.ShipcallId]?.GetTimesForParticipantType(Extensions.ParticipantType.AGENCY);
+                    ap.Berth = currentShipcalls[notification.ShipcallId]?.GetBerthText(agencyTimes);
+                    ap.Message = notification.Message;
+
+                    System.Diagnostics.Trace.WriteLine($"Notification {notification.Id} Type {notification.Type}");
+                    MessageOptions options = new()
+                    {
+                        FontSize = 14,
+                        ShowCloseButton = true,
+                        Tag = ap
+                    };
+
+                    newList.Add(ap);
+                    newList.Sort((a, b) => (a.NotificationDate ?? "").CompareTo(b.NotificationDate));
+                    _notificationsCollection.Clear();
+                    foreach(AppNotification newAp in newList)
+                        _notificationsCollection.Add(newAp);
+
+                    ap.NotificationDisplay = string.Empty;
+                    switch(notification.Type)
+                    {
+                        case misc.Model.NotificationType.Assignment:
+                            ap.NotificationDisplay = Resources.Resources.textAssignment; break;
+                        case misc.Model.NotificationType.Next24h:
+                            ap.NotificationDisplay = Resources.Resources.textNext24h; break;
+                        case misc.Model.NotificationType.TimeConflict:
+                            ap.NotificationDisplay = Resources.Resources.textTimeConflict; break;
+                        case misc.Model.NotificationType.TimeConflictResolved:
+                            ap.NotificationDisplay = Resources.Resources.textTimeConflictResolved; break;
+                        case misc.Model.NotificationType.MissingData:
+                            ap.NotificationDisplay = Resources.Resources.textMissingData; break;
+                        case misc.Model.NotificationType.Cancelled:
+                            ap.NotificationDisplay = Resources.Resources.textCancelled; break;
+                        case misc.Model.NotificationType.Unassigned:
+                            ap.NotificationDisplay = Resources.Resources.textUnassigned; break;
+                    }
+
+                    string toastText = ap.NotificationDisplay + "\n";
+
+                    toastText += $"{ap.Ship} ({ap.ShipcallType}) - {ap.ETA} - {ap.Berth}";
+                    if (!string.IsNullOrEmpty(ap.Message))
+                        toastText += $" \n{ap.Message}";
+
+                    if (_notifications.TryAdd(notification.Id, ap))
+                    {
+                        App.Current.Dispatcher.Invoke(() =>
+                        {
+                            vm.ShowAppNotification(toastText, options);
+                        });
+                        result = true;
+                    }
+                }
+            }
+
+            if (result)
+                SaveNotifications(); // store notification ids in config array on change
+
+            return result;
+        }
+
+        internal static void SaveNotifications()
+        {
+            if (Properties.Settings.Default.Notifications == null)
+                Properties.Settings.Default.Notifications = [];
+            else
+                Properties.Settings.Default.Notifications.Clear();
+            foreach (int notification_id in _notifications.Keys)
+            {
+                Properties.Settings.Default.Notifications.Add(notification_id.ToString());
+            }
+        }
+
+        #endregion
+    }
+}

src/BreCalClient/AppNotificationExtension.cs

@@ -0,0 +1,23 @@
+// Copyright (c) 2024- schick Informatik
+// Description:
+// 
+
+using ToastNotifications;
+using ToastNotifications.Core;
+
+namespace BreCalClient
+{
+    public static class AppNotificationExtension
+    {
+        public static void ShowAppNotification(this Notifier notifier, string message)
+        {
+            notifier.Notify(() => new AppNotificationMessage(message));
+        }
+
+        public static void ShowAppNotification(this Notifier notifier, string message, MessageOptions displayOptions)
+        {
+            notifier.Notify(() => new AppNotificationMessage(message, displayOptions));
+        }
+
+    }
+}

src/BreCalClient/AppNotificationMessage.cs

@@ -0,0 +1,30 @@
+using System.Windows;
+using ToastNotifications.Core;
+using ToastNotifications.Messages.Core;
+
+namespace BreCalClient
+{
+    public class AppNotificationMessage : MessageBase<AppNotificationPart>
+    {
+        public AppNotificationMessage(string message) : this(message, new MessageOptions())
+        {
+        }
+
+        public AppNotificationMessage(string message, MessageOptions options) : base(message, options)
+        {
+        }
+
+        protected override AppNotificationPart CreateDisplayPart()
+        {
+            return new AppNotificationPart(this);
+        }
+
+        protected override void UpdateDisplayOptions(AppNotificationPart displayPart, MessageOptions options)
+        {
+          //  if (options.FontSize != null)
+          //      displayPart.Text.FontSize = options.FontSize.Value;
+
+          //  displayPart.CloseButton.Visibility = options.ShowCloseButton ? Visibility.Visible : Visibility.Collapsed;
+        }
+    }
+}

src/BreCalClient/AppNotificationPart.xaml

@@ -0,0 +1,31 @@
+<core:NotificationDisplayPart x:Class="BreCalClient.AppNotificationPart"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:core="clr-namespace:ToastNotifications.Core;assembly=ToastNotifications"
+             mc:Ignorable="d" d:DesignWidth="250" >
+    <Border x:Name="ContentWrapper" Style="{DynamicResource NotificationBorder}" Background="{DynamicResource ErrorColorBrush}">
+        <Grid x:Name="ContentContainer">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="25" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto"  />
+            </Grid.ColumnDefinitions>
+            <Rectangle x:Name="Icon" Width="24" Height="24">
+                <Rectangle.Fill>
+                    <VisualBrush Visual="{StaticResource ErrorIcon}" />
+                </Rectangle.Fill>
+            </Rectangle>
+
+            <TextBlock x:Name="Text" Text="{Binding Message, Mode=OneTime}" Style="{StaticResource NotificationText}" Grid.Column="1"  />
+            <Button x:Name="CloseButton" Style="{StaticResource NotificationCloseButton}"  Padding="1" Grid.Column="2" Click="OnClose" Visibility="Hidden">
+                <Rectangle Style="{StaticResource CloseButtonIcon}" Margin="2">
+                    <Rectangle.OpacityMask>
+                        <VisualBrush Stretch="Fill" Visual="{StaticResource CloseIcon}" />
+                    </Rectangle.OpacityMask>
+                </Rectangle>
+            </Button>
+        </Grid>
+    </Border>
+</core:NotificationDisplayPart>

src/BreCalClient/AppNotificationPart.xaml.cs

@@ -0,0 +1,57 @@
+using BreCalClient.misc.Model;
+using System.Windows;
+using System.Windows.Media;
+using ToastNotifications.Core;
+
+namespace BreCalClient
+{
+    /// <summary>
+    /// Interaction logic for NotificationPart.xaml
+    /// </summary>
+    public partial class AppNotificationPart : NotificationDisplayPart
+    {
+        public AppNotificationPart(AppNotificationMessage appNotification)
+        {
+            InitializeComponent();
+            Bind(appNotification);
+
+            if (appNotification.Options.Tag is AppNotification ap)
+            {
+                switch (ap.NotificationType)
+                {
+                    case "TimeConflict":
+                        this.ContentWrapper.Background = Brushes.Red;
+                        break;
+                    case "TimeConflictResolved":
+                        this.ContentWrapper.Background = Brushes.Green;
+                        break;
+                    case "Assignment":
+                        this.ContentWrapper.Background = Brushes.Blue;
+                        break;
+                    case "Next24h":
+                        this.ContentWrapper.Background = Brushes.DarkOrange;
+                        break;
+                    case "Unassigned":
+                        this.ContentWrapper.Background = Brushes.Gray;
+                        break;
+                    case "MissingData":
+                        this.ContentWrapper.Background = Brushes.DarkKhaki;
+                        break;
+                    case "Cancelled":
+                        this.ContentWrapper.Background = Brushes.DarkGray;
+                        break;
+                    default:
+                        break;
+
+                }
+            }
+
+        }
+
+        private void OnClose(object sender, RoutedEventArgs e)
+        {
+            Notification.Close();
+        }
+
+    }
+}

src/BreCalClient/BreCalClient.csproj

@@ -2,21 +2,23 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.1.0.0</AssemblyVersion>
-    <FileVersion>1.1.0.0</FileVersion>
+    <AssemblyVersion>1.8.0.0</AssemblyVersion>
+    <FileVersion>1.8.0.0</FileVersion>
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
-    <AssemblyName>BreCalDevelClient</AssemblyName>
+    <AssemblyName>BreCalTestClient</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
+    <None Remove="Resources\24hours.png" />
+    <None Remove="Resources\add.png" />
     <None Remove="Resources\arrow_down_green.png" />
     <None Remove="Resources\arrow_down_red.png" />
     <None Remove="Resources\arrow_right_blue.png" />
@@ -24,6 +26,7 @@
     <None Remove="Resources\arrow_up_blue.png" />
     <None Remove="Resources\arrow_up_green.png" />
     <None Remove="Resources\arrow_up_red.png" />
+    <None Remove="Resources\bell3.png" />
     <None Remove="Resources\check.png" />
     <None Remove="Resources\clipboard.png" />
     <None Remove="Resources\clock.png" />
@@ -31,8 +34,13 @@
     <None Remove="Resources\containership.png" />
     <None Remove="Resources\delete.png" />
     <None Remove="Resources\delete2.png" />
+    <None Remove="Resources\edit.png" />
     <None Remove="Resources\emergency_stop_button.png" />
+    <None Remove="Resources\lock.png" />
+    <None Remove="Resources\lock_open.png" />
     <None Remove="Resources\logo_bremen_calling.png" />
+    <None Remove="Resources\nav_refresh_green.png" />
+    <None Remove="Resources\nav_undo_red.png" />
     <None Remove="Resources\ship2.png" />
     <None Remove="Resources\sign_warning.png" />
     <None Remove="Resources\trafficlight_green.png" />
@@ -68,6 +76,8 @@
       <Generator>OpenApiCodeGenerator</Generator>
       <LastGenOutput>BreCalApi.cs</LastGenOutput>
     </None>
+    <Resource Include="Resources\24hours.png" />
+    <Resource Include="Resources\add.png" />
     <Resource Include="Resources\arrow_down_green.png" />
     <Resource Include="Resources\arrow_down_red.png" />
     <Resource Include="Resources\arrow_right_blue.png" />
@@ -75,6 +85,7 @@
     <Resource Include="Resources\arrow_up_blue.png" />
     <Resource Include="Resources\arrow_up_green.png" />
     <Resource Include="Resources\arrow_up_red.png" />
+    <Resource Include="Resources\bell3.png" />
     <Resource Include="Resources\check.png" />
     <Resource Include="Resources\clipboard.png" />
     <Resource Include="Resources\clock.png" />
@@ -82,8 +93,13 @@
     <Resource Include="Resources\containership.png" />
     <Resource Include="Resources\delete.png" />
     <Resource Include="Resources\delete2.png" />
+    <Resource Include="Resources\edit.png" />
     <Resource Include="Resources\emergency_stop_button.png" />
+    <Resource Include="Resources\lock.png" />
+    <Resource Include="Resources\lock_open.png" />
     <Resource Include="Resources\logo_bremen_calling.png" />
+    <Resource Include="Resources\nav_refresh_green.png" />
+    <Resource Include="Resources\nav_undo_red.png" />
     <Resource Include="Resources\ship2.png" />
     <Resource Include="Resources\sign_warning.png" />
     <Resource Include="Resources\StringResources.de.xaml">
@@ -102,12 +118,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
+    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.6.1" />
     <PackageReference Include="JsonSubTypes" Version="2.0.1" />
-    <PackageReference Include="log4net" Version="2.0.15" />
+    <PackageReference Include="log4net" Version="3.0.3" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Polly" Version="7.2.4" />
-    <PackageReference Include="RestSharp" Version="110.2.0" />
+    <PackageReference Include="Polly" Version="8.5.1" />
+    <PackageReference Include="RestSharp" Version="112.0.0" />
+    <PackageReference Include="ToastNotifications" Version="2.5.1" />
+    <PackageReference Include="ToastNotifications.Messages" Version="2.5.1" />
   </ItemGroup>
 
   <ItemGroup>

src/BreCalClient/BreCalClient.licenseheader

@@ -1,12 +1,12 @@
 extensions: designer.cs generated.cs
 extensions: .cs .cpp .h
-// Copyright (c) 2023 schick Informatik
+// Copyright (c) 2024- schick Informatik
 // Description:
 // 
 
 extensions: .aspx .ascx
 <%-- 
-Copyright (c) 2023 schick Informatik
+Copyright (c) 2024- schick Informatik
 --%>
 extensions: .vb
 'Sample license text.

src/BreCalClient/BreCalClient.sln

@@ -10,6 +10,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "..\Setup\Setup.vdproj", "{CDC1EC53-8D75-4F8B-B627-A76B126380D4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -20,6 +22,8 @@ Global
 		{FA9E0A87-FBFB-4F2B-B5FA-46DE2E5E4BCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FA9E0A87-FBFB-4F2B-B5FA-46DE2E5E4BCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FA9E0A87-FBFB-4F2B-B5FA-46DE2E5E4BCB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CDC1EC53-8D75-4F8B-B627-A76B126380D4}.Debug|Any CPU.ActiveCfg = Debug
+		{CDC1EC53-8D75-4F8B-B627-A76B126380D4}.Release|Any CPU.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/BreCalClient/BreCalLists.cs

@@ -1,6 +1,6 @@
 // Copyright (c) 2023 schick Informatik
 // Description: Static lists used everywhere
-// 
+//
 
 using BreCalClient.misc.Model;
 using System.Collections.Concurrent;
@@ -23,23 +23,51 @@ namespace BreCalClient
         private static readonly List<Berth> _berths = new();
         private static List<Berth> _allBerths = new();
         private static List<Participant> _participants = new();
-        private static readonly List<Ship> _ships = new();
-        private static List<Ship> _allShips = new();
+        private static readonly List<ShipModel> _ships = new();
+        private static readonly List<ShipModel> _allShips = new();
+        private static readonly List<Port> _ports = new();
+        private static readonly List<Port> _allPorts = new();
 
-        private readonly static ConcurrentDictionary<int, Ship> _shipLookupDict = new();
+        private readonly static ConcurrentDictionary<int, ShipModel> _shipLookupDict = new();
         private readonly static ConcurrentDictionary<int, Berth> _berthLookupDict = new();
         private readonly static Dictionary<int, Participant> _participantLookupDict = new();
+        private readonly static ConcurrentDictionary<int, Port> _portLookupDict = new();
+
+        /// <summary>
+        /// List of TimeRef points
+        /// </summary>
+        // TODO: To make this portable the list of texts should come from a configuration file
+        private readonly static List<string> _timeRefs = new()
+        {
+            "ETB",
+            "Geeste",
+            "TN-Weser"
+        };
 
         #endregion
 
         #region Properties
 
-        public static ConcurrentDictionary<int, Ship> ShipLookupDict { get { return _shipLookupDict; } }
+        /// <summary>
+        /// fast ship lookup
+        /// </summary>
+        public static ConcurrentDictionary<int, ShipModel> ShipLookupDict { get { return _shipLookupDict; } }
 
+        /// <summary>
+        /// fast port lookup
+        /// </summary>
         public static ConcurrentDictionary<int, Berth> BerthLookupDict { get { return _berthLookupDict; } }
 
+        /// <summary>
+        /// fast participant lookup
+        /// </summary>
         public static Dictionary<int, Participant> ParticipantLookupDict { get { return _participantLookupDict; } }
 
+        /// <summary>
+        /// fast port lookup
+        /// </summary>
+        public static ConcurrentDictionary<int, Port> PortLookupDict { get { return _portLookupDict; } }
+
         /// <summary>
         /// Participants that are agents
         /// </summary>
@@ -76,23 +104,64 @@ namespace BreCalClient
         public static List<Berth> Berths { get { return _berths; } }
 
         /// <summary>
-        /// All active berths
+        /// All berths including deleted berths
         /// </summary>
         public static List<Berth> AllBerths { get { return _allBerths; } }
 
         /// <summary>
-        /// All active ships
+        /// All active ports
         /// </summary>
-        public static List<Ship> Ships { get { return _ships; } }
+        public static List<Port> Ports { get { return _ports; } }
 
         /// <summary>
-        /// All active berths
+        /// All ports including deleted ports
         /// </summary>
-        public static List<Ship> AllShips { get { return _allShips; } }
+        public static List<Port> AllPorts { get { return _allPorts; } }
+
+        /// <summary>
+        /// All active ships
+        /// </summary>
+        public static List<ShipModel> Ships { get { return _ships; } }
+
+        /// <summary>
+        /// All ships including deleted ships
+        /// </summary>
+        public static List<ShipModel> AllShips { get { return _allShips; } }
+
+        /// <summary>
+        /// List of display values for TimeRef points
+        /// </summary>
+        public static List<string> TimeRefs { get { return _timeRefs; } }
 
         #endregion
 
-        #region methods
+        #region public static methods
+
+        public static List<Berth> GetBerthsByPort(int port)
+        {
+            List<Berth> berths = new();
+            foreach(Berth berth in _berths)
+            {
+                if(berth.PortId == port)
+                    berths.Add(berth);
+            }
+            return berths;
+        }
+
+        public static List<Participant> GetParticipants(int port, Extensions.ParticipantType type)
+        {
+            List<Participant> participants = new();
+            foreach(Participant participant in _participants)
+            {
+                if(participant.IsTypeFlagSet(type) && participant.Ports.Contains(port))
+                    participants.Add(participant);
+            }
+            return participants;
+        }
+
+        #endregion
+
+        #region Internal initializer methods
 
         internal static void InitializeParticipants(List<Participant> participants)
         {
@@ -101,7 +170,7 @@ namespace BreCalClient
             aList.Clear();
             mList.Clear();
             pList.Clear();
-            tList.Clear(); 
+            tList.Clear();
             terList.Clear();
 
             foreach (Participant p in participants)
@@ -128,13 +197,28 @@ namespace BreCalClient
 
         internal static void InitializeShips(List<Ship> ships)
         {
+            _ships.Clear();
+            _allShips.Clear();
+
             foreach (var ship in ships)
             {
-                _shipLookupDict[ship.Id] = ship;
+                ShipModel sm = new(ship);
+                _shipLookupDict[ship.Id] = sm;
                 if (!ship.Deleted)
-                    _ships.Add(ship);
+                    _ships.Add(sm);
+                _allShips.Add(sm);
+            }
+        }
+
+        internal static void InitializePorts(List<Port> ports)
+        {
+            foreach(var port in ports)
+            {
+                _portLookupDict[port.Id] = port;
+                if(!port.Deleted) 
+                    _ports.Add(port);
+                _allPorts.Add(port);
             }
-            _allShips = ships;
         }
 
         #endregion

src/BreCalClient/DateTimePickerExt.cs

@@ -0,0 +1,41 @@
+using System.Text.RegularExpressions;
+using System.Windows.Input;
+using Xceed.Wpf.Toolkit;
+
+namespace BreCalClient
+{
+    public class DateTimePickerExt : DateTimePicker
+    {
+        protected override void OnPreviewTextInput(TextCompositionEventArgs e)
+        {
+            base.OnPreviewTextInput(e);
+            if (this.Template.FindName("PART_TextBox", this) is not WatermarkTextBox tb) return;
+
+            // strip input after caret
+            string subText = (tb.CaretIndex > 0) ? this.Text[..tb.CaretIndex] : tb.Text; // Range operator instead of Substring(0, tb.CaretIndex)
+            string text = subText + e.Text;
+            
+            // System.Diagnostics.Debug.WriteLine("C:" + this.Text + " E: " + e.Text + " Caret: " + tb.CaretIndex + " Subt: " + subText);
+
+            // 10 char eingabe "am Stück"
+            if (Regex.IsMatch(text, @"^\d{10}"))
+            {
+                e.Handled = true;
+                tb.Text = Regex.Replace(text, @"(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})", "$1.$2.20$3 $4:$5");
+                tb.CaretIndex = tb.Text.Length;
+                tb.SelectedText = "";
+            }
+
+            // nur die Zeit wird markiert und mit 4 Zahlen befüllt, diese Regel setzt den Doppelpunkt
+            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\. \d{4}  \d{3})"))
+            {
+                e.Handled = true;
+                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\. \d{4}  \d{2})(\d)(.*)", "$1:$2");
+                // System.Diagnostics.Trace.WriteLine("Replaced: " + tb.Text);
+                tb.CaretIndex = tb.Text.Length;
+                tb.Select(tb.Text.Length, 0);
+            }
+
+        }
+    }
+}

src/BreCalClient/ENIDataGrid.cs

@@ -0,0 +1,257 @@
+// Copyright (c) 2017 schick Informatik
+// Description: DataGrid mit etwas "verbesserten" Funktionen
+//
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+using System.Windows.Controls.Primitives;
+using System.Collections.Generic;
+
+using System.Globalization;
+using System.Threading;
+
+namespace BreCalClient
+{
+    /// <summary>
+    /// Follow steps 1a or 1b and then 2 to use this custom control in a XAML file.
+    ///
+    /// Step 1a) Using this custom control in a XAML file that exists in the current project.
+    /// Add this XmlNamespace attribute to the root element of the markup file where it is 
+    /// to be used:
+    ///
+    ///     xmlns:enictrl="clr-namespace:ENI2.Controls"
+    ///
+    ///
+    /// Step 1b) Using this custom control in a XAML file that exists in a different project.
+    /// Add this XmlNamespace attribute to the root element of the markup file where it is 
+    /// to be used:
+    ///
+    ///     xmlns:enictrl="clr-namespace:ENI2.Controls;assembly=ENI2.Controls"
+    ///
+    /// You will also need to add a project reference from the project where the XAML file lives
+    /// to this project and Rebuild to avoid compilation errors:
+    ///
+    ///     Right click on the target project in the Solution Explorer and
+    ///     "Add Reference"->"Projects"->[Browse to and select this project]
+    ///
+    ///
+    /// Step 2)
+    /// Go ahead and use your control in the XAML file.
+    ///
+    ///     <MyNamespace:ENIDataGrid/>
+    ///
+    /// </summary>
+    public class ENIDataGrid : DataGrid
+    {        
+
+        public event Action<object>? EditRequested;
+        public event Action<object>? DeleteRequested;
+        public event Action? CreateRequested;
+        public event Action? RefreshGrid;
+
+        public event Action<object>? PrintRequested;
+        public event Action<object>? ExportRequested;
+        public event Action<object>? ShowTextRequested;
+
+        public void Initialize()
+        {
+
+            this.MouseDoubleClick += dataGrid_MouseDoubleClick;
+            this.PreviewKeyDown += ENIDataGrid_PreviewKeyDown;
+
+            this.ContextMenu = new ContextMenu();
+            this.CanUserAddRows = false;
+            this.IsReadOnly = false;
+
+            MenuItem addItem = new MenuItem();
+
+            addItem.Header = BreCalClient.Resources.Resources.textAdd;
+            addItem.Icon = new Image { Source = Util.LoadImage(BreCalClient.Resources.Resources.add) };
+            addItem.Click += new RoutedEventHandler(this.addItem);            
+            this.ContextMenu.Items.Add(addItem);
+
+            MenuItem deleteItem = new MenuItem();
+            deleteItem.Header = BreCalClient.Resources.Resources.textDelete;
+            deleteItem.Icon = new Image { Source = Util.LoadImage(BreCalClient.Resources.Resources.delete) };
+            deleteItem.Click += this.deleteItem;
+            this.ContextMenu.Items.Add(deleteItem);
+
+            MenuItem editItem = new MenuItem();
+            editItem.Header = BreCalClient.Resources.Resources.textEdit;
+            editItem.Icon = new Image { Source = Util.LoadImage(BreCalClient.Resources.Resources.edit) };
+            editItem.Click += this.editItem;
+            this.ContextMenu.Items.Add(editItem);            
+        }
+
+        private void ENIDataGrid_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if(sender is ENIDataGrid)
+            {
+                var grid = sender as ENIDataGrid;
+                if (Key.Delete == e.Key)
+                    this.deleteItem(null, null);
+            }
+        }
+
+        #region public
+
+        public DataGridRow GetRow(int index)
+        {
+            DataGridRow row = (DataGridRow)this.ItemContainerGenerator.ContainerFromIndex(index);
+            if(row == null)
+            {
+                this.UpdateLayout();
+                this.ScrollIntoView(this.Items[index]);
+                row = (DataGridRow)this.ItemContainerGenerator.ContainerFromIndex(index);
+            }
+            return row;
+        }
+
+        public DataGridCell? GetCell(DataGridRow row, int column)
+        {
+            if (row != null)
+            {
+                DataGridCellsPresenter? presenter = GetVisualChild<DataGridCellsPresenter>(row);
+
+                if (presenter == null)
+                {
+                    this.ScrollIntoView(row, this.Columns[column]);
+                    presenter = GetVisualChild<DataGridCellsPresenter>(row);
+                }
+
+                DataGridCell? cell = (DataGridCell?)presenter?.ItemContainerGenerator.ContainerFromIndex(column);
+                return cell;
+            }
+            return null;
+        }
+
+        public DataGridCell? GetCell(int rowIndex, int columnIndex)
+        {
+            DataGridRow row = this.GetRow(rowIndex);
+            return this.GetCell(row, columnIndex);
+        }
+
+        #endregion
+
+        #region protected
+
+        protected void addItem(object sender, RoutedEventArgs e)
+        {            
+            if (!this.IsReadOnly)
+            {
+                this.CreateRequested?.Invoke();
+            }
+            e.Handled = true;
+        }
+
+        protected void deleteItem(object? sender, RoutedEventArgs? e)
+        {
+            if((this.SelectedItems != null) && (this.SelectedItems.Count > 0) && !this.IsReadOnly)
+            {
+                MessageBoxResult result = MessageBox.Show("Are your sure?", "Please confirm", MessageBoxButton.YesNo, MessageBoxImage.Question);
+                if (result == MessageBoxResult.Yes)
+                {
+                    List<object> deleteList = new List<object>();
+                    foreach (object deleteItem in this.SelectedItems)
+                        deleteList.Add(deleteItem);
+
+                    foreach (object deleteItem in deleteList)
+                    {
+                        if (deleteItem != null)
+                        {
+                            this.DeleteRequested?.Invoke(deleteItem);
+                        }
+                    }
+
+                    this.RefreshGrid?.Invoke();
+
+                }
+            }
+        }        
+
+        protected void editItem(object sender, RoutedEventArgs e)
+        {
+            if((this.SelectedItems != null) && (this.SelectedItems.Count == 1) && !this.IsReadOnly)
+            {
+                if (this.SelectedItems[0] is object selectedEntity)
+                    this.EditRequested?.Invoke(selectedEntity);
+            }
+        }
+
+        protected void printItem(object sender, RoutedEventArgs e)
+        {
+            if ((this.SelectedItems != null) && (this.SelectedItems.Count == 1) )
+            {
+                if (this.SelectedItems[0] is object selectedEntity)
+                    this.PrintRequested?.Invoke(selectedEntity);
+            }
+        }
+
+        protected void exportItem(object sender, RoutedEventArgs e)
+        {
+            if ((this.SelectedItems != null) && (this.SelectedItems.Count == 1))
+            {
+                if (this.SelectedItems[0] is object selectedEntity)
+                    this.ExportRequested?.Invoke(selectedEntity);
+            }
+        }
+
+        protected void showTextItem(object sender, RoutedEventArgs e)
+        {
+            if ((this.SelectedItems != null) && (this.SelectedItems.Count == 1))
+            {
+                if (this.SelectedItems[0] is object selectedEntity)
+                    this.ShowTextRequested?.Invoke(selectedEntity);
+            }
+        }
+
+        #endregion
+
+        #region private
+
+        private void dataGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            if (sender != null)
+            {
+                if ((sender is DataGrid grid) && (grid.SelectedItems != null) && (grid.SelectedItems.Count == 1) && !this.IsReadOnly)
+                {
+                    DataGridRow? dgr = grid.ItemContainerGenerator.ContainerFromItem(grid.SelectedItem) as DataGridRow;
+                    if (grid.SelectedItem is object selectedEntity)
+                        this.EditRequested?.Invoke(selectedEntity);
+                }
+            }
+        }
+
+        #endregion
+
+        #region private static
+
+        private static T? GetVisualChild<T>(Visual parent) where T : Visual
+        {
+            T? child = default;
+            int numVisuals = VisualTreeHelper.GetChildrenCount(parent);
+            for (int i = 0; i < numVisuals; i++)
+            {
+                Visual? v = (Visual)VisualTreeHelper.GetChild(parent, i);
+                child = v as T;
+                if (child == null)
+                {
+                    child = GetVisualChild<T>(v);
+                }
+                if (child != null)
+                {
+                    break;
+                }
+            }
+            return child;
+        }
+
+        #endregion
+
+    }
+}

src/BreCalClient/EditShipDialog.xaml

@@ -0,0 +1,54 @@
+<Window x:Class="BreCalClient.EditShipDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:BreCalClient"
+        xmlns:p = "clr-namespace:BreCalClient.Resources"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        mc:Ignorable="d"
+        Left="{local:SettingBinding W3Left}" Top="{local:SettingBinding W3Top}"
+        Title="{x:Static p:Resources.textEditShip}" Height="250" Width="500" Loaded="Window_Loaded" ResizeMode="NoResize">
+    <Grid x:Name="shipGrid">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width=".3*" />
+            <ColumnDefinition Width=".6*" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="28" />
+        </Grid.RowDefinitions>
+        <Label Content="Name" HorizontalAlignment="Right" />
+        <TextBox x:Name="textBoxName" Grid.Column="1" Margin="2" VerticalContentAlignment="Center" Text="{Binding Name, Mode=OneWay}" TextChanged="textBoxName_TextChanged" MaxLength="64"/>
+        <Label Content="{x:Static p:Resources.textTugCompany}" HorizontalAlignment="Right" Grid.Row="1" />
+        <Grid Grid.Row="1" Grid.Column="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="28" />
+            </Grid.ColumnDefinitions>
+            <ComboBox x:Name="comboBoxParticipants" Margin="2" DisplayMemberPath="Name" />
+            <Button x:Name="buttonResetParticipant" Grid.Column="1" Margin="2" Click="buttonResetParticipant_Click">
+                <Image Source="./Resources/delete2.png"/>
+            </Button>
+        </Grid>
+        <Label Content="IMO" HorizontalAlignment="Right" Grid.Row="2" />
+        <xctk:IntegerUpDown Name="integerUpDownIMO" Grid.Column="1" Grid.Row="2" Value="{Binding Imo, Mode=OneWay}" Margin="2" Minimum="1000000" Maximum="9999999" ShowButtonSpinner="False" ValueChanged="integerUpDownIMO_ValueChanged"/>
+        <Label Content="{x:Static p:Resources.textCallsign}" HorizontalAlignment="Right" Grid.Row="3" />
+        <TextBox x:Name="textBoxCallsign" Grid.Column="1"  Grid.Row="3" Margin="2" VerticalContentAlignment="Center" Text="{Binding Callsign, Mode=OneWay}" MaxLength="8"/>
+        <Label Content="{x:Static p:Resources.textLength}" HorizontalAlignment="Right" Grid.Row="4" />
+        <xctk:DoubleUpDown Name="doubleUpDownLength" Grid.Row="4" Grid.Column="1" Value="{Binding Length, Mode=OneWay}" Margin="2" Minimum="0" />
+        <Label Content="{x:Static p:Resources.textWidth}" HorizontalAlignment="Right" Grid.Row="5" />
+        <xctk:DoubleUpDown Name="doubleUpDownWidth" Grid.Row="5" Grid.Column="1" Value="{Binding Width, Mode=OneWay}" Margin="2" Minimum="0"/>
+        <StackPanel Grid.Column="1" Grid.Row="7" Orientation="Horizontal" FlowDirection="RightToLeft">
+            <Button x:Name="buttonCancel" Width="80" Content="{x:Static p:Resources.textCancel}" Margin="2" Click="buttonCancel_Click" />
+            <Button x:Name="buttonOK" Width="80" Content="OK" Margin="2" Click="buttonOK_Click"/>
+        </StackPanel>
+
+    </Grid>
+</Window>

src/BreCalClient/EditShipDialog.xaml.cs

@@ -0,0 +1,87 @@
+using BreCalClient.misc.Model;
+
+using System.Collections.Generic;
+using System.Windows;
+
+namespace BreCalClient
+{
+    /// <summary>
+    /// Interaction logic for EditShipDialog.xaml
+    /// </summary>
+    public partial class EditShipDialog : Window
+    {
+        public EditShipDialog()
+        {
+            InitializeComponent();
+        }
+
+        public Ship Ship { get; set; } = new();
+
+        public List<Participant> Participants { get; } = new List<Participant>();
+
+        private void buttonCancel_Click(object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = false;
+            this.Close();
+        }
+
+        private void buttonOK_Click(object sender, RoutedEventArgs e)
+        {
+            
+            this.Ship.Name = this.textBoxName.Text.ToUpper().Trim();
+
+            if (this.comboBoxParticipants.SelectedItem != null)
+            {
+                this.Ship.ParticipantId = ((Participant)this.comboBoxParticipants.SelectedItem).Id;
+                this.Ship.IsTug = true;
+            } 
+            else
+            {
+                this.Ship.IsTug = false;
+            }
+            this.Ship.Imo = this.integerUpDownIMO.Value;
+            this.Ship.Callsign = this.textBoxCallsign.Text.ToUpper().Trim();
+            this.Ship.Length = this.doubleUpDownLength.Value;
+            this.Ship.Width = this.doubleUpDownWidth.Value;
+            this.DialogResult = true;
+            this.Close();
+            
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.DataContext = this.Ship;
+            this.comboBoxParticipants.ItemsSource = this.Participants;            
+
+            if(this.Ship.ParticipantId != null)
+            {
+                foreach(Participant p in this.Participants)
+                {
+                    if(this.Ship.ParticipantId == p.Id)
+                        this.comboBoxParticipants.SelectedItem = p;
+                }
+            }
+            this.EnableOK();
+        }
+
+        private void buttonResetParticipant_Click(object sender, RoutedEventArgs e)
+        {
+           this.comboBoxParticipants.SelectedItem = null;
+        }
+
+        private void textBoxName_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+        {
+            this.EnableOK();
+        }
+
+        private void integerUpDownIMO_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            this.EnableOK();
+        }
+
+        private void EnableOK()
+        {
+            this.buttonOK.IsEnabled = (this.textBoxName.Text.Length > 2) && (this.integerUpDownIMO.Value.HasValue);
+        }
+    }
+}

src/BreCalClient/EditShipcallControl.xaml

@@ -5,12 +5,13 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BreCalClient"
         xmlns:p = "clr-namespace:BreCalClient.Resources"
-        xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
+        xmlns:api="clr-namespace:BreCalClient.misc.Model"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textEditShipcall}" Height="242" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+        mc:Ignorable="d" Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
+        Title="{x:Static p:Resources.textEditShipcall}" Height="298" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
     <Window.Resources>
         <local:BoolToIndexConverter x:Key="boolToIndexConverter" />
+        <local:EnumToStringConverter x:Key="enumToStringConverter" />
     </Window.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
@@ -27,41 +28,29 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
         </Grid.RowDefinitions>
 
         <Label Content="{x:Static p:Resources.textShip}" Grid.Column="0" Grid.Row="0"  HorizontalContentAlignment="Right"/>
-        <ComboBox x:Name="comboBoxShip" Margin="2" Grid.Column="1" Grid.Row="0" SelectionChanged="comboBoxShip_SelectionChanged" SelectedValuePath="Id">
-            <ComboBox.ItemTemplate>
-                <DataTemplate>
-                    <!--Border-->
-                    <TextBlock>
-                        <TextBlock.Text>
-                            <MultiBinding StringFormat="{}{0} ({1})">
-                                <Binding Path="Name" />
-                                <Binding Path="Imo" />
-                            </MultiBinding>
-                        </TextBlock.Text>
-                    </TextBlock>
-                    <!--/Border-->
-                </DataTemplate>
-            </ComboBox.ItemTemplate>
-        </ComboBox>
+        <ComboBox x:Name="comboBoxShip" Margin="2" Grid.Column="1" Grid.Row="0" SelectionChanged="comboBoxShip_SelectionChanged" SelectedValuePath="Ship.Id" IsEditable="True" IsTextSearchEnabled="True" IsTextSearchCaseSensitive="False" />
         <Label Content="IMO" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right"/>
-        <xctk:IntegerUpDown x:Name="integerUpDownIMO" IsReadOnly="True" Margin="2" Grid.Column="1" Grid.Row="1" />
+        <xctk:IntegerUpDown x:Name="integerUpDownIMO" IsReadOnly="True" Margin="2" Grid.Column="1" Grid.Row="1" ShowButtonSpinner="False" IsEnabled="False"/>
         <Label Content="{x:Static p:Resources.textCallsign}" Grid.Column="0" Grid.Row="2"  HorizontalContentAlignment="Right"/>
-        <TextBox x:Name="textBoxCallsign" IsReadOnly="True" Grid.Column="1" Grid.Row="2" Margin="2" />
+        <TextBox x:Name="textBoxCallsign" IsReadOnly="True" Grid.Column="1" Grid.Row="2" Margin="2" IsEnabled="False"/>
         <Label Content="{x:Static p:Resources.textLength}" Grid.Column="0" Grid.Row="3"  HorizontalContentAlignment="Right"/>
-        <xctk:DoubleUpDown x:Name="doubleUpDownLength" Margin="2" Grid.Column="1" Grid.Row="3" FormatString="N2" IsReadOnly="True" />
+        <xctk:DoubleUpDown x:Name="doubleUpDownLength" Margin="2" Grid.Column="1" Grid.Row="3" FormatString="N2" IsReadOnly="True" IsEnabled="False" ShowButtonSpinner="False"/>
         <Label Content="{x:Static p:Resources.textWidth}" Grid.Column="0" Grid.Row="4"  HorizontalContentAlignment="Right"/>
-        <xctk:DoubleUpDown x:Name="doubleUpDownWidth" Margin="2" Grid.Column="1" Grid.Row="4" FormatString="N2" IsReadOnly="True" />
+        <xctk:DoubleUpDown x:Name="doubleUpDownWidth" Margin="2" Grid.Column="1" Grid.Row="4" FormatString="N2" IsReadOnly="True" IsEnabled="False" ShowButtonSpinner="False"/>
         <Label Content="{x:Static p:Resources.textCancelled}" Grid.Column="0" Grid.Row="5" HorizontalContentAlignment="Right" />
         <CheckBox x:Name="checkBoxCancelled" Grid.Column="1" Grid.Row="5" Margin="2" VerticalContentAlignment="Center" />
+        <Label Content="{x:Static p:Resources.textHarbour}" Grid.Column="0" Grid.Row="6" HorizontalContentAlignment="Right" />
+        <ComboBox x:Name="comboBoxHarbour" Grid.Column="1" Margin="2" Grid.Row="6" DisplayMemberPath="Name" SelectedValuePath="Id" />
+        <Button x:Name="buttonEditShips" Grid.Column="1" Grid.Row="7" Margin="2" Content="{x:Static p:Resources.textEditShips}" Click="buttonEditShips_Click" Visibility="Hidden" />
 
         <Label Content="{x:Static p:Resources.textType}" Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" />
-        <Label Content="ETA" Grid.Column="2" Grid.Row="2"  HorizontalContentAlignment="Right"/>
-        <Label Content="ETD" Grid.Column="2" Grid.Row="3"  HorizontalContentAlignment="Right"/>
 
-        <ComboBox x:Name="comboBoxCategories" Grid.Column="3" Margin="2" Grid.Row="0" SelectedValuePath="Key" SelectionChanged="comboBoxCategories_SelectionChanged"/>
+        <ComboBox ItemsSource="{local:Enumerate {x:Type api:ShipcallType}}" Grid.Column="3" Margin="2" Grid.Row="0" SelectionChanged="comboBoxCategories_SelectionChanged" x:Name="comboBoxCategories" />
 
         <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="2" Grid.Row="1"  HorizontalContentAlignment="Right"/>
         <Grid Grid.Row="1" Grid.Column="3">
@@ -75,12 +64,19 @@
 
 
         </Grid>
-        
-        <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="3" Grid.Row="2" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETA_ValueChanged"/>
-        <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="3" Grid.Row="3" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETD_ValueChanged"/>
 
-        <Label Content="{x:Static p:Resources.textAgency}" Grid.Column="2" Grid.Row="4"  HorizontalContentAlignment="Right"/>
-        <ComboBox Name="comboBoxAgency" Grid.Column="3" Grid.Row="4" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" SelectionChanged="comboBoxAgency_SelectionChanged">
+        <Label Content="Zeit Ref." Grid.Column="2" Grid.Row="2" HorizontalContentAlignment="Right" />
+
+        <Label Content="ETA" Grid.Column="2" Grid.Row="4"  HorizontalContentAlignment="Right" Margin="0,2,0,26" Grid.RowSpan="2" x:Name="labelETA"/>
+        <Label Content="ETD" Grid.Column="2" Grid.Row="3"  HorizontalContentAlignment="Right" x:Name="labelETD"/>
+
+        <ComboBox x:Name="comboBoxTimeRef" Grid.Column="3" Margin="2" Grid.Row="2" />
+        
+        <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="3" Grid.Row="3" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETD_ValueChanged"/>
+        <local:DateTimePickerExt x:Name="datePickerETA" Grid.Column="3" Grid.Row="4" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETA_ValueChanged"/>
+
+        <Label Content="{x:Static p:Resources.textAgency}" Grid.Column="2" Grid.Row="5"  HorizontalContentAlignment="Right"/>
+        <ComboBox Name="comboBoxAgency" Grid.Column="3" Grid.Row="5" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" SelectionChanged="comboBoxAgency_SelectionChanged">
             <ComboBox.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearAgency" Click="contextMenuItemClearAgency_Click" />
@@ -88,8 +84,12 @@
             </ComboBox.ContextMenu>
         </ComboBox>
 
-        <Label x:Name="labelBSMDGranted" Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textBSMDGranted}" Visibility="Hidden" FontWeight="DemiBold" />
-        <StackPanel Grid.Row="6" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
+        <Label x:Name="labelBSMDGranted" Grid.Row="7" Grid.Column="3" Grid.ColumnSpan="1" Content="{x:Static p:Resources.textBSMDGranted}" Visibility="Hidden" FontWeight="DemiBold" />
+
+        <Label x:Name="labelShiftingCount" Grid.Row="6" Grid.Column="2" HorizontalAlignment="Right" Content="{x:Static p:Resources.textShiftingSequence}" />
+        <xctk:IntegerUpDown x:Name="integerUpDownShiftingCount" Grid.Row="6" Grid.Column="3" Margin="2" Minimum="0" Maximum="127" />
+
+        <StackPanel Grid.Row="8" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False" />
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
         </StackPanel>

src/BreCalClient/EditShipcallControl.xaml.cs

@@ -2,8 +2,11 @@
 // Description: Windows dialog to create / edit ship calls
 //
 
+using BreCalClient.misc.Api;
 using BreCalClient.misc.Model;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using static BreCalClient.Extensions;
@@ -31,18 +34,37 @@ namespace BreCalClient
             }
         }
 
+        public bool ShipEditingEnabled
+        {
+            get { return this.buttonEditShips.Visibility == Visibility.Visible; }
+            set { this.buttonEditShips.Visibility = value ? Visibility.Visible : Visibility.Hidden; }
+        }
+
+        public ShipApi? ShipApi { get; set; }
+
+        public bool IsCreate { get; set; } = false;
+
         #endregion
 
         #region Event handler
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
-        {
-            this.comboBoxAgency.ItemsSource = BreCalLists.Participants_Agent;
+        {         
 
             this.comboBoxShip.ItemsSource = BreCalLists.Ships;
-            this.comboBoxCategories.ItemsSource = Enum.GetValues(typeof(TypeEnum));
-            this.comboBoxArrivalBerth.ItemsSource = BreCalLists.Berths;
-            this.comboBoxDepartureBerth.ItemsSource = BreCalLists.Berths;
+            Array types = Enum.GetValues(typeof(ShipcallType));
+            List<ShipcallType> shipcallTypes = new();
+            bool first = true;
+            foreach(ShipcallType shipcallType in types)
+            {
+                if (!first) shipcallTypes.Add(shipcallType);
+                else first = false;
+            }            
+
+            this.comboBoxTimeRef.ItemsSource = BreCalLists.TimeRefs;
+            this.comboBoxHarbour.ItemsSource = BreCalLists.Ports.Where(x => App.Participant.Ports.Contains(x.Id));
+
+            this.integerUpDownShiftingCount.Value = this.ShipcallModel.ShiftSequence;
 
             if (this.ShipcallModel.Shipcall == null) this.ShipcallModel.Shipcall = new();
             this.CopyToControls();
@@ -64,14 +86,14 @@ namespace BreCalClient
         }
 
         private void comboBoxShip_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {            
+        {
             if (this.comboBoxShip.SelectedItem != null)
             {
-                Ship? ship = this.comboBoxShip.SelectedItem as Ship;
-                this.integerUpDownIMO.Value = ship?.Imo;
-                this.textBoxCallsign.Text = ship?.Callsign;
-                this.doubleUpDownLength.Value = ship?.Length;
-                this.doubleUpDownWidth.Value = ship?.Width;
+                ShipModel? ship = this.comboBoxShip.SelectedItem as ShipModel;
+                this.integerUpDownIMO.Value = ship?.Ship.Imo;
+                this.textBoxCallsign.Text = ship?.Ship.Callsign;
+                this.doubleUpDownLength.Value = ship?.Ship.Length;
+                this.doubleUpDownWidth.Value = ship?.Ship.Width;
             }
             else
             {
@@ -91,32 +113,53 @@ namespace BreCalClient
 
         private void comboBoxCategories_SelectionChanged(object? sender, SelectionChangedEventArgs? e)
         {
-            TypeEnum? type = this.comboBoxCategories.SelectedItem as TypeEnum?;
+            ShipcallType? type = GetShipcallTypeFromCombobox();
             if (type != null)
             {
                 switch (type)
                 {
-                    case TypeEnum.Incoming:
-                        this.datePickerETA.IsEnabled = true;
-                        this.datePickerETD.IsEnabled = false;
+                    case ShipcallType.Arrival:
+                        this.datePickerETD.Visibility = Visibility.Hidden;
+                        this.labelETD.Visibility = Visibility.Hidden;
+                        this.datePickerETA.Visibility = Visibility.Visible;
+                        this.labelETA.Visibility = Visibility.Visible;
+                        Grid.SetRow(datePickerETA, 3);
+                        Grid.SetRow(labelETA, 3);
                         this.datePickerETD.Value = null;
                         this.comboBoxDepartureBerth.SelectedIndex = -1;
                         this.comboBoxDepartureBerth.IsEnabled = false;
                         this.comboBoxArrivalBerth.IsEnabled = true;
+                        this.comboBoxTimeRef.IsEnabled = true;
+                        this.labelShiftingCount.Visibility = Visibility.Hidden;
+                        this.integerUpDownShiftingCount.Visibility = Visibility.Hidden;
                         break;
-                    case TypeEnum.Outgoing:
-                        this.datePickerETA.IsEnabled = false;
-                        this.datePickerETD.IsEnabled = true;
+                    case ShipcallType.Departure:
+                        this.datePickerETD.Visibility = Visibility.Visible;
+                        this.labelETD.Visibility = Visibility.Visible;
+                        this.datePickerETA.Visibility = Visibility.Hidden;
+                        this.labelETA.Visibility = Visibility.Hidden;
                         this.datePickerETA.Value = null;
                         this.comboBoxArrivalBerth.SelectedIndex = -1;
                         this.comboBoxArrivalBerth.IsEnabled = false;
                         this.comboBoxDepartureBerth.IsEnabled = true;
+                        this.comboBoxTimeRef.IsEnabled = false;
+                        this.comboBoxTimeRef.SelectedIndex = 0;
+                        this.labelShiftingCount.Visibility = Visibility.Hidden;
+                        this.integerUpDownShiftingCount.Visibility = Visibility.Hidden;
                         break;
-                    case TypeEnum.Shifting:
-                        this.datePickerETA.IsEnabled = true;
-                        this.datePickerETD.IsEnabled = true;
+                    case ShipcallType.Shifting:
+                        Grid.SetRow(datePickerETA, 4);
+                        Grid.SetRow(labelETA, 4);
+                        this.datePickerETA.Visibility = Visibility.Visible;
+                        this.labelETA.Visibility = Visibility.Visible;
+                        this.datePickerETD.Visibility = Visibility.Visible;
+                        this.labelETD.Visibility = Visibility.Visible;
                         this.comboBoxArrivalBerth.IsEnabled = true;
                         this.comboBoxDepartureBerth.IsEnabled = true;
+                        this.comboBoxTimeRef.IsEnabled = false;
+                        this.comboBoxTimeRef.SelectedIndex = 0;
+                        this.labelShiftingCount.Visibility = Visibility.Visible;
+                        this.integerUpDownShiftingCount.Visibility = Visibility.Visible;
                         break;
                 }
             }
@@ -132,17 +175,26 @@ namespace BreCalClient
             this.comboBoxAgency.SelectedIndex = -1;
             this.ShipcallModel.AssignedParticipants.Remove(Extensions.ParticipantType.AGENCY);
         }
-        
+
         #endregion
 
         #region private methods
 
+        ShipcallType? GetShipcallTypeFromCombobox()
+        {
+            EnumToStringConverter enumToStringConverter = new();
+            return (ShipcallType?)enumToStringConverter.ConvertBack(this.comboBoxCategories.SelectedItem, typeof(ShipcallType), new object(), System.Globalization.CultureInfo.CurrentCulture);
+        }
+
         void CheckForCompletion()
         {
+            if (this.ShipcallModel.Shipcall?.Canceled ?? false) return; // Cancelled shipcall never clicks ok
+
             bool isEnabled = true;
 
             isEnabled &= this.comboBoxShip.SelectedItem != null;
             isEnabled &= this.comboBoxCategories.SelectedItem != null;
+            isEnabled &= this.comboBoxHarbour.SelectedItem != null;
 
             if (comboBoxCategories.SelectedItem == null)
             {
@@ -150,25 +202,35 @@ namespace BreCalClient
             }
             else
             {
-                TypeEnum callType = (TypeEnum)comboBoxCategories.SelectedItem;
+                ShipcallType callType = GetShipcallTypeFromCombobox() ?? ShipcallType.Undefined;
                 switch (callType)
                 {
-                    case TypeEnum.Outgoing:
+                    case ShipcallType.Departure:
                         isEnabled &= this.comboBoxDepartureBerth.SelectedItem != null;
-                        isEnabled &= this.datePickerETD.Value.HasValue;
-                        break;                        
-                    case TypeEnum.Incoming:
-                        isEnabled &= this.comboBoxArrivalBerth.SelectedItem != null;
-                        isEnabled &= this.datePickerETA.Value.HasValue;
+                        isEnabled &= this.datePickerETD.Value.HasValue;                        
+                        isEnabled &= !(this.datePickerETD.Value.IsTooOld() && this.datePickerETD.Value != this.ShipcallModel.Shipcall?.Etd);
+                        isEnabled &= !this.datePickerETD.Value.IsTooFar();
                         break;
-                    case TypeEnum.Shifting:
+                    case ShipcallType.Arrival:
+                        isEnabled &= this.comboBoxArrivalBerth.SelectedItem != null;
+                        isEnabled &= this.datePickerETA.Value.HasValue;                        
+                        isEnabled &= !(this.datePickerETA.Value.IsTooOld() && this.datePickerETA.Value != this.ShipcallModel.Shipcall?.Eta);
+                        isEnabled &= !this.datePickerETA.Value.IsTooFar();
+                        break;
+                    case ShipcallType.Shifting:
                         isEnabled &= ((this.comboBoxDepartureBerth.SelectedItem != null) && (this.comboBoxArrivalBerth.SelectedItem != null));
                         isEnabled &= this.datePickerETD.Value.HasValue;
-                        isEnabled &= this.datePickerETA.Value.HasValue;
+                        isEnabled &= this.datePickerETA.Value.HasValue;                        
+                        isEnabled &= !(this.datePickerETD.Value.IsTooOld() && this.datePickerETD.Value != this.ShipcallModel.Shipcall?.Etd);
+                        isEnabled &= !(this.datePickerETA.Value.IsTooOld() && this.datePickerETA.Value != this.ShipcallModel.Shipcall?.Eta);
+                        if (this.datePickerETA.Value.HasValue && this.datePickerETD.Value.HasValue)
+                            isEnabled &= (this.datePickerETA.Value.Value > this.datePickerETD.Value.Value);
+                        isEnabled &= !this.datePickerETD.Value.IsTooFar();
+                        isEnabled &= !this.datePickerETA.Value.IsTooFar();
                         break;
                 }
             }
-                        
+
             isEnabled &= this.comboBoxAgency.SelectedItem != null;
 
             this.buttonOK.IsEnabled = isEnabled;
@@ -178,23 +240,24 @@ namespace BreCalClient
         {
             if (this.ShipcallModel.Shipcall != null)
             {
-                this.ShipcallModel.Shipcall.Type = (int)this.comboBoxCategories.SelectedItem;
+                this.ShipcallModel.Shipcall.Type = GetShipcallTypeFromCombobox() ?? ShipcallType.Undefined;
                 this.ShipcallModel.Shipcall.Eta = this.datePickerETA.Value;
                 this.ShipcallModel.Shipcall.Etd = this.datePickerETD.Value;
 
-                this.ShipcallModel.Shipcall.ShipId = ((Ship)this.comboBoxShip.SelectedItem).Id;
-                this.ShipcallModel.Ship = (Ship)this.comboBoxShip.SelectedItem;
+                this.ShipcallModel.Shipcall.ShipId = ((ShipModel)this.comboBoxShip.SelectedItem).Ship.Id;
+                this.ShipcallModel.Ship = ((ShipModel)this.comboBoxShip.SelectedItem).Ship;
                 this.ShipcallModel.Shipcall.Canceled = this.checkBoxCancelled.IsChecked;
 
-                if (this.ShipcallModel.Shipcall.Type != 3) // incoming, outgoing
+                if (this.ShipcallModel.Shipcall.Type != ShipcallType.Shifting) // 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;
+                    this.ShipcallModel.ShiftSequence = (byte?) this.integerUpDownShiftingCount.Value;
                 }
 
                 Participant? participant;
@@ -204,10 +267,11 @@ namespace BreCalClient
                     ParticipantAssignment pa = new()
                     {
                         ParticipantId = participant.Id,
+
                         Type = (int)Extensions.ParticipantType.AGENCY
                     };
                     this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.AGENCY] = pa;
-                } 
+                }
                 else
                 {
                     // AGENCY was set before and now is set to nothing
@@ -245,6 +309,10 @@ namespace BreCalClient
                     };
                     this.ShipcallModel.AssignedParticipants[ParticipantType.BSMD] = pa;
                 }
+
+                // set the time reference value (which point do all times refer to?)
+                this.ShipcallModel.Shipcall.TimeRefPoint = this.comboBoxTimeRef.SelectedIndex;
+                this.ShipcallModel.Shipcall.PortId = ((Port) this.comboBoxHarbour.SelectedItem).Id;
             }
         }
 
@@ -253,15 +321,32 @@ namespace BreCalClient
             if (this.ShipcallModel == null) return;
             if (this.ShipcallModel.Shipcall != null)
             {
-                this.comboBoxCategories.SelectedItem = (TypeEnum)this.ShipcallModel.Shipcall.Type;
+                this.comboBoxTimeRef.SelectedIndex = this.ShipcallModel.Shipcall.TimeRefPoint ?? 1;
+                this.comboBoxCategories.SelectedItem = new EnumToStringConverter().Convert(this.ShipcallModel.Shipcall.Type, typeof(ShipcallType), new object(), System.Globalization.CultureInfo.CurrentCulture);
                 if (this.ShipcallModel.Shipcall.Eta != DateTime.MinValue)
-                    this.datePickerETA.Value = this.ShipcallModel.Shipcall.Eta;
-                // this.textBoxVoyage.Text = this.ShipcallModel.Shipcall.Voyage;
+                    this.datePickerETA.Value = this.ShipcallModel.Shipcall.Eta;               
+
                 this.datePickerETD.Value = this.ShipcallModel.Shipcall.Etd;
-                this.comboBoxShip.SelectedValue = this.ShipcallModel.Shipcall.ShipId;
+                if (BreCalLists.Ships.Find(x => x.Ship.Id == this.ShipcallModel.Shipcall.ShipId) != null)
+                {
+                    this.comboBoxShip.SelectedValue = this.ShipcallModel.Shipcall.ShipId;
+                } else
+                {
+                    this.comboBoxShip.IsEnabled = false;
+                }
                 this.checkBoxCancelled.IsChecked = this.ShipcallModel.Shipcall.Canceled ?? false;
 
-                if (this.ShipcallModel.Shipcall.Type != 3) // incoming, outgoing
+                if (BreCalLists.PortLookupDict.ContainsKey(this.ShipcallModel.Shipcall.PortId))
+                    this.comboBoxHarbour.SelectedValue = this.ShipcallModel.Shipcall.PortId;
+                List<Berth> availableBerths = BreCalLists.GetBerthsByPort(this.ShipcallModel.Shipcall.PortId);                
+                this.comboBoxArrivalBerth.ItemsSource = availableBerths;                
+                this.comboBoxDepartureBerth.ItemsSource = availableBerths;
+
+                // Filter agency combobox by port
+                List<Participant> availableAgencies = BreCalLists.GetParticipants(this.ShipcallModel.Shipcall.PortId, ParticipantType.AGENCY);                
+                this.comboBoxAgency.ItemsSource = availableAgencies;
+
+                if (this.ShipcallModel.Shipcall.Type != ShipcallType.Shifting) // incoming, outgoing
                 {
                     this.comboBoxArrivalBerth.SelectedValue = this.ShipcallModel.Shipcall.ArrivalBerthId;
                     this.comboBoxDepartureBerth.SelectedValue = this.ShipcallModel.Shipcall.DepartureBerthId;
@@ -273,14 +358,18 @@ namespace BreCalClient
                 }
 
                 if (this.ShipcallModel.Shipcall.Participants == null) this.ShipcallModel.Shipcall.Participants = new();
-                
+
                 if(this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.AGENCY))
                 {
                     if (BreCalLists.ParticipantLookupDict.ContainsKey(this.ShipcallModel.AssignedParticipants[ParticipantType.AGENCY].ParticipantId))
                     {
                         this.comboBoxAgency.SelectedValue = this.ShipcallModel.AssignedParticipants[ParticipantType.AGENCY].ParticipantId;
                     }
-                }                
+                }
+                                
+                this.comboBoxHarbour.SelectionChanged += this.comboBoxHarbour_SelectionChanged;
+
+                this.comboBoxHarbour.IsEnabled = this.ShipcallModel.AllowPortChange;
             }
         }
 
@@ -291,6 +380,8 @@ namespace BreCalClient
 
             bool editRightGrantedForBSMD = false;
 
+            if (this.ShipcallModel.Shipcall?.Canceled ?? false) return; // do not allow edit on canceled shipcall
+
             // Special case: Selected Agency allows BSMD to edit their fields
             if (this.comboBoxAgency.SelectedIndex >= 0)
             {
@@ -311,9 +402,10 @@ namespace BreCalClient
             this.comboBoxDepartureBerth.IsEnabled = isBsmd || isAgency;
             this.comboBoxShip.IsEnabled = isBsmd;
             this.datePickerETA.IsEnabled = isAgency || isBsmd;
-            this.datePickerETD.IsEnabled = isAgency;
+            this.datePickerETD.IsEnabled = isAgency || isBsmd;
 
             this.labelBSMDGranted.Visibility = editRightGrantedForBSMD ? Visibility.Visible : Visibility.Hidden;
+            this.comboBoxHarbour.IsEnabled = this.IsCreate && this.ShipcallModel.AllowPortChange;
 
             this.comboBoxCategories_SelectionChanged(null, null);
         }
@@ -342,6 +434,38 @@ namespace BreCalClient
             this.CheckForCompletion();
         }
 
+        private void buttonEditShips_Click(object sender, RoutedEventArgs e)
+        {
+            ShipListDialog shipListDialog = new()
+            {
+                ShipApi = this.ShipApi
+            };
+
+            shipListDialog.ShowDialog();
+
+            // reload combobox
+            this.comboBoxShip.ItemsSource = null;
+            this.comboBoxShip.ItemsSource = BreCalLists.Ships;
+        }
+
+        private void comboBoxHarbour_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            Port port = (Port)this.comboBoxHarbour.SelectedItem;
+            if (port == null) return;
+
+            // Filter berth selection combobox by port
+            List<Berth> availableBerths = BreCalLists.GetBerthsByPort(port.Id);
+            this.comboBoxArrivalBerth.ItemsSource = null;
+            this.comboBoxArrivalBerth.ItemsSource = availableBerths;
+            this.comboBoxDepartureBerth.ItemsSource = null;
+            this.comboBoxDepartureBerth.ItemsSource = availableBerths;
+
+            // Filter agency combobox by port
+            List<Participant> availableAgencies = BreCalLists.GetParticipants(port.Id, ParticipantType.AGENCY);
+            this.comboBoxAgency.ItemsSource = null;
+            this.comboBoxAgency.ItemsSource = availableAgencies;
+        }
+
         #endregion
 
     }

src/BreCalClient/EditTimesAgencyIncomingControl.xaml

@@ -5,19 +5,18 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BreCalClient"
         xmlns:p = "clr-namespace:BreCalClient.Resources"
-        xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textEditShipcall}" Height="403" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+        mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
+        Title="{x:Static p:Resources.textEditShipcall}" Height="403" Width="900" Loaded="Window_Loaded" ResizeMode="CanResizeWithGrip" Icon="Resources/containership.ico">
     <Window.Resources>
         <local:BoolToIndexConverter x:Key="boolToIndexConverter" />
     </Window.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.2*"/>
-            <ColumnDefinition Width=".3*" />
+            <ColumnDefinition Width="0.18*"/>
+            <ColumnDefinition Width=".4*" />
             <ColumnDefinition Width="0.15*"/>
-            <ColumnDefinition Width=".35*" />
+            <ColumnDefinition Width=".3*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
@@ -31,7 +30,7 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
+            <RowDefinition Height="*" />
             <RowDefinition Height="28" />
         </Grid.RowDefinitions>
         <Grid Grid.Row="0" Grid.Column="0">
@@ -42,26 +41,34 @@
             <Label Grid.Column="0" Grid.Row="0" Content="{x:Static p:Resources.textIncoming}" FontWeight="DemiBold"/>
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_down_red.png" />
         </Grid>
-        
-        <Label Content="ETA" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right"/>
-        <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="1" Grid.Row="1" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
-        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2"  HorizontalContentAlignment="Right"/>
-        <ComboBox Name="comboBoxArrivalBerth" Grid.Column="1" Grid.Row="2" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
-            <ComboBox.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemArrivalBerth" Click="contextMenuItemArrivalBerth_Click" />
-                </ContextMenu>
-            </ComboBox.ContextMenu>
+
+        <Label Content="ETA" x:Name="labelETA" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <Grid Grid.Column="1" Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width=".5*" />
+                <ColumnDefinition Width=".5*" />
+            </Grid.ColumnDefinitions>
+            <local:DateTimePickerExt x:Name="datePickerETA" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETA_ValueChanged"/>
+            <local:DateTimePickerExt x:Name="datePickerETA_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETA_End_ValueChanged"/>
+        </Grid>
+        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <ComboBox Name="comboBoxArrivalBerth" Grid.Column="1" Grid.Row="2" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" SelectionChanged="comboBoxArrivalBerth_SelectionChanged">
+
         </ComboBox>
         <Label Content="{x:Static p:Resources.textPierside}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right" />
         <ComboBox x:Name="comboBoxPierside" Grid.Column="1" Grid.Row="3" Margin="2" >
-            <ComboBoxItem Content="{x:Static p:Resources.textNotRotated}" />
-            <ComboBoxItem Content="{x:Static p:Resources.textRotated}" />
+            <ComboBoxItem Content="{x:Static p:Resources.textPort}" />
+            <ComboBoxItem Content="{x:Static p:Resources.textStarboard}" />
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearPierside" Click="contextMenuItemClearPierside_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
         </ComboBox>
         <Label Content="{x:Static p:Resources.textBerthRemarks}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" />
-        <TextBox x:Name="textBoxBerthRemarks" Grid.Column="1" Grid.Row="4" Margin="2" Grid.RowSpan="2" VerticalContentAlignment="Top" AcceptsReturn="True" MaxLength="512"/>
-        <Label Content="{x:Static p:Resources.textDraft}" Grid.Column="0" Grid.Row="6" HorizontalContentAlignment="Right" />
-        <xctk:DoubleUpDown x:Name="doubleUpDownDraft" Grid.Column="1" Grid.Row="6" Margin="2" FormatString="N2" Minimum="0" Maximum="50"/>
+        <TextBox x:Name="textBoxBerthRemarks" Grid.Column="1" Grid.Row="4" Margin="2" Grid.RowSpan="2" VerticalContentAlignment="Top" AcceptsReturn="True" MaxLength="512" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"/>
+        <Label Content="{x:Static p:Resources.textDraft}" Grid.Column="0" Grid.Row="6" HorizontalContentAlignment="Right" FontWeight="Bold" />
+        <xctk:DoubleUpDown x:Name="doubleUpDownDraft" Grid.Column="1" Grid.Row="6" Margin="2" FormatString="N2" Minimum="0" Maximum="50" MaxLength="5" ValueChanged="doubleUpDownDraft_ValueChanged"/>
         <Label Content="{x:Static p:Resources.textTidalWindow}" FontWeight="DemiBold" Grid.Column="0" Grid.Row="7" HorizontalContentAlignment="Right"/>
         <Label Content="{x:Static p:Resources.textFrom}" Grid.Column="0" Grid.Row="8" HorizontalContentAlignment="Right"/>
         <Label Content="{x:Static p:Resources.textTo}" Grid.Column="0" Grid.Row="9" HorizontalContentAlignment="Right"/>
@@ -119,7 +126,7 @@
         <CheckBox x:Name="checkBoxReplenishingTerminal" Grid.Column="2" Grid.Row="8" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,4,0" />
         <CheckBox x:Name="checkBoxReplenishingLock" Grid.Column="2" Grid.Row="9" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,4,0" />
         <Label Content="{x:Static p:Resources.textRemarks}" Grid.Row="10" Grid.Column="2" HorizontalAlignment="Right"/>
-        <TextBox x:Name="textBoxRemarks" Grid.Column="3" Grid.Row="10" Margin="2" Grid.RowSpan="2" VerticalContentAlignment="Top" AcceptsReturn="True" MaxLength="512"/>
+        <TextBox x:Name="textBoxRemarks" Grid.Column="3" Grid.Row="10" Margin="2" Grid.RowSpan="2" VerticalContentAlignment="Top" AcceptsReturn="True" MaxLength="512"  ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"/>
 
         <StackPanel Grid.Row="14" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False" />

src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs

@@ -1,11 +1,9 @@
 // Copyright (c) 2023 schick Informatik
 // Description: Input control for incoming shipcalls
-// 
+//
 
 using BreCalClient.misc.Model;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Windows;
 using static BreCalClient.Extensions;
 
@@ -14,8 +12,14 @@ namespace BreCalClient
     /// <summary>
     /// Interaction logic for EditTimesAgencyIncomingControl.xaml
     /// </summary>
-    public partial class EditTimesAgencyIncomingControl : Window, IEditShipcallTimesControl
+    public partial class EditTimesAgencyIncomingControl : Window, IEditTimesControl
     {
+        #region Fields
+
+        bool _editing = false;
+
+        #endregion
+
         #region Construction
 
         public EditTimesAgencyIncomingControl()
@@ -31,27 +35,33 @@ namespace BreCalClient
 
         public Times Times { get; set; } = new();
 
-        public Extensions.TypeEnum CallType { get; set; }
-
         #endregion
 
         #region event handler
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            this.comboBoxMooring.ItemsSource = BreCalLists.Participants_Mooring;
-            this.comboBoxPilot.ItemsSource = BreCalLists.Participants_Pilot;
-            this.comboBoxTug.ItemsSource = BreCalLists.Participants_Tug;
-            this.comboBoxTerminal.ItemsSource = BreCalLists.Participants_Terminal;
 
-            this.comboBoxArrivalBerth.ItemsSource = BreCalLists.Berths;
+            if ((this.ShipcallModel != null) && (this.ShipcallModel.Shipcall != null))
+            {
+                int portId = this.ShipcallModel.Shipcall.PortId;
+                this.comboBoxArrivalBerth.ItemsSource = BreCalLists.GetBerthsByPort(portId);
+                this.comboBoxMooring.ItemsSource = BreCalLists.GetParticipants(portId, ParticipantType.MOORING);
+                this.comboBoxPilot.ItemsSource = BreCalLists.GetParticipants(portId, ParticipantType.PILOT);
+                this.comboBoxTug.ItemsSource = BreCalLists.GetParticipants(portId, ParticipantType.TUG);
+                this.comboBoxTerminal.ItemsSource = BreCalLists.GetParticipants(portId, ParticipantType.TERMINAL);
+            }
+
             this.CopyToControls();
-            
-            this.Title = this.ShipcallModel.Title;
+
+            this.Title = this.ShipcallModel?.Title;
 
             Participant? p = null;
-            if(this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.AGENCY))
-                p = BreCalLists.Participants.Find(x => x.Id == this.ShipcallModel.AssignedParticipants[ParticipantType.AGENCY].ParticipantId);
+            if (this.ShipcallModel != null)
+            {
+                if (this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.AGENCY))
+                    p = BreCalLists.Participants.Find(x => x.Id == this.ShipcallModel.AssignedParticipants[ParticipantType.AGENCY].ParticipantId);
+            }
 
             bool allowBSMD = false;
             if (p != null)
@@ -59,18 +69,25 @@ namespace BreCalClient
                 allowBSMD = p.IsFlagSet(ParticipantFlag.ALLOW_BSMD);
             }
 
-            bool enableControls = (this.Times.ParticipantId == App.Participant.Id) ||
+            _editing = (this.Times.ParticipantId == App.Participant.Id) ||
                 (App.Participant.IsTypeFlagSet(ParticipantType.BSMD) && allowBSMD);
 
-            this.EnableControls(enableControls);
-            
+            this.EnableControls();
+
         }
 
         private void buttonOK_Click(object sender, RoutedEventArgs e)
         {
-            this.CopyToModel();
-            this.DialogResult = true;
-            this.Close();
+            if (!CheckValues(out string message))
+            {
+                MessageBox.Show(message, BreCalClient.Resources.Resources.textWarning, MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
+            else
+            {
+                this.CopyToModel();
+                this.DialogResult = true;
+                this.Close();
+            }
         }
 
         private void buttonCancel_Click(object sender, RoutedEventArgs e)
@@ -83,19 +100,80 @@ namespace BreCalClient
 
         #region private methods
 
+        private bool CheckValues(out string message)
+        {
+            message = "";
+
+            if ((this.datePickerETA.Value != this.Times.EtaBerth) || (this.datePickerETA_End.Value != this.Times.EtaIntervalEnd)) // something has changed
+            {
+                if (datePickerETA.Value.IsTooOld() || datePickerETA_End.Value.IsTooOld())
+                {
+                    message = BreCalClient.Resources.Resources.textETAInThePast;
+                    return false;
+                }
+
+                if (this.datePickerETA.Value.HasValue && this.datePickerETA_End.Value.HasValue && this.datePickerETA.Value > this.datePickerETA_End.Value)
+                {
+                    message = BreCalClient.Resources.Resources.textEndValueBeforeStartValue;
+                    return false;
+                }
+            }
+
+            if((this.datePickerTidalWindowFrom.Value != this.ShipcallModel.Shipcall?.TidalWindowFrom) || (this.datePickerTidalWindowTo.Value != this.ShipcallModel.Shipcall?.TidalWindowTo)) // something has changed
+            {
+                if(datePickerTidalWindowTo.Value.IsTooOld() || this.datePickerTidalWindowFrom.Value.IsTooOld())
+                {
+                    message = BreCalClient.Resources.Resources.textTideTimesInThePast;
+                    return false;
+                }
+
+                if (this.datePickerTidalWindowFrom.Value.HasValue && this.datePickerTidalWindowTo.Value.HasValue && this.datePickerTidalWindowFrom.Value > this.datePickerTidalWindowTo.Value)
+                {
+                    message = BreCalClient.Resources.Resources.textEndValueBeforeStartValue;
+                    return false;
+                }
+
+                if ((this.datePickerTidalWindowFrom.Value.HasValue && !this.datePickerTidalWindowTo.Value.HasValue) || (!this.datePickerTidalWindowFrom.Value.HasValue && this.datePickerTidalWindowTo.Value.HasValue))
+                {
+                    message = BreCalClient.Resources.Resources.textTidalBothValues;
+                    return false;
+                }
+            }
+
+            if(this.datePickerETA.Value.IsTooFar() || this.datePickerETA_End.Value.IsTooFar() || this.datePickerTidalWindowFrom.Value.IsTooFar() || this.datePickerTidalWindowTo.Value.IsTooFar())
+            {
+                message = BreCalClient.Resources.Resources.textTooFarInTheFuture;
+                return false;
+            }
+
+            if((this.datePickerETA_End.Value.HasValue && !this.datePickerETA.Value.HasValue) ||
+                (this.datePickerTidalWindowTo.Value.HasValue && !this.datePickerTidalWindowFrom.Value.HasValue))
+            {
+                message = BreCalClient.Resources.Resources.textStartTimeMissing;
+                return false;
+            }                
+
+            return true;
+        }
+
         private void CopyToModel()
         {
             if (this.ShipcallModel.Shipcall != null)
             {
                 this.Times.EtaBerth = this.datePickerETA.Value;
-                
+                this.Times.EtaIntervalEnd = this.datePickerETA_End.Value;
+
                 if (this.comboBoxPierside.SelectedIndex >= 0)
                 {
-                    this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPierside.SelectedIndex == 0) ? true : false;
+                    this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPierside.SelectedIndex == 0);
+                }
+                else
+                {
+                    this.ShipcallModel.Shipcall.PierSide = null;
                 }
 
-                this.Times.BerthInfo = this.textBoxBerthRemarks.Text.Trim();                
-                this.Times.BerthId = (int?)this.comboBoxArrivalBerth.SelectedValue;               
+                this.Times.BerthInfo = this.textBoxBerthRemarks.Text.Trim();
+                this.Times.BerthId = (int?)this.comboBoxArrivalBerth.SelectedValue;
 
                 this.ShipcallModel.Shipcall.Draft = (float?)this.doubleUpDownDraft.Value;
                 this.ShipcallModel.Shipcall.TidalWindowFrom = this.datePickerTidalWindowFrom.Value;
@@ -103,9 +181,9 @@ namespace BreCalClient
                 this.ShipcallModel.Shipcall.Canceled = this.checkBoxCanceled.IsChecked;
 
                 this.ShipcallModel.Shipcall.Anchored = this.checkBoxAnchored.IsChecked;
-                
+
                 this.ShipcallModel.Shipcall.RecommendedTugs = this.integerUpDownRecommendedTugs.Value;
-                
+
                 this.ShipcallModel.Shipcall.MooredLock = this.checkBoxMooredLock.IsChecked;
                 this.ShipcallModel.Shipcall.Bunkering = this.checkBoxBunkering.IsChecked;
                 this.ShipcallModel.Shipcall.ReplenishingTerminal = this.checkBoxReplenishingTerminal.IsChecked;
@@ -117,7 +195,7 @@ namespace BreCalClient
                 Participant? participant = (Participant?)this.comboBoxMooring.SelectedItem;
                 if (participant != null)
                 {
-                    ParticipantAssignment participantAssignment = new() { 
+                    ParticipantAssignment participantAssignment = new() {
                         ParticipantId = participant.Id,
                         Type = (int)Extensions.ParticipantType.MOORING
                     };
@@ -165,7 +243,7 @@ namespace BreCalClient
                 if(this.Times.EtaBerth.HasValue)
                 {
                     this.datePickerETA.Value = this.Times.EtaBerth.Value;
-                } 
+                }
                 else
                 {
                     // if not set through times use value of BSMD entry
@@ -173,6 +251,8 @@ namespace BreCalClient
                         this.datePickerETA.Value = this.ShipcallModel.Shipcall.Eta;
                 }
 
+                this.datePickerETA_End.Value = this.Times.EtaIntervalEnd;
+
                 if (Times.BerthId.HasValue)
                     this.comboBoxArrivalBerth.SelectedValue = Times.BerthId;
                 else if (this.ShipcallModel.Shipcall.ArrivalBerthId.HasValue)
@@ -190,17 +270,22 @@ namespace BreCalClient
                 this.checkBoxCanceled.IsChecked = this.ShipcallModel.Shipcall.Canceled ?? false;
 
                 this.checkBoxAnchored.IsChecked = this.ShipcallModel.Shipcall.Anchored ?? false;
-                
+
                 this.integerUpDownRecommendedTugs.Value = this.ShipcallModel.Shipcall.RecommendedTugs;
-                
-                                               
+
+
                 this.checkBoxMooredLock.IsChecked = this.ShipcallModel.Shipcall.MooredLock ?? false;
-                
+
                 this.checkBoxBunkering.IsChecked = this.ShipcallModel.Shipcall.Bunkering ?? false;
                 this.checkBoxReplenishingLock.IsChecked = this.ShipcallModel.Shipcall.ReplenishingLock ?? false;
                 this.checkBoxReplenishingTerminal.IsChecked = this.ShipcallModel.Shipcall.ReplenishingTerminal ?? false;
 
-                if(!string.IsNullOrEmpty(this.Times.Remarks)) 
+                if ((this.ShipcallModel.Shipcall.TimeRefPoint ?? 0) == 0)
+                    this.labelETA.Content = BreCalClient.Resources.Resources.textETABerth;
+                else
+                    this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall.TimeRefPoint ?? 0]);
+
+                if(!string.IsNullOrEmpty(this.Times.Remarks))
                     this.textBoxRemarks.Text = this.Times.Remarks;
 
                 if (this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.MOORING))
@@ -233,42 +318,60 @@ namespace BreCalClient
                     {
                         this.comboBoxTug.SelectedValue = this.ShipcallModel.AssignedParticipants[ParticipantType.TUG].ParticipantId;
                     }
-                }                
-                
+                }
+
             }
         }
 
-        private void EnableControls(bool isEnabled)
+        private void EnableControls()
         {
-            this.datePickerETA.IsEnabled = isEnabled;
-            this.comboBoxArrivalBerth.IsEnabled = isEnabled;
-            this.comboBoxPierside.IsEnabled = isEnabled;
-            this.textBoxBerthRemarks.IsEnabled = isEnabled;
-            this.doubleUpDownDraft.IsEnabled = isEnabled;
-            this.datePickerTidalWindowFrom.IsEnabled = isEnabled;
-            this.datePickerTidalWindowTo.IsEnabled = isEnabled;
-            this.checkBoxCanceled.IsEnabled = isEnabled;
+            this.datePickerETA.IsEnabled = _editing;
+            this.datePickerETA_End.IsEnabled = _editing;
+            this.comboBoxArrivalBerth.IsEnabled = _editing;
+            this.comboBoxPierside.IsEnabled = _editing;
+            this.textBoxBerthRemarks.IsReadOnly = !_editing;
+            this.doubleUpDownDraft.IsEnabled = _editing;
+            this.datePickerTidalWindowFrom.IsEnabled = _editing;
+            this.datePickerTidalWindowTo.IsEnabled = _editing;
+            this.checkBoxCanceled.IsEnabled = _editing;
 
-            this.checkBoxAnchored.IsEnabled = isEnabled;
-            
-            this.comboBoxTug.IsEnabled = isEnabled;
-            this.integerUpDownRecommendedTugs.IsEnabled = isEnabled;
-            
-            this.comboBoxPilot.IsEnabled = isEnabled;
-            this.comboBoxMooring.IsEnabled = isEnabled;
-            this.checkBoxMooredLock.IsEnabled = isEnabled;
-            this.comboBoxTerminal.IsEnabled = isEnabled;
-            this.checkBoxBunkering.IsEnabled = isEnabled;
-            this.checkBoxReplenishingTerminal.IsEnabled = isEnabled;
-            this.checkBoxReplenishingLock.IsEnabled = isEnabled;
-            this.textBoxRemarks.IsEnabled = isEnabled;
+            this.checkBoxAnchored.IsEnabled = _editing;
 
-            this.buttonOK.IsEnabled = isEnabled;
+            this.comboBoxTug.IsEnabled = _editing;
+            this.integerUpDownRecommendedTugs.IsEnabled = _editing;
+
+            this.comboBoxPilot.IsEnabled = _editing;
+            this.comboBoxMooring.IsEnabled = _editing;
+            this.checkBoxMooredLock.IsEnabled = _editing;
+            this.comboBoxTerminal.IsEnabled = _editing;
+            this.checkBoxBunkering.IsEnabled = _editing;
+            this.checkBoxReplenishingTerminal.IsEnabled = _editing;
+            this.checkBoxReplenishingLock.IsEnabled = _editing;
+            this.textBoxRemarks.IsReadOnly = !_editing;
+
+            CheckOKButton();
+        }
+
+        private bool RequiredFieldsSet()
+        {
+            bool areSet = this.datePickerETA.Value.HasValue &&
+                this.doubleUpDownDraft.Value.HasValue &&
+                this.comboBoxArrivalBerth.SelectedIndex >= 0;
+
+            if (areSet && this.datePickerETA_End.Value.HasValue)
+                areSet &= (this.datePickerETA.Value < this.datePickerETA_End.Value);
+
+            return areSet;
+        }
+
+        private void CheckOKButton()
+        {
+            this.buttonOK.IsEnabled = _editing && RequiredFieldsSet() && !(this.ShipcallModel.Shipcall?.Canceled ?? false);
         }
 
         #endregion
 
-        #region context menu handlers
+        #region event handlers
 
         private void contextMenuItemArrivalBerth_Click(object sender, RoutedEventArgs e)
         {
@@ -300,6 +403,31 @@ namespace BreCalClient
             this.ShipcallModel.AssignedParticipants.Remove(Extensions.ParticipantType.TERMINAL);
         }
 
+        private void contextMenuItemClearPierside_Click(object sender, RoutedEventArgs e)
+        {
+            this.comboBoxPierside.SelectedIndex = -1;
+        }
+
+        private void doubleUpDownDraft_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            this.CheckOKButton();
+        }
+
+        private void datePickerETA_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            this.CheckOKButton();
+        }
+
+        private void comboBoxArrivalBerth_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+        {
+            this.CheckOKButton();
+        }
+
+        private void datePickerETA_End_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            this.CheckOKButton();
+        }
+
         #endregion
 
     }

src/BreCalClient/EditTimesAgencyOutgoingControl.xaml

@@ -5,16 +5,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BreCalClient"
         xmlns:p = "clr-namespace:BreCalClient.Resources"
-        xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textEditShipcall}" Height="375" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+        mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
+        Title="{x:Static p:Resources.textEditShipcall}" Height="375" Width="900" Loaded="Window_Loaded" ResizeMode="CanResizeWithGrip" Icon="Resources/containership.ico">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.2*"/>
-            <ColumnDefinition Width=".3*" />
+            <ColumnDefinition Width="0.18*"/>
+            <ColumnDefinition Width=".4*" />
             <ColumnDefinition Width="0.15*"/>
-            <ColumnDefinition Width=".35*" />
+            <ColumnDefinition Width=".3*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
@@ -28,6 +27,7 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
+            <RowDefinition Height="*" />
             <RowDefinition Height="28" />
         </Grid.RowDefinitions>
         <Grid Grid.Row="0" Grid.Column="0">
@@ -38,32 +38,38 @@
             <Label Grid.Column="0" Grid.Row="0" Content="{x:Static p:Resources.textOutgoing}" FontWeight="DemiBold"/>
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_up_blue.png" />
         </Grid>
-        
-        <Label Content="ETD" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right"/>
-        <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="1" Grid.Row="1" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
-        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" />
-        <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Grid.Row="2" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id">
+
+        <Label Content="ETD" x:Name="labelETD" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <Grid Grid.Row="1" Grid.Column="1" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width=".5*" />
+                <ColumnDefinition Width=".5*" />
+            </Grid.ColumnDefinitions>
+            <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged" AllowTextInput="True" />
+            <local:DateTimePickerExt x:Name="datePickerETD_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged"/>
+        </Grid>
+        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Grid.Row="2" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id" SelectionChanged="comboBoxDepartureBerth_SelectionChanged" />
+        <Label Content="{x:Static p:Resources.textPierside}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right" />
+        <ComboBox x:Name="comboBoxPierside" Grid.Column="1" Grid.Row="3" Margin="2" >
+            <ComboBoxItem Content="{x:Static p:Resources.textPort}" />
+            <ComboBoxItem Content="{x:Static p:Resources.textStarboard}" />
             <ComboBox.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemDepartureBerth" Click="contextMenuItemDepartureBerth_Click" />
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearPierside" Click="contextMenuItemClearPierside_Click" />
                 </ContextMenu>
             </ComboBox.ContextMenu>
         </ComboBox>
-        <Label Content="{x:Static p:Resources.textPierside}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right" />
-        <ComboBox x:Name="comboBoxPierside" Grid.Column="1" Grid.Row="3" Margin="2" >
-            <ComboBoxItem Content="{x:Static p:Resources.textNotRotated}" />
-            <ComboBoxItem Content="{x:Static p:Resources.textRotated}" />
-        </ComboBox>
         <Label Content="{x:Static p:Resources.textBerthRemarks}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" />
         <TextBox x:Name="textBoxBerthRemarks" Grid.Column="1" Grid.Row="4" Margin="2" Grid.RowSpan="2" VerticalContentAlignment="Top" AcceptsReturn="True" MaxLength="512"/>
-        <Label Content="{x:Static p:Resources.textDraft}" Grid.Column="0" Grid.Row="6" HorizontalContentAlignment="Right" />
-        <xctk:DoubleUpDown x:Name="doubleUpDownDraft" Grid.Column="1" Grid.Row="6" Margin="2" FormatString="N2" Minimum="0" Maximum="50"/>
+        <Label Content="{x:Static p:Resources.textDraft}" Grid.Column="0" Grid.Row="6" HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <xctk:DoubleUpDown x:Name="doubleUpDownDraft" Grid.Column="1" Grid.Row="6" Margin="2" FormatString="N2" Minimum="0" Maximum="50" MaxLength="5" ValueChanged="doubleUpDownDraft_ValueChanged"/>
         <Label Content="{x:Static p:Resources.textTidalWindow}" FontWeight="DemiBold" Grid.Column="0" Grid.Row="7" HorizontalContentAlignment="Right"/>
         <Label Content="{x:Static p:Resources.textFrom}" Grid.Column="0" Grid.Row="8" HorizontalContentAlignment="Right"/>
         <Label Content="{x:Static p:Resources.textTo}" Grid.Column="0" Grid.Row="9" HorizontalContentAlignment="Right"/>
         <xctk:DateTimePicker Name="datePickerTidalWindowFrom" Grid.Column="1" Grid.Row="8" Margin="2"  Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
         <xctk:DateTimePicker Name="datePickerTidalWindowTo" Grid.Column="1" Grid.Row="9" Margin="2"  Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
-        <Label Content="{x:Static p:Resources.textCancelled}" Grid.Column="0" Grid.Row="10" HorizontalContentAlignment="Right" />
+        <Label Content="{x:Static p:Resources.textCancelled}" Grid.Column="0" Grid.Row="10" HorizontalContentAlignment="Right" VerticalAlignment="Center" />
         <CheckBox x:Name="checkBoxCanceled" Grid.Column="1" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,4,0" />
 
         <Label Content="{x:Static p:Resources.textTugRequired}" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right"/>
@@ -109,9 +115,9 @@
         <Label Content="{x:Static p:Resources.textRainSensitiveCargo}" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="7" HorizontalAlignment="Right" />
         <CheckBox x:Name="checkBoxRainsensitiveCargo" Grid.Column="3" Grid.Row="7" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,4,0" />
         <Label Content="{x:Static p:Resources.textRemarks}" Grid.Column="2" Grid.Row="8" HorizontalContentAlignment="Right" />
-        <TextBox x:Name="textBoxRemarks" Grid.Column="3" Grid.Row="8" Margin="2" Grid.RowSpan="3" VerticalContentAlignment="Top" AcceptsReturn="True" MaxLength="512"/>
+        <TextBox x:Name="textBoxRemarks" Grid.Column="3" Grid.Row="8" Margin="2" Grid.RowSpan="4" VerticalContentAlignment="Top" AcceptsReturn="True" MaxLength="512"/>
 
-        <StackPanel Grid.Row="11" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
+        <StackPanel Grid.Row="12" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False" />
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
         </StackPanel>

src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs

@@ -1,6 +1,6 @@
 // Copyright (c) 2023 schick Informatik
 // Description: Input control for outgoing shipcalls
-// 
+//
 
 using BreCalClient.misc.Model;
 using System;
@@ -12,9 +12,15 @@ namespace BreCalClient
     /// <summary>
     /// Interaction logic for EditTimesAgencyOutgoingControl.xaml
     /// </summary>
-    public partial class EditTimesAgencyOutgoingControl : Window, IEditShipcallTimesControl
+    public partial class EditTimesAgencyOutgoingControl : Window, IEditTimesControl
     {
 
+        #region Fields
+
+        bool _editing = false;
+
+        #endregion
+
         #region Construction
 
         public EditTimesAgencyOutgoingControl()
@@ -30,46 +36,60 @@ namespace BreCalClient
 
         public Times Times { get; set; } = new();
 
-        public Extensions.TypeEnum CallType { get; set; }
-
         #endregion
 
         #region event handler
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            this.comboBoxMooring.ItemsSource = BreCalLists.Participants_Mooring;
-            this.comboBoxPilot.ItemsSource = BreCalLists.Participants_Pilot;
-            this.comboBoxTug.ItemsSource = BreCalLists.Participants_Tug;
-            this.comboBoxTerminal.ItemsSource = BreCalLists.Participants_Terminal;
 
-            this.comboBoxDepartureBerth.ItemsSource = BreCalLists.Berths;
+            if ((this.ShipcallModel != null) && (this.ShipcallModel.Shipcall != null))
+            {
+                int portId = this.ShipcallModel.Shipcall.PortId;
+                this.comboBoxDepartureBerth.ItemsSource = BreCalLists.GetBerthsByPort(portId);
+                this.comboBoxMooring.ItemsSource = BreCalLists.GetParticipants(portId, ParticipantType.MOORING);
+                this.comboBoxPilot.ItemsSource = BreCalLists.GetParticipants(portId, ParticipantType.PILOT);
+                this.comboBoxTug.ItemsSource = BreCalLists.GetParticipants(portId, ParticipantType.TUG);
+                this.comboBoxTerminal.ItemsSource = BreCalLists.GetParticipants(portId, ParticipantType.TERMINAL);
+            }
+
             this.CopyToControls();
 
-            this.Title = this.ShipcallModel.Title;
+            this.Title = this.ShipcallModel?.Title;
 
             Participant? p = null;
-            if (this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.AGENCY))
-                p = BreCalLists.Participants.Find(x => x.Id == this.ShipcallModel.AssignedParticipants[ParticipantType.AGENCY].ParticipantId);
-
+            if (this.ShipcallModel != null)
+            {
+                if (this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.AGENCY))
+                    p = BreCalLists.Participants.Find(x => x.Id == this.ShipcallModel.AssignedParticipants[ParticipantType.AGENCY].ParticipantId);
+            }
             bool allowBSMD = false;
             if (p != null)
             {
                 allowBSMD = p.IsFlagSet(ParticipantFlag.ALLOW_BSMD);
             }
 
-            bool enableControls = (this.Times.ParticipantId == App.Participant.Id) ||
+            _editing = (this.Times.ParticipantId == App.Participant.Id) ||
                 (App.Participant.IsTypeFlagSet(ParticipantType.BSMD) && allowBSMD);
 
-            this.EnableControls(enableControls);
+            this.EnableControls();
 
         }
 
+
+
         private void buttonOK_Click(object sender, RoutedEventArgs e)
         {
-            this.CopyToModel();
-            this.DialogResult = true;
-            this.Close();
+            if (!CheckValues(out string message))
+            {
+                System.Windows.MessageBox.Show(message, BreCalClient.Resources.Resources.textWarning, MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
+            else
+            {
+                this.CopyToModel();
+                this.DialogResult = true;
+                this.Close();
+            }
         }
 
         private void buttonCancel_Click(object sender, RoutedEventArgs e)
@@ -82,27 +102,90 @@ namespace BreCalClient
 
         #region private methods
 
+
+        private bool CheckValues(out string message)
+        {
+            message = "";
+
+            if((this.datePickerETD.Value != this.Times.EtdBerth) || (this.datePickerETD_End.Value != this.Times.EtdIntervalEnd))
+            {
+                if (datePickerETD.Value.IsTooOld() || datePickerETD_End.Value.IsTooOld())
+                {
+                    message = BreCalClient.Resources.Resources.textETDInThePast;
+                    return false;
+                }
+            }
+
+            if (this.datePickerETD.Value.HasValue && this.datePickerETD_End.Value.HasValue && this.datePickerETD.Value > this.datePickerETD_End.Value)
+            {
+                message = BreCalClient.Resources.Resources.textEndValueBeforeStartValue;
+                return false;
+            }
+
+            if((this.datePickerTidalWindowFrom.Value != this.ShipcallModel.Shipcall?.TidalWindowFrom) || (this.datePickerTidalWindowTo.Value != this.ShipcallModel.Shipcall?.TidalWindowTo))
+            {
+                if (this.datePickerTidalWindowTo.Value.IsTooOld() || this.datePickerTidalWindowFrom.Value.IsTooOld())
+                {
+                    message = BreCalClient.Resources.Resources.textTideTimesInThePast;
+                    return false;
+                }
+            }
+
+            if (this.datePickerTidalWindowFrom.Value.HasValue && this.datePickerTidalWindowTo.Value.HasValue && this.datePickerTidalWindowFrom.Value > this.datePickerTidalWindowTo.Value)
+            {
+                message = BreCalClient.Resources.Resources.textEndValueBeforeStartValue;
+                return false;
+            }
+
+            if ((this.datePickerTidalWindowFrom.Value.HasValue && !this.datePickerTidalWindowTo.Value.HasValue) || (!this.datePickerTidalWindowFrom.Value.HasValue && this.datePickerTidalWindowTo.Value.HasValue))
+            {
+                message = BreCalClient.Resources.Resources.textTidalBothValues;
+                return false;
+            }
+
+            if (this.datePickerETD.Value.IsTooFar() || this.datePickerETD_End.Value.IsTooFar() || this.datePickerTidalWindowFrom.Value.IsTooFar() || this.datePickerTidalWindowTo.Value.IsTooFar())
+            {
+                message = BreCalClient.Resources.Resources.textTooFarInTheFuture;
+                return false;
+            }
+
+            if((this.datePickerETD_End.Value.HasValue && !this.datePickerETD.Value.HasValue) ||
+                (this.datePickerTidalWindowTo.Value.HasValue && !this.datePickerTidalWindowFrom.Value.HasValue))
+            {
+                message = BreCalClient.Resources.Resources.textStartTimeMissing;
+                return false;
+            }
+
+            return true;
+        }
+
         private void CopyToModel()
         {
             if (this.ShipcallModel.Shipcall != null)
             {
-                this.Times.EtdBerth = this.datePickerETD.Value;                
+                this.Times.EtdBerth = this.datePickerETD.Value;
+                this.Times.EtdIntervalEnd = this.datePickerETD_End.Value;
+
                 if (this.comboBoxPierside.SelectedIndex >= 0)
                 {
-                    this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPierside.SelectedIndex == 0) ? true : false;
+                    this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPierside.SelectedIndex == 0);
                 }
-                
+                else
+                {
+                    this.ShipcallModel.Shipcall.PierSide = null;
+                }
+
                 this.Times.BerthId = (int?)this.comboBoxDepartureBerth.SelectedValue;
-                
+
                 this.Times.BerthInfo = this.textBoxBerthRemarks.Text.Trim();
                 this.ShipcallModel.Shipcall.Draft = (float?)this.doubleUpDownDraft.Value;
                 this.ShipcallModel.Shipcall.TidalWindowFrom = this.datePickerTidalWindowFrom.Value;
                 this.ShipcallModel.Shipcall.TidalWindowTo = this.datePickerTidalWindowTo.Value;
                 this.ShipcallModel.Shipcall.Canceled = this.checkBoxCanceled.IsChecked;
-                
-                
+
+
                 this.ShipcallModel.Shipcall.RecommendedTugs = this.integerUpDownRecommendedTugs.Value;
-                
+
                 this.ShipcallModel.Shipcall.MooredLock = this.checkBoxMooredLock.IsChecked;
                 this.ShipcallModel.Shipcall.RainSensitiveCargo = this.checkBoxRainsensitiveCargo.IsChecked;
                 if(!string.IsNullOrEmpty(this.textBoxRemarks.Text.Trim()))
@@ -167,6 +250,8 @@ namespace BreCalClient
                         this.datePickerETD.Value = this.ShipcallModel.Shipcall.Etd;
                 }
 
+                this.datePickerETD_End.Value = this.Times.EtdIntervalEnd;
+
                 if (this.Times.BerthId.HasValue)
                     this.comboBoxDepartureBerth.SelectedValue = this.Times.BerthId;
                 else if (this.ShipcallModel.Shipcall.DepartureBerthId.HasValue)
@@ -182,14 +267,20 @@ namespace BreCalClient
                 this.datePickerTidalWindowFrom.Value = this.ShipcallModel.Shipcall.TidalWindowFrom;
                 this.datePickerTidalWindowTo.Value = this.ShipcallModel.Shipcall.TidalWindowTo;
                 this.checkBoxCanceled.IsChecked = this.ShipcallModel.Shipcall.Canceled ?? false;
-                
-                
+
+
                 this.integerUpDownRecommendedTugs.Value = this.ShipcallModel.Shipcall.RecommendedTugs;
-                
+
 
                 this.checkBoxMooredLock.IsChecked = this.ShipcallModel.Shipcall.MooredLock ?? false;
                 this.checkBoxRainsensitiveCargo.IsChecked = this.ShipcallModel.Shipcall.RainSensitiveCargo ?? false;
-                if(!string.IsNullOrEmpty(this.Times.Remarks))
+
+                if ((this.ShipcallModel.Shipcall.TimeRefPoint ?? 0) == 0)
+                    this.labelETD.Content = BreCalClient.Resources.Resources.textETDBerth;
+                else
+                    this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall.TimeRefPoint ?? 0]);
+
+                if (!string.IsNullOrEmpty(this.Times.Remarks))
                     this.textBoxRemarks.Text = this.Times.Remarks;
 
                 if (this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.MOORING))
@@ -223,37 +314,54 @@ namespace BreCalClient
                         this.comboBoxTug.SelectedValue = this.ShipcallModel.AssignedParticipants[ParticipantType.TUG].ParticipantId;
                     }
                 }
-
             }
         }
 
-        private void EnableControls(bool isEnabled)
+        private void EnableControls()
         {
-            this.datePickerETD.IsEnabled = isEnabled;
-            this.comboBoxDepartureBerth.IsEnabled = isEnabled;
-            this.comboBoxPierside.IsEnabled = isEnabled;
-            this.textBoxBerthRemarks.IsEnabled = isEnabled;
-            this.doubleUpDownDraft.IsEnabled = isEnabled;
-            this.datePickerTidalWindowFrom.IsEnabled = isEnabled;
-            this.datePickerTidalWindowTo.IsEnabled = isEnabled;
-            this.checkBoxCanceled.IsEnabled = isEnabled;
+            this.datePickerETD.IsEnabled = _editing;
+            this.datePickerETD_End.IsEnabled = _editing;
+            this.comboBoxDepartureBerth.IsEnabled = _editing;
+            this.comboBoxPierside.IsEnabled = _editing;
+            this.textBoxBerthRemarks.IsReadOnly = !_editing;
+            this.doubleUpDownDraft.IsEnabled = _editing;
+            this.datePickerTidalWindowFrom.IsEnabled = _editing;
+            this.datePickerTidalWindowTo.IsEnabled = _editing;
+            this.checkBoxCanceled.IsEnabled = _editing;
 
-            
-            this.comboBoxTug.IsEnabled = isEnabled;
-            this.integerUpDownRecommendedTugs.IsEnabled = isEnabled;            
-            this.comboBoxPilot.IsEnabled = isEnabled;
-            this.comboBoxMooring.IsEnabled = isEnabled;
-            this.checkBoxMooredLock.IsEnabled = isEnabled;
-            this.comboBoxTerminal.IsEnabled = isEnabled;
-            this.checkBoxRainsensitiveCargo.IsEnabled = isEnabled;
-            this.textBoxRemarks.IsEnabled = isEnabled;
 
-            this.buttonOK.IsEnabled = isEnabled;
+            this.comboBoxTug.IsEnabled = _editing;
+            this.integerUpDownRecommendedTugs.IsEnabled = _editing;
+            this.comboBoxPilot.IsEnabled = _editing;
+            this.comboBoxMooring.IsEnabled = _editing;
+            this.checkBoxMooredLock.IsEnabled = _editing;
+            this.comboBoxTerminal.IsEnabled = _editing;
+            this.checkBoxRainsensitiveCargo.IsEnabled = _editing;
+            this.textBoxRemarks.IsReadOnly = !_editing;
+
+            CheckOKButton();
+        }
+
+        private bool RequiredFieldsSet()
+        {
+            bool areSet = this.datePickerETD.Value.HasValue &&
+                this.doubleUpDownDraft.Value.HasValue &&
+                this.comboBoxDepartureBerth.SelectedIndex >= 0;
+
+            if (areSet && this.datePickerETD_End.Value.HasValue)
+                areSet &= (this.datePickerETD_End.Value > this.datePickerETD.Value);
+
+            return areSet;
+        }
+
+        private void CheckOKButton()
+        {
+            this.buttonOK.IsEnabled = _editing && RequiredFieldsSet() && !(this.ShipcallModel.Shipcall?.Canceled ?? false);
         }
 
         #endregion
 
-        #region context menu handlers
+        #region event handlers
 
         private void contextMenuItemClearTug_Click(object sender, RoutedEventArgs e)
         {
@@ -285,6 +393,26 @@ namespace BreCalClient
             this.ShipcallModel.AssignedParticipants.Remove(Extensions.ParticipantType.TERMINAL);
         }
 
+        private void contextMenuItemClearPierside_Click(object sender, RoutedEventArgs e)
+        {
+            this.comboBoxPierside.SelectedIndex = -1;
+        }
+
+        private void datePickerETD_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            CheckOKButton();
+        }
+
+        private void comboBoxDepartureBerth_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+        {
+            CheckOKButton();
+        }
+
+        private void doubleUpDownDraft_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            CheckOKButton();
+        }
+
         #endregion
 
     }

src/BreCalClient/EditTimesAgencyShiftingControl.xaml

@@ -5,15 +5,14 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BreCalClient"
         xmlns:p = "clr-namespace:BreCalClient.Resources"
-        xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textEditShipcall}" Height="490" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+        mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
+        Title="{x:Static p:Resources.textEditShipcall}" Height="490" Width="900" Loaded="Window_Loaded" ResizeMode="CanResizeWithGrip" Icon="Resources/containership.ico">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.2*"/>
-            <ColumnDefinition Width=".3*" />
-            <ColumnDefinition Width="0.2*"/>
+            <ColumnDefinition Width="0.18*"/>
+            <ColumnDefinition Width=".4*" />
+            <ColumnDefinition Width="0.15*"/>
             <ColumnDefinition Width=".3*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
@@ -30,10 +29,10 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
+            <RowDefinition Height="*" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
-            
+
         </Grid.RowDefinitions>
 
         <Grid Grid.Row="0" Grid.Column="0">
@@ -44,9 +43,16 @@
             <Label Grid.Column="0" Grid.Row="0" Content="{x:Static p:Resources.textShiftingFrom}" FontWeight="DemiBold"/>
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_right_green.png" />
         </Grid>
-        <Label Content="ETD" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right"/>
-        <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="1" Grid.Row="1" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
-        
+        <Label Content="{x:Static p:Resources.textETDBerth}" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <Grid Grid.Column="1" Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width=".5*" />
+                <ColumnDefinition Width=".5*" />
+            </Grid.ColumnDefinitions>
+            <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged"/>
+            <local:DateTimePickerExt x:Name="datePickerETD_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged"/>
+        </Grid>
+
         <Label Content="{x:Static p:Resources.textTerminal}" Grid.Column="0" Grid.Row="2"  HorizontalContentAlignment="Right"/>
         <ComboBox Name="comboBoxTerminal" Grid.Column="1" Grid.Row="2" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
             <ComboBox.ContextMenu>
@@ -55,18 +61,13 @@
                 </ContextMenu>
             </ComboBox.ContextMenu>
         </ComboBox>
-        
-        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right" />
-        <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Grid.Row="3" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id">
-            <ComboBox.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemDepartureBerth" Click="contextMenuItemDepartureBerth_Click" />
-                </ContextMenu>
-            </ComboBox.ContextMenu>
+
+        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right"  FontWeight="Bold"/>
+        <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Grid.Row="3" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id" SelectionChanged="comboBoxDepartureBerth_SelectionChanged">
         </ComboBox>
-        
-        <Label Content="{x:Static p:Resources.textDraft}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" />
-        <xctk:DoubleUpDown x:Name="doubleUpDownDraft" Grid.Column="1" Grid.Row="4" Margin="2" FormatString="N2" Minimum="0" Maximum="50"/>
+
+        <Label Content="{x:Static p:Resources.textDraft}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <xctk:DoubleUpDown x:Name="doubleUpDownDraft" Grid.Column="1" Grid.Row="4" Margin="2" FormatString="N2" Minimum="0" Maximum="50" MaxLength="5" ValueChanged="doubleUpDownDraft_ValueChanged"/>
         <Label Content="{x:Static p:Resources.textTidalWindow}" FontWeight="DemiBold" Grid.Column="0" Grid.Row="5" HorizontalContentAlignment="Right"/>
         <Label Content="{x:Static p:Resources.textFrom}" Grid.Column="0" Grid.Row="6" HorizontalContentAlignment="Right"/>
         <Label Content="{x:Static p:Resources.textTo}" Grid.Column="0" Grid.Row="7" HorizontalContentAlignment="Right"/>
@@ -80,21 +81,28 @@
             <Label Grid.Column="0" Grid.Row="0" Content="{x:Static p:Resources.textShiftingTo}" FontWeight="DemiBold"/>
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_right_green.png" />
         </Grid>
-        <Label Content="ETA" Grid.Column="0" Grid.Row="9"  HorizontalContentAlignment="Right"/>
-        <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="1" Grid.Row="9" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
+        <Label Content="{x:Static p:Resources.textETABerth}" Grid.Column="0" Grid.Row="9"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <Grid Grid.Column="1" Grid.Row="9">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width=".5*" />
+                <ColumnDefinition Width=".5*" />
+            </Grid.ColumnDefinitions>
+            <local:DateTimePickerExt x:Name="datePickerETA" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETA_ValueChanged"/>
+            <local:DateTimePickerExt x:Name="datePickerETA_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETA_ValueChanged"/>
+        </Grid>
 
-        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="10"  HorizontalContentAlignment="Right"/>
-        <ComboBox Name="comboBoxArrivalBerth" Grid.Column="1" Grid.Row="10" 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>
+
+        <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="10"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <ComboBox Name="comboBoxArrivalBerth" Grid.Column="1" Grid.Row="10" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" SelectionChanged="comboBoxArrivalBerth_SelectionChanged" />
         <Label Content="{x:Static p:Resources.textPierside}" Grid.Column="0" Grid.Row="11" HorizontalContentAlignment="Right" />
         <ComboBox x:Name="comboBoxPiersideArrival" Grid.Column="1" Grid.Row="11" Margin="2" >
-            <ComboBoxItem Content="{x:Static p:Resources.textNotRotated}" />
-            <ComboBoxItem Content="{x:Static p:Resources.textRotated}" />
+            <ComboBoxItem Content="{x:Static p:Resources.textPort}" />
+            <ComboBoxItem Content="{x:Static p:Resources.textStarboard}" />
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearPierside" Click="contextMenuItemClearPierside_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
         </ComboBox>
         <Label Content="{x:Static p:Resources.textBerthRemarks}" Grid.Column="0" Grid.Row="12" HorizontalContentAlignment="Right" />
         <TextBox x:Name="textBoxBerthRemarksArrival" Grid.Column="1" Grid.Row="12" Margin="2,1,2,3" Grid.RowSpan="2" VerticalContentAlignment="Top" AcceptsReturn="True" MaxLength="512"/>
@@ -134,7 +142,7 @@
         </ComboBox>
         <Label Content="{x:Static p:Resources.textMooredLock}" Grid.Column="2" Grid.Row="5" HorizontalContentAlignment="Right" />
         <CheckBox x:Name="checkBoxMooredLock" Grid.Column="3" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,4,0" />
-        
+
         <Label Content="{x:Static p:Resources.textRainSensitiveCargo}" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="6" HorizontalAlignment="Right" />
         <CheckBox x:Name="checkBoxRainsensitiveCargo" Grid.Column="3" Grid.Row="6" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,4,0" />
         <Label Content="{x:Static p:Resources.textRemarks}" Grid.Column="2" Grid.Row="7" HorizontalContentAlignment="Right" />

src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs

@@ -4,7 +4,9 @@
 
 using BreCalClient.misc.Model;
 using System;
+using System.Collections.Generic;
 using System.Windows;
+using System.Windows.Documents;
 using static BreCalClient.Extensions;
 
 namespace BreCalClient
@@ -12,8 +14,13 @@ namespace BreCalClient
     /// <summary>
     /// Interaction logic for EditTimesAgencyShiftingControl.xaml
     /// </summary>
-    public partial class EditTimesAgencyShiftingControl : Window, IEditShipcallTimesControl
+    public partial class EditTimesAgencyShiftingControl : Window, IEditTimesControl
     {
+        #region Fields
+
+        bool _editing = false;
+
+        #endregion
 
         #region Construction
 
@@ -28,30 +35,37 @@ namespace BreCalClient
 
         public ShipcallControlModel ShipcallModel { get; set; } = new();
 
-        public Times Times { get; set; } = new();
-
-        public Extensions.TypeEnum CallType { get; set; }
+        public Times Times { get; set; } = new();        
 
         #endregion
 
         #region event handler
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
-        {
-            this.comboBoxMooring.ItemsSource = BreCalLists.Participants_Mooring;
-            this.comboBoxPilot.ItemsSource = BreCalLists.Participants_Pilot;
-            this.comboBoxTug.ItemsSource = BreCalLists.Participants_Tug;
-            this.comboBoxTerminal.ItemsSource = BreCalLists.Participants_Terminal;
+        {            
 
-            this.comboBoxDepartureBerth.ItemsSource = BreCalLists.Berths;
-            this.comboBoxArrivalBerth.ItemsSource = BreCalLists.Berths;
+            if ((this.ShipcallModel != null) && (this.ShipcallModel.Shipcall != null))
+            {
+                int portId = this.ShipcallModel.Shipcall.PortId;
+                List<Berth> availableBerths = BreCalLists.GetBerthsByPort(portId);
+                this.comboBoxArrivalBerth.ItemsSource = availableBerths;
+                this.comboBoxDepartureBerth.ItemsSource = availableBerths;
+                this.comboBoxMooring.ItemsSource = BreCalLists.GetParticipants(portId, ParticipantType.MOORING);
+                this.comboBoxPilot.ItemsSource = BreCalLists.GetParticipants(portId, ParticipantType.PILOT);
+                this.comboBoxTug.ItemsSource = BreCalLists.GetParticipants(portId, ParticipantType.TUG);
+                this.comboBoxTerminal.ItemsSource = BreCalLists.GetParticipants(portId, ParticipantType.TERMINAL);
+            }            
+            
             this.CopyToControls();
 
-            this.Title = this.ShipcallModel.Title;
-
             Participant? p = null;
-            if (this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.AGENCY))
-                p = BreCalLists.Participants.Find(x => x.Id == this.ShipcallModel.AssignedParticipants[ParticipantType.AGENCY].ParticipantId);
+
+            if (this.ShipcallModel != null)
+            {
+                this.Title = this.ShipcallModel.Title;
+                if (this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.AGENCY))
+                    p = BreCalLists.Participants.Find(x => x.Id == this.ShipcallModel.AssignedParticipants[ParticipantType.AGENCY].ParticipantId);
+            }
 
             bool allowBSMD = false;
             if (p != null)
@@ -59,18 +73,25 @@ namespace BreCalClient
                 allowBSMD = p.IsFlagSet(ParticipantFlag.ALLOW_BSMD);
             }
 
-            bool enableControls = (this.Times.ParticipantId == App.Participant.Id) ||
+            _editing = (this.Times.ParticipantId == App.Participant.Id) ||
                 (App.Participant.IsTypeFlagSet(ParticipantType.BSMD) && allowBSMD);
 
-            this.EnableControls(enableControls);
+            this.EnableControls();
 
         }
 
         private void buttonOK_Click(object sender, RoutedEventArgs e)
         {
-            this.CopyToModel();
-            this.DialogResult = true;
-            this.Close();
+            if (!CheckValues(out string message))
+            {
+                System.Windows.MessageBox.Show(message, BreCalClient.Resources.Resources.textWarning, MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
+            else
+            {
+                this.CopyToModel();
+                this.DialogResult = true;
+                this.Close();
+            }
         }
 
         private void buttonCancel_Click(object sender, RoutedEventArgs e)
@@ -83,16 +104,97 @@ namespace BreCalClient
 
         #region private methods
 
+        private bool CheckValues(out string message)
+        {
+            message = "";
+
+
+            if((this.datePickerETA.Value != this.Times.EtaBerth) || (this.datePickerETA_End.Value != this.Times.EtaIntervalEnd))
+            {
+                if (this.datePickerETA.Value.IsTooOld() && this.datePickerETA_End.Value.IsTooOld())
+                {
+                    message = BreCalClient.Resources.Resources.textETAInThePast;
+                    return false;
+                }
+            }            
+
+            if (this.datePickerETA.Value.HasValue && this.datePickerETA_End.Value.HasValue && this.datePickerETA.Value > this.datePickerETA_End.Value)
+            {
+                message = BreCalClient.Resources.Resources.textEndValueBeforeStartValue;
+                return false;
+            }
+
+            if((this.datePickerETD.Value != this.Times.EtdBerth) || (this.datePickerETD_End.Value != this.Times.EtdIntervalEnd))
+            {
+                if (this.datePickerETD.Value.IsTooOld() || this.datePickerETD_End.Value.IsTooOld())
+                {
+                    message = BreCalClient.Resources.Resources.textETDInThePast;
+                    return false;
+                }
+            }            
+
+            if (this.datePickerETD.Value.HasValue && this.datePickerETD_End.Value.HasValue && this.datePickerETD.Value > this.datePickerETD_End.Value)
+            {
+                message = BreCalClient.Resources.Resources.textEndValueBeforeStartValue;
+                return false;
+            }
+
+            if((this.datePickerTidalWindowFrom.Value != this.ShipcallModel.Shipcall?.TidalWindowFrom) || (this.datePickerTidalWindowTo.Value != this.ShipcallModel.Shipcall?.TidalWindowTo))
+            {
+                if (this.datePickerTidalWindowFrom.Value.IsTooOld() && this.datePickerTidalWindowTo.Value.IsTooOld())
+                {
+                    message = BreCalClient.Resources.Resources.textTideTimesInThePast;
+                    return false;
+                }
+            }            
+
+            if (this.datePickerTidalWindowFrom.Value.HasValue && this.datePickerTidalWindowTo.Value.HasValue && this.datePickerTidalWindowFrom.Value > this.datePickerTidalWindowTo.Value)
+            {
+                message = BreCalClient.Resources.Resources.textEndValueBeforeStartValue;
+                return false;
+            }
+
+            if ((this.datePickerTidalWindowFrom.Value.HasValue && !this.datePickerTidalWindowTo.Value.HasValue) || (!this.datePickerTidalWindowFrom.Value.HasValue && this.datePickerTidalWindowTo.Value.HasValue))
+            {
+                message = BreCalClient.Resources.Resources.textTidalBothValues;
+                return false;
+            }
+
+            if (this.datePickerETA.Value.IsTooFar() || this.datePickerETA_End.Value.IsTooFar() || this.datePickerTidalWindowFrom.Value.IsTooFar() || this.datePickerTidalWindowTo.Value.IsTooFar() ||
+                this.datePickerETD.Value.IsTooFar() || this.datePickerETD_End.Value.IsTooFar())
+            {
+                message = BreCalClient.Resources.Resources.textTooFarInTheFuture;
+                return false;
+            }
+
+            if((this.datePickerETA_End.Value.HasValue && !this.datePickerETA.Value.HasValue) ||
+                (this.datePickerETD_End.Value.HasValue && !this.datePickerETD.Value.HasValue) ||
+                (this.datePickerTidalWindowTo.Value.HasValue && !this.datePickerTidalWindowFrom.Value.HasValue))
+            {
+                message = BreCalClient.Resources.Resources.textStartTimeMissing;
+                return false;
+            }
+
+            return true;
+        }
+
         private void CopyToModel()
         {
             if (this.ShipcallModel.Shipcall != null)
             {
                 this.Times.EtdBerth = this.datePickerETD.Value;
                 this.Times.EtaBerth = this.datePickerETA.Value;
+                this.Times.EtaIntervalEnd = this.datePickerETA_End.Value;
+                this.Times.EtdIntervalEnd = this.datePickerETD_End.Value;
+
                 this.ShipcallModel.Shipcall.DepartureBerthId = (int)this.comboBoxDepartureBerth.SelectedValue;                
                 if (this.comboBoxPiersideArrival.SelectedIndex >= 0)
                 {
-                    this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPiersideArrival.SelectedIndex == 0) ? true : false;
+                    this.ShipcallModel.Shipcall.PierSide = (this.comboBoxPiersideArrival.SelectedIndex == 0);
+                }
+                else
+                {
+                    this.ShipcallModel.Shipcall.PierSide = null;
                 }
 
                 this.Times.BerthInfo = this.textBoxBerthRemarksArrival.Text.Trim();                
@@ -180,6 +282,9 @@ namespace BreCalClient
                         this.datePickerETD.Value = this.ShipcallModel.Shipcall.Etd;
                 }
 
+                this.datePickerETA_End.Value = this.Times.EtaIntervalEnd;
+                this.datePickerETD_End.Value = this.Times.EtdIntervalEnd;
+
                 if (this.Times.BerthId.HasValue)
                     this.comboBoxArrivalBerth.SelectedValue = this.Times.BerthId;
                 else if (this.ShipcallModel.Shipcall.ArrivalBerthId.HasValue)
@@ -204,7 +309,8 @@ namespace BreCalClient
 
                 this.checkBoxMooredLock.IsChecked = this.ShipcallModel.Shipcall.MooredLock ?? false;
                 this.checkBoxRainsensitiveCargo.IsChecked = this.ShipcallModel.Shipcall.RainSensitiveCargo ?? false;
-                if(!string.IsNullOrEmpty(this.Times.Remarks))
+               
+                if (!string.IsNullOrEmpty(this.Times.Remarks))
                     this.textBoxRemarks.Text = this.Times.Remarks;
 
                 if (this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.MOORING))
@@ -241,35 +347,59 @@ namespace BreCalClient
             }
         }
 
-        private void EnableControls(bool isEnabled)
+        private void EnableControls()
         {
-            this.datePickerETD.IsEnabled = isEnabled;
-            this.comboBoxArrivalBerth.IsEnabled = isEnabled;
-            this.doubleUpDownDraft.IsEnabled = isEnabled;
-            this.datePickerTidalWindowFrom.IsEnabled = isEnabled;
-            this.datePickerTidalWindowTo.IsEnabled = isEnabled;
-            this.datePickerETA.IsEnabled = isEnabled;
-            this.comboBoxDepartureBerth.IsEnabled = isEnabled;
-            this.comboBoxPiersideArrival.IsEnabled = isEnabled;
-            this.textBoxBerthRemarksArrival.IsEnabled = isEnabled;
-            this.checkBoxCanceled.IsEnabled = isEnabled;
+            this.datePickerETD_End.IsEnabled = _editing;
+            this.datePickerETA_End.IsEnabled = _editing;
+            this.datePickerETD.IsEnabled = _editing;
+            this.comboBoxArrivalBerth.IsEnabled = _editing;
+            this.doubleUpDownDraft.IsEnabled = _editing;
+            this.datePickerTidalWindowFrom.IsEnabled = _editing;
+            this.datePickerTidalWindowTo.IsEnabled = _editing;
+            this.datePickerETA.IsEnabled = _editing;
+            this.comboBoxDepartureBerth.IsEnabled = _editing;
+            this.comboBoxPiersideArrival.IsEnabled = _editing;
+            this.textBoxBerthRemarksArrival.IsReadOnly = !_editing;
+            this.checkBoxCanceled.IsEnabled = _editing;
 
             
-            this.comboBoxTug.IsEnabled = isEnabled;
-            this.integerUpDownRecommendedTugs.IsEnabled = isEnabled;            
-            this.comboBoxPilot.IsEnabled = isEnabled;
-            this.comboBoxMooring.IsEnabled = isEnabled;
-            this.checkBoxMooredLock.IsEnabled = isEnabled;
-            this.comboBoxTerminal.IsEnabled = isEnabled;
-            this.checkBoxRainsensitiveCargo.IsEnabled = isEnabled;
-            this.textBoxRemarks.IsEnabled = isEnabled;
+            this.comboBoxTug.IsEnabled = _editing;
+            this.integerUpDownRecommendedTugs.IsEnabled = _editing;            
+            this.comboBoxPilot.IsEnabled = _editing;
+            this.comboBoxMooring.IsEnabled = _editing;
+            this.checkBoxMooredLock.IsEnabled = _editing;
+            this.comboBoxTerminal.IsEnabled = _editing;
+            this.checkBoxRainsensitiveCargo.IsEnabled = _editing;
+            this.textBoxRemarks.IsReadOnly = !_editing;
 
-            this.buttonOK.IsEnabled = isEnabled;
+            CheckOKButton();
+        }
+
+        private bool RequiredFieldsSet()
+        {
+            bool areSet = this.datePickerETA.Value.HasValue &&
+                this.datePickerETD.Value.HasValue &&
+                this.doubleUpDownDraft.Value.HasValue &&
+                (this.comboBoxArrivalBerth.SelectedIndex >= 0) &&
+                (this.comboBoxDepartureBerth.SelectedIndex >= 0);
+
+            if (this.datePickerETA_End.Value.HasValue)
+                areSet &= (this.datePickerETA_End.Value > this.datePickerETA.Value);
+
+            if (this.datePickerETD_End.Value.HasValue)
+                areSet &= (this.datePickerETD_End.Value > this.datePickerETD.Value);
+
+            return areSet;
+        }
+
+        private void CheckOKButton()
+        {
+            this.buttonOK.IsEnabled = _editing && RequiredFieldsSet() && !(this.ShipcallModel.Shipcall?.Canceled ?? false);
         }
 
         #endregion
 
-        #region context menu handlers
+        #region event handlers
 
         private void contextMenuItemDepartureBerth_Click(object sender, RoutedEventArgs e)
         {
@@ -305,6 +435,36 @@ namespace BreCalClient
         {
             this.comboBoxTerminal.SelectedIndex = -1;
             this.ShipcallModel.AssignedParticipants.Remove(Extensions.ParticipantType.TERMINAL);
+        }        
+
+        private void contextMenuItemClearPierside_Click(object sender, RoutedEventArgs e)
+        {
+            this.comboBoxPiersideArrival.SelectedIndex = -1;
+        }        
+
+        private void datePickerETD_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            CheckOKButton();
+        }
+
+        private void comboBoxDepartureBerth_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+        {
+            CheckOKButton();
+        }
+
+        private void doubleUpDownDraft_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            CheckOKButton();
+        }
+
+        private void datePickerETA_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            CheckOKButton();
+        }
+
+        private void comboBoxArrivalBerth_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+        {
+            CheckOKButton();
         }
 
         #endregion

src/BreCalClient/EditTimesControl.xaml

@@ -5,58 +5,133 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BreCalClient"
         xmlns:p = "clr-namespace:BreCalClient.Resources"
-        xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textEditTimes}" Height="265" Width="400" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+        mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
+        Title="{x:Static p:Resources.textEditTimes}" Height="415" Width="500" Loaded="Window_Loaded" ResizeMode="CanResizeWithGrip" Icon="Resources/containership.ico">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width=".25*" />
-            <ColumnDefinition Width=".75*" />
+            <ColumnDefinition Width=".20*" />
+            <ColumnDefinition Width=".80*" />
             <!--ColumnDefinition Width="40" /-->
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
+            <RowDefinition Height="28" x:Name="rowETA" />
+            <RowDefinition Height="28" x:Name="rowETD" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
-            <RowDefinition Height="56" />
+            <RowDefinition Height="28" x:Name="rowt1" />
+            <RowDefinition Height="28" x:Name="rowt2" />
+            <RowDefinition Height="28" x:Name="rowt3" />
+            <RowDefinition Height="*" />
             <RowDefinition Height="28" />
         </Grid.RowDefinitions>
+        <Button x:Name="buttonFixedOrder" Grid.Row="0" Grid.Column="1" Margin="2" Click="buttonFixedOrder_Click" Width="28" HorizontalAlignment="Left">
+            <Image x:Name="imageFixedOrder" Source="Resources\lock_open.png" />
+        </Button>
         <!-- Label Grid.Row="0" Grid.Column="2" Content="{x:Static p:Resources.textFixed}" /-->
-        <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textETABerth}" HorizontalContentAlignment="Right" />
-        <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textETDBerth}" HorizontalContentAlignment="Right" />
-        <Label Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textLockTime}" HorizontalContentAlignment="Right" />
-        <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textZoneEntryTime}" HorizontalContentAlignment="Right" />
-        
-        <Label Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textETABerth}" HorizontalContentAlignment="Right" x:Name="labelETA" />
+        <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textETDBerth}" HorizontalContentAlignment="Right" x:Name="labelETD" />
+        <Label Grid.Row="3" Grid.Column="0" Content="ATA" HorizontalContentAlignment="Right" x:Name="labelATA" />
+        <Label Grid.Row="4" Grid.Column="0" Content="ATD" HorizontalContentAlignment="Right" x:Name="labelATD" />
+        <Label Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textLockTime}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textZoneEntryTime}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textTidalWindow}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textFrom}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textTo}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="10" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" HorizontalContentAlignment="Right" />
 
-        <xctk:DateTimePicker IsEnabled="False" Grid.Row="1" Grid.Column="1" Margin="2" Name="datePickerETABerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+        <Grid Grid.Row="1" Grid.Column="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width=".5*" />
+                <ColumnDefinition Width=".5*" />
+            </Grid.ColumnDefinitions>
+
+            <local:DateTimePickerExt IsEnabled="False" Grid.Row="0" Grid.Column="0" Margin="2" x:Name="datePickerETABerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+                <xctk:DateTimePicker.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearETA" Click="contextMenuItemClearETA_Click" >
+                            <MenuItem.Icon>
+                                <Image Source="Resources\delete.png" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                    </ContextMenu>
+                </xctk:DateTimePicker.ContextMenu>
+            </local:DateTimePickerExt>
+
+            <local:DateTimePickerExt IsEnabled="False" Grid.Row="0" Grid.Column="1" Margin="2" x:Name="datePickerETABerth_End" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+                <xctk:DateTimePicker.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearETA_End" Click="contextMenuItemClearETA_End_Click" >
+                            <MenuItem.Icon>
+                                <Image Source="Resources\delete.png" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                    </ContextMenu>
+                </xctk:DateTimePicker.ContextMenu>
+            </local:DateTimePickerExt>
+
+        </Grid>
+
+        <Grid Grid.Row="2" Grid.Column="1" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width=".5*" />
+                <ColumnDefinition Width=".5*" />
+            </Grid.ColumnDefinitions>
+
+            <local:DateTimePickerExt IsEnabled="False" Grid.Row="0" Grid.Column="0" Margin="2" x:Name="datePickerETDBerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+                <xctk:DateTimePicker.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearETD" Click="contextMenuItemClearETD_Click" >
+                            <MenuItem.Icon>
+                                <Image Source="Resources\delete.png" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                    </ContextMenu>
+                </xctk:DateTimePicker.ContextMenu>
+            </local:DateTimePickerExt>
+
+            <local:DateTimePickerExt IsEnabled="False" Grid.Row="0" Grid.Column="1" Margin="2" x:Name="datePickerETDBerth_End" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+                <xctk:DateTimePicker.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearETD_End" Click="contextMenuItemClearETD_End_Click" >
+                            <MenuItem.Icon>
+                                <Image Source="Resources\delete.png" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                    </ContextMenu>
+                </xctk:DateTimePicker.ContextMenu>
+            </local:DateTimePickerExt>
+
+        </Grid>
+
+        <local:DateTimePickerExt IsEnabled="False"  Grid.Row="3" Grid.Column="1" Margin="2" x:Name="datePickerATA" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearETA" Click="contextMenuItemClearETA_Click" >
+                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearATA" Click="contextMenuItemClearATA_Click" >
                         <MenuItem.Icon>
                             <Image Source="Resources\delete.png" />
                         </MenuItem.Icon>
                     </MenuItem>
                 </ContextMenu>
             </xctk:DateTimePicker.ContextMenu>
-        </xctk:DateTimePicker>
-        <!--CheckBox IsEnabled="False" Grid.Row="1" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxEtaBerthFixed" VerticalAlignment="Center" /-->
-        <xctk:DateTimePicker IsEnabled="False" Grid.Row="2" Grid.Column="1" Margin="2" Name="datePickerETDBerth" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+        </local:DateTimePickerExt>
+
+        <local:DateTimePickerExt IsEnabled="False" Grid.Row="4" Grid.Column="1" Margin="2" x:Name="datePickerATD" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearETD" Click="contextMenuItemClearETD_Click" >
+                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearATD" Click="contextMenuItemClearATD_Click" >
                         <MenuItem.Icon>
                             <Image Source="Resources\delete.png" />
                         </MenuItem.Icon>
                     </MenuItem>
                 </ContextMenu>
             </xctk:DateTimePicker.ContextMenu>
-        </xctk:DateTimePicker>
-        <!--CheckBox IsEnabled="False" Grid.Row="2" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxEtDBerthFixed" VerticalAlignment="Center" /-->
-        <xctk:DateTimePicker IsEnabled="False" Grid.Row="3" Grid.Column="1" Margin="2" Name="datePickerLockTime" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+        </local:DateTimePickerExt>
+
+        <local:DateTimePickerExt IsEnabled="False" Grid.Row="5" Grid.Column="1" Margin="2" x:Name="datePickerLockTime" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearLockTime" Click="contextMenuItemClearLockTime_Click" >
@@ -66,9 +141,9 @@
                     </MenuItem>
                 </ContextMenu>
             </xctk:DateTimePicker.ContextMenu>
-        </xctk:DateTimePicker>
-        <!--CheckBox IsEnabled="False" Grid.Row="3" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxLockTimeFixed" VerticalAlignment="Center" /-->
-        <xctk:DateTimePicker IsEnabled="False" Grid.Row="4" Grid.Column="1" Margin="2" Name="datePickerZoneEntry" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
+        </local:DateTimePickerExt>
+        
+        <local:DateTimePickerExt IsEnabled="False" Grid.Row="6" Grid.Column="1" Margin="2" x:Name="datePickerZoneEntry" Format="Custom" FormatString="dd.MM. yyyy  HH:mm">
             <xctk:DateTimePicker.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearZoneEntry" Click="contextMenuItemClearZoneEntry_Click" >
@@ -78,13 +153,18 @@
                     </MenuItem>
                 </ContextMenu>
             </xctk:DateTimePicker.ContextMenu>
-        </xctk:DateTimePicker>
-        <!--CheckBox IsEnabled="False" Grid.Row="4" Grid.Column="2" Margin="4,0,0,0" Name="checkBoxZoneEntryFixed" VerticalAlignment="Center" /-->
+        </local:DateTimePickerExt>
         
-        <TextBox Grid.Row="5" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="False" IsEnabled="False"/>
-        <StackPanel Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False" />
+        <xctk:DateTimePicker Name="datePickerTidalWindowFrom" Grid.Column="1" Grid.Row="8" Margin="2" IsEnabled="False" Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
+        <xctk:DateTimePicker Name="datePickerTidalWindowTo" Grid.Column="1" Grid.Row="9" Margin="2" IsEnabled="False" Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
+
+        <TextBox Grid.Row="10" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="False" IsReadOnly="True" MaxLength="512"/>
+        <StackPanel Grid.Row="11" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" />
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
+            <Button Width="28" x:Name="buttonClearAll" Click="buttonClearAll_Click" Margin="2" IsEnabled="False">
+                <Image Source="Resources\nav_undo_red.png"/>
+            </Button>
         </StackPanel>
 
     </Grid>

src/BreCalClient/EditTimesControl.xaml.cs

@@ -1,10 +1,13 @@
 // Copyright (c) 2023 schick Informatik
 // Description: Single dialog to edit times for all participant types
 // (we might use different controls at a later time)
-// 
+//
 
 using BreCalClient.misc.Model;
+using System;
 using System.Windows;
+using System.Windows.Media.Imaging;
+using Xceed.Wpf.Toolkit;
 
 namespace BreCalClient
 {
@@ -25,26 +28,36 @@ namespace BreCalClient
 
         #region Properties
 
-        public Times Times { get; set; } = new();        
+        public Times Times { get; set; } = new();
 
-        public Extensions.TypeEnum CallType { get; set; }        
+        public Times? AgencyTimes { get; set; } = new();
+
+        public ShipcallControlModel ShipcallModel { get; set; } = new();
 
         #endregion
 
         #region event handler
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
-        {            
-            this.CopyToControls();
+        {
             this.EnableControls();
+            this.CopyToControls();
         }
 
         private void buttonOK_Click(object sender, RoutedEventArgs e)
         {
-            this.CopyToModel();
-            this.DialogResult = true;
-            this.Close();
-        }        
+            if (!CheckValues(out string message))
+            {
+                System.Windows.MessageBox.Show(message, BreCalClient.Resources.Resources.textWarning, 
+                    MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
+            else
+            {
+                this.CopyToModel();
+                this.DialogResult = true;
+                this.Close();
+            }
+        }
 
         private void buttonCancel_Click(object sender, RoutedEventArgs e)
         {
@@ -52,71 +65,294 @@ namespace BreCalClient
             this.Close();
         }
 
+        private void buttonFixedOrder_Click(object sender, RoutedEventArgs e)
+        {
+            bool newValue = true;
+            if (this.Times.EtaBerthFixed ?? false)
+                newValue = false;
+            SetLockButton(newValue);
+        }
+
+        private void buttonClearAll_Click(object sender, RoutedEventArgs e)
+        {
+            if (System.Windows.MessageBox.Show(BreCalClient.Resources.Resources.textClearAll, BreCalClient.Resources.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
+            {
+                this.datePickerETABerth.Value = null;
+                this.datePickerETABerth_End.Value = null;
+                this.datePickerETDBerth.Value = null;
+                this.datePickerETDBerth_End.Value = null;
+                this.datePickerATA.Value = null;
+                this.datePickerATD.Value = null;
+                this.datePickerLockTime.Value = null;
+                this.datePickerZoneEntry.Value = null;
+                this.textBoxRemarks.Text = null;
+                this.datePickerTidalWindowFrom.Value = null;
+                this.datePickerTidalWindowTo.Value = null;
+            }
+        }
+
         #endregion
 
         #region private methods
 
+        private bool CheckValues(out string message)
+        {
+
+            message = "";
+
+            if ((this.datePickerETABerth.Value != this.Times.EtaBerth) || (this.datePickerETABerth_End.Value != this.Times.EtaIntervalEnd))
+            {
+                if (this.datePickerETABerth.Value.IsTooOld() || this.datePickerETABerth_End.Value.IsTooOld())
+                {
+                    message = BreCalClient.Resources.Resources.textETAInThePast;
+                    return false;
+                }
+            }
+
+            if (this.datePickerETABerth.Value.HasValue && this.datePickerETABerth_End.Value.HasValue && this.datePickerETABerth.Value > this.datePickerETABerth_End.Value)
+            {
+                message = BreCalClient.Resources.Resources.textEndValueBeforeStartValue;
+                return false;
+            }
+
+            if((this.datePickerETDBerth.Value != this.Times.EtdBerth) || (this.datePickerETDBerth_End.Value != this.Times.EtdIntervalEnd))
+            {
+                if(this.datePickerETDBerth.Value.IsTooOld() || this.datePickerETDBerth_End.Value.IsTooOld())
+                {
+                    message = BreCalClient.Resources.Resources.textETDInThePast;
+                    return false;
+                }
+            }
+
+            if (this.datePickerETDBerth.Value.HasValue && this.datePickerETDBerth_End.Value.HasValue && this.datePickerETDBerth.Value > this.datePickerETDBerth_End.Value)
+            {
+                message = BreCalClient.Resources.Resources.textEndValueBeforeStartValue;
+                return false;
+            }
+
+            if (this.datePickerLockTime.Value.IsTooOld() && (this.datePickerLockTime.Value != this.Times.LockTime))
+            {
+                message = BreCalClient.Resources.Resources.textLockTimeInThePast;
+                return false;
+            }
+
+            if (this.datePickerZoneEntry.Value.IsTooOld() && (this.datePickerZoneEntry.Value != this.Times.ZoneEntry))
+            {
+                message = BreCalClient.Resources.Resources.textZoneEntryInThePast;
+                return false;
+            }
+
+            if(this.datePickerATA.Value.IsTooFar() || this.datePickerATD.Value.IsTooFar() || this.datePickerETABerth.Value.IsTooFar() || this.datePickerETABerth_End.Value.IsTooFar() ||
+                this.datePickerETDBerth.Value.IsTooFar() || this.datePickerETDBerth_End.Value.IsTooFar() || this.datePickerLockTime.Value.IsTooFar() || this.datePickerZoneEntry.Value.IsTooFar())
+            {
+                message = BreCalClient.Resources.Resources.textTooFarInTheFuture;
+                return false;
+            }
+
+            if((this.datePickerETABerth_End.Value.HasValue && !this.datePickerETABerth.Value.HasValue) || (this.datePickerETDBerth_End.Value.HasValue && !this.datePickerETDBerth.Value.HasValue))
+            {
+                message = BreCalClient.Resources.Resources.textStartTimeMissing;
+                return false;
+            }
+
+            if ((Extensions.ParticipantType)this.Times.ParticipantType == Extensions.ParticipantType.PILOT)
+            {
+                if ((this.datePickerTidalWindowFrom.Value != this.ShipcallModel.Shipcall?.TidalWindowFrom) || (this.datePickerTidalWindowTo.Value != this.ShipcallModel.Shipcall?.TidalWindowTo)) // something has changed
+                {
+                    if (datePickerTidalWindowTo.Value.IsTooOld() || this.datePickerTidalWindowFrom.Value.IsTooOld())
+                    {
+                        message = BreCalClient.Resources.Resources.textTideTimesInThePast;
+                        return false;
+                    }
+
+                    if (this.datePickerTidalWindowFrom.Value.HasValue && this.datePickerTidalWindowTo.Value.HasValue && this.datePickerTidalWindowFrom.Value > this.datePickerTidalWindowTo.Value)
+                    {
+                        message = BreCalClient.Resources.Resources.textEndValueBeforeStartValue;
+                        return false;
+                    }
+
+                    if ((this.datePickerTidalWindowFrom.Value.HasValue && !this.datePickerTidalWindowTo.Value.HasValue) || (!this.datePickerTidalWindowFrom.Value.HasValue && this.datePickerTidalWindowTo.Value.HasValue))
+                    {
+                        message = BreCalClient.Resources.Resources.textTidalBothValues;
+                        return false;
+                    }
+                }
+            }
+
+            return true;
+        }
+
         private void CopyToModel()
         {
             this.Times.Remarks = this.textBoxRemarks.Text.Trim().Truncate(512);
             this.Times.EtaBerth = this.datePickerETABerth.Value;
             this.Times.EtdBerth = this.datePickerETDBerth.Value;
+            this.Times.EtaIntervalEnd = this.datePickerETABerth_End.Value;
+            this.Times.EtdIntervalEnd = this.datePickerETDBerth_End.Value;
             this.Times.LockTime = this.datePickerLockTime.Value;
             this.Times.ZoneEntry = this.datePickerZoneEntry.Value;
-            
-            //this.Times.EtaBerthFixed = this.checkBoxEtaBerthFixed.IsChecked;
-            //this.Times.EtdBerthFixed = this.checkBoxEtDBerthFixed.IsChecked;
-            //this.Times.LockTimeFixed = this.checkBoxLockTimeFixed.IsChecked;
-            //this.Times.ZoneEntryFixed = this.checkBoxZoneEntryFixed.IsChecked;
+            this.Times.Ata = this.datePickerATA.Value;
+            this.Times.Atd = this.datePickerATD.Value;
+
+            Extensions.ParticipantType pType = (Extensions.ParticipantType)this.Times.ParticipantType;
+            if ((pType == Extensions.ParticipantType.PILOT) && this.ShipcallModel.Shipcall != null)
+            {
+                this.ShipcallModel.Shipcall.TidalWindowFrom = this.datePickerTidalWindowFrom.Value;
+                this.ShipcallModel.Shipcall.TidalWindowTo = this.datePickerTidalWindowTo.Value;
+            }
         }
 
         private void CopyToControls()
         {
             this.textBoxRemarks.Text = this.Times.Remarks;
             this.datePickerETABerth.Value = this.Times.EtaBerth;
+            if(this.datePickerETABerth.IsEnabled && (this.Times.EtaBerth == null) && (this.AgencyTimes?.EtaBerth != null) && (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival) && (this.AgencyTimes?.EtaBerth > DateTime.Now))
+            {
+                this.datePickerETABerth.Value = this.AgencyTimes.EtaBerth;
+                if (this.datePickerETABerth.Template.FindName("PART_TextBox", this.datePickerETABerth) is WatermarkTextBox tb) { tb.Focus(); tb.SelectAll(); }
+            }
             this.datePickerETDBerth.Value = this.Times.EtdBerth;
+            if(this.datePickerETDBerth.IsEnabled && (this.Times.EtdBerth == null) && (this.AgencyTimes?.EtdBerth != null) && ((ShipcallModel.Shipcall?.Type == ShipcallType.Departure) || (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting)) && (this.AgencyTimes?.EtdBerth > DateTime.Now))
+            {
+                this.datePickerETDBerth.Value = this.AgencyTimes.EtdBerth;
+                if (this.datePickerETDBerth.Template.FindName("PART_TextBox", this.datePickerETDBerth) is WatermarkTextBox tb) tb.SelectAll();
+            }
+
             this.datePickerLockTime.Value = this.Times.LockTime;
             this.datePickerZoneEntry.Value = this.Times.ZoneEntry;
-            
-            //this.checkBoxEtaBerthFixed.IsChecked = this.Times.EtaBerthFixed;
-            //this.checkBoxEtDBerthFixed.IsChecked = this.Times.EtdBerthFixed;
-            //this.checkBoxLockTimeFixed.IsChecked = this.Times.LockTimeFixed;
-            //this.checkBoxZoneEntryFixed.IsChecked = this.Times.ZoneEntryFixed;
+            this.datePickerATA.Value = this.Times.Ata;
+            this.datePickerATD.Value = this.Times.Atd;
+            this.datePickerETABerth_End.Value = this.Times.EtaIntervalEnd;
+            if (this.datePickerETABerth_End.IsEnabled && (this.Times.EtaIntervalEnd == null) && (this.Times.EtaBerth == null) && (this.AgencyTimes?.EtaIntervalEnd != null) && (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival))
+            {
+                this.datePickerETABerth_End.Value = this.AgencyTimes.EtaIntervalEnd;
+                //if (this.datePickerETABerth_End.Template.FindName("PART_TextBox", this.datePickerETABerth_End) is WatermarkTextBox tb) { tb.Focus(); tb.SelectAll(); }
+            }
+
+            this.datePickerETDBerth_End.Value = this.Times.EtdIntervalEnd;
+            if (this.datePickerETDBerth_End.IsEnabled && (this.Times.EtdIntervalEnd == null) && (this.Times.EtdBerth == null) && (this.AgencyTimes?.EtdIntervalEnd != null) && ((ShipcallModel.Shipcall?.Type == ShipcallType.Departure) || (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting)))
+            {
+                this.datePickerETDBerth_End.Value = this.AgencyTimes.EtdIntervalEnd;
+                //if (this.datePickerETDBerth_End.Template.FindName("PART_TextBox", this.datePickerETDBerth_End) is WatermarkTextBox tb) { tb.Focus(); tb.SelectAll(); }
+            }
+
+            if (this.ShipcallModel.Shipcall?.Type != ShipcallType.Shifting)
+            {
+                int displayIndex = this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0;
+                if (displayIndex > 0)
+                {
+                    this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[displayIndex]);
+                    this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[displayIndex]);
+                }
+                else
+                {
+                    this.labelETA.Content = BreCalClient.Resources.Resources.textETABerth;
+                    this.labelETD.Content = BreCalClient.Resources.Resources.textETDBerth;
+                }
+            }
+
+            Extensions.ParticipantType pType = (Extensions.ParticipantType)this.Times.ParticipantType;
+            if ((pType == Extensions.ParticipantType.PILOT) && this.ShipcallModel.Shipcall != null)
+            {
+                this.datePickerTidalWindowFrom.Value = this.ShipcallModel.Shipcall.TidalWindowFrom;
+                this.datePickerTidalWindowTo.Value = this.ShipcallModel.Shipcall.TidalWindowTo;                
+            } 
+            else
+            {
+                this.rowt1.Height = new(0);
+                this.rowt2.Height = new(0);
+                this.rowt3.Height = new(0);
+            }
+
+            this.SetLockButton(this.Times.EtaBerthFixed ?? false);
         }
 
         private void EnableControls()
         {
-            Extensions.ParticipantType pType = (Extensions.ParticipantType) (this.Times.ParticipantType ?? 0);
-            if (this.Times.ParticipantId != App.Participant.Id) return; // if this is not "my" entry, there is no editing!
+            Extensions.ParticipantType pType = (Extensions.ParticipantType) this.Times.ParticipantType;
+
+            // setting visibility
+
+            if (pType != Extensions.ParticipantType.MOORING)
+            {
+                this.labelATA.Visibility = Visibility.Hidden;
+                this.datePickerATA.Visibility = Visibility.Hidden;
+                this.labelATD.Visibility = Visibility.Hidden;
+                this.datePickerATD.Visibility = Visibility.Hidden;
+            }
+            else
+            {
+                if(ShipcallModel.Shipcall?.Type == ShipcallType.Arrival)
+                {
+                    this.labelATD.Visibility = Visibility.Hidden;
+                    this.datePickerATD.Visibility = Visibility.Hidden;
+                }
+                if (ShipcallModel.Shipcall?.Type == ShipcallType.Departure)
+                {
+                    this.labelATA.Visibility = Visibility.Hidden;
+                    this.datePickerATA.Visibility = Visibility.Hidden;
+                }
+            }
+
+            if (ShipcallModel.Shipcall?.Type != ShipcallType.Arrival)
+            {
+                this.rowETA.Height = new(0);
+            }
+            else
+            {
+                this.rowETD.Height = new(0);
+            }
+
+            // setting en/dis-abled
+
+            if ((this.Times.ParticipantId != App.Participant.Id) || (this.ShipcallModel.Shipcall?.Canceled ?? false))
+            {
+                this.buttonFixedOrder.IsEnabled = false;
+                this.buttonOK.IsEnabled = false;
+                return; // if this is not "my" entry, there is no editing!
+            }
+
+            this.datePickerETABerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);
+            this.datePickerETABerth_End.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);
+            this.datePickerETDBerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
+            this.datePickerETDBerth_End.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
+            this.textBoxRemarks.IsReadOnly = false;
+            this.buttonClearAll.IsEnabled = true;
 
             switch (pType)
             {
                 case Extensions.ParticipantType.MOORING:
+                    this.datePickerATA.IsEnabled = true;
+                    this.datePickerATD.IsEnabled = true;
+                    break;
                 case Extensions.ParticipantType.PORT_ADMINISTRATION:
+                    this.datePickerLockTime.IsEnabled = true;
+                    break;
                 case Extensions.ParticipantType.TUG:
-                    this.datePickerETABerth.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
-                    //this.checkBoxEtaBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
-                    this.datePickerETDBerth.IsEnabled = (CallType == Extensions.TypeEnum.Outgoing || CallType == Extensions.TypeEnum.Shifting);
-                    //this.checkBoxEtDBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Outgoing || CallType == Extensions.TypeEnum.Shifting);
-                    this.datePickerLockTime.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
-                    //this.checkBoxLockTimeFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
-                    this.datePickerZoneEntry.IsEnabled = false;
-                    //this.checkBoxZoneEntryFixed.IsEnabled = false;
-                    this.textBoxRemarks.IsEnabled = true;
+                    this.datePickerZoneEntry.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);
                     break;
                 case Extensions.ParticipantType.PILOT:
-                    this.datePickerETABerth.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
-                    //this.checkBoxEtaBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
-                    this.datePickerETDBerth.IsEnabled = (CallType == Extensions.TypeEnum.Outgoing || CallType == Extensions.TypeEnum.Shifting);
-                    //this.checkBoxEtDBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Outgoing || CallType == Extensions.TypeEnum.Shifting);
-                    this.datePickerLockTime.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
-                    //this.checkBoxLockTimeFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
-                    this.datePickerZoneEntry.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
-                    //this.checkBoxZoneEntryFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
-                    this.textBoxRemarks.IsEnabled = true;
+                    this.datePickerZoneEntry.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);
+                    this.datePickerTidalWindowFrom.IsEnabled = true;
+                    this.datePickerTidalWindowTo.IsEnabled = true;
                     break;
             }
-            this.buttonOK.IsEnabled = true;
+        }
+
+        private void SetLockButton(bool newValue)
+        {
+            if (newValue)
+            {
+                this.Times.EtaBerthFixed = true;
+                this.imageFixedOrder.Source = new BitmapImage(new Uri(@"pack://application:,,,/Resources/lock.png", UriKind.RelativeOrAbsolute));
+                this.buttonFixedOrder.ToolTip = BreCalClient.Resources.Resources.textTooltipUnSetFixedOrder;
+            }
+            else
+            {
+                this.Times.EtaBerthFixed = false;
+                this.imageFixedOrder.Source = new BitmapImage(new Uri(@"pack://application:,,,/Resources/lock_open.png", UriKind.RelativeOrAbsolute));
+                this.buttonFixedOrder.ToolTip = BreCalClient.Resources.Resources.textTooltipSetFixedOrder;
+            }
         }
 
         #endregion
@@ -141,7 +377,27 @@ namespace BreCalClient
         private void contextMenuItemClearZoneEntry_Click(object sender, RoutedEventArgs e)
         {
             this.datePickerZoneEntry.Value = null;
-        }        
+        }
+
+        private void contextMenuItemClearATA_Click(object sender, RoutedEventArgs e)
+        {
+            this.datePickerATA.Value = null;
+        }
+
+        private void contextMenuItemClearATD_Click(object sender, RoutedEventArgs e)
+        {
+            this.datePickerATD.Value = null;
+        }
+
+        private void contextMenuItemClearETA_End_Click(object sender, RoutedEventArgs e)
+        {
+            this.datePickerETABerth_End.Value = null;
+        }
+
+        private void contextMenuItemClearETD_End_Click(object sender, RoutedEventArgs e)
+        {
+            this.datePickerETDBerth_End.Value = null;
+        }
 
         #endregion
 

src/BreCalClient/EditTimesTerminalControl.xaml

@@ -6,54 +6,96 @@
         xmlns:p = "clr-namespace:BreCalClient.Resources"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:local="clr-namespace:BreCalClient"
-        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textEditTimes}" Loaded="Window_Loaded" Height="295" Width="400" >
+        mc:Ignorable="d"  Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
+        Title="{x:Static p:Resources.textEditTimes}" Loaded="Window_Loaded" Height="295" Width="500" ResizeMode="CanResizeWithGrip" >
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width=".4*" />
-            <ColumnDefinition Width=".6*" />
-            
+            <ColumnDefinition Width=".3*" />
+            <ColumnDefinition Width=".7*" />
+
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
+            <RowDefinition Height="28" x:Name="rowStart"/>
+            <RowDefinition Height="28" x:Name="rowEnd"/>
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="56" />
-            <RowDefinition Height="56" />
+            <RowDefinition Height="*" />
             <RowDefinition Height="28" />
         </Grid.RowDefinitions>
 
-        <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textOperationsStart}" HorizontalContentAlignment="Right" />
-        <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textOperationsEnd}" HorizontalContentAlignment="Right" />
-        <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textBerth}" HorizontalAlignment="Right" />
-        <Label Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textPierside}" HorizontalContentAlignment="Right" />
-        <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textBerthRemarks}" HorizontalContentAlignment="Right" />
+        <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textOperationsStart}" HorizontalContentAlignment="Right" x:Name="labelStart" />
+        <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textOperationsEnd}" HorizontalContentAlignment="Right" x:Name="labelEnd" />
+        <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textBerth}" HorizontalAlignment="Right" x:Name="labelBerth"/>
+        <Label Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textPierside}" HorizontalContentAlignment="Right" x:Name="labelPierside" />
+        <Label Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textBerthRemarks}" HorizontalContentAlignment="Right" x:Name="labelBerthRemarks"/>
 
         <Label Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" HorizontalContentAlignment="Right" />
 
-        <xctk:DateTimePicker Grid.Row="0" Grid.Column="1" Margin="2" Name="datePickerOperationStart" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False">
-            <xctk:DateTimePicker.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationStart" Click="contextMenuItemClearOperationStart_Click" >
-                        <MenuItem.Icon>
-                            <Image Source="Resources\delete.png" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                </ContextMenu>
-            </xctk:DateTimePicker.ContextMenu>
-        </xctk:DateTimePicker>
-        <xctk:DateTimePicker Grid.Row="1" Grid.Column="1" Margin="2" Name="datePickerOperationEnd" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False">
-            <xctk:DateTimePicker.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationEnd" Click="contextMenuItemClearOperationEnd_Click" >
-                        <MenuItem.Icon>
-                            <Image Source="Resources\delete.png" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                </ContextMenu>
-            </xctk:DateTimePicker.ContextMenu>
-        </xctk:DateTimePicker>
+        <Grid Grid.Row="0" Grid.Column="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width=".5*" />
+                <ColumnDefinition Width=".5*" />
+            </Grid.ColumnDefinitions>
+
+            <local:DateTimePickerExt Grid.Row="0" Grid.Column="0" Margin="2" x:Name="datePickerOperationStart" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" >
+                <xctk:DateTimePicker.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationStart" Click="contextMenuItemClearOperationStart_Click" >
+                            <MenuItem.Icon>
+                                <Image Source="Resources\delete.png" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                    </ContextMenu>
+                </xctk:DateTimePicker.ContextMenu>
+            </local:DateTimePickerExt>
+            <local:DateTimePickerExt Grid.Row="0" Grid.Column="1" Margin="2" x:Name="datePickerOperationStart_End" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False">
+                <xctk:DateTimePicker.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationStart_End" Click="contextMenuItemClearOperationStart_End_Click">
+                            <MenuItem.Icon>
+                                <Image Source="Resources\delete.png" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                    </ContextMenu>
+                </xctk:DateTimePicker.ContextMenu>
+            </local:DateTimePickerExt>
+
+        </Grid>
+
+        <Grid Grid.Row="1" Grid.Column="1" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width=".5*" />
+                <ColumnDefinition Width=".5*" />
+            </Grid.ColumnDefinitions>
+
+            <local:DateTimePickerExt Grid.Row="0" Grid.Column="0" Margin="2" x:Name="datePickerOperationEnd" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" >
+                <xctk:DateTimePicker.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationEnd" Click="contextMenuItemClearOperationEnd_Click" >
+                            <MenuItem.Icon>
+                                <Image Source="Resources\delete.png" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                    </ContextMenu>
+                </xctk:DateTimePicker.ContextMenu>
+            </local:DateTimePickerExt>
+
+            <local:DateTimePickerExt Grid.Row="0" Grid.Column="1" Margin="2" x:Name="datePickerOperationEnd_End" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False">
+                <xctk:DateTimePicker.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem Header="{x:Static p:Resources.textClearValue}" Name="contextMenuItemClearOperationEnd_End" Click="contextMenuItemClearOperationEnd_End_Click">
+                            <MenuItem.Icon>
+                                <Image Source="Resources\delete.png" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                    </ContextMenu>
+                </xctk:DateTimePicker.ContextMenu>
+            </local:DateTimePickerExt>
+
+        </Grid>
+
+
         <ComboBox Name="comboBoxBerth" Grid.Column="1" Grid.Row="2" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" IsEnabled="False">
             <ComboBox.ContextMenu>
                 <ContextMenu>
@@ -62,14 +104,22 @@
             </ComboBox.ContextMenu>
         </ComboBox>
         <ComboBox x:Name="comboBoxPierside" Grid.Column="1" Grid.Row="3" Margin="2" IsEnabled="False">
-            <ComboBoxItem Content="{x:Static p:Resources.textNotRotated}" />
-            <ComboBoxItem Content="{x:Static p:Resources.textRotated}" />
+            <ComboBoxItem Content="{x:Static p:Resources.textPort}" />
+            <ComboBoxItem Content="{x:Static p:Resources.textStarboard}" />
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearPierside" Click="contextMenuItemClearPierside_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
         </ComboBox>
-        <TextBox Grid.Row="4" Grid.Column="1" Margin="2" Name="textBoxBerthRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="False" IsEnabled="False" />
-        <TextBox Grid.Row="5" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="False" IsEnabled="False" />
+        <TextBox Grid.Row="4" Grid.Column="1" Margin="2" Name="textBoxBerthRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="False" IsReadOnly="True" MaxLength="512" />
+        <TextBox Grid.Row="5" Grid.Column="1" Margin="2" Name="textBoxRemarks" TextWrapping="Wrap" AcceptsReturn="True" SpellCheck.IsEnabled="True" AcceptsTab="False" IsReadOnly="True" MaxLength="512" />
         <StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False"/>
+            <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="True"/>
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
+            <Button Width="28" x:Name="buttonClearAll" Click="buttonClearAll_Click" Margin="2" IsEnabled="False">
+                <Image Source="Resources\nav_undo_red.png"/>
+            </Button>
         </StackPanel>
 
     </Grid>

src/BreCalClient/EditTimesTerminalControl.xaml.cs

@@ -1,8 +1,9 @@
 // Copyright (c) 2023 schick Informatik
 // Description: Terminals have all different fields so a different dialog
-// 
+//
 
 using BreCalClient.misc.Model;
+using System;
 using System.Windows;
 
 namespace BreCalClient
@@ -21,7 +22,7 @@ namespace BreCalClient
 
         public Times Times { get; set; } = new();
 
-        public Extensions.TypeEnum CallType { get; set; }
+        public ShipcallControlModel ShipcallModel { get; set; } = new();
 
         #endregion
 
@@ -29,7 +30,10 @@ namespace BreCalClient
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            this.comboBoxBerth.ItemsSource = BreCalLists.Berths;
+            if ((this.ShipcallModel != null) && (this.ShipcallModel.Shipcall != null))
+                this.comboBoxBerth.ItemsSource = BreCalLists.GetBerthsByPort(this.ShipcallModel.Shipcall.PortId);
+            else
+                this.comboBoxBerth.ItemsSource = BreCalLists.Berths;
             this.CopyToControls();
             this.EnableControls();
         }
@@ -44,6 +48,16 @@ namespace BreCalClient
             this.datePickerOperationEnd.Value = null;
         }
 
+        private void contextMenuItemClearOperationStart_End_Click(object sender, RoutedEventArgs e)
+        {
+            this.datePickerOperationStart_End.Value = null;
+        }
+
+        private void contextMenuItemClearOperationEnd_End_Click(object sender, RoutedEventArgs e)
+        {
+            this.datePickerOperationEnd_End.Value = null;
+        }
+
         private void contextMenuItemBerth_Click(object sender, RoutedEventArgs e)
         {
             this.comboBoxBerth.SelectedIndex -= 1;
@@ -51,9 +65,16 @@ namespace BreCalClient
 
         private void buttonOK_Click(object sender, RoutedEventArgs e)
         {
-            this.CopyToModel();
-            this.DialogResult = true;
-            this.Close();
+            if (!CheckValues(out string message))
+            {
+                System.Windows.MessageBox.Show(message, BreCalClient.Resources.Resources.textWarning, MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
+            else
+            {
+                this.CopyToModel();
+                this.DialogResult = true;
+                this.Close();
+            }
         }
 
         private void buttonCancel_Click(object sender, RoutedEventArgs e)
@@ -61,21 +82,92 @@ namespace BreCalClient
             this.DialogResult = false;
             this.Close();
         }
+        private void contextMenuItemClearPierside_Click(object sender, RoutedEventArgs e)
+        {
+            this.comboBoxPierside.SelectedIndex = -1;
+        }
+
+        private void buttonClearAll_Click(object sender, RoutedEventArgs e)
+        {
+            if (MessageBox.Show(BreCalClient.Resources.Resources.textClearAll, BreCalClient.Resources.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
+            {
+                this.datePickerOperationStart.Value = null;
+                this.datePickerOperationStart_End.Value = null;
+                this.datePickerOperationEnd.Value = null;
+                this.datePickerOperationEnd_End.Value = null;
+                this.comboBoxBerth.SelectedIndex = -1;
+                this.comboBoxPierside.SelectedIndex = -1;
+                this.textBoxRemarks.Text = null;
+                this.textBoxBerthRemarks.Text = null;
+            }
+        }
 
         #endregion
 
         #region private methods
 
+        private bool CheckValues(out string message)
+        {
+
+            message = "";
+
+            if((this.datePickerOperationStart.Value != this.Times.OperationsStart) || (this.datePickerOperationStart_End.Value != this.Times.EtaIntervalEnd))
+            {
+                if(this.datePickerOperationStart.Value.IsTooOld() || this.datePickerOperationStart_End.Value.IsTooOld())
+                {
+                    message = BreCalClient.Resources.Resources.textOperationStartInThePast;
+                    return false;
+                }
+            }
+
+            if (this.datePickerOperationStart.Value.HasValue && this.datePickerOperationStart_End.Value.HasValue && this.datePickerOperationStart.Value > this.datePickerOperationStart_End.Value)
+            {
+                message = BreCalClient.Resources.Resources.textEndValueBeforeStartValue;
+                return false;
+            }
+
+            if ((this.datePickerOperationEnd.Value != this.Times.OperationsEnd) || (this.datePickerOperationEnd_End.Value != this.Times.EtdIntervalEnd))
+            {
+                if(this.datePickerOperationEnd.Value.IsTooOld() || this.datePickerOperationEnd_End.Value.IsTooOld())
+                {
+                    message = BreCalClient.Resources.Resources.textOperationEndInThePast;
+                    return false;
+                }
+            }
+
+            if (this.datePickerOperationEnd.Value.HasValue && this.datePickerOperationEnd_End.Value.HasValue && this.datePickerOperationEnd.Value > this.datePickerOperationEnd_End.Value)
+            {
+                message = BreCalClient.Resources.Resources.textEndValueBeforeStartValue;
+                return false;
+            }
+
+            if(this.datePickerOperationEnd.Value.IsTooFar() || this.datePickerOperationEnd_End.Value.IsTooFar() || this.datePickerOperationStart.Value.IsTooFar() || this.datePickerOperationStart_End.Value.IsTooFar())
+            {
+                message = BreCalClient.Resources.Resources.textTooFarInTheFuture;
+                return false;
+            }
+
+            if((this.datePickerOperationEnd_End.Value.HasValue && !this.datePickerOperationEnd.Value.HasValue) || (this.datePickerOperationStart_End.Value.HasValue && !this.datePickerOperationStart.Value.HasValue))
+            {
+                message = BreCalClient.Resources.Resources.textStartTimeMissing;
+                return false;
+            }
+
+            return true;
+        }
+
         private void CopyToModel()
         {
-            switch(this.comboBoxPierside.SelectedIndex)
+            this.Times.PierSide = this.comboBoxPierside.SelectedIndex switch
             {
-                case 0: this.Times.PierSide = true; break;
-                case 1: this.Times.PierSide= false; break;
-                default: this.Times.PierSide = null; break;
-            }            
+                0 => true,
+                1 => false,
+                _ => null,
+            };
             this.Times.OperationsStart = this.datePickerOperationStart.Value;
             this.Times.OperationsEnd = this.datePickerOperationEnd.Value;
+            this.Times.EtaIntervalEnd = this.datePickerOperationStart_End.Value;
+            this.Times.EtdIntervalEnd = this.datePickerOperationEnd_End.Value;
             this.Times.BerthId = (this.comboBoxBerth.SelectedItem != null) ? ((Berth)this.comboBoxBerth.SelectedItem).Id : null;
             this.Times.Remarks = this.textBoxRemarks.Text.Trim();
             this.Times.BerthInfo = this.textBoxBerthRemarks.Text.Trim();
@@ -85,27 +177,65 @@ namespace BreCalClient
         {
             this.datePickerOperationStart.Value = this.Times.OperationsStart;
             this.datePickerOperationEnd.Value = this.Times.OperationsEnd;
+            this.datePickerOperationStart_End.Value = this.Times.EtaIntervalEnd;
+            this.datePickerOperationEnd_End.Value = this.Times.EtdIntervalEnd;
             if(this.Times.PierSide == null) { this.comboBoxPierside.SelectedIndex = -1; }
             else this.comboBoxPierside.SelectedIndex = (this.Times.PierSide ?? false) ? 0 : 1;
             this.comboBoxBerth.SelectedValue = this.Times.BerthId;
             this.textBoxRemarks.Text = this.Times.Remarks;
             this.textBoxBerthRemarks.Text = this.Times.BerthInfo;
+
+            switch (ShipcallModel.Shipcall?.Type)
+            {
+                case ShipcallType.Arrival:
+                    this.labelEnd.Visibility = Visibility.Hidden;
+                    this.datePickerOperationEnd.Visibility = Visibility.Hidden;
+                    this.datePickerOperationEnd_End.Visibility = Visibility.Hidden;
+                    this.rowEnd.Height = new(0);
+                    break;
+                case ShipcallType.Departure:
+                    this.rowStart.Height = new(0);
+                    this.labelBerth.Visibility = Visibility.Hidden;
+                    this.comboBoxBerth.Visibility= Visibility.Hidden;
+                    this.labelPierside.Visibility = Visibility.Hidden;
+                    this.comboBoxPierside.Visibility = Visibility.Hidden;
+                    this.labelBerthRemarks.Visibility = Visibility.Hidden;
+                    this.textBoxBerthRemarks.Visibility = Visibility.Hidden;
+                    break;
+                case ShipcallType.Shifting:
+                    this.rowStart.Height = new(0);
+                    this.labelBerth.Visibility = Visibility.Hidden;
+                    this.comboBoxBerth.Visibility = Visibility.Hidden;
+                    this.labelPierside.Visibility = Visibility.Hidden;
+                    this.comboBoxPierside.Visibility = Visibility.Hidden;
+                    this.labelBerthRemarks.Visibility = Visibility.Hidden;
+                    this.textBoxBerthRemarks.Visibility = Visibility.Hidden;
+                    break;
+            }
+
         }
 
         private void EnableControls()
         {
-            if (this.Times.ParticipantId != App.Participant.Id) return;
+            if ((this.Times.ParticipantId != App.Participant.Id) || (this.ShipcallModel.Shipcall?.Canceled ?? false))
+            {
+                this.buttonOK.IsEnabled = false;
+                return;
+            }
+
+            this.datePickerOperationStart.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;
+            this.datePickerOperationStart_End.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;
+            this.datePickerOperationEnd.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure) || (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
+            this.datePickerOperationEnd_End.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure) || (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
+            this.comboBoxBerth.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;
+            this.comboBoxPierside.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;
+            this.textBoxBerthRemarks.IsReadOnly = ShipcallModel.Shipcall?.Type != ShipcallType.Arrival;
+            this.textBoxRemarks.IsReadOnly = false;
+            this.buttonClearAll.IsEnabled = true;
 
-            this.datePickerOperationStart.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
-            this.datePickerOperationEnd.IsEnabled = (CallType == Extensions.TypeEnum.Outgoing) || (CallType == Extensions.TypeEnum.Shifting);
-            this.comboBoxBerth.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
-            this.comboBoxPierside.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
-            this.textBoxBerthRemarks.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
-            this.textBoxRemarks.IsEnabled = true;
-            this.buttonOK.IsEnabled = true;
         }
 
         #endregion
-        
+
     }
 }

src/BreCalClient/EnumHelper.cs

@@ -0,0 +1,71 @@
+// Copyright (c) 2024- schick Informatik
+// Description: Helpers to display localized Enum values in Comboboxes
+// https://stackoverflow.com/questions/29658721/enum-in-wpf-comboxbox-with-localized-names
+//
+
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Markup;
+
+namespace BreCalClient
+{
+
+    #region class EnumToStringConverter
+
+    public sealed class EnumToStringConverter : IValueConverter
+    {
+        public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            { return null; }
+
+            return Resources.Resources.ResourceManager.GetString(value.ToString() ?? "");            
+        }
+
+        public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            string str = (string)value;
+
+            foreach (object enumValue in Enum.GetValues(targetType))
+            {
+                if (str == Resources.Resources.ResourceManager.GetString(enumValue.ToString() ?? ""))
+                { return enumValue; }
+            }
+            return null;
+        }
+    }
+
+    #endregion
+
+    #region class EnumerateExtension
+
+    public sealed class EnumerateExtension : MarkupExtension
+    {
+        public Type Type { get; set; }
+
+        public EnumerateExtension(Type type)
+        {
+            this.Type = type;
+        }
+
+        public override object ProvideValue(IServiceProvider serviceProvider)
+        {
+            string[] names = Enum.GetNames(Type);
+
+            // skip value "0" == "Unknown" (we dont want this selectable in the Combobox)
+            // NOTE: This will only work in the future if the first element is always "undefined" aka unused
+
+            string[] values = new string[names.Length - 1];
+            for (int i = 0; i < names.Length - 1; i++) 
+            { 
+                values[i] = Resources.Resources.ResourceManager.GetString(names[i + 1]) ?? names[i]; 
+            }
+
+            return values;
+        }
+    }
+
+    #endregion
+
+}

src/BreCalClient/Extensions.cs

@@ -1,6 +1,6 @@
 // Copyright (c) 2023 schick Informatik
 // Description: some helpers
-// 
+//
 
 using BreCalClient.misc.Model;
 using System;
@@ -11,7 +11,7 @@ namespace BreCalClient
     public static class Extensions
     {
 
-        #region Enum 
+        #region Enum
 
         /// <summary>
         /// Copied from models clunky I know
@@ -25,7 +25,7 @@ namespace BreCalClient
             BSMD = 1,
             [Description("Terminal")]
             TERMINAL = 2,
-            [Description("Lotsen")]
+            [Description("Flusslotsen")]
             PILOT = 4,
             [Description("Agentur")]
             AGENCY = 8,
@@ -47,16 +47,6 @@ namespace BreCalClient
             ALLOW_BSMD = 1,
         }
 
-        /// <summary>
-        /// Should actually be defined in yaml
-        /// </summary>
-        public enum TypeEnum
-        {            
-            Incoming = 1,            
-            Outgoing = 2,            
-            Shifting = 3
-        }
-
         public enum SortOrder
         {
             SHIP_NAME,
@@ -68,6 +58,25 @@ namespace BreCalClient
 
         #region public helper
 
+        public static bool IsTooFar(this DateTime datetime)
+        {
+            return datetime > DateTime.Now.AddYears(1);
+        }
+
+        public static bool IsTooFar(this DateTime? datetime)
+        {
+            if (datetime == null) return false;
+            return datetime > DateTime.Now.AddYears(1);
+        }
+
+        public static bool IsTooOld(this DateTime? datetime)
+        {
+            if (datetime == null) return false;
+            {
+                return datetime < DateTime.Now.AddDays(-1);
+            }
+        }
+
         public static bool IsTypeFlagSet(this Participant participant, ParticipantType flag)
         {
             return (participant.Type & (uint)flag) != 0;
@@ -76,20 +85,87 @@ namespace BreCalClient
         public static bool IsFlagSet(this Participant participant, ParticipantFlag flag)
         {
             return (participant.Flags & (uint)flag) != 0;
-        }        
+        }
 
         public static string Truncate(this string value, int maxLength)
         {
             if (string.IsNullOrEmpty(value)) return value;
-            return value.Length <= maxLength ? value : value.Substring(0, maxLength);
+            return value.Length <= maxLength ? value : value[..maxLength];
         }
 
         public static string TruncateDots(this string value, int maxLength)
         {
             if(string.IsNullOrEmpty(value)) return value;
             if (value.Length <= maxLength) return value;
-            if (value.Length > (maxLength + 1)) return $"{value.Substring(0, maxLength)}..";
-            return value.Substring(0, maxLength);
+            if (value.Length > (maxLength + 1))
+            {
+                int i = maxLength - 2;
+                for (; (i > 0) && !(char.IsWhiteSpace(value[i])); i--) ; // try to put the "..." at a word break
+                return value.Substring(0, i) + " ...";
+            }
+            return value[..maxLength];
+        }
+
+        public static string DisplayTime(this Times times, bool isArrival)
+        {
+            if (isArrival)
+            {
+                if(times.ParticipantType == (int) ParticipantType.TERMINAL)
+                {
+                    if(times.OperationsStart.HasValue)
+                    {
+                        string result = times.OperationsStart.Value.ToString("dd.MM.yyyy HH:mm");
+                        if (times.EtaIntervalEnd.HasValue) result = times.OperationsStart.Value.ToString("d.M. HH:mm") + " - " + times.EtaIntervalEnd.Value.ToString("d.M. HH:mm");
+                        return result;
+                    }
+                    else
+                    {
+                        return "- / -";
+                    }
+                }
+                else
+                {
+                    if(times.EtaBerth.HasValue)
+                    {
+                        string result = times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm");
+                        if (times.EtaIntervalEnd.HasValue) result = times.EtaBerth.Value.ToString("d.M. HH:mm") + " - " + times.EtaIntervalEnd.Value.ToString("d.M. HH:mm");
+                        return result;
+                    }
+                    else
+                    {
+                        return "- / -";
+                    }
+                }
+            }
+            else
+            {
+                if (times.ParticipantType == (int)ParticipantType.TERMINAL)
+                {
+                    if(times.OperationsEnd.HasValue)
+                    {
+                        string result = times.OperationsEnd.Value.ToString("dd.MM.yyyy HH:mm");
+                        if (times.EtdIntervalEnd.HasValue) result = times.OperationsEnd.Value.ToString("d.M. HH:mm") + " - " + times.EtdIntervalEnd.Value.ToString("d.M. HH:mm");
+                        return result;
+                    }
+                    else
+                    {
+                        return "- / -";
+                    }
+                }
+                else
+                {
+                    if(times.EtdBerth.HasValue)
+                    {
+                        string result = times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm");
+                        if (times.EtdIntervalEnd.HasValue) result = times.EtdBerth.Value.ToString("d.M. HH:mm") + " - " + times.EtdIntervalEnd.Value.ToString("d.M. HH:mm");
+                        return result;
+                    }
+                    else
+                    {
+                        return "- / -";
+                    }
+                }
+            }
         }
 
         #endregion

src/BreCalClient/HistoryControl.xaml

@@ -0,0 +1,39 @@
+<UserControl x:Class="BreCalClient.HistoryControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:BreCalClient"
+             xmlns:p = "clr-namespace:BreCalClient.Resources"
+             mc:Ignorable="d" 
+             d:DesignHeight="46" d:DesignWidth="800">
+    <Border BorderBrush="Black" BorderThickness="0 0 0 .5">
+        <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="14" />
+            <RowDefinition Height="25" />
+        </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width=".2*" />
+                <ColumnDefinition Width=".2*" />
+                <ColumnDefinition Width=".2*" />
+                <ColumnDefinition Width=".2*" />
+                <ColumnDefinition Width=".2*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock Grid.Row="0" Grid.Column="0" FontSize="10" FontWeight="DemiBold" Text="{x:Static p:Resources.textShip}" VerticalAlignment="Center" Foreground="Gray" />
+            <TextBlock Grid.Row="0" Grid.Column="1" FontSize="10" FontWeight="DemiBold"  VerticalAlignment="Center" x:Name="textBlockShipcallType" />
+            <TextBlock Grid.Row="0" Grid.Column="2" FontSize="10" FontWeight="DemiBold" Text="{x:Static p:Resources.textTimestamp}" VerticalAlignment="Center" Foreground="Gray"/>
+            <TextBlock Grid.Row="0" Grid.Column="3" FontSize="10" FontWeight="DemiBold" Text="{x:Static p:Resources.textOperation}" VerticalAlignment="Center" Foreground="Gray"/>
+            <TextBlock Grid.Row="0" Grid.Column="4" FontSize="10" FontWeight="DemiBold" Text="{x:Static p:Resources.textParticipant}" VerticalAlignment="Center" Foreground="Gray"/>
+            <TextBlock Grid.Row="1" Grid.Column="0" x:Name="textBlockShip" FontWeight="DemiBold">
+                <Hyperlink Click="textBlockShip_Click">
+                  <TextBlock  x:Name="hyperLinkShip" /> 
+                </Hyperlink>
+            </TextBlock>
+            <TextBlock Grid.Row="1" Grid.Column="1" x:Name="textBlockEta" />
+            <TextBlock Grid.Row="1" Grid.Column="2" x:Name="textBlockTimestamp" />
+            <TextBlock Grid.Row="1" Grid.Column="3" x:Name="textBlockOperation" />
+            <TextBlock Grid.Row="1" Grid.Column="4" x:Name="textBlockParticipant" />
+        </Grid>
+    </Border>
+</UserControl>

src/BreCalClient/HistoryControl.xaml.cs

@@ -0,0 +1,38 @@
+// Copyright (c) 2024- schick Informatik
+// Description: display single history element (later shown in a list)
+// 
+
+using BreCalClient.misc.Model;
+using System;
+using System.Windows.Controls;
+
+namespace BreCalClient
+{
+    /// <summary>
+    /// Interaction logic for HistoryControl.xaml
+    /// </summary>
+    public partial class HistoryControl : UserControl
+    {
+        private readonly History _history;
+        public event Action<int>? HistorySelected;
+
+        public HistoryControl(string ship, History history, string callType, string etaetd)
+        {
+            InitializeComponent();
+            _history = history;
+            this.textBlockOperation.Text = $"{history.Operation} on {history.Type}";
+            this.hyperLinkShip.Text = ship;
+            
+            if(BreCalLists.ParticipantLookupDict.ContainsKey(history.ParticipantId))
+                this.textBlockParticipant.Text = BreCalLists.ParticipantLookupDict[history.ParticipantId].Name;
+            this.textBlockTimestamp.Text = history.Timestamp.ToString();
+            this.textBlockEta.Text = etaetd;
+            this.textBlockShipcallType.Text = callType;
+        }
+
+        private void textBlockShip_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            this.HistorySelected?.Invoke(_history.ShipcallId);
+        }
+    }
+}

src/BreCalClient/HistoryDialog.xaml

@@ -0,0 +1,32 @@
+<Window x:Class="BreCalClient.HistoryDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:BreCalClient"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        xmlns:p = "clr-namespace:BreCalClient.Resources"
+        mc:Ignorable="d" Left="{local:SettingBinding W4Left}" Top="{local:SettingBinding W4Top}"
+        Title="{x:Static p:Resources.textChangeHistory}" Height="450" Width="800" Loaded="Window_Loaded">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="28" />
+        </Grid.RowDefinitions>
+        <ScrollViewer Grid.Row="0" VerticalScrollBarVisibility="Auto" Margin="2">
+            <StackPanel x:Name="stackPanel"/>
+        </ScrollViewer>
+        <Grid Grid.Row="1" Grid.Column="0" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="22" />
+                <ColumnDefinition Width="80" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width=".2*" />
+            </Grid.ColumnDefinitions>
+            <CheckBox x:Name="checkboxMyOwnOnly" VerticalContentAlignment="Center" Grid.Column="0" Margin="2" Checked="checkboxMyOwnOnly_Checked" Unchecked="checkboxMyOwnOnly_Checked" />
+            <Label Content="{x:Static p:Resources.textMineOnly}" Grid.Column="1" />
+            <Button x:Name="buttonClose" Click="buttonClose_Click" Content="{x:Static p:Resources.textClose}" Width="80" Margin="2" Grid.Row="0" Grid.Column="3" HorizontalAlignment="Right" />
+        </Grid>
+        
+    </Grid>
+</Window>

src/BreCalClient/HistoryDialog.xaml.cs

@@ -0,0 +1,136 @@
+// Copyright (c) 2024- schick Informatik
+// Description:
+// 
+
+using BreCalClient.misc.Api;
+using BreCalClient.misc.Model;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Printing;
+using System.Windows;
+using System.Windows.Input;
+
+namespace BreCalClient
+{
+    /// <summary>
+    /// Interaction logic for HistoryDialog.xaml
+    /// </summary>
+    public partial class HistoryDialog : Window
+    {
+        #region Fields
+
+        private readonly ConcurrentDictionary<int, ShipcallControlModel> _shipcalls;
+        private readonly StaticApi _staticApi;
+
+        #endregion
+
+        #region delegate/event to react to history item selection        
+
+        public event Action<int>? HistoryItemSelected;
+
+        #endregion
+
+        #region Construction
+
+        public HistoryDialog(ConcurrentDictionary<int, ShipcallControlModel> shipcalls, StaticApi staticApi)
+        {
+            InitializeComponent();
+            _shipcalls = shipcalls;
+            _staticApi = staticApi;
+        }
+
+        #endregion
+
+        #region event handler
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            Mouse.OverrideCursor = Cursors.Wait;
+            RefreshHistory();
+        }
+
+        private void buttonClose_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
+        private void checkboxMyOwnOnly_Checked(object sender, RoutedEventArgs e)
+        {
+            Mouse.OverrideCursor = Cursors.Wait;
+            RefreshHistory();
+        }
+
+        #endregion
+
+        #region private methods
+
+        private async void RefreshHistory()
+        {
+            List<History> allHistories = new();
+            this.stackPanel.Children.Clear();
+
+            foreach (int shipcall_id in _shipcalls.Keys)
+            {
+                List<History> shipcallHistory = await _staticApi.HistoryGetAsync(shipcall_id);
+                System.Diagnostics.Trace.WriteLine($"{shipcallHistory.Count} history elements loaded for shipcall {shipcall_id}");
+                allHistories.AddRange( shipcallHistory );
+            }
+
+            // sort all entries
+            allHistories.Sort((x, y) => { return y.Timestamp.CompareTo(x.Timestamp); });
+
+            EnumToStringConverter enumToStringConverter = new();
+
+            // create controls for all entries
+            foreach (History history in allHistories)
+            {
+                if (FilterShipcall(history.ShipcallId)) continue;
+                string shipname = "";
+                Ship? ship = this._shipcalls[history.ShipcallId].Ship;
+                if (ship != null)
+                    shipname = ship.Name;
+                string etaetd = "", calltype = "";
+                if (_shipcalls.ContainsKey(history.ShipcallId))
+                {
+                    etaetd = _shipcalls[history.ShipcallId].GetETAETD();                    
+                    if (_shipcalls[history.ShipcallId].Shipcall != null)
+                    {
+                        ShipcallType? type = _shipcalls[history.ShipcallId].Shipcall?.Type;
+                        if (type != null) calltype = (string) (enumToStringConverter.Convert(type ?? ShipcallType.Undefined, typeof(ShipcallType), new(), System.Globalization.CultureInfo.CurrentCulture) ?? "");
+                    }
+                }
+
+                HistoryControl hc = new(shipname, history, calltype, etaetd);
+                hc.HistorySelected += (x) => { HistoryItemSelected?.Invoke(x); }; // bubble event
+                this.stackPanel.Children.Add(hc);
+            }
+
+            Mouse.OverrideCursor = null;
+        }
+
+        bool FilterShipcall(int shipcallId)
+        {
+            bool result = true;
+            if (shipcallId < 0) return result;
+            if(_shipcalls.TryGetValue(shipcallId, out ShipcallControlModel? scm))
+            {
+                if(this.checkboxMyOwnOnly.IsChecked ?? false)
+                {
+                    foreach(ParticipantAssignment p in scm.AssignedParticipants.Values)
+                    {
+                        if (p.ParticipantId.Equals(App.Participant.Id)) return false;
+                    }
+                }
+                else
+                {
+                    return false;
+                }
+            }            
+            return result;                    
+        }
+
+        #endregion
+
+    }
+}

src/BreCalClient/IEditTimesControl.cs

@@ -13,15 +13,10 @@ namespace BreCalClient
 
         string Title { get; set; }
 
-        Extensions.TypeEnum CallType { get; set; }
+        ShipcallControlModel ShipcallModel { get; set; }
 
         bool? ShowDialog();
 
-    }
-
-    internal interface IEditShipcallTimesControl : IEditTimesControl
-    {
-        ShipcallControlModel ShipcallModel { get; set; }
-    }
+    }    
 
 }

src/BreCalClient/MainWindow.xaml

@@ -3,12 +3,13 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:BreCalClient"        
+        xmlns:local="clr-namespace:BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:sets="clr-namespace:BreCalClient.Properties"
         xmlns:p = "clr-namespace:BreCalClient.Resources"
         mc:Ignorable="d"
-        Title="{DynamicResource textApplicationTitle}" Height="450" Width="800" Loaded="Window_Loaded" Closing="Window_Closing" Icon="Resources/containership.ico">
+        Title="{DynamicResource textApplicationTitle}" Height="{local:SettingBinding Height}" Width="{local:SettingBinding Width}"
+        Top="{local:SettingBinding Top}" Left="{local:SettingBinding Left}" Loaded="Window_Loaded" Closing="Window_Closing" Icon="Resources/containership.ico">
     <Window.Resources>
         <local:BoolToIndexConverter x:Key="boolToIndexConverter" />
     </Window.Resources>
@@ -26,6 +27,7 @@
                     <RowDefinition Height="28" />
                     <RowDefinition Height="28" />
                     <RowDefinition Height="28" />
+                    <RowDefinition Height="84" />
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*" />
@@ -39,6 +41,12 @@
                 <Label Name="labelLoginResult" Grid.Row="3" Grid.ColumnSpan="2" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontWeight="Bold" />
                 <Button Name="buttonLogin" Content="{x:Static p:Resources.textLogin}" Grid.Row="4" Grid.Column="0" Margin="2" Click="buttonLogin_Click" IsDefault="True" />
                 <Button Name="buttonExit" Content="{x:Static p:Resources.textExit}" Grid.Row="4" Grid.Column="1" Margin="2" Click="buttonExit_Click" />
+                <TextBlock FontSize="10" TextWrapping="Wrap" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" >
+                    <Underline>Hinweis</Underline>:<LineBreak />
+                    Mit der Anmeldung in Bremen Calling akzeptieren Sie die Bedingungen<LineBreak />
+                    des Systems, die Sie in der aktuell gültigen Fassung unter dem nachfolgenden Link
+                    einsehen können: <Hyperlink NavigateUri="https://www.bsmd-emswe.eu/disclaimer.html" RequestNavigate="Hyperlink_RequestNavigate">Datenschutzerklärung</Hyperlink>.
+                </TextBlock>
             </Grid>
         </xctk:BusyIndicator.BusyContent>
         <Grid>
@@ -65,9 +73,19 @@
                 </Grid.ColumnDefinitions>
                 <Button Margin="2" Grid.Column="0" Content="{x:Static p:Resources.textNewDots}" x:Name="buttonNew" Visibility="Hidden" Click="buttonNew_Click" Background="Transparent"/>
                 <Label Content="{x:Static p:Resources.textSortOrder}" Grid.Column="1" HorizontalContentAlignment="Right"/>
-                <ComboBox x:Name="comboBoxSortOrder" Margin="2" Grid.Column="2" SelectionChanged="comboBoxSortOrder_SelectionChanged" />
-                <CheckBox x:Name="checkboxShowCancelledCalls" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="2" Checked="checkboxShowCancelledCalls_Checked" Unchecked="checkboxShowCancelledCalls_Checked" />
-                <Label Content="{x:Static p:Resources.textShowCancelledShipcalls}" Grid.Column="4" />
+                <Grid Grid.Column="2" Grid.Row="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width=".5*" />
+                        <ColumnDefinition Width="30" />
+                        <ColumnDefinition Width=".5*" />
+                    </Grid.ColumnDefinitions>
+                    <ComboBox x:Name="comboBoxSortOrder" Margin="2" Grid.Column="0" SelectionChanged="comboBoxSortOrder_SelectionChanged" />
+                    <CheckBox x:Name="checkboxShowCancelledCalls" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="2" Checked="checkboxShowCancelledCalls_Checked" Unchecked="checkboxShowCancelledCalls_Checked" />
+                    <Label Content="{x:Static p:Resources.textShowCancelledShipcalls}" Grid.Column="2" />
+                </Grid>
+                <Label Content="{x:Static p:Resources.textHarbour}" Grid.Column="3" HorizontalAlignment="Right" />
+                <xctk:CheckComboBox x:Name="comboBoxPorts" Margin="2" Grid.Column="4" ItemSelectionChanged="comboBoxPorts_ItemSelectionChanged" DisplayMemberPath="Name" />
+
                 <Button Margin="2" Grid.Column="6" Content="{x:Static p:Resources.textClearFilters}" x:Name="buttonClearFilter" Click="buttonClearFilter_Click" Background="Transparent" />
             </Grid>
             <Grid Grid.Row="2">
@@ -81,12 +99,12 @@
                     <ColumnDefinition Width=".15*" />
                 </Grid.ColumnDefinitions>
                 <Label Grid.Column="0" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
-                <Label Grid.Column="1" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="Agent" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
-                <Label Grid.Column="2" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="Festmacher" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
-                <Label Grid.Column="3" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="Hafenamt" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
-                <Label Grid.Column="4" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="Lotsen" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
-                <Label Grid.Column="5" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="Schlepper" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
-                <Label Grid.Column="6" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="Terminal" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
+                <Label Grid.Column="1" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textAgency}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
+                <Label Grid.Column="2" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textMooring}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
+                <Label Grid.Column="3" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textPortAuthority}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
+                <Label Grid.Column="4" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textPilots}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
+                <Label Grid.Column="5" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textTug}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
+                <Label Grid.Column="6" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textTerminal}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
             </Grid>
             <ScrollViewer Grid.Row="3" VerticalScrollBarVisibility="Auto">
                 <StackPanel x:Name="stackPanel"/>
@@ -98,14 +116,21 @@
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="120" />
                                 <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="100" />
+                                <ColumnDefinition Width="80" />
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="120" />
                                 <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="30" />
+                                <ColumnDefinition Width="26" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="26" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="26" />
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="26" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="100" />
                             </Grid.ColumnDefinitions>
                         </Grid>
@@ -124,15 +149,36 @@
                 </StatusBarItem>
                 <Separator Grid.Column="5"/>
                 <StatusBarItem Grid.Column="6">
-                    <Button x:Name="buttonInfo" Content="?" Click="buttonInfo_Click" Width="20" />
+                    <Button x:Name="buttonInfo" Content="?" Click="buttonInfo_Click" Width="20" ToolTip="{x:Static p:Resources.textInfoChangePW}"/>
                 </StatusBarItem>
                 <Separator Grid.Column="7"/>
                 <StatusBarItem Grid.Column="8">
-                    <TextBlock Name="labelStatusBar"></TextBlock>
+                    <Button x:Name="buttonHistory" Click="buttonHistory_Click" Width="20" ToolTip="{x:Static p:Resources.textShowHistory}">
+                        <Image Source="./Resources/clock.png"/>
+                    </Button>
                 </StatusBarItem>
                 <Separator Grid.Column="9"/>
                 <StatusBarItem Grid.Column="10">
-                    <ProgressBar Name="generalProgressStatus" Width="90" Height="16"/>
+                        <Button x:Name="buttonNotifications" Click="buttonNotifications_Click" Width="20" ToolTip="{x:Static p:Resources.textShowNotifications}">
+                            <Image Source="./Resources/bell3.png"/>
+                        </Button>
+                </StatusBarItem>
+                <Separator Grid.Column="9"/>
+                <StatusBarItem Grid.Column="12">
+                    <TextBlock Name="labelStatusBar"></TextBlock>
+                </StatusBarItem>
+                <Separator Grid.Column="13"/>
+                <StatusBarItem Grid.Column="14">
+                    <Button x:Name="buttonManualRefresh" Width="20" Click="buttonManualRefresh_Click" ToolTip="{x:Static p:Resources.textTriggerManualRefresh}">
+                        <Image Source="./Resources/nav_refresh_green.png"/>
+                    </Button>
+                </StatusBarItem>
+                <StatusBarItem Grid.Column="15">
+                    <TextBlock x:Name="labelLatestUpdate" />
+                </StatusBarItem>
+                <Separator Grid.Column="16"/>
+                <StatusBarItem Grid.Column="17">
+                    <ProgressBar Name="generalProgressStatus" Width="90" Height="16" Foreground="LightGray"/>
                 </StatusBarItem>
             </StatusBar>
         </Grid>

src/BreCalClient/NotificationDialog.xaml

@@ -0,0 +1,68 @@
+<Window x:Class="BreCalClient.NotificationDialog"
+            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:local="clr-namespace:BreCalClient"
+    xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+    xmlns:p = "clr-namespace:BreCalClient.Resources"
+    mc:Ignorable="d" Left="{local:SettingBinding W5Left}" Top="{local:SettingBinding W5Top}"
+    Title="{x:Static p:Resources.textNotifications}" Height="450" Width="800" Loaded="Window_Loaded">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="28" />
+        </Grid.RowDefinitions>
+        <local:ENIDataGrid x:Name="dataGridNotifications" Grid.Row="0" SelectionMode="Single" IsReadOnly="True" AutoGenerateColumns="False"
+                                       CanUserAddRows="False" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
+            <local:ENIDataGrid.RowStyle>
+                <Style TargetType="DataGridRow">
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding NotificationType}" Value="Assignment">
+                            <Setter Property="Foreground" Value="Blue"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding NotificationType}" Value="Next24h">
+                            <Setter Property="Foreground" Value="DarkOrange"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding NotificationType}" Value="TimeConflict">
+                            <Setter Property="Background" Value="Red"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding NotificationType}" Value="TimeConflictResolved">
+                            <Setter Property="Foreground" Value="Green"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding NotificationType}" Value="Unassigned">
+                            <Setter Property="Foreground" Value="DarkGray"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding NotificationType}" Value="MissingData">
+                            <Setter Property="Foreground" Value="Yellow" />
+                            <Setter Property="Background" Value="DarkGray" />
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding NotificationType}" Value="Cancelled">
+                            <Setter Property="Background" Value="LightGray" />
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </local:ENIDataGrid.RowStyle>
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Id" Binding="{Binding Path=Id}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static p:Resources.textType}" Binding="{Binding Path=NotificationDisplay}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static p:Resources.textDate}" Binding="{Binding Path=NotificationDate}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static p:Resources.textShip}" Binding="{Binding Path=Ship}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static p:Resources.textShipcall}" Binding="{Binding Path=ShipcallType}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="ETA/ETD" Binding="{Binding Path=ETA}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static p:Resources.textBerth}" Binding="{Binding Path=Berth}" IsReadOnly="True"/>
+            </DataGrid.Columns>
+        </local:ENIDataGrid>
+        <Grid Grid.Row="1" Grid.Column="0" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="22" />
+                <ColumnDefinition Width="80" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width=".2*" />
+            </Grid.ColumnDefinitions>
+            
+            <Button x:Name="buttonClose" Click="buttonClose_Click" Content="{x:Static p:Resources.textClose}" Width="80" Margin="2" Grid.Row="0" Grid.Column="3" HorizontalAlignment="Right" />
+        </Grid>
+
+    </Grid>
+</Window>

src/BreCalClient/NotificationDialog.xaml.cs

@@ -0,0 +1,44 @@
+// Copyright (c) 2024- schick Informatik
+// Description:
+// 
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace BreCalClient
+{
+    /// <summary>
+    /// Interaction logic for NotificationDialog.xaml
+    /// </summary>
+    public partial class NotificationDialog : Window
+    {
+        public NotificationDialog()
+        {
+            InitializeComponent();            
+        }
+
+        internal ObservableCollection<AppNotification>? AppNotifications { get; set; }
+
+        private void buttonClose_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.dataGridNotifications.ItemsSource = AppNotifications;
+        }
+    }
+}

src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.1.1.0</ApplicationVersion>
+    <ApplicationVersion>1.8.0.0</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
@@ -21,7 +21,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <OpenBrowserOnPublish>False</OpenBrowserOnPublish>
     <Platform>Any CPU</Platform>
     <ProductName>Bremen calling development client</ProductName>
-    <PublishDir>bin\Debug\net6.0-windows\win-x64\app.publish\</PublishDir>
+    <PublishDir>bin\Debug\net8.0-windows7.0\win-x64\app.publish\</PublishDir>
     <PublishUrl>bin\publish.devel\</PublishUrl>
     <PublisherName>Informatikbüro Daniel Schick</PublisherName>
     <PublishProtocol>ClickOnce</PublishProtocol>
@@ -33,11 +33,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SignManifests>False</SignManifests>
     <SuiteName>Bremen calling</SuiteName>
     <SupportUrl>https://www.textbausteine.net/</SupportUrl>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <UpdateEnabled>True</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
-    <UpdateRequired>False</UpdateRequired>
+    <UpdateRequired>True</UpdateRequired>
     <WebPageFileName>Publish.html</WebPageFileName>
+    <MinimumRequiredVersion>1.8.0.0</MinimumRequiredVersion>
+    <SkipPublishVerification>false</SkipPublishVerification>
   </PropertyGroup>
   <ItemGroup>
     <PublishFile Include="containership.ico">

src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml

@@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.1.0.*</ApplicationVersion>
+    <ApplicationRevision>5</ApplicationRevision>
+    <ApplicationVersion>1.7.0.7</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
@@ -27,10 +27,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SelfContained>True</SelfContained>
     <SignatureAlgorithm>(none)</SignatureAlgorithm>
     <SignManifests>False</SignManifests>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <UpdateEnabled>True</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
-    <UpdateRequired>False</UpdateRequired>
+    <UpdateRequired>True</UpdateRequired>
     <WebPageFileName>Publish.html</WebPageFileName>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
     <ErrorReportUrl>https://www.bsmd-emswe.eu/</ErrorReportUrl>
@@ -38,8 +38,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublisherName>Informatikbüro Daniel Schick</PublisherName>
     <SuiteName>Bremen Calling</SuiteName>
     <SupportUrl>http://www.textbausteine.net/</SupportUrl>
-    <PublishDir>bin\Debug\net6.0-windows\win-x64\app.publish\</PublishDir>
+    <PublishDir>bin\Debug\net8.0-windows7.0\win-x64\app.publish\</PublishDir>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SkipPublishVerification>false</SkipPublishVerification>
+    <MinimumRequiredVersion>1.7.0.7</MinimumRequiredVersion>
   </PropertyGroup>
   <ItemGroup>
     <PublishFile Include="containership.ico">

src/BreCalClient/Properties/Settings.Designer.cs

@@ -9,47 +9,38 @@
 //------------------------------------------------------------------------------
 
 namespace BreCalClient.Properties {
-    
-    
+
+
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.12.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
+
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
+
         public static Settings Default {
             get {
                 return defaultInstance;
             }
         }
-        
+
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("https://brecal.bsmd-emswe.eu")]
-        public string API_URL {
-            get {
-                return ((string)(this["API_URL"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("#1D751F")]
+        [global::System.Configuration.DefaultSettingValueAttribute("#751D1F")]
         public string BG_COLOR {
             get {
                 return ((string)(this["BG_COLOR"]));
             }
         }
-        
+
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("!!Bremen calling Testversion!!")]
+        [global::System.Configuration.DefaultSettingValueAttribute("!!Bremen calling Entwicklungsversion!!")]
         public string APP_TITLE {
             get {
                 return ((string)(this["APP_TITLE"]));
             }
         }
-        
+
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("https://www.textbausteine.net/")]
@@ -58,7 +49,7 @@ namespace BreCalClient.Properties {
                 return ((string)(this["LOGO_IMAGE_URL"]));
             }
         }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("")]
@@ -70,5 +61,205 @@ namespace BreCalClient.Properties {
                 this["FilterCriteria"] = value;
             }
         }
+
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("https://brecaltest.bsmd-emswe.eu")]
+        public string API_URL {
+            get {
+                return ((string)(this["API_URL"]));
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("800")]
+        public double Width {
+            get {
+                return ((double)(this["Width"]));
+            }
+            set {
+                this["Width"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("450")]
+        public double Height {
+            get {
+                return ((double)(this["Height"]));
+            }
+            set {
+                this["Height"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public double Left {
+            get {
+                return ((double)(this["Left"]));
+            }
+            set {
+                this["Left"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public double Top {
+            get {
+                return ((double)(this["Top"]));
+            }
+            set {
+                this["Top"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public double W1Left {
+            get {
+                return ((double)(this["W1Left"]));
+            }
+            set {
+                this["W1Left"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public double W1Top {
+            get {
+                return ((double)(this["W1Top"]));
+            }
+            set {
+                this["W1Top"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public double W2Left {
+            get {
+                return ((double)(this["W2Left"]));
+            }
+            set {
+                this["W2Left"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public double W2Top {
+            get {
+                return ((double)(this["W2Top"]));
+            }
+            set {
+                this["W2Top"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public double W3Left {
+            get {
+                return ((double)(this["W3Left"]));
+            }
+            set {
+                this["W3Left"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public double W3Top {
+            get {
+                return ((double)(this["W3Top"]));
+            }
+            set {
+                this["W3Top"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public double W4Left {
+            get {
+                return ((double)(this["W4Left"]));
+            }
+            set {
+                this["W4Left"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public double W4Top {
+            get {
+                return ((double)(this["W4Top"]));
+            }
+            set {
+                this["W4Top"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string FilterCriteriaMap {
+            get {
+                return ((string)(this["FilterCriteriaMap"]));
+            }
+            set {
+                this["FilterCriteriaMap"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public global::System.Collections.Specialized.StringCollection Notifications {
+            get {
+                return ((global::System.Collections.Specialized.StringCollection)(this["Notifications"]));
+            }
+            set {
+                this["Notifications"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public double W5Top {
+            get {
+                return ((double)(this["W5Top"]));
+            }
+            set {
+                this["W5Top"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public double W5Left {
+            get {
+                return ((double)(this["W5Left"]));
+            }
+            set {
+                this["W5Left"] = value;
+            }
+        }
     }
 }

src/BreCalClient/Properties/Settings.settings

@@ -2,14 +2,11 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="BreCalClient.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
-    <Setting Name="API_URL" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">https://brecal.bsmd-emswe.eu</Value>
-    </Setting>
     <Setting Name="BG_COLOR" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">#1D751F</Value>
+      <Value Profile="(Default)">#751D1F</Value>
     </Setting>
     <Setting Name="APP_TITLE" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">!!Bremen calling Testversion!!</Value>
+      <Value Profile="(Default)">!!Bremen calling Entwicklungsversion!!</Value>
     </Setting>
     <Setting Name="LOGO_IMAGE_URL" Type="System.String" Scope="Application">
       <Value Profile="(Default)">https://www.textbausteine.net/</Value>
@@ -17,5 +14,56 @@
     <Setting Name="FilterCriteria" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="API_URL" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">https://brecaltest.bsmd-emswe.eu</Value>
+    </Setting>
+    <Setting Name="Width" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">800</Value>
+    </Setting>
+    <Setting Name="Height" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">450</Value>
+    </Setting>
+    <Setting Name="Left" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="Top" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="W1Left" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="W1Top" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="W2Left" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="W2Top" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="W3Left" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="W3Top" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="W4Left" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="W4Top" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="FilterCriteriaMap" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="Notifications" Type="System.Collections.Specialized.StringCollection" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="W5Top" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="W5Left" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

src/BreCalClient/Resources/Resources.Designer.cs

@@ -60,6 +60,45 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] _24hours {
+            get {
+                object obj = ResourceManager.GetObject("_24hours", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] _lock {
+            get {
+                object obj = ResourceManager.GetObject("_lock", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] add {
+            get {
+                object obj = ResourceManager.GetObject("add", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Incoming.
+        /// </summary>
+        public static string Arrival {
+            get {
+                return ResourceManager.GetString("Arrival", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -80,6 +119,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to .
+        /// </summary>
+        public static string arrow_right_blue {
+            get {
+                return ResourceManager.GetString("arrow_right_blue", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -100,6 +148,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to .
+        /// </summary>
+        public static string arrow_up_green {
+            get {
+                return ResourceManager.GetString("arrow_up_green", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -110,6 +167,16 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] bell3 {
+            get {
+                object obj = ResourceManager.GetObject("bell3", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -180,6 +247,25 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Outgoing.
+        /// </summary>
+        public static string Departure {
+            get {
+                return ResourceManager.GetString("Departure", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] edit {
+            get {
+                object obj = ResourceManager.GetObject("edit", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -190,6 +276,16 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] lock_open {
+            get {
+                object obj = ResourceManager.GetObject("lock_open", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -200,6 +296,35 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] nav_refresh_green {
+            get {
+                object obj = ResourceManager.GetObject("nav_refresh_green", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] nav_undo_red {
+            get {
+                object obj = ResourceManager.GetObject("nav_undo_red", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Shifting.
+        /// </summary>
+        public static string Shifting {
+            get {
+                return ResourceManager.GetString("Shifting", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -220,6 +345,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Add.
+        /// </summary>
+        public static string textAdd {
+            get {
+                return ResourceManager.GetString("textAdd", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Agencies.
         /// </summary>
@@ -256,6 +390,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Participant assigned to shipcall.
+        /// </summary>
+        public static string textAssignment {
+            get {
+                return ResourceManager.GetString("textAssignment", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Berth.
         /// </summary>
@@ -283,6 +426,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Both tide times are required.
+        /// </summary>
+        public static string textBothTideTimesNecessary {
+            get {
+                return ResourceManager.GetString("textBothTideTimesNecessary", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to BSMD right to edit granted.
         /// </summary>
@@ -355,6 +507,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Change history.
+        /// </summary>
+        public static string textChangeHistory {
+            get {
+                return ResourceManager.GetString("textChangeHistory", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Change password.
         /// </summary>
@@ -364,6 +525,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Clear all entries?.
+        /// </summary>
+        public static string textClearAll {
+            get {
+                return ResourceManager.GetString("textClearAll", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Clear assignment.
         /// </summary>
@@ -409,6 +579,33 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Date.
+        /// </summary>
+        public static string textDate {
+            get {
+                return ResourceManager.GetString("textDate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Delete.
+        /// </summary>
+        public static string textDelete {
+            get {
+                return ResourceManager.GetString("textDelete", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Deleted.
+        /// </summary>
+        public static string textDeleted {
+            get {
+                return ResourceManager.GetString("textDeleted", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Departure terminal.
         /// </summary>
@@ -419,7 +616,7 @@ namespace BreCalClient.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Draft.
+        ///   Looks up a localized string similar to Draft (m).
         /// </summary>
         public static string textDraft {
             get {
@@ -427,6 +624,33 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Draft.
+        /// </summary>
+        public static string textDraftNoUnit {
+            get {
+                return ResourceManager.GetString("textDraftNoUnit", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Edit.
+        /// </summary>
+        public static string textEdit {
+            get {
+                return ResourceManager.GetString("textEdit", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Edit ship.
+        /// </summary>
+        public static string textEditShip {
+            get {
+                return ResourceManager.GetString("textEditShip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Edit ship call.
         /// </summary>
@@ -436,6 +660,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Edit ships.
+        /// </summary>
+        public static string textEditShips {
+            get {
+                return ResourceManager.GetString("textEditShips", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Edit times.
         /// </summary>
@@ -454,6 +687,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Some interval end times are before start times.
+        /// </summary>
+        public static string textEndValueBeforeStartValue {
+            get {
+                return ResourceManager.GetString("textEndValueBeforeStartValue", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Ship / remark.
         /// </summary>
@@ -463,6 +705,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Error.
+        /// </summary>
+        public static string textError {
+            get {
+                return ResourceManager.GetString("textError", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to ETA berth.
         /// </summary>
@@ -472,6 +723,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to ETA value is in the past.
+        /// </summary>
+        public static string textETAInThePast {
+            get {
+                return ResourceManager.GetString("textETAInThePast", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to ETD berth.
         /// </summary>
@@ -481,6 +741,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to ETD value is in the past.
+        /// </summary>
+        public static string textETDInThePast {
+            get {
+                return ResourceManager.GetString("textETDInThePast", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Exit.
         /// </summary>
@@ -499,6 +768,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Marked as a fixed order.
+        /// </summary>
+        public static string textFixedOrder {
+            get {
+                return ResourceManager.GetString("textFixedOrder", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to from.
         /// </summary>
@@ -508,6 +786,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Harbour.
+        /// </summary>
+        public static string textHarbour {
+            get {
+                return ResourceManager.GetString("textHarbour", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Incoming.
         /// </summary>
@@ -517,6 +804,24 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Show app info and change user password.
+        /// </summary>
+        public static string textInfoChangePW {
+            get {
+                return ResourceManager.GetString("textInfoChangePW", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Information successfully updated.
+        /// </summary>
+        public static string textInformationUpdated {
+            get {
+                return ResourceManager.GetString("textInformationUpdated", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Interval.
         /// </summary>
@@ -553,6 +858,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Lock time is in the past.
+        /// </summary>
+        public static string textLockTimeInThePast {
+            get {
+                return ResourceManager.GetString("textLockTimeInThePast", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Login.
         /// </summary>
@@ -562,6 +876,24 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to mine only.
+        /// </summary>
+        public static string textMineOnly {
+            get {
+                return ResourceManager.GetString("textMineOnly", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The participant has not provided any info.
+        /// </summary>
+        public static string textMissingData {
+            get {
+                return ResourceManager.GetString("textMissingData", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Moored in lock.
         /// </summary>
@@ -598,6 +930,51 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Relevant next 24hrs.
+        /// </summary>
+        public static string textNext24h {
+            get {
+                return ResourceManager.GetString("textNext24h", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Notifications.
+        /// </summary>
+        public static string textNotifications {
+            get {
+                return ResourceManager.GetString("textNotifications", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Notify by e-mail.
+        /// </summary>
+        public static string textNotifyEmail {
+            get {
+                return ResourceManager.GetString("textNotifyEmail", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Notify on.
+        /// </summary>
+        public static string textNotifyOn {
+            get {
+                return ResourceManager.GetString("textNotifyOn", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Notify by push notification in app.
+        /// </summary>
+        public static string textNotifyPush {
+            get {
+                return ResourceManager.GetString("textNotifyPush", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Not rotated.
         /// </summary>
@@ -625,6 +1002,24 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Operation.
+        /// </summary>
+        public static string textOperation {
+            get {
+                return ResourceManager.GetString("textOperation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Operation end is in the past.
+        /// </summary>
+        public static string textOperationEndInThePast {
+            get {
+                return ResourceManager.GetString("textOperationEndInThePast", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Operations end.
         /// </summary>
@@ -643,6 +1038,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Operation start is in the past.
+        /// </summary>
+        public static string textOperationStartInThePast {
+            get {
+                return ResourceManager.GetString("textOperationStartInThePast", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Outgoing.
         /// </summary>
@@ -652,6 +1056,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Participant.
+        /// </summary>
+        public static string textParticipant {
+            get {
+                return ResourceManager.GetString("textParticipant", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Participants.
         /// </summary>
@@ -715,6 +1128,42 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Pilot.
+        /// </summary>
+        public static string textPilots {
+            get {
+                return ResourceManager.GetString("textPilots", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Port.
+        /// </summary>
+        public static string textPort {
+            get {
+                return ResourceManager.GetString("textPort", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Port authority.
+        /// </summary>
+        public static string textPortAuthority {
+            get {
+                return ResourceManager.GetString("textPortAuthority", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Position.
+        /// </summary>
+        public static string textPosition {
+            get {
+                return ResourceManager.GetString("textPosition", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Rain sensitive cargo.
         /// </summary>
@@ -805,6 +1254,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Shift. number.
+        /// </summary>
+        public static string textShiftingSequence {
+            get {
+                return ResourceManager.GetString("textShiftingSequence", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Shifting to.
         /// </summary>
@@ -823,6 +1281,24 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Shipcall.
+        /// </summary>
+        public static string textShipcall {
+            get {
+                return ResourceManager.GetString("textShipcall", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The shipcall was cancelled.
+        /// </summary>
+        public static string textShipcallCancelled {
+            get {
+                return ResourceManager.GetString("textShipcallCancelled", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Ship length.
         /// </summary>
@@ -832,6 +1308,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Ships.
+        /// </summary>
+        public static string textShips {
+            get {
+                return ResourceManager.GetString("textShips", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Show cancelled calls.
         /// </summary>
@@ -841,6 +1326,24 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Show shipcall change history.
+        /// </summary>
+        public static string textShowHistory {
+            get {
+                return ResourceManager.GetString("textShowHistory", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Show notificiations.
+        /// </summary>
+        public static string textShowNotifications {
+            get {
+                return ResourceManager.GetString("textShowNotifications", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Sort order.
         /// </summary>
@@ -850,6 +1353,24 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Starboard.
+        /// </summary>
+        public static string textStarboard {
+            get {
+                return ResourceManager.GetString("textStarboard", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to If an end time is set, a start time is also required.
+        /// </summary>
+        public static string textStartTimeMissing {
+            get {
+                return ResourceManager.GetString("textStartTimeMissing", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Terminal.
         /// </summary>
@@ -859,6 +1380,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to For a tidal window both values must be set.
+        /// </summary>
+        public static string textTidalBothValues {
+            get {
+                return ResourceManager.GetString("textTidalBothValues", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Tidal window.
         /// </summary>
@@ -868,6 +1398,42 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Times for the tide window are in the past.
+        /// </summary>
+        public static string textTideTimesInThePast {
+            get {
+                return ResourceManager.GetString("textTideTimesInThePast", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Participants disagree on times.
+        /// </summary>
+        public static string textTimeConflict {
+            get {
+                return ResourceManager.GetString("textTimeConflict", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Times conflict resolved.
+        /// </summary>
+        public static string textTimeConflictResolved {
+            get {
+                return ResourceManager.GetString("textTimeConflictResolved", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Timestamp.
+        /// </summary>
+        public static string textTimestamp {
+            get {
+                return ResourceManager.GetString("textTimestamp", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to to.
         /// </summary>
@@ -877,6 +1443,42 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to A time value is too far in the future.
+        /// </summary>
+        public static string textTooFarInTheFuture {
+            get {
+                return ResourceManager.GetString("textTooFarInTheFuture", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Set as a fixed order.
+        /// </summary>
+        public static string textTooltipSetFixedOrder {
+            get {
+                return ResourceManager.GetString("textTooltipSetFixedOrder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Unset as a a fixed order.
+        /// </summary>
+        public static string textTooltipUnSetFixedOrder {
+            get {
+                return ResourceManager.GetString("textTooltipUnSetFixedOrder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Trigger a manual refresh of all shipcalls.
+        /// </summary>
+        public static string textTriggerManualRefresh {
+            get {
+                return ResourceManager.GetString("textTriggerManualRefresh", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Tug.
         /// </summary>
@@ -886,6 +1488,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Tug company.
+        /// </summary>
+        public static string textTugCompany {
+            get {
+                return ResourceManager.GetString("textTugCompany", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Tug required.
         /// </summary>
@@ -904,6 +1515,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Participant unassigned from shipcall.
+        /// </summary>
+        public static string textUnassigned {
+            get {
+                return ResourceManager.GetString("textUnassigned", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to User login.
         /// </summary>
@@ -922,6 +1542,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Username and/or password empty!.
+        /// </summary>
+        public static string textUserNamePasswordEmpty {
+            get {
+                return ResourceManager.GetString("textUserNamePasswordEmpty", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Voyage.
         /// </summary>
@@ -931,6 +1560,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Warning.
+        /// </summary>
+        public static string textWarning {
+            get {
+                return ResourceManager.GetString("textWarning", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Width.
         /// </summary>
@@ -949,6 +1587,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Zone entry time is in the past.
+        /// </summary>
+        public static string textZoneEntryInThePast {
+            get {
+                return ResourceManager.GetString("textZoneEntryInThePast", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Zone entry.
         /// </summary>
@@ -1038,6 +1685,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Undefined.
+        /// </summary>
+        public static string Undefined {
+            get {
+                return ResourceManager.GetString("Undefined", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>

src/BreCalClient/Resources/Resources.de.resx

@@ -117,16 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Arrival" xml:space="preserve">
+    <value>Einkommend</value>
+  </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="arrow_down_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>arrow_down_red.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="arrow_right_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>arrow_right_blue.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="arrow_up_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>arrow_up_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="clipboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>clipboard.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -136,15 +133,24 @@
   <data name="containership" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>containership.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="Departure" xml:space="preserve">
+    <value>Ausgehend</value>
+  </data>
   <data name="emergency_stop_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>emergency_stop_button.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="logo_bremen_calling" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>logo_bremen_calling.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="Shifting" xml:space="preserve">
+    <value>Verholung</value>
+  </data>
   <data name="ship2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>ship2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="textAdd" xml:space="preserve">
+    <value>Hinzufügen</value>
+  </data>
   <data name="textAgencies" xml:space="preserve">
     <value>Agenturen</value>
   </data>
@@ -160,9 +166,18 @@
   <data name="textBerth" xml:space="preserve">
     <value>Liegeplatz</value>
   </data>
+  <data name="textBerthRemarks" xml:space="preserve">
+    <value>Liegeplatz Informationen</value>
+  </data>
   <data name="textBerths" xml:space="preserve">
     <value>Liegeplätze</value>
   </data>
+  <data name="textBothTideTimesNecessary" xml:space="preserve">
+    <value>Beide Tidenzeiten sollten angegeben werden (von - bis)</value>
+  </data>
+  <data name="textBSMDGranted" xml:space="preserve">
+    <value>Freigabe zur Bearb. f. BSMD erteilt</value>
+  </data>
   <data name="textBunkering" xml:space="preserve">
     <value>Bunkeraufnahme</value>
   </data>
@@ -181,59 +196,128 @@
   <data name="textChange" xml:space="preserve">
     <value>Ändern</value>
   </data>
+  <data name="textChangeContactInfo" xml:space="preserve">
+    <value>Kontaktdaten bearbeiten</value>
+  </data>
+  <data name="textChangeHistory" xml:space="preserve">
+    <value>Verlauf</value>
+  </data>
   <data name="textChangePassword" xml:space="preserve">
     <value>Passwort ändern</value>
   </data>
+  <data name="textClearAll" xml:space="preserve">
+    <value>Alle Eintragungen zurücksetzen?</value>
+  </data>
+  <data name="textClearAssignment" xml:space="preserve">
+    <value>Zuordnung entfernen</value>
+  </data>
+  <data name="textClearFilters" xml:space="preserve">
+    <value>Filter löschen</value>
+  </data>
+  <data name="textClearValue" xml:space="preserve">
+    <value>Eingabe löschen</value>
+  </data>
   <data name="textClose" xml:space="preserve">
     <value>Schliessen</value>
   </data>
+  <data name="textConfirmation" xml:space="preserve">
+    <value>Bestätigung</value>
+  </data>
+  <data name="textDelete" xml:space="preserve">
+    <value>Löschen</value>
+  </data>
+  <data name="textDeleted" xml:space="preserve">
+    <value>Gelöscht</value>
+  </data>
   <data name="textDepartureTerminal" xml:space="preserve">
     <value>Terminal Abfahrt</value>
   </data>
   <data name="textDraft" xml:space="preserve">
+    <value>Tiefgang (m)</value>
+  </data>
+  <data name="textDraftNoUnit" xml:space="preserve">
     <value>Tiefgang</value>
   </data>
+  <data name="textEdit" xml:space="preserve">
+    <value>Bearbeiten</value>
+  </data>
+  <data name="textEditShip" xml:space="preserve">
+    <value>Schiff bearbeiten</value>
+  </data>
   <data name="textEditShipcall" xml:space="preserve">
     <value>Schiffsanlauf bearbeiten</value>
   </data>
+  <data name="textEditShips" xml:space="preserve">
+    <value>Schiffe anlegen / bearbeiten</value>
+  </data>
   <data name="textEditTimes" xml:space="preserve">
     <value>Zeiten bearbeiten</value>
   </data>
-  <data name="textETABerth" xml:space="preserve">
-    <value>ETA Liegeplatz</value>
+  <data name="textEmail" xml:space="preserve">
+    <value>E-Mail</value>
   </data>
-  <data name="textETDBerth" xml:space="preserve">
-    <value>ETD Liegeplatz</value>
+  <data name="textEndValueBeforeStartValue" xml:space="preserve">
+    <value>Endzeit liegt vor Startzeit</value>
   </data>
   <data name="textEnterKeyword" xml:space="preserve">
     <value>Schiff / Bemerkung</value>
   </data>
+  <data name="textError" xml:space="preserve">
+    <value>Error</value>
+  </data>
+  <data name="textETABerth" xml:space="preserve">
+    <value>ETA Liegeplatz</value>
+  </data>
+  <data name="textETAInThePast" xml:space="preserve">
+    <value>Zeitpunkt ETA liegt in der Vergangenheit</value>
+  </data>
+  <data name="textETDBerth" xml:space="preserve">
+    <value>ETD Liegeplatz</value>
+  </data>
+  <data name="textETDInThePast" xml:space="preserve">
+    <value>Zeitpunkt ETD liegt in der Vergangenheit</value>
+  </data>
   <data name="textExit" xml:space="preserve">
     <value>Verlassen</value>
   </data>
-  <data name="textFrom" xml:space="preserve">
-    <value>von</value>
-  </data>
-  <data name="textInterval" xml:space="preserve">
-    <value>Zeitraum</value>
-  </data>
-  <data name="textLengthWidth" xml:space="preserve">
-    <value>L/B</value>
-  </data>
-  <data name="textLogin" xml:space="preserve">
-    <value>Anmelden</value>
-  </data>
   <data name="textFixed" xml:space="preserve">
     <value>Fest</value>
   </data>
+  <data name="textFixedOrder" xml:space="preserve">
+    <value>Als feste Bestellung vermerkt</value>
+  </data>
+  <data name="textFrom" xml:space="preserve">
+    <value>von</value>
+  </data>
+  <data name="textHarbour" xml:space="preserve">
+    <value>Hafen</value>
+  </data>
+  <data name="textIncoming" xml:space="preserve">
+    <value>Einkommend</value>
+  </data>
+  <data name="textInfoChangePW" xml:space="preserve">
+    <value>App Info anzeigen und Passwort ändern</value>
+  </data>
+  <data name="textInterval" xml:space="preserve">
+    <value>Zeitraum</value>
+  </data>
+  <data name="textLength" xml:space="preserve">
+    <value>Länge</value>
+  </data>
+  <data name="textLengthWidth" xml:space="preserve">
+    <value>L/B (m)</value>
+  </data>
   <data name="textLockTime" xml:space="preserve">
     <value>Zeit Schleuse</value>
   </data>
-  <data name="textOperationsEnd" xml:space="preserve">
-    <value>Operation Ende</value>
+  <data name="textLockTimeInThePast" xml:space="preserve">
+    <value>Schleusenzeit liegt in der Vergangenheit</value>
   </data>
-  <data name="textOperationsStart" xml:space="preserve">
-    <value>Operation Start</value>
+  <data name="textLogin" xml:space="preserve">
+    <value>Anmelden</value>
+  </data>
+  <data name="textMineOnly" xml:space="preserve">
+    <value>nur eigene</value>
   </data>
   <data name="textMooredLock" xml:space="preserve">
     <value>auch in Schleuse</value>
@@ -250,44 +334,80 @@
   <data name="textNotRotated" xml:space="preserve">
     <value>Ungedreht</value>
   </data>
-  <data name="textZoneEntryTime" xml:space="preserve">
-    <value>Reviereintritt</value>
-  </data>
   <data name="textOK" xml:space="preserve">
     <value>OK</value>
   </data>
   <data name="textOldPassword" xml:space="preserve">
     <value>Altes Passwort</value>
   </data>
+  <data name="textOperation" xml:space="preserve">
+    <value>Vorgang</value>
+  </data>
+  <data name="textOperationEndInThePast" xml:space="preserve">
+    <value>Operation Endzeit liegt in der Vergangenheit</value>
+  </data>
+  <data name="textOperationsEnd" xml:space="preserve">
+    <value>Operation Ende</value>
+  </data>
+  <data name="textOperationsStart" xml:space="preserve">
+    <value>Operation Start</value>
+  </data>
+  <data name="textOperationStartInThePast" xml:space="preserve">
+    <value>Operation Startzeit liegt in der Vergangenheit</value>
+  </data>
+  <data name="textOutgoing" xml:space="preserve">
+    <value>Ausgehend</value>
+  </data>
+  <data name="textParticipant" xml:space="preserve">
+    <value>Teilnehmer</value>
+  </data>
   <data name="textParticipants" xml:space="preserve">
     <value>Teilnehmer</value>
   </data>
   <data name="textPassword" xml:space="preserve">
     <value>Passwort</value>
   </data>
+  <data name="textPasswordChanged" xml:space="preserve">
+    <value>Passwort geändert.</value>
+  </data>
+  <data name="textPhone" xml:space="preserve">
+    <value>Telefon</value>
+  </data>
   <data name="textPierside" xml:space="preserve">
     <value>Anlegeseite</value>
   </data>
   <data name="textPilot" xml:space="preserve">
-    <value>Lotse</value>
+    <value>Flusslotse</value>
   </data>
   <data name="textPilotRequired" xml:space="preserve">
     <value>Lotsorder</value>
   </data>
+  <data name="textPilots" xml:space="preserve">
+    <value>Flusslotsen</value>
+  </data>
+  <data name="textPort" xml:space="preserve">
+    <value>Backbord</value>
+  </data>
+  <data name="textPortAuthority" xml:space="preserve">
+    <value>Hafenamt</value>
+  </data>
   <data name="textRainSensitiveCargo" xml:space="preserve">
     <value>Regensensitive Ladung</value>
   </data>
   <data name="textRecommendedTugs" xml:space="preserve">
     <value>Anzahl Schlepper</value>
   </data>
+  <data name="textRemarks" xml:space="preserve">
+    <value>Info</value>
+  </data>
   <data name="textRepeatNewPassword" xml:space="preserve">
     <value>Neues Passwort wiederholen</value>
   </data>
   <data name="textReplenishingLock" xml:space="preserve">
-    <value>Versorgungsaufnahme Schleuse</value>
+    <value>Güterübernahme in der Schleuse geplant</value>
   </data>
   <data name="textReplenishingTerminal" xml:space="preserve">
-    <value>Versorgungsaufnahme Terminal</value>
+    <value>Güterübernahme am Terminal geplant</value>
   </data>
   <data name="textRotated" xml:space="preserve">
     <value>Gedreht</value>
@@ -295,27 +415,75 @@
   <data name="textSearch" xml:space="preserve">
     <value>Suche</value>
   </data>
+  <data name="textShifting" xml:space="preserve">
+    <value>Verholung</value>
+  </data>
+  <data name="textShiftingFrom" xml:space="preserve">
+    <value>Verholung von</value>
+  </data>
+  <data name="textShiftingSequence" xml:space="preserve">
+    <value>Verhol. Nr.</value>
+  </data>
+  <data name="textShiftingTo" xml:space="preserve">
+    <value>Verholung nach</value>
+  </data>
   <data name="textShip" xml:space="preserve">
     <value>Schiff</value>
   </data>
   <data name="textShipLength" xml:space="preserve">
     <value>Schiffslänge</value>
   </data>
+  <data name="textShips" xml:space="preserve">
+    <value>Schiffe</value>
+  </data>
+  <data name="textShowCancelledShipcalls" xml:space="preserve">
+    <value>Stornierte anzeigen</value>
+  </data>
+  <data name="textShowHistory" xml:space="preserve">
+    <value>Änderungshistorie der Anläufe anzeigen</value>
+  </data>
   <data name="textSortOrder" xml:space="preserve">
     <value>Sortierung</value>
   </data>
+  <data name="textStarboard" xml:space="preserve">
+    <value>Steuerbord</value>
+  </data>
   <data name="textTerminal" xml:space="preserve">
     <value>Terminal</value>
   </data>
+  <data name="textTidalBothValues" xml:space="preserve">
+    <value>Für das Tidenfenster müssen beide Zeiten angegeben werden</value>
+  </data>
   <data name="textTidalWindow" xml:space="preserve">
     <value>Tidenfenster</value>
   </data>
+  <data name="textTideTimesInThePast" xml:space="preserve">
+    <value>Tidenzeit liegt in der Vergangenheit</value>
+  </data>
+  <data name="textTimestamp" xml:space="preserve">
+    <value>Zeitpunkt</value>
+  </data>
   <data name="textTo" xml:space="preserve">
     <value>bis</value>
   </data>
+  <data name="textTooFarInTheFuture" xml:space="preserve">
+    <value>Eine Zeiteingabe ist zu weit in der Zukunft</value>
+  </data>
+  <data name="textTooltipSetFixedOrder" xml:space="preserve">
+    <value>Als feste Bestellung vermerken</value>
+  </data>
+  <data name="textTooltipUnSetFixedOrder" xml:space="preserve">
+    <value>Feste Bestellung zurücknehmen</value>
+  </data>
+  <data name="textTriggerManualRefresh" xml:space="preserve">
+    <value>Manuelle Aktualisierung der Anläufe auslösen</value>
+  </data>
   <data name="textTug" xml:space="preserve">
     <value>Schlepper</value>
   </data>
+  <data name="textTugCompany" xml:space="preserve">
+    <value>Schlepper-Reederei</value>
+  </data>
   <data name="textTugRequired" xml:space="preserve">
     <value>Schlepperorder</value>
   </data>
@@ -328,9 +496,27 @@
   <data name="textUsername" xml:space="preserve">
     <value>Benutzername</value>
   </data>
+  <data name="textUserNamePasswordEmpty" xml:space="preserve">
+    <value>Benutzername / Passwort leer!</value>
+  </data>
   <data name="textVoyage" xml:space="preserve">
     <value>Reise</value>
   </data>
+  <data name="textWarning" xml:space="preserve">
+    <value>Warnung</value>
+  </data>
+  <data name="textWidth" xml:space="preserve">
+    <value>Breite</value>
+  </data>
+  <data name="textWrongCredentials" xml:space="preserve">
+    <value>Benutzername / Passwort falsch</value>
+  </data>
+  <data name="textZoneEntryInThePast" xml:space="preserve">
+    <value>Zeit Reviereintritt liegt in der Vergangenheit</value>
+  </data>
+  <data name="textZoneEntryTime" xml:space="preserve">
+    <value>Reviereintritt</value>
+  </data>
   <data name="trafficlight_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>trafficlight_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -355,67 +541,64 @@
   <data name="umbrella_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>umbrella_open.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="Undefined" xml:space="preserve">
+    <value>Unbekannt</value>
+  </data>
   <data name="worker2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>worker2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="textClearAssignment" xml:space="preserve">
-    <value>Zuordnung entfernen</value>
+  <data name="arrow_right_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>arrow_right_blue.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="textClearValue" xml:space="preserve">
-    <value>Eingabe löschen</value>
+  <data name="arrow_up_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>arrow_up_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="textConfirmation" xml:space="preserve">
-    <value>Bestätigung</value>
+  <data name="textStartTimeMissing" xml:space="preserve">
+    <value>Wenn eine Ende-Zeit angegeben wird, muss auch eine Start-Zeit angegeben werden</value>
   </data>
-  <data name="textPasswordChanged" xml:space="preserve">
-    <value>Passwort geändert.</value>
+  <data name="textInformationUpdated" xml:space="preserve">
+    <value>Einstellungen erfolgreich aktualisiert</value>
   </data>
-  <data name="textClearFilters" xml:space="preserve">
-    <value>Filter löschen</value>
+  <data name="textNotifications" xml:space="preserve">
+    <value>Benachrichtigungen</value>
   </data>
-  <data name="textShowCancelledShipcalls" xml:space="preserve">
-    <value>Stornierte anzeigen</value>
+  <data name="textNotifyEmail" xml:space="preserve">
+    <value>E-Mail Benachrichtigung</value>
   </data>
-  <data name="textBerthRemarks" xml:space="preserve">
-    <value>Liegeplatz Informationen</value>
+  <data name="textNotifyPush" xml:space="preserve">
+    <value>Banner / Push Benachrichtigung in App</value>
   </data>
-  <data name="textBSMDGranted" xml:space="preserve">
-    <value>Freigabe zur Bearb. f. BSMD erteilt</value>
+  <data name="textAssignment" xml:space="preserve">
+    <value>Teilnehmer wurde nominiert</value>
   </data>
-  <data name="textRemarks" xml:space="preserve">
-    <value>Info</value>
+  <data name="textDate" xml:space="preserve">
+    <value>Datum</value>
   </data>
-  <data name="textIncoming" xml:space="preserve">
-    <value>Einkommend</value>
+  <data name="textNext24h" xml:space="preserve">
+    <value>Relevant für Morgenrunde (24hrs)</value>
   </data>
-  <data name="textOutgoing" xml:space="preserve">
-    <value>Ausgehend</value>
+  <data name="textShipcall" xml:space="preserve">
+    <value>Anlauf</value>
   </data>
-  <data name="textShifting" xml:space="preserve">
-    <value>Verholung</value>
+  <data name="textShowNotifications" xml:space="preserve">
+    <value>Benachrichtigungen anzeigen</value>
   </data>
-  <data name="textLength" xml:space="preserve">
-    <value>Länge</value>
+  <data name="textTimeConflict" xml:space="preserve">
+    <value>"Ampel"-Regel(n) wurde verletzt</value>
   </data>
-  <data name="textShiftingFrom" xml:space="preserve">
-    <value>Verholung von</value>
+  <data name="textTimeConflictResolved" xml:space="preserve">
+    <value>Zeitliche Konflikte aufgelöst</value>
   </data>
-  <data name="textShiftingTo" xml:space="preserve">
-    <value>Verholung nach</value>
+  <data name="textUnassigned" xml:space="preserve">
+    <value>Nominierung des Teilnehmer entfernt</value>
   </data>
-  <data name="textWidth" xml:space="preserve">
-    <value>Breite</value>
+  <data name="textMissingData" xml:space="preserve">
+    <value>Der Teilnehmer hat keine Daten eingetragen</value>
   </data>
-  <data name="textChangeContactInfo" xml:space="preserve">
-    <value>Kontaktdaten bearbeiten</value>
+  <data name="textShipcallCancelled" xml:space="preserve">
+    <value>Der Anlauf wurde storniert</value>
   </data>
-  <data name="textEmail" xml:space="preserve">
-    <value>E-Mail</value>
-  </data>
-  <data name="textPhone" xml:space="preserve">
-    <value>Telefon</value>
-  </data>
-  <data name="textWrongCredentials" xml:space="preserve">
-    <value>Benutzername / Passwort falsch</value>
+  <data name="textNotifyOn" xml:space="preserve">
+    <value>Benachrichtigung bei</value>
   </data>
 </root>

src/BreCalClient/Resources/Resources.resx

@@ -118,6 +118,12 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="add" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>add.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Arrival" xml:space="preserve">
+    <value>Incoming</value>
+  </data>
   <data name="arrow_down_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>arrow_down_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -154,18 +160,39 @@
   <data name="delete2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>delete2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="Departure" xml:space="preserve">
+    <value>Outgoing</value>
+  </data>
+  <data name="edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>edit.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="emergency_stop_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>emergency_stop_button.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="lock_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>lock_open.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="logo_bremen_calling" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>logo_bremen_calling.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="nav_refresh_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>nav_refresh_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="nav_undo_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>nav_undo_red.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Shifting" xml:space="preserve">
+    <value>Shifting</value>
+  </data>
   <data name="ship2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>ship2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="sign_warning" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>sign_warning.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="textAdd" xml:space="preserve">
+    <value>Add</value>
+  </data>
   <data name="textAgencies" xml:space="preserve">
     <value>Agencies</value>
   </data>
@@ -187,6 +214,9 @@
   <data name="textBerths" xml:space="preserve">
     <value>Berths</value>
   </data>
+  <data name="textBothTideTimesNecessary" xml:space="preserve">
+    <value>Both tide times are required</value>
+  </data>
   <data name="textBSMDGranted" xml:space="preserve">
     <value>BSMD right to edit granted</value>
   </data>
@@ -211,9 +241,15 @@
   <data name="textChangeContactInfo" xml:space="preserve">
     <value>Update contact info</value>
   </data>
+  <data name="textChangeHistory" xml:space="preserve">
+    <value>Change history</value>
+  </data>
   <data name="textChangePassword" xml:space="preserve">
     <value>Change password</value>
   </data>
+  <data name="textClearAll" xml:space="preserve">
+    <value>Clear all entries?</value>
+  </data>
   <data name="textClearAssignment" xml:space="preserve">
     <value>Clear assignment</value>
   </data>
@@ -229,42 +265,78 @@
   <data name="textConfirmation" xml:space="preserve">
     <value>Confirmation</value>
   </data>
+  <data name="textDelete" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="textDeleted" xml:space="preserve">
+    <value>Deleted</value>
+  </data>
   <data name="textDepartureTerminal" xml:space="preserve">
     <value>Departure terminal</value>
   </data>
   <data name="textDraft" xml:space="preserve">
-    <value>Draft</value>
+    <value>Draft (m)</value>
+  </data>
+  <data name="textEdit" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="textEditShip" xml:space="preserve">
+    <value>Edit ship</value>
   </data>
   <data name="textEditShipcall" xml:space="preserve">
     <value>Edit ship call</value>
   </data>
+  <data name="textEditShips" xml:space="preserve">
+    <value>Edit ships</value>
+  </data>
   <data name="textEditTimes" xml:space="preserve">
     <value>Edit times</value>
   </data>
   <data name="textEmail" xml:space="preserve">
     <value>E-mail</value>
   </data>
+  <data name="textEndValueBeforeStartValue" xml:space="preserve">
+    <value>Some interval end times are before start times</value>
+  </data>
   <data name="textEnterKeyword" xml:space="preserve">
     <value>Ship / remark</value>
   </data>
+  <data name="textError" xml:space="preserve">
+    <value>Error</value>
+  </data>
   <data name="textETABerth" xml:space="preserve">
     <value>ETA berth</value>
   </data>
+  <data name="textETAInThePast" xml:space="preserve">
+    <value>ETA value is in the past</value>
+  </data>
   <data name="textETDBerth" xml:space="preserve">
     <value>ETD berth</value>
   </data>
+  <data name="textETDInThePast" xml:space="preserve">
+    <value>ETD value is in the past</value>
+  </data>
   <data name="textExit" xml:space="preserve">
     <value>Exit</value>
   </data>
   <data name="textFixed" xml:space="preserve">
     <value>Fixed</value>
   </data>
+  <data name="textFixedOrder" xml:space="preserve">
+    <value>Marked as a fixed order</value>
+  </data>
   <data name="textFrom" xml:space="preserve">
     <value>from</value>
   </data>
+  <data name="textHarbour" xml:space="preserve">
+    <value>Harbour</value>
+  </data>
   <data name="textIncoming" xml:space="preserve">
     <value>Incoming</value>
   </data>
+  <data name="textInfoChangePW" xml:space="preserve">
+    <value>Show app info and change user password</value>
+  </data>
   <data name="textInterval" xml:space="preserve">
     <value>Interval</value>
   </data>
@@ -277,9 +349,15 @@
   <data name="textLockTime" xml:space="preserve">
     <value>Lock time</value>
   </data>
+  <data name="textLockTimeInThePast" xml:space="preserve">
+    <value>Lock time is in the past</value>
+  </data>
   <data name="textLogin" xml:space="preserve">
     <value>Login</value>
   </data>
+  <data name="textMineOnly" xml:space="preserve">
+    <value>mine only</value>
+  </data>
   <data name="textMooredLock" xml:space="preserve">
     <value>Moored in lock</value>
   </data>
@@ -301,15 +379,27 @@
   <data name="textOldPassword" xml:space="preserve">
     <value>Old password</value>
   </data>
+  <data name="textOperation" xml:space="preserve">
+    <value>Operation</value>
+  </data>
+  <data name="textOperationEndInThePast" xml:space="preserve">
+    <value>Operation end is in the past</value>
+  </data>
   <data name="textOperationsEnd" xml:space="preserve">
     <value>Operations end</value>
   </data>
   <data name="textOperationsStart" xml:space="preserve">
     <value>Operations start</value>
   </data>
+  <data name="textOperationStartInThePast" xml:space="preserve">
+    <value>Operation start is in the past</value>
+  </data>
   <data name="textOutgoing" xml:space="preserve">
     <value>Outgoing</value>
   </data>
+  <data name="textParticipant" xml:space="preserve">
+    <value>Participant</value>
+  </data>
   <data name="textParticipants" xml:space="preserve">
     <value>Participants</value>
   </data>
@@ -331,6 +421,15 @@
   <data name="textPilotRequired" xml:space="preserve">
     <value>Pilot required</value>
   </data>
+  <data name="textPilots" xml:space="preserve">
+    <value>Pilot</value>
+  </data>
+  <data name="textPort" xml:space="preserve">
+    <value>Port</value>
+  </data>
+  <data name="textPortAuthority" xml:space="preserve">
+    <value>Port authority</value>
+  </data>
   <data name="textRainSensitiveCargo" xml:space="preserve">
     <value>Rain sensitive cargo</value>
   </data>
@@ -361,6 +460,9 @@
   <data name="textShiftingFrom" xml:space="preserve">
     <value>Shifting from</value>
   </data>
+  <data name="textShiftingSequence" xml:space="preserve">
+    <value>Shift. number</value>
+  </data>
   <data name="textShiftingTo" xml:space="preserve">
     <value>Shifting to</value>
   </data>
@@ -370,24 +472,57 @@
   <data name="textShipLength" xml:space="preserve">
     <value>Ship length</value>
   </data>
+  <data name="textShips" xml:space="preserve">
+    <value>Ships</value>
+  </data>
   <data name="textShowCancelledShipcalls" xml:space="preserve">
     <value>Show cancelled calls</value>
   </data>
+  <data name="textShowHistory" xml:space="preserve">
+    <value>Show shipcall change history</value>
+  </data>
   <data name="textSortOrder" xml:space="preserve">
     <value>Sort order</value>
   </data>
+  <data name="textStarboard" xml:space="preserve">
+    <value>Starboard</value>
+  </data>
   <data name="textTerminal" xml:space="preserve">
     <value>Terminal</value>
   </data>
+  <data name="textTidalBothValues" xml:space="preserve">
+    <value>For a tidal window both values must be set</value>
+  </data>
   <data name="textTidalWindow" xml:space="preserve">
     <value>Tidal window</value>
   </data>
+  <data name="textTideTimesInThePast" xml:space="preserve">
+    <value>Times for the tide window are in the past</value>
+  </data>
+  <data name="textTimestamp" xml:space="preserve">
+    <value>Timestamp</value>
+  </data>
   <data name="textTo" xml:space="preserve">
     <value>to</value>
   </data>
+  <data name="textTooFarInTheFuture" xml:space="preserve">
+    <value>A time value is too far in the future</value>
+  </data>
+  <data name="textTooltipSetFixedOrder" xml:space="preserve">
+    <value>Set as a fixed order</value>
+  </data>
+  <data name="textTooltipUnSetFixedOrder" xml:space="preserve">
+    <value>Unset as a a fixed order</value>
+  </data>
+  <data name="textTriggerManualRefresh" xml:space="preserve">
+    <value>Trigger a manual refresh of all shipcalls</value>
+  </data>
   <data name="textTug" xml:space="preserve">
     <value>Tug</value>
   </data>
+  <data name="textTugCompany" xml:space="preserve">
+    <value>Tug company</value>
+  </data>
   <data name="textTugRequired" xml:space="preserve">
     <value>Tug required</value>
   </data>
@@ -400,15 +535,24 @@
   <data name="textUsername" xml:space="preserve">
     <value>User name</value>
   </data>
+  <data name="textUserNamePasswordEmpty" xml:space="preserve">
+    <value>Username and/or password empty!</value>
+  </data>
   <data name="textVoyage" xml:space="preserve">
     <value>Voyage</value>
   </data>
+  <data name="textWarning" xml:space="preserve">
+    <value>Warning</value>
+  </data>
   <data name="textWidth" xml:space="preserve">
     <value>Width</value>
   </data>
   <data name="textWrongCredentials" xml:space="preserve">
     <value>Wrong username or password</value>
   </data>
+  <data name="textZoneEntryInThePast" xml:space="preserve">
+    <value>Zone entry time is in the past</value>
+  </data>
   <data name="textZoneEntryTime" xml:space="preserve">
     <value>Zone entry</value>
   </data>
@@ -436,7 +580,79 @@
   <data name="umbrella_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>umbrella_open.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="Undefined" xml:space="preserve">
+    <value>Undefined</value>
+  </data>
   <data name="worker2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>worker2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="_24hours" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>24hours.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="_lock" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>lock.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="arrow_right_blue" xml:space="preserve">
+    <value />
+  </data>
+  <data name="arrow_up_green" xml:space="preserve">
+    <value />
+  </data>
+  <data name="textStartTimeMissing" xml:space="preserve">
+    <value>If an end time is set, a start time is also required</value>
+  </data>
+  <data name="textInformationUpdated" xml:space="preserve">
+    <value>Information successfully updated</value>
+  </data>
+  <data name="textNotifications" xml:space="preserve">
+    <value>Notifications</value>
+  </data>
+  <data name="textNotifyEmail" xml:space="preserve">
+    <value>Notify by e-mail</value>
+  </data>
+  <data name="textNotifyPush" xml:space="preserve">
+    <value>Notify by push notification in app</value>
+  </data>
+  <data name="bell3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>bell3.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="textAssignment" xml:space="preserve">
+    <value>Participant assigned to shipcall</value>
+  </data>
+  <data name="textDate" xml:space="preserve">
+    <value>Date</value>
+  </data>
+  <data name="textNext24h" xml:space="preserve">
+    <value>Relevant next 24hrs</value>
+  </data>
+  <data name="textShipcall" xml:space="preserve">
+    <value>Shipcall</value>
+  </data>
+  <data name="textShowNotifications" xml:space="preserve">
+    <value>Show notificiations</value>
+  </data>
+  <data name="textTimeConflict" xml:space="preserve">
+    <value>Participants disagree on times</value>
+  </data>
+  <data name="textTimeConflictResolved" xml:space="preserve">
+    <value>Times conflict resolved</value>
+  </data>
+  <data name="textUnassigned" xml:space="preserve">
+    <value>Participant unassigned from shipcall</value>
+  </data>
+  <data name="textMissingData" xml:space="preserve">
+    <value>The participant has not provided any info</value>
+  </data>
+  <data name="textShipcallCancelled" xml:space="preserve">
+    <value>The shipcall was cancelled</value>
+  </data>
+  <data name="textNotifyOn" xml:space="preserve">
+    <value>Notify on</value>
+  </data>
+  <data name="textPosition" xml:space="preserve">
+    <value>Position</value>
+  </data>
+  <data name="textDraftNoUnit" xml:space="preserve">
+    <value>Draft</value>
+  </data>
 </root>

src/BreCalClient/Resources/StringResources.de.xaml

@@ -5,6 +5,5 @@
 	<system:String x:Key="textUsername">Benutzername</system:String>
 	<system:String x:Key="textPassword">Passwort</system:String>
 	<system:String x:Key="textLogin">Anmelden</system:String>
-	<system:String x:Key="textExit">Abbrechen</system:String>
-	<system:String x:Key="textUserNamePasswordEmpty">Benutzername / Password leer!</system:String>
+    <system:String x:Key="textExit">Abbrechen</system:String>
 </ResourceDictionary>

src/BreCalClient/Resources/StringResources.xaml

@@ -7,5 +7,4 @@
     <system:String x:Key="textLogin">Login</system:String>
     <system:String x:Key="textExit">Exit</system:String>
     <system:String x:Key="textApplicationTitle">Bremen calling</system:String>
-    <system:String x:Key="textUserNamePasswordEmpty">Username and/or password empty!</system:String>
 </ResourceDictionary>

src/BreCalClient/SearchFilterControl.xaml

@@ -5,9 +5,13 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:p = "clr-namespace:BreCalClient.Resources"
              xmlns:local="clr-namespace:BreCalClient"
+             xmlns:api="clr-namespace:BreCalClient.misc.Model"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              mc:Ignorable="d" 
-             d:DesignHeight="56" d:DesignWidth="800" Loaded="UserControl_Loaded">
+             d:DesignHeight="56" d:DesignWidth="800">
+    <UserControl.Resources>
+        <local:EnumToStringConverter x:Key="enumToStringConverter" />
+    </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
@@ -48,7 +52,8 @@
                 </TextBlock.Text>
             </TextBlock>
         </Label>
-        <Label Grid.Row="1" Grid.Column="1" Content="{x:Static p:Resources.textSearch}" HorizontalContentAlignment="Right"/>
+        
+        <Label Grid.Row="1" Grid.Column="1" Content="{x:Static p:Resources.textSearch}" HorizontalContentAlignment="Right"/>                   
         <Label Grid.Row="1" Grid.Column="3" Content="{x:Static p:Resources.textBerths}" HorizontalContentAlignment="Right"/>
         <Label Grid.Row="1" Grid.Column="5" Content="{x:Static p:Resources.textAgencies}" HorizontalContentAlignment="Right"/>
         
@@ -58,12 +63,16 @@
                 <ColumnDefinition Width=".5*" />
                 <ColumnDefinition Width="30" />
                 <ColumnDefinition Width=".5*" />
+                <ColumnDefinition Width="30" />
             </Grid.ColumnDefinitions>
             <DatePicker x:Name="datePickerETAFrom" Grid.Column="0" Margin="2" SelectedDateChanged="datePickerETAFrom_SelectedDateChanged" SelectedDate="{Binding Path=EtaFrom}"/>
             <Label Grid.Column="1" Content="{x:Static p:Resources.textTo}" />
             <DatePicker x:Name="datePickerETATo" Grid.Column="2" Margin="2" SelectedDateChanged="datePickerETATo_SelectedDateChanged" SelectedDate="{Binding Path=EtaTo}"/>
+            <Button Grid.Column="3" Margin="2" x:Name="toggleButton24Hrs" Click="toggleButton24Hrs_Click">
+                <Image Source="./Resources/24hours.png"/>
+            </Button>
         </Grid>
-        <xctk:CheckComboBox x:Name="comboBoxCategories" Grid.Column="4" Margin="2" ItemSelectionChanged="comboBoxCategories_ItemSelectionChanged" />
+        <xctk:CheckComboBox x:Name="comboBoxCategories" Grid.Column="4" Margin="2" ItemSelectionChanged="comboBoxCategories_ItemSelectionChanged" ItemsSource="{local:Enumerate {x:Type api:ShipcallType}}" />
         <Grid Grid.Column="6" Grid.Row="0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width=".5*" />
@@ -74,8 +83,16 @@
             <Label Grid.Column="1" Content="{x:Static p:Resources.textTo}" />
             <xctk:DoubleUpDown x:Name="upDownShiplengthTo" Grid.Column="2" Margin="2" Minimum="0" Maximum="1000" ValueChanged="upDownShiplengthTo_ValueChanged" Value="{Binding Path=ShipLengthTo}"/>
         </Grid>
-        <xctk:WatermarkTextBox x:Name="textBoxSearch" Grid.Column="2" Grid.Row="1" Margin="2" Watermark="{x:Static p:Resources.textEnterKeyword}" PreviewTextInput="textBoxSearch_PreviewTextInput" 
-                               DataObject.Pasting="textBoxSearch_Pasting" TextChanged="textBoxSearch_TextChanged" />
+        <Grid Grid.Column="2" Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width=".5*" />
+                <ColumnDefinition Width="30" />
+                <ColumnDefinition Width=".5*" />
+            </Grid.ColumnDefinitions>
+            <xctk:WatermarkTextBox x:Name="textBoxSearch" Grid.Column="0" Margin="2" Watermark="{x:Static p:Resources.textEnterKeyword}" TextChanged="textBoxSearch_TextChanged" />
+            <CheckBox x:Name="checkBoxOwn" VerticalAlignment="Center" Grid.Column="1" HorizontalAlignment="Right" Margin="2" Checked="checkBoxOwn_Checked" Unchecked="checkBoxOwn_Checked" />
+            <Label Content="{x:Static p:Resources.textMineOnly}" Grid.Column="2" />
+        </Grid>
         <xctk:CheckComboBox x:Name="comboBoxBerths" DisplayMemberPath="Name" Grid.Column="4" Grid.Row="1" Margin="2" ItemSelectionChanged="comboBoxBerths_ItemSelectionChanged" />
         <xctk:CheckComboBox x:Name="comboBoxAgencies" DisplayMemberPath="Name" Grid.Column="6" Grid.Row="1" Margin="2" ItemSelectionChanged="comboBoxAgencies_ItemSelectionChanged" />
     </Grid>

src/BreCalClient/SearchFilterControl.xaml.cs

@@ -72,11 +72,12 @@ namespace BreCalClient
             this.comboBoxAgencies.UnSelectAll();
             this.comboBoxBerths.UnSelectAll();
             this.comboBoxCategories.UnSelectAll();
-            this.datePickerETAFrom.SelectedDate = null;
+            this.datePickerETAFrom.SelectedDate = DateTime.Now.AddDays(-2);
             this.datePickerETATo.SelectedDate = null;
             this.textBoxSearch.Clear();
             this.upDownShiplengthFrom.Value = null;
-            this.upDownShiplengthTo.Value = null;            
+            this.upDownShiplengthTo.Value = null;
+            this.checkBoxOwn.IsChecked = false;
         }
 
 
@@ -100,14 +101,21 @@ namespace BreCalClient
             }
             if(sfm.Categories != null)
             {
-                foreach(int category in sfm.Categories)
-                    this.comboBoxCategories.SelectedItems.Add((Extensions.TypeEnum)category);
+                EnumToStringConverter enumToStringConverter = new();
+                foreach (ShipcallType category in sfm.Categories)
+                {
+                    this.comboBoxCategories.SelectedItems.Add(enumToStringConverter.Convert(category, typeof(ShipcallControl), new object(), System.Globalization.CultureInfo.CurrentCulture));
+                }
             }
             if (sfm.SearchString != null) this.textBoxSearch.Text = sfm.SearchString;
             this.upDownShiplengthFrom.Value = sfm.ShipLengthFrom;
             this.upDownShiplengthTo.Value = sfm.ShipLengthTo;
-            this.datePickerETAFrom.SelectedDate = sfm.EtaFrom;
+            if (sfm.EtaFrom != null)
+                this.datePickerETAFrom.SelectedDate = sfm.EtaFrom;
+            else
+                this.datePickerETAFrom.SelectedDate = DateTime.Now.AddDays(-2);
             this.datePickerETATo.SelectedDate = sfm.EtaTo;
+            this.checkBoxOwn.IsChecked = sfm.MineOnly;
 
             this._model = sfm;
             SearchFilterChanged?.Invoke();
@@ -120,30 +128,31 @@ namespace BreCalClient
         private void logoImage_MouseUp(object sender, MouseButtonEventArgs e)
         {
             LogoImageClicked?.Invoke();
-        }        
-
-        private void UserControl_Loaded(object sender, System.Windows.RoutedEventArgs e)
-        {
-            this.comboBoxCategories.ItemsSource = Enum.GetValues(typeof(Extensions.TypeEnum));
-        }        
+        }
 
         private void datePickerETAFrom_SelectedDateChanged(object sender, SelectionChangedEventArgs e)
         {
-            this._model.EtaFrom = this.datePickerETAFrom.SelectedDate;
+            this._model.EtaFrom = this.datePickerETAFrom.SelectedDate?.Date;
             SearchFilterChanged?.Invoke();
         }
 
         private void datePickerETATo_SelectedDateChanged(object sender, SelectionChangedEventArgs e)
         {
-            this._model.EtaTo = datePickerETATo.SelectedDate;
+            this._model.EtaTo = datePickerETATo.SelectedDate?.Date;
             SearchFilterChanged?.Invoke();
         }
 
         private void comboBoxCategories_ItemSelectionChanged(object sender, Xceed.Wpf.Toolkit.Primitives.ItemSelectionChangedEventArgs e)
         {
+            EnumToStringConverter enumToStringConverter = new();
+            
             _model.Categories.Clear();
-            foreach(int category in comboBoxCategories.SelectedItems)
-                _model.Categories.Add(category);
+            foreach (string categoryString in comboBoxCategories.SelectedItems)
+            {                
+                ShipcallType? type = (ShipcallType?)enumToStringConverter.ConvertBack(categoryString, typeof(ShipcallType), new object(), System.Globalization.CultureInfo.CurrentCulture);
+                if(type != null)
+                    _model.Categories.Add(type.Value);
+            }
 
             SearchFilterChanged?.Invoke();
         }
@@ -174,23 +183,24 @@ namespace BreCalClient
             foreach (Participant agency in comboBoxAgencies.SelectedItems)
                 _model.Agencies.Add(agency.Id);
             SearchFilterChanged?.Invoke();
-        }        
-
-        private void textBoxSearch_Pasting(object sender, System.Windows.DataObjectPastingEventArgs e)
-        {
-            this.SearchFilter.SearchString = e.SourceDataObject.ToString();
-            SearchFilterChanged?.Invoke();
-        }
-
-        private void textBoxSearch_PreviewTextInput(object sender, TextCompositionEventArgs e)
-        {
-            this.SearchFilter.SearchString = this.textBoxSearch.Text + e.Text;
-            SearchFilterChanged?.Invoke();
-        }
+        }                
 
         private void textBoxSearch_TextChanged(object sender, TextChangedEventArgs e)
         {
-            this.SearchFilter.SearchString = this.textBoxSearch.Text;
+            this.SearchFilter.SearchString = this.textBoxSearch.Text.Trim();
+            SearchFilterChanged?.Invoke();
+        }        
+
+        private void checkBoxOwn_Checked(object sender, System.Windows.RoutedEventArgs e)
+        {
+            this._model.MineOnly = this.checkBoxOwn.IsChecked;
+            SearchFilterChanged?.Invoke();
+        }        
+
+        private void toggleButton24Hrs_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            this.datePickerETAFrom.SelectedDate = DateTime.Now;
+            this.datePickerETATo.SelectedDate = DateTime.Now.AddDays(1);
             SearchFilterChanged?.Invoke();
         }
 

src/BreCalClient/SearchFilterModel.cs

@@ -19,29 +19,40 @@ namespace BreCalClient
 
         public DateTime? EtaTo { get; set; }
 
-        public List<int> Categories { get; set; } = new();
+        public List<ShipcallType> Categories { get; set; } = new();
 
         public List<int> Agencies { get; set; } = new();
 
         public List<int> Berths { get; set; } = new();
 
+        public List<int> Ports { get; set; } = new();
+
         public string? SearchString { get; set; }
 
         public double? ShipLengthFrom { get; set; }
 
         public double? ShipLengthTo { get; set; }
 
+        public bool? MineOnly { get; set; }
+
+        public static Dictionary<int, SearchFilterModel>? filterMap = new();
+
         #endregion
 
-        public static SearchFilterModel? Deserialize(string json)
+        #region Serialisation
+
+        public static bool Deserialize(string json)
         {
-            return (SearchFilterModel?) JsonConvert.DeserializeObject(json, typeof(SearchFilterModel));
+            filterMap = (Dictionary<int, SearchFilterModel>?) JsonConvert.DeserializeObject(json, typeof(Dictionary<int, SearchFilterModel>));
+            return (filterMap != null);
         }
 
-        public string Serialize()
+        public static string Serialize()
         {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
+            return JsonConvert.SerializeObject(filterMap, Formatting.Indented);
         }
 
+        #endregion
+
     }
 }

src/BreCalClient/SettingBindingExtension.cs

@@ -0,0 +1,30 @@
+// Copyright (c) 2023 schick Informatik
+// Description: Binding extension to allow shorter declaraction of bindings that persist
+//              to the application settings
+// 
+
+using System.Windows.Data;
+
+namespace BreCalClient
+{
+    public class SettingBindingExtension : Binding
+    {
+
+        public SettingBindingExtension()
+        {
+            Initialize();
+        }
+
+        public SettingBindingExtension(string path) : base(path)
+        {
+            Initialize();
+        }
+
+        private void Initialize()
+        {
+            this.Source = BreCalClient.Properties.Settings.Default;
+            this.Mode = BindingMode.TwoWay;
+        }
+
+    }
+}

src/BreCalClient/ShipListDialog.xaml

@@ -0,0 +1,41 @@
+<Window x:Class="BreCalClient.ShipListDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:p = "clr-namespace:BreCalClient.Resources"
+        xmlns:local="clr-namespace:BreCalClient"
+        mc:Ignorable="d" Left="{local:SettingBinding W2Left}" Top="{local:SettingBinding W2Top}" Title="{x:Static p:Resources.textShips}"
+        Height="490" Width="800" ResizeMode="CanResize" Icon="Resources/containership.ico" Loaded="Window_Loaded">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="28" />
+        </Grid.RowDefinitions>
+        <local:ENIDataGrid x:Name="dataGridShips" Grid.Row="0" SelectionMode="Single" IsReadOnly="True" AlternatingRowBackground="LightBlue" AutoGenerateColumns="False"
+                                       CanUserAddRows="False" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
+            <local:ENIDataGrid.RowStyle>
+                <Style TargetType="DataGridRow">
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding Ship.Deleted}" Value="True">
+                            <Setter Property="Foreground" Value="DarkGray"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </local:ENIDataGrid.RowStyle>
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Id" Binding="{Binding Path=Ship.Id}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="Name" Binding="{Binding Path=Ship.Name}" IsReadOnly="True"/>
+                <DataGridCheckBoxColumn Header="{x:Static p:Resources.textTug}" Binding="{Binding Path=Ship.IsTug, Mode=OneWay}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static p:Resources.textTugCompany}" Binding="{Binding Path=TugCompany, Mode=OneWay}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="IMO" Binding="{Binding Path=Ship.Imo}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static p:Resources.textCallsign}" Binding="{Binding Path=Ship.Callsign}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static p:Resources.textLength}" Binding="{Binding Path=Ship.Length}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static p:Resources.textWidth}" Binding="{Binding Path=Ship.Width}" IsReadOnly="True"/>
+                <DataGridCheckBoxColumn Header="{x:Static p:Resources.textDeleted}" Binding="{Binding Path=Ship.Deleted, Mode=OneWay}" IsReadOnly="True" />
+            </DataGrid.Columns>
+        </local:ENIDataGrid>
+        <Button Grid.Row="1" x:Name="buttonClose" Content="{x:Static p:Resources.textClose}" HorizontalAlignment="Right" Margin="2" Click="buttonClose_Click"/>
+    </Grid>
+</Window>

src/BreCalClient/ShipListDialog.xaml.cs

@@ -0,0 +1,137 @@
+// Copyright (c) 2023 schick Informatik
+// Description: Administration screen for ships
+// 
+
+
+using BreCalClient.misc.Api;
+using BreCalClient.misc.Model;
+using System;
+using System.Windows;
+
+namespace BreCalClient
+{
+    /// <summary>
+    /// Interaction logic for ShipListDialog.xaml
+    /// </summary>
+    public partial class ShipListDialog : Window
+    {
+        public ShipListDialog()
+        {
+            InitializeComponent();
+        }
+
+        #region Properties
+
+        public ShipApi? ShipApi { get; set; }
+
+        #endregion
+
+        #region Event handler
+
+        private void buttonClose_Click(object sender, RoutedEventArgs e)
+        {            
+            this.Close();
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {            
+            this.dataGridShips.Initialize();
+            this.dataGridShips.ItemsSource = BreCalLists.AllShips;
+
+            this.dataGridShips.CreateRequested += DataGridShips_CreateRequested;
+            this.dataGridShips.EditRequested += DataGridShips_EditRequested;
+            this.dataGridShips.DeleteRequested += DataGridShips_DeleteRequested;
+        }
+
+        private async void DataGridShips_DeleteRequested(object obj)
+        {
+            if (obj is ShipModel shipmodel)
+            {
+                if (!shipmodel.Ship.Deleted)
+                {
+                    try
+                    {
+                        if (this.ShipApi != null)
+                            await this.ShipApi.ShipDeleteAsync(shipmodel.Ship.Id);
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show(ex.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                    BreCalLists.Ships.Remove(shipmodel); // remove from "selectable" ships
+                    shipmodel.Ship.Deleted = true; // set deleted marker on working instance
+                    this.dataGridShips.ItemsSource = null;
+                    this.dataGridShips.ItemsSource = BreCalLists.AllShips;
+                }
+            }
+        }
+
+        private async void DataGridShips_EditRequested(object obj)
+        {
+            if (obj is ShipModel shipmodel)
+            {
+                EditShipDialog esd = new()
+                {
+                    Ship = shipmodel.Ship                    
+                };
+                esd.Participants.AddRange(BreCalLists.Participants_Tug);
+                
+                if (esd.ShowDialog() ?? false)
+                {
+                    try
+                    {
+                        if (this.ShipApi != null)
+                        {
+                            Id tmpId = await this.ShipApi.ShipUpdateAsync(shipmodel.Ship);
+                        }
+                        this.dataGridShips.ItemsSource = null;
+                        this.dataGridShips.ItemsSource = BreCalLists.AllShips;
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show(ex.Message);
+                    }
+                }
+            }
+        }
+
+        private async void DataGridShips_CreateRequested()
+        {
+            
+            ShipModel shipModel = new(ShipModel.LastEditShip ?? new Ship());
+
+            EditShipDialog esd = new()
+            {
+                Ship = shipModel.Ship
+            };
+            esd.Participants.AddRange(BreCalLists.Participants_Tug);
+            
+            if(esd.ShowDialog() ?? false)
+            {
+                try
+                {
+                    if (this.ShipApi != null)
+                    {
+                        Id id = await this.ShipApi.ShipsCreateAsync(shipModel.Ship);
+                        shipModel.Ship.Id = id.VarId;
+                        this.dataGridShips.ItemsSource = null;
+                        BreCalLists.AllShips.Add(shipModel);
+                        BreCalLists.Ships.Add(shipModel);
+                        if(!BreCalLists.ShipLookupDict.TryAdd(id.VarId, shipModel))
+                            BreCalLists.ShipLookupDict[id.VarId] = shipModel;
+                        this.dataGridShips.ItemsSource = BreCalLists.AllShips;
+                        ShipModel.LastEditShip = null;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    ShipModel.LastEditShip = shipModel.Ship;
+                    MessageBox.Show(ex.Message);                    
+                }
+            }            
+        }
+
+        #endregion
+
+    }
+}

src/BreCalClient/ShipModel.cs

@@ -0,0 +1,36 @@
+// Copyright (c) 2023 schick Informatik
+// Description: Helper class to display/search ships
+// 
+
+using BreCalClient.misc.Model;
+using System;
+
+namespace BreCalClient
+{
+    public class ShipModel
+    {
+
+        public ShipModel(Ship ship) { 
+            this.Ship = ship;
+        }
+
+        public Ship Ship { get; private set; }
+
+        public static Ship? LastEditShip { get; set; }
+
+        public string TugCompany
+        {
+            get { if(this.Ship.ParticipantId.HasValue)
+                {
+                    return BreCalLists.ParticipantLookupDict[this.Ship.ParticipantId.Value].Name;
+                }
+                return "";
+            }
+        }
+
+        public override string ToString()
+        {
+            return String.Format("{0} ({1})", this.Ship.Name, this.Ship.Imo);
+        }
+    }
+}

src/BreCalClient/ShipcallControl.xaml

@@ -5,9 +5,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"              
              xmlns:p = "clr-namespace:BreCalClient.Resources"
              xmlns:sets="clr-namespace:BreCalClient.Properties"
-             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalDevelClient"             
+             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalTestClient"             
              mc:Ignorable="d" 
-             d:DesignHeight="120" d:DesignWidth="800" Loaded="UserControl_Loaded">
+             d:DesignHeight="135" d:DesignWidth="800">
     <Border BorderBrush="LightGray" Margin="1" BorderThickness="1">
         <Grid>
             <Grid.ColumnDefinitions>
@@ -20,17 +20,16 @@
                 <ColumnDefinition Width=".15*" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-                <RowDefinition Height="32" />
+                <RowDefinition Height="42" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <Grid Grid.Column="0" Grid.Row="0" Grid.RowSpan="2" >
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="32"/>
+                    <RowDefinition Height="42"/>
+                    <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
-
-                    <RowDefinition Height=".05*"/>
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
                 </Grid.RowDefinitions>
@@ -41,13 +40,19 @@
                 <Grid Grid.Row="0" Grid.Column="0" Grid.RowSpan="1" Grid.ColumnSpan="3">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="30" />
+                        <ColumnDefinition Width="20" x:Name="columnDefinitionShiftingSequence"/>
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="32" />
                     </Grid.ColumnDefinitions>
                     <Image Margin="2" Grid.Column="0" PreviewMouseUp="Image_PreviewMouseUp" x:Name="imageShipcallType" />
-                    <Label Grid.Column="1" FontSize="12" x:Name="labelShipName" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
-                       HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" PreviewMouseUp="Image_PreviewMouseUp"/>
-                    <Grid Grid.Column="2" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}">
+                    <Viewbox Grid.Column="1">
+                        <TextBlock x:Name="textBlockShiftingSequence"></TextBlock>
+                    </Viewbox>
+                    <Label Grid.Column="2" FontSize="12" x:Name="labelShipName" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+                       HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" PreviewMouseUp="Image_PreviewMouseUp">
+                        <TextBlock Name="textBlockShipName" />
+                    </Label>
+                    <Grid Grid.Column="3" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}">
                         <Image Grid.Column="3" Margin="2" x:Name="imageEvaluation" />
                     </Grid>
                 </Grid>
@@ -58,49 +63,91 @@
                     <TextBlock x:Name="textBlockIMO" Padding="0" FontWeight="DemiBold" />
                 </Viewbox>
                 <Viewbox Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left">
-                    <TextBlock Text="{x:Static p:Resources.textCallsign}" />
-                </Viewbox>
-                <Viewbox Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">
-                    <TextBlock x:Name="textBlockCallsign" Padding="0"/>
-                </Viewbox>
-                <Viewbox Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="{x:Static p:Resources.textLengthWidth}" Padding="0" />
                 </Viewbox>
-                <Viewbox Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockLengthWidth" Padding="0"/>
                 </Viewbox>
-                <Viewbox Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left">
+                    <TextBlock Text="{x:Static p:Resources.textDraftNoUnit}" />
+                </Viewbox>
+                <Viewbox Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left">
+                    <TextBlock x:Name="textBlockDraft" Padding="0"/>
+                </Viewbox>
+                <Viewbox Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="ETA" x:Name="labelETA"/>
                 </Viewbox>
-                <Viewbox Grid.Row="5" Grid.Column="1" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockETA"  Padding="0" FontWeight="DemiBold"/>
                 </Viewbox>
-                <Viewbox Grid.Row="6" Grid.Column="0" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="{x:Static p:Resources.textBerth}"/>
                 </Viewbox>
-                <Viewbox Grid.Row="6" Grid.Column="1" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="5" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockBerth" Padding="0" FontWeight="DemiBold" />
                 </Viewbox>
-                
-
+                <Viewbox Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left">
+                    <TextBlock x:Name="textBlockHarbour" Padding="0" FontWeight="DemiBold" />
+                </Viewbox>
             </Grid>
-
-            <Label Grid.Row="0" Grid.Column="1" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+            <Grid Grid.Row="0" Grid.Column="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="14" />
+                </Grid.RowDefinitions>
+                <Label Padding="0" Grid.Row="0" Grid.Column="0" Grid.RowSpan="1" FontSize="13" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelAgent" PreviewMouseUp="labelAgent_PreviewMouseUp"/>
-            <Label Grid.Row="0" Grid.Column="2" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
-                       HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelMooring" PreviewMouseUp="labelMooring_PreviewMouseUp"/>
-            <Label Grid.Row="0" Grid.Column="3" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
-                       HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelPortAuthority" PreviewMouseUp="labelPortAuthority_PreviewMouseUp" />
-            <Label Grid.Row="0" Grid.Column="4" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
-                       HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelPilot" PreviewMouseUp="labelPilot_PreviewMouseUp"/>
-            <Label Grid.Row="0" Grid.Column="5" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
-                       HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelTug" PreviewMouseUp="labelTug_PreviewMouseUp"/>
-            <Label Grid.Row="0" Grid.Column="6" Grid.RowSpan="1" FontSize="12" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
-                       HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelTerminal" PreviewMouseUp="labelTerminal_PreviewMouseUp" />
-            
+                <Label Name="labelLastChangeAgency" FontSize="9" Padding="0" VerticalContentAlignment="Center" Grid.Row="1" Foreground="WhiteSmoke" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" HorizontalContentAlignment="Center" />
+            </Grid>
+            <Grid Grid.Row="0" Grid.Column="2">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="14" />
+                </Grid.RowDefinitions>
+                <Label Padding="0" Grid.Row="0" Grid.Column="0" Grid.RowSpan="1" FontSize="13" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+           HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelMooring" PreviewMouseUp="labelMooring_PreviewMouseUp"/>
+                <Label Name="labelLastChangeMooring" FontSize="9" Padding="0" VerticalContentAlignment="Center" Grid.Row="1" Foreground="WhiteSmoke" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" HorizontalContentAlignment="Center" />
+            </Grid>
+            <Grid Grid.Row="0" Grid.Column="3">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="14" />
+                </Grid.RowDefinitions>
+                <Label Padding="0" Grid.Row="0" Grid.Column="0" Grid.RowSpan="1" FontSize="13" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+           HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelPortAuthority" PreviewMouseUp="labelPortAuthority_PreviewMouseUp"/>
+                <Label Name="labelLastChangePortAuthority" FontSize="9" Padding="0" VerticalContentAlignment="Center" Grid.Row="1" Foreground="WhiteSmoke" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" HorizontalContentAlignment="Center" />
+            </Grid>
+            <Grid Grid.Row="0" Grid.Column="4">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="14" />
+                </Grid.RowDefinitions>
+                <Label Padding="0" Grid.Row="0" Grid.Column="0" Grid.RowSpan="1" FontSize="13" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+           HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelPilot" PreviewMouseUp="labelPilot_PreviewMouseUp"/>
+                <Label Name="labelLastChangePilot" FontSize="9" Padding="0" VerticalContentAlignment="Center" Grid.Row="1" Foreground="WhiteSmoke" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" HorizontalContentAlignment="Center" />
+            </Grid>
+            <Grid Grid.Row="0" Grid.Column="5">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="14" />
+                </Grid.RowDefinitions>
+                <Label Padding="0" Grid.Row="0" Grid.Column="0" Grid.RowSpan="1" FontSize="13" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+           HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelTug" PreviewMouseUp="labelTug_PreviewMouseUp"/>
+                <Label Name="labelLastChangeTug" FontSize="9" Padding="0" VerticalContentAlignment="Center" Grid.Row="1" Foreground="WhiteSmoke" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" HorizontalContentAlignment="Center" />
+            </Grid>
+            <Grid Grid.Row="0" Grid.Column="6">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="14" />
+                </Grid.RowDefinitions>
+                <Label Padding="0" Grid.Row="0" Grid.Column="0" Grid.RowSpan="1" FontSize="13" Content="- / -" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+           HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Name="labelTerminal" PreviewMouseUp="labelTerminal_PreviewMouseUp"/>
+                <Label Name="labelLastChangeTerminal" FontSize="9" Padding="0" VerticalContentAlignment="Center" Grid.Row="1" Foreground="WhiteSmoke" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" HorizontalContentAlignment="Center" />
+            </Grid>
+                                    
             <!-- AGENCY -->
             <Border Grid.Row="2" Grid.Column="1" BorderThickness="1, 0, 0, 0" BorderBrush="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Padding="3,0,0,0">
-                <Grid>
+                <Grid Grid.Row="2" Grid.Column="1">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="0.3*" />
                         <ColumnDefinition Width="0.7*" />
@@ -114,52 +161,67 @@
                     
                     <Label Grid.Row="0" Grid.Column="0" Content = "ETA" x:Name="labelETAETDAgent" Padding="0" VerticalContentAlignment="Center" />
                     <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
-                    <Label Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textBerth}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                    <Border Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" BorderThickness="0,1,0,0" BorderBrush="Gray" >
+                        <Label Content="{x:Static p:Resources.textBerth}" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>    
+                    </Border>
+                    
                     <Label Grid.Row="0" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelAgencyETAETDValue" FontWeight="DemiBold"/>
                     <TextBlock Grid.Row="1" Grid.Column="1" Grid.RowSpan="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockAgencyRemarks"  FontSize="10"/>
+                    
                     <Label Grid.Row="2" Grid.Column="1" HorizontalContentAlignment="Left" x:Name="labelAgencyBerth" Padding="0" VerticalContentAlignment="Center"  FontSize="11" FontWeight="SemiBold" />
-                    <TextBlock Grid.Row="3" Grid.Column="0"  Text="{x:Static p:Resources.textBerthRemarks}" Padding="0" VerticalAlignment="Top" TextWrapping="Wrap" FontSize="9"/>
+                    <TextBlock Grid.Row="3" Grid.Column="0"  Text="{x:Static p:Resources.textRemarks}" Padding="0" VerticalAlignment="Top" TextWrapping="Wrap" FontSize="9"/>
                     <TextBlock Grid.Row="3" Grid.Column="1" Grid.RowSpan="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockAgencyBerthRemarks"  FontSize="10"/>
                 </Grid>
             </Border>
             <!-- MOORING -->
             <Border Grid.Row="2" Grid.Column="2" BorderThickness="1, 0, 0, 0" BorderBrush="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Padding="3,0,0,0">
-                <Grid>
+                <Grid x:Name="gridMooring">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="0.3*" />
                         <ColumnDefinition Width="0.7*" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="20" />
-                        <RowDefinition Height="*" />
+                        <RowDefinition Height="0" x:Name="ataRowDefinition" />
+                        <RowDefinition Height="0" x:Name="atdRowDefinition" />
+                        <RowDefinition Height="*" x:Name="infoRowDefinition"/>
                     </Grid.RowDefinitions>
                     <Label Grid.Row="0" x:Name="labelETAETDMooring" Grid.Column="0" Content="ETA" Padding="0" VerticalContentAlignment="Center" />
-                    <Label Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Top" FontSize="9"/>
                     <Label Grid.Row="0" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelMooringETAETDValue" FontWeight="DemiBold"/>
-                    <TextBlock Grid.Row="1" Grid.Column="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockMooringRemarks"/>
+                    <Label Grid.Row="1" Grid.Column="0" Content="ATA" Padding="0" VerticalContentAlignment="Center" />
+                    <Label Grid.Row="1" Grid.Column="1" x:Name="labelTimesMooringATA" Padding="0" VerticalContentAlignment="Center" />
+                    <Label Grid.Row="2" Grid.Column="0" Content="ATD" Padding="0" VerticalContentAlignment="Center" />
+                    <Label Grid.Row="2" Grid.Column="1" x:Name="labelTimesMooringATD" Padding="0" VerticalContentAlignment="Center" />
+                    <Label Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Top" FontSize="9"/>
+                    <Image Grid.Row="3" Grid.Column="0" x:Name="imageMooringLocked" VerticalAlignment="Top" Margin="0 20 0 0" HorizontalAlignment="Left" Source="./Resources/lock.png" Width="16" Height="16" ToolTip="{x:Static p:Resources.textFixedOrder}"/>
+                    <TextBlock Grid.Row="3" Grid.Column="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockMooringRemarks"/>
                 </Grid>
             </Border>
 
             <!-- PORT AUTHORITY -->
             <Border Grid.Row="2" Grid.Column="3" BorderThickness="1, 0, 0, 0" BorderBrush="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Padding="3,0,0,0">
-                <Grid >
+                <Grid x:Name="gridPortAuthority">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="0.3*" />
                         <ColumnDefinition Width="0.7*" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="20" />
+                        <RowDefinition Height="0" x:Name="lockTimeRowDefinition" />
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
                     <Label Grid.Row="0" Grid.Column="0" x:Name="labelETAETDPortAuthority" Content="ETA" Padding="0" VerticalContentAlignment="Center" />
-                    <Label Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Top" FontSize="9"/>
+                    <Label Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Top" FontSize="9"/>
+                    <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textLockTime}" VerticalContentAlignment="Center" Padding="0"/>
+                    <Label Grid.Row="1" Grid.Column="1" x:Name="labelPortAuthorityLockTime" VerticalContentAlignment="Center" Padding="0" />
                     <Label Grid.Row="0" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelPortAuthorityETAETDValue" FontWeight="DemiBold"/>
-                    <TextBlock Grid.Row="1" Grid.Column="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockPortAuthorityRemarks"/>
+                    <Image Grid.Row="2" Grid.Column="0" x:Name="imagePortAuthorityLocked" VerticalAlignment="Top" Margin="0 20 0 0" HorizontalAlignment="Left" Source="./Resources/lock.png" Width="16" Height="16" ToolTip="{x:Static p:Resources.textFixedOrder}"/>
+                    <TextBlock Grid.Row="2" Grid.Column="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockPortAuthorityRemarks"/>
                 </Grid>
             </Border>
             <!-- PILOT -->
             <Border Grid.Row="2" Grid.Column="4" BorderThickness="1, 0, 0, 0" BorderBrush="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Padding="3,0,0,0">
-                <Grid >
+                <Grid x:Name="gridPilot">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="0.3*" />
                         <ColumnDefinition Width="0.7*" />
@@ -171,12 +233,13 @@
                     <Label Grid.Row="0" Grid.Column="0" x:Name="labelETAETDPilot" Content="ETA" Padding="0" VerticalContentAlignment="Center" />
                     <Label Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Top" FontSize="9"/>
                     <Label Grid.Row="0" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelPilotETAETDValue" FontWeight="DemiBold"/>
+                    <Image Grid.Row="1" Grid.Column="0" x:Name="imagePilotLocked" VerticalAlignment="Top" Margin="0 20 0 0" HorizontalAlignment="Left" Source="./Resources/lock.png" Width="16" Height="16" ToolTip="{x:Static p:Resources.textFixedOrder}"/>
                     <TextBlock Grid.Row="1" Grid.Column="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockPilotRemarks"/>
                 </Grid>
             </Border>
             <!-- TUG -->
             <Border Grid.Row="2" Grid.Column="5" BorderThickness="1, 0, 0, 0" BorderBrush="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Padding="3,0,0,0">
-                <Grid>
+                <Grid x:Name="gridTug">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="0.3*" />
                         <ColumnDefinition Width="0.7*" />
@@ -188,6 +251,7 @@
                     <Label Grid.Row="0" Grid.Column="0" x:Name="labelETAETDTug" Content="ETA" Padding="0" VerticalContentAlignment="Center" />
                     <Label Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Top" FontSize="9"/>
                     <Label Grid.Row="0" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelTugETAETDValue" FontWeight="DemiBold"/>
+                    <Image Grid.Row="1" Grid.Column="0" x:Name="imageTugLocked" VerticalAlignment="Top" Margin="0 20 0 0" HorizontalAlignment="Left" Source="./Resources/lock.png" Width="16" Height="16" ToolTip="{x:Static p:Resources.textFixedOrder}"/>
                     <TextBlock Grid.Row="1" Grid.Column="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockTugRemarks"/>
                 </Grid>
             </Border>
@@ -201,16 +265,18 @@
                     <Grid.RowDefinitions>
                         <RowDefinition Height="20" />
                         <RowDefinition Height=".5*" />
-                        <RowDefinition Height="14" />
-                        <RowDefinition Height=".5*" />
+                        <RowDefinition Height="14" x:Name="rowDefinitionTerminalBerth"/>
+                        <RowDefinition Height=".5*" x:Name="rowDefinitionTerminalBerthRemarks"/>
                     </Grid.RowDefinitions>
                     <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textOperationsStart}" x:Name="labelETAETDTerminal" Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
                     <Label Grid.Row="0" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelOperationsStart" FontWeight="DemiBold"/>
                     <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Top" FontSize="9"/>
                     <TextBlock Grid.Row="1" Grid.Column="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockTerminalRemarks"  FontSize="10"/>
-                    <Label Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textBerth}"  Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                    <Border BorderThickness="0,1,0,0" BorderBrush="Gray" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2">
+                        <Label Content="{x:Static p:Resources.textBerth}"  Padding="0" VerticalContentAlignment="Center" FontSize="9"/>
+                    </Border>
                     <Label Grid.Row="2" Grid.Column="1" HorizontalContentAlignment="Left" x:Name="labelTerminalBerth" Padding="0" VerticalContentAlignment="Center" FontSize="11" FontWeight="SemiBold" />
-                    <TextBlock Grid.Row="3" Grid.Column="0" Text="{x:Static p:Resources.textBerthRemarks}" TextWrapping="Wrap" Padding="0" VerticalAlignment="Top" FontSize="9"/>
+                    <TextBlock Grid.Row="3" Grid.Column="0" Text="{x:Static p:Resources.textRemarks}" TextWrapping="Wrap" Padding="0" VerticalAlignment="Top" FontSize="9"/>
                     <TextBlock Grid.Row="3" Grid.Column="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockTerminalBerthRemarks"  FontSize="10"/>
                 </Grid>
             </Border>

src/BreCalClient/ShipcallControl.xaml.cs

@@ -1,6 +1,6 @@
 // Copyright (c) 2023 schick Informatik
 // Description: Show general shipcall info
-// 
+//
 
 using BreCalClient.misc.Model;
 using log4net;
@@ -25,7 +25,7 @@ namespace BreCalClient
         Participant? _terminal;
         Participant? _tug;
         Participant? _port_administration;
-        private static readonly ILog _log = LogManager.GetLogger(typeof(ShipcallControl));
+        private static readonly ILog _log = LogManager.GetLogger(typeof(ShipcallControl));        
 
         #endregion
 
@@ -53,7 +53,7 @@ namespace BreCalClient
         /// <summary>
         /// this is our datasource
         /// </summary>
-        public ShipcallControlModel? ShipcallControlModel { get; set; }        
+        public ShipcallControlModel? ShipcallControlModel { get; set; }
 
         #endregion
 
@@ -65,9 +65,14 @@ namespace BreCalClient
             {
                 if (this.ShipcallControlModel != null)
                 {
+
+                    bool shiftingNoVisible = ((this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Shifting) && this.ShipcallControlModel.ShiftSequence.HasValue);
+                    this.textBlockShiftingSequence.Text = shiftingNoVisible ? this.ShipcallControlModel?.ShiftSequence.ToString() : "";
+                    this.columnDefinitionShiftingSequence.Width = shiftingNoVisible ? new(20) : new(0);
+
                     string agentName = "";
                     string? name;
-                    _agency = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.AGENCY);
+                    _agency = this.ShipcallControlModel?.GetParticipantForType(Extensions.ParticipantType.AGENCY);
                     name = _agency?.Name;
                     if (name != null) agentName = name;
                     this.labelAgent.Content = name ?? "- / -";
@@ -77,10 +82,10 @@ namespace BreCalClient
                         this.labelAgencyBerth.Content = "";
                         this.labelAgencyETAETDValue.Content = "";
                         this.textBlockAgencyRemarks.Text = "";
-                        this.textBlockAgencyBerthRemarks.Text = "";
+                        this.textBlockAgencyBerthRemarks.Text = "";                        
                     }
 
-                    _mooring = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.MOORING);
+                    _mooring = this.ShipcallControlModel?.GetParticipantForType(Extensions.ParticipantType.MOORING);
                     name = _mooring?.Name;
                     this.labelMooring.Content = name ?? "- / -";
                     if(_mooring == null)
@@ -89,7 +94,7 @@ namespace BreCalClient
                         this.textBlockMooringRemarks.Text = "";
                     }
 
-                    _pilot = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.PILOT);
+                    _pilot = this.ShipcallControlModel?.GetParticipantForType(Extensions.ParticipantType.PILOT);
                     name = _pilot?.Name;
                     this.labelPilot.Content = name ?? "- / - ";
                     if(_pilot == null)
@@ -98,7 +103,7 @@ namespace BreCalClient
                         this.textBlockPilotRemarks.Text = "";
                     }
 
-                    _tug = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.TUG);
+                    _tug = this.ShipcallControlModel?.GetParticipantForType(Extensions.ParticipantType.TUG);
                     name = _tug?.Name;
                     this.labelTug.Content = name ?? "- / - ";
                     if(_tug == null)
@@ -107,7 +112,7 @@ namespace BreCalClient
                         this.textBlockTugRemarks.Text = "";
                     }
 
-                    _port_administration = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.PORT_ADMINISTRATION);
+                    _port_administration = this.ShipcallControlModel?.GetParticipantForType(Extensions.ParticipantType.PORT_ADMINISTRATION);
                     name = _port_administration?.Name;
                     this.labelPortAuthority.Content = name ?? "- / - ";
                     if(_port_administration == null)
@@ -116,7 +121,7 @@ namespace BreCalClient
                         this.textBlockPortAuthorityRemarks.Text = "";
                     }
 
-                    _terminal = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.TERMINAL);
+                    _terminal = this.ShipcallControlModel?.GetParticipantForType(Extensions.ParticipantType.TERMINAL);
                     name = _terminal?.Name;
                     this.labelTerminal.Content = name ?? "- / - ";
                     if(_terminal == null)
@@ -132,12 +137,22 @@ namespace BreCalClient
                         this.labelTerminal.FontWeight = FontWeights.Bold;
                         this.labelTerminal.Foreground = Brushes.LightYellow;
                     }
+                    else
+                    {
+                        this.labelTerminal.FontWeight = FontWeights.Normal;
+                        this.labelTerminal.Foreground = Brushes.White;
+                    }
 
                     if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.PILOT) && (App.Participant.Id == _pilot?.Id))
                     {
                         this.labelPilot.FontWeight = FontWeights.Bold;
                         this.labelPilot.Foreground = Brushes.LightYellow;
                     }
+                    else
+                    {
+                        this.labelPilot.FontWeight = FontWeights.Normal;
+                        this.labelPilot.Foreground = Brushes.White;
+                    }
 
                     if ((App.Participant.IsTypeFlagSet(Extensions.ParticipantType.AGENCY) && (App.Participant.Id == _agency?.Id)) ||
                         (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.BSMD) && (_agency != null) && _agency.IsFlagSet(Extensions.ParticipantFlag.ALLOW_BSMD)))
@@ -145,42 +160,68 @@ namespace BreCalClient
                         this.labelAgent.FontWeight = FontWeights.Bold;
                         this.labelAgent.Foreground = Brushes.LightYellow;
                     }
+                    else
+                    {
+                        this.labelAgent.FontWeight = FontWeights.Normal;
+                        this.labelAgent.Foreground = Brushes.White;
+                    }
 
                     if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.MOORING) && (App.Participant.Id == _mooring?.Id))
                     {
                         this.labelMooring.FontWeight = FontWeights.Bold;
                         this.labelMooring.Foreground = Brushes.LightYellow;
                     }
+                    else
+                    {
+                        this.labelMooring.FontWeight = FontWeights.Normal;
+                        this.labelMooring.Foreground = Brushes.White;
+                    }
 
                     if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.PORT_ADMINISTRATION) && (App.Participant.Id == _port_administration?.Id))
                     {
                         this.labelPortAuthority.FontWeight = FontWeights.Bold;
                         this.labelPortAuthority.Foreground = Brushes.LightYellow;
                     }
+                    else
+                    {
+                        this.labelPortAuthority.FontWeight = FontWeights.Normal;
+                        this.labelPortAuthority.Foreground = Brushes.White;
+                    }
 
                     if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.TUG) && (App.Participant.Id == _tug?.Id))
                     {
                         this.labelTug.FontWeight = FontWeights.Bold;
                         this.labelTug.Foreground = Brushes.LightYellow;
                     }
+                    else
+                    {
+                        this.labelTug.FontWeight = FontWeights.Normal;
+                        this.labelTug.Foreground = Brushes.White;
+                    }
 
                     if (App.Participant.IsTypeFlagSet(Extensions.ParticipantType.BSMD))
                     {
                         this.labelShipName.FontWeight = FontWeights.Bold;
                         this.labelShipName.Foreground = Brushes.LightYellow;
                     }
+                    else
+                    {
+                        this.labelShipName.FontWeight = FontWeights.Normal;
+                        this.labelShipName.Foreground = Brushes.White;
+                    }
 
-                    this.labelShipName.Content = this.ShipcallControlModel?.Ship?.Name;
+                    this.textBlockShipName.Text = this.ShipcallControlModel?.Ship?.Name;
+                    // this.labelShipName.Content = this.ShipcallControlModel?.Ship?.Name;
                     switch (this.ShipcallControlModel?.Shipcall?.Type)
                     {
-                        case 1: // incoming
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_down_red.png"));
+                        case ShipcallType.Arrival: // incoming
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_down_red.png"));
                             break;
-                        case 2: // outgoing
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_up_blue.png"));
+                        case ShipcallType.Departure: // outgoing
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_up_blue.png"));
                             break;
-                        case 3: // shifting
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_right_green.png"));
+                        case ShipcallType.Shifting: // shifting
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_right_green.png"));
                             break;
                         default:
                             break;
@@ -188,36 +229,37 @@ namespace BreCalClient
 
                     switch(this.ShipcallControlModel?.LightMode)
                     {
-                        case ShipcallControlModel.TrafficLightMode.GREEN:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/check.png"));
+                        case EvaluationType.Green:
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/check.png"));
                             break;
-                        case ShipcallControlModel.TrafficLightMode.YELLOW:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/sign_warning.png"));
+                        case EvaluationType.Yellow:
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/sign_warning.png"));
                             break;
-                        case ShipcallControlModel.TrafficLightMode.RED:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/delete2.png"));
+                        case EvaluationType.Red:
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/delete2.png"));
                             break;
                         default:
                             break;
                     }
 
-                    if (this.ShipcallControlModel?.Shipcall?.Evaluation != null)
+                    if (this.ShipcallControlModel?.Shipcall?.Canceled ?? false)
                     {
-                        ShipcallControlModel.TrafficLightMode resultColor = (ShipcallControlModel.TrafficLightMode) (this.ShipcallControlModel?.Shipcall?.Evaluation ?? 0); // der nullable Operator hier ist so doof, die VS validation blickts einfach nicht
-                        switch (resultColor)
+                        this.Background = Brushes.LightGray;
+                        //this.Foreground = Brushes.DarkGray;
+                        this.labelShipName.Foreground = Brushes.LightGray;
+                        this.textBlockShipName.TextDecorations.Add(TextDecorations.Strikethrough);
+                    }
+                    else
+                    {
+                        if (this.ShipcallControlModel?.Shipcall?.Evaluation != null)
                         {
-                            //case ShipcallControlModel.TrafficLightMode.GREEN:
-                            //    this.Background = Brushes.LightGreen;
-                            //    break;
-                            case ShipcallControlModel.TrafficLightMode.YELLOW:
-                                this.Background= Brushes.LightYellow;
-                                break;
-                            case ShipcallControlModel.TrafficLightMode.RED:
-                                this.Background = new SolidColorBrush(Color.FromArgb(200, 255, 100, 100));
-                                break;
-                            default:
-                                this.Background = Brushes.Transparent;
-                                break;
+                            this.Background = this.ShipcallControlModel.LightMode switch
+                            {
+                                // ShipcallControlModel.TrafficLightMode.GREEN => this.Background = Brushes.LightGreen,
+                                EvaluationType.Yellow => Brushes.LightYellow,
+                                EvaluationType.Red => new SolidColorBrush(Color.FromArgb(200, 255, 100, 100)),
+                                _ => Brushes.Transparent,
+                            };
                         }
                     }
 
@@ -226,26 +268,19 @@ namespace BreCalClient
                     else
                         this.imageEvaluation.ToolTip = null;
 
-                    this.textBlockBerth.Text = this.ShipcallControlModel?.Berth;
-                    this.textBlockCallsign.Text = this.ShipcallControlModel?.Ship?.Callsign;
-                    if (this.ShipcallControlModel?.Shipcall?.Type == 1) 
-                    {
-                        this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Eta?.ToString("dd.MM. HH:mm");
-                    }
-                    if ((this.ShipcallControlModel?.Shipcall?.Type == 2) || (this.ShipcallControlModel?.Shipcall?.Type == 3))
-                    {
-                        this.labelETA.Text = "ETD";
-                        this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Etd?.ToString("dd.MM. HH:mm");
-                    }
+                    this.textBlockBerth.Text = this.ShipcallControlModel?.GetBerthText(null);
+                    this.textBlockDraft.Text = (this.ShipcallControlModel?.Shipcall?.Draft != null) ? $"{this.ShipcallControlModel?.Shipcall?.Draft.Value.ToString("N2")} m" : "-";
+                    this.textBlockETA.Text = this.ShipcallControlModel?.GetETAETD(true);
 
                     this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString();
                     this.textBlockLengthWidth.Text = $"{this.ShipcallControlModel?.Ship?.Length} / {this.ShipcallControlModel?.Ship?.Width}";
 
-                    // rename labels if this is not an incoming 
+                    // rename labels if this is not an incoming
                     // must be here because there may not be a times record for each participant (yet)
 
-                    if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                    if (this.ShipcallControlModel?.Shipcall?.Type != ShipcallType.Arrival)
                     {
+                        this.labelETA.Text = "ETD";
                         this.labelETAETDAgent.Content = "ETD";
                         this.labelETAETDMooring.Content = "ETD";
                         this.labelETAETDPilot.Content = "ETD";
@@ -254,22 +289,44 @@ namespace BreCalClient
                         this.labelETAETDTerminal.Content = BreCalClient.Resources.Resources.textOperationsEnd;
                     }
 
+                    if((this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival) && (this.ShipcallControlModel?.Shipcall.TimeRefPoint != null))
+                    {
+                        int timeRefPointIndex = this.ShipcallControlModel?.Shipcall?.TimeRefPoint ?? 0;
+
+                        this.labelETAETDAgent.Content = BreCalLists.TimeRefs[timeRefPointIndex];
+                        this.labelETAETDMooring.Content = BreCalLists.TimeRefs[timeRefPointIndex];
+                        this.labelETAETDPilot.Content = BreCalLists.TimeRefs[timeRefPointIndex];
+                        this.labelETAETDPortAuthority.Content = BreCalLists.TimeRefs[timeRefPointIndex];
+                        this.labelETAETDTug.Content = BreCalLists.TimeRefs[timeRefPointIndex];
+                    }
+
                     if (this.ShipcallControlModel != null)
                     {
-                        
+                        this.textBlockHarbour.Text = ((ShipcallControlModel != null) && (ShipcallControlModel.Shipcall != null) && BreCalLists.PortLookupDict.ContainsKey(ShipcallControlModel.Shipcall.PortId)) ?
+                                BreCalLists.PortLookupDict[ShipcallControlModel.Shipcall.PortId].Name : "";
+                        Extensions.ParticipantType? lastToUpdate = this.ShipcallControlModel?.LastParticipantTypeToUpdate();
 
                         Times? agencyTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.AGENCY);
                         if (agencyTimes != null)
                         {
                             this.labelAgencyBerth.Content = this.ShipcallControlModel?.GetBerthText(agencyTimes);
-                            this.labelAgencyETAETDValue.Content = agencyTimes.EtaBerth.HasValue ? agencyTimes.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                            this.textBlockAgencyRemarks.Text = agencyTimes.Remarks;
-                            this.textBlockAgencyBerthRemarks.Text = agencyTimes.BerthInfo;
-                            if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                            this.labelAgencyETAETDValue.Content = agencyTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
+                            this.textBlockAgencyRemarks.Text = agencyTimes.Remarks.TruncateDots(50);
+                            this.textBlockAgencyBerthRemarks.Text = agencyTimes.BerthInfo.TruncateDots(50);
+                            DateTime? lc = this.ShipcallControlModel?.GetLastChangeForType(Extensions.ParticipantType.AGENCY);
+                            this.labelLastChangeAgency.Content = lc.HasValue ? lc.Value.ToString("dd.MM.yyyy HH:mm") : string.Empty;
+                            Grid.SetRowSpan(this.labelAgent, 1);
+                            if(lastToUpdate == Extensions.ParticipantType.AGENCY)
                             {
-                                this.labelAgencyETAETDValue.Content = agencyTimes.EtdBerth.HasValue ? agencyTimes.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.labelLastChangeAgency.Foreground = Brushes.White;
+                                this.labelLastChangeAgency.FontWeight = FontWeights.DemiBold;
+                            } 
+                            else
+                            {
+                                this.labelLastChangeAgency.Foreground = Brushes.LightGray;
+                                this.labelLastChangeAgency.FontWeight = FontWeights.Normal;
                             }
-                        } 
+                        }
                         else
                         {
                             // no agency times set (yet)
@@ -277,93 +334,178 @@ namespace BreCalClient
                             this.labelAgencyETAETDValue.Content = "- / -";
                             this.textBlockAgencyRemarks.Text = "";
                             this.textBlockAgencyBerthRemarks.Text = "";
+                            Grid.SetRowSpan(this.labelAgent, 2);
                         }
 
                         Times? mooringTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.MOORING);
+
                         if (mooringTimes != null)
                         {
 
-                            this.labelMooringETAETDValue.Content = mooringTimes.EtaBerth.HasValue ? mooringTimes.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                            this.textBlockMooringRemarks.Text = mooringTimes.Remarks;
-                            if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                            this.labelMooringETAETDValue.Content = mooringTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
+                            this.textBlockMooringRemarks.Text = mooringTimes.Remarks.TruncateDots(50);
+                            this.imageMooringLocked.Visibility = (mooringTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden;
+                            ataRowDefinition.Height = mooringTimes.Ata.HasValue ? new(15) : new(0);
+                            atdRowDefinition.Height = mooringTimes.Atd.HasValue ? new(15) : new(0);
+
+                            if(mooringTimes.Ata.HasValue)
+                            {                                                                    
+                                labelTimesMooringATA.Content = mooringTimes.Ata.Value.ToString("dd.MM.yyyy HH:mm");                                                                
+                            }
+
+                            if (mooringTimes.Atd.HasValue)
+                            {                                                                    
+                                labelTimesMooringATD.Content = mooringTimes.Atd.Value.ToString("dd.MM.yyyy HH:mm");                                
+                            }
+
+                            DateTime? lc = this.ShipcallControlModel?.GetLastChangeForType(Extensions.ParticipantType.MOORING);
+                            this.labelLastChangeMooring.Content = lc.HasValue ? lc.Value.ToString("dd.MM.yyyy HH:mm") : string.Empty;
+                            Grid.SetRowSpan(this.labelMooring, 1);
+                            if (lastToUpdate == Extensions.ParticipantType.MOORING)
                             {
-                                this.labelMooringETAETDValue.Content = mooringTimes.EtdBerth.HasValue ? mooringTimes.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.labelLastChangeMooring.Foreground = Brushes.White;
+                                this.labelLastChangeMooring.FontWeight = FontWeights.DemiBold;
+                            }
+                            else
+                            {
+                                this.labelLastChangeMooring.Foreground = Brushes.LightGray;
+                                this.labelLastChangeMooring.FontWeight = FontWeights.Normal;
                             }
                         }
                         else
                         {
                             this.labelMooringETAETDValue.Content = "- / ";
                             this.textBlockMooringRemarks.Text = "";
+                            this.imageMooringLocked.Visibility = Visibility.Hidden;
+                            Grid.SetRowSpan(this.labelMooring, 2);
                         }
 
                         Times? portAuthorityTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.PORT_ADMINISTRATION);
                         if (portAuthorityTimes != null)
                         {
-                            this.labelPortAuthorityETAETDValue.Content = portAuthorityTimes.EtaBerth.HasValue ? portAuthorityTimes.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                            this.textBlockPortAuthorityRemarks.Text = portAuthorityTimes.Remarks;
-                            if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                            this.labelPortAuthorityETAETDValue.Content = portAuthorityTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
+                            this.textBlockPortAuthorityRemarks.Text = portAuthorityTimes.Remarks.TruncateDots(50);
+                            this.imagePortAuthorityLocked.Visibility = (portAuthorityTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden;
+                            lockTimeRowDefinition.Height = portAuthorityTimes.LockTime.HasValue ? new(15) : new(0);
+                            if(portAuthorityTimes.LockTime.HasValue)
+                            {                                
+                                labelPortAuthorityLockTime.Content = portAuthorityTimes.LockTime.Value.ToString("dd.MM.yyyy HH:mm");
+                            }
+
+                            DateTime? lc = this.ShipcallControlModel?.GetLastChangeForType(Extensions.ParticipantType.PORT_ADMINISTRATION);
+                            this.labelLastChangePortAuthority.Content = lc.HasValue ? lc.Value.ToString("dd.MM.yyyy HH:mm") : string.Empty;
+                            Grid.SetRowSpan(this.labelPortAuthority, 1);
+                            if (lastToUpdate == Extensions.ParticipantType.PORT_ADMINISTRATION)
                             {
-                                this.labelPortAuthorityETAETDValue.Content = portAuthorityTimes.EtdBerth.HasValue ? portAuthorityTimes.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.labelLastChangePortAuthority.Foreground = Brushes.White;
+                                this.labelLastChangePortAuthority.FontWeight = FontWeights.DemiBold;
+                            }
+                            else
+                            {
+                                this.labelLastChangePortAuthority.Foreground = Brushes.LightGray;
+                                this.labelLastChangePortAuthority.FontWeight = FontWeights.Normal;
                             }
                         }
                         else
                         {
                             this.labelPortAuthorityETAETDValue.Content = "- / -";
                             this.textBlockPortAuthorityRemarks.Text = "";
+                            this.imagePortAuthorityLocked.Visibility = Visibility.Hidden;
+                            Grid.SetRowSpan(this.labelPortAuthority, 2);
                         }
 
                         Times? pilotTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.PILOT);
                         if (pilotTimes != null)
                         {
-                            this.labelPilotETAETDValue.Content = pilotTimes.EtaBerth.HasValue ? pilotTimes.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                            this.textBlockPilotRemarks.Text = pilotTimes.Remarks;
-                            if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                            this.labelPilotETAETDValue.Content = pilotTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
+                            this.textBlockPilotRemarks.Text = pilotTimes.Remarks.TruncateDots(50);
+                            this.imagePilotLocked.Visibility = (pilotTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden;
+
+                            DateTime? lc = this.ShipcallControlModel?.GetLastChangeForType(Extensions.ParticipantType.PILOT);
+                            this.labelLastChangePilot.Content = lc.HasValue ? lc.Value.ToString("dd.MM.yyyy HH:mm") : string.Empty;
+                            Grid.SetRowSpan(this.labelPilot, 1);
+                            if (lastToUpdate == Extensions.ParticipantType.PILOT)
                             {
-                                this.labelPilotETAETDValue.Content = pilotTimes.EtdBerth.HasValue ? pilotTimes.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.labelLastChangePilot.Foreground = Brushes.White;
+                                this.labelLastChangePilot.FontWeight = FontWeights.DemiBold;
+                            }
+                            else
+                            {
+                                this.labelLastChangePilot.Foreground = Brushes.LightGray;
+                                this.labelLastChangePilot.FontWeight = FontWeights.Normal;
                             }
                         }
                         else
                         {
                             this.labelPilotETAETDValue.Content = "- / -";
                             this.textBlockPilotRemarks.Text = "";
+                            this.imagePilotLocked.Visibility = Visibility.Hidden;
+                            Grid.SetRowSpan(this.labelPilot, 2);
                         }
 
                         Times? tugTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.TUG);
                         if (tugTimes != null)
                         {
-                            this.labelTugETAETDValue.Content = tugTimes.EtaBerth.HasValue ? tugTimes.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                            this.textBlockTugRemarks.Text = tugTimes.Remarks;
-                            if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                            this.labelTugETAETDValue.Content = tugTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
+                            this.textBlockTugRemarks.Text = tugTimes.Remarks.TruncateDots(50);
+                            this.imageTugLocked.Visibility = (tugTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden;
+
+                            DateTime? lc = this.ShipcallControlModel?.GetLastChangeForType(Extensions.ParticipantType.TUG);
+                            this.labelLastChangeTug.Content = lc.HasValue ? lc.Value.ToString("dd.MM.yyyy HH:mm") : string.Empty;
+                            Grid.SetRowSpan(this.labelTug, 1);
+                            if (lastToUpdate == Extensions.ParticipantType.TUG)
                             {
-                                this.labelTugETAETDValue.Content = tugTimes.EtdBerth.HasValue ? tugTimes.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.labelLastChangeTug.Foreground = Brushes.White;
+                                this.labelLastChangeTug.FontWeight = FontWeights.DemiBold;
+                            }
+                            else
+                            {
+                                this.labelLastChangeTug.Foreground = Brushes.LightGray;
+                                this.labelLastChangeTug.FontWeight = FontWeights.Normal;
                             }
                         }
                         else
                         {
                             this.labelTugETAETDValue.Content = "- / -";
                             this.textBlockTugRemarks.Text = "";
+                            this.imageTugLocked.Visibility = Visibility.Hidden;
+                            Grid.SetRowSpan(this.labelTug, 2);
                         }
 
-                        Times? terminalTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.TERMINAL);
+                        this.rowDefinitionTerminalBerth.Height = (this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival) ? new(14) : new(0);
+                        this.rowDefinitionTerminalBerthRemarks.Height = (this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival) ? new GridLength(.5, GridUnitType.Star) : new(0);
+
+                        Times ? terminalTimes = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.TERMINAL);
                         if (terminalTimes != null)
                         {
+                            this.labelTerminalBerth.Visibility = (this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival) ? Visibility.Visible : Visibility.Hidden;
                             this.labelTerminalBerth.Content = this.ShipcallControlModel?.GetBerthText(terminalTimes);
-                            this.labelOperationsStart.Content = terminalTimes.OperationsStart.HasValue ? terminalTimes.OperationsStart.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
-                            this.textBlockTerminalRemarks.Text = terminalTimes.Remarks;
-                            if (this.ShipcallControlModel?.Shipcall?.Type != 1)
+                            this.labelOperationsStart.Content = terminalTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
+                            this.textBlockTerminalRemarks.Text = terminalTimes.Remarks.TruncateDots(40);
+                            this.textBlockTerminalBerthRemarks.Text = terminalTimes.BerthInfo.TruncateDots(40);
+                            DateTime? lc = this.ShipcallControlModel?.GetLastChangeForType(Extensions.ParticipantType.TERMINAL);
+                            this.labelLastChangeTerminal.Content = lc.HasValue ? lc.Value.ToString("dd.MM.yyyy HH:mm") : string.Empty;
+                            Grid.SetRowSpan(this.labelTerminal, 1);
+                            if (lastToUpdate == Extensions.ParticipantType.TERMINAL)
                             {
-                                this.labelOperationsStart.Content = terminalTimes.OperationsEnd.HasValue ? terminalTimes.OperationsEnd.Value.ToString("dd.MM.yyyy HH:mm") : "- / -";
+                                this.labelLastChangeTerminal.Foreground = Brushes.White;
+                                this.labelLastChangeTerminal.FontWeight = FontWeights.DemiBold;
+                            }
+                            else
+                            {
+                                this.labelLastChangeTerminal.Foreground = Brushes.LightGray;
+                                this.labelLastChangeTerminal.FontWeight = FontWeights.Normal;
                             }
-                            this.textBlockTerminalBerthRemarks.Text = terminalTimes.BerthInfo;
                         }
                         else
                         {
                             this.labelTerminalBerth.Content = "";
                             this.labelOperationsStart.Content = "";
                             this.textBlockTerminalRemarks.Text = "";
-                            this.textBlockAgencyBerthRemarks.Text = "";
+                            this.textBlockTerminalBerthRemarks.Text = "";
+                            Grid.SetRowSpan(this.labelTerminal, 2);
                         }
-                        
+
                     }
                     this.DataContext = this.ShipcallControlModel;
                 }
@@ -378,16 +520,11 @@ namespace BreCalClient
 
         #region event handler
 
-        private void UserControl_Loaded(object sender, RoutedEventArgs e)
-        {
-            // TBD
-        }
-
         private void buttonEditShipcall_Click(object? sender, RoutedEventArgs? e)
         {
             if(App.Participant.IsTypeFlagSet(Extensions.ParticipantType.BSMD))
                 this.EditRequested?.Invoke(this);
-        }                
+        }
 
         private void Image_PreviewMouseUp(object sender, System.Windows.Input.MouseButtonEventArgs e)
         {
@@ -395,10 +532,10 @@ namespace BreCalClient
         }
 
         private void labelAgent_PreviewMouseUp(object sender, System.Windows.Input.MouseButtonEventArgs e)
-        {            
+        {
             Times? times = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.AGENCY);
-            this.EditAgencyRequested?.Invoke(this, times);            
-        }        
+            this.EditAgencyRequested?.Invoke(this, times);
+        }
 
         private void labelMooring_PreviewMouseUp(object sender, System.Windows.Input.MouseButtonEventArgs e)
         {
@@ -408,7 +545,7 @@ namespace BreCalClient
 
         private void labelPortAuthority_PreviewMouseUp(object sender, System.Windows.Input.MouseButtonEventArgs e)
         {
-            Times? times = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.PORT_ADMINISTRATION);                
+            Times? times = this.ShipcallControlModel?.GetTimesForParticipantType(Extensions.ParticipantType.PORT_ADMINISTRATION);
             this.EditTimesRequested?.Invoke(this, times, Extensions.ParticipantType.PORT_ADMINISTRATION);
         }
 

src/BreCalClient/ShipcallControlModel.cs

@@ -1,11 +1,12 @@
 // Copyright (c) 2023 schick Informatik
 // Description: Container model for shipcall related info
-// 
+//
 
 using BreCalClient.misc.Api;
 using BreCalClient.misc.Model;
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace BreCalClient
 {
@@ -18,16 +19,6 @@ namespace BreCalClient
 
         #region Enumerations
 
-        public enum TrafficLightMode
-        {
-            OFF,
-            GREEN,
-            YELLOW,
-            RED,
-            RED_YELLOW,
-            ALL
-        };
-
         [Flags]
         public enum StatusFlags
         {
@@ -44,10 +35,12 @@ namespace BreCalClient
 
         public Shipcall? Shipcall { get; set; }
 
-        public Ship? Ship { get; set; }        
+        public Ship? Ship { get; set; }
 
         public string? Berth { get; set; }
 
+        public string LastErrorMessage { get; private set; } = "";
+
         internal Dictionary<Extensions.ParticipantType, ParticipantAssignment> AssignedParticipants { get; } = new();
 
         public List<Times> Times { get; set; } = new();
@@ -74,21 +67,21 @@ namespace BreCalClient
             }
         }
 
-        public TrafficLightMode LightMode
+        public EvaluationType LightMode
         {
             get
             {
-                TrafficLightMode tlm = TrafficLightMode.OFF;
+                EvaluationType elm = EvaluationType.Undefined;
 
                 if (this.Shipcall != null)
                 {
                     if(this.Shipcall.Evaluation.HasValue)
                     {
-                        tlm = (TrafficLightMode)this.Shipcall.Evaluation;
+                        elm = this.Shipcall.Evaluation.Value;
                     }
                 }
-                return tlm;
-            }                
+                return elm;
+            }
         }
 
         public string Title
@@ -96,11 +89,37 @@ namespace BreCalClient
             get
             {
                 if (this.Shipcall == null) return "";
-                Extensions.TypeEnum callType = (Extensions.TypeEnum) this.Shipcall.Type;
-                return string.Format("{0} {1}", callType, this.Ship?.Name);
+                return string.Format("{0} {1}", this.Shipcall.Type, this.Ship?.Name);
             }
         }
 
+        /// <summary>
+        /// This property attempts to store the (hopefully short) shifting sequence in the topmost
+        /// byte of the "flags" integer which will not be used for the forseeable future
+        /// 
+        /// This is a workaround to avoid adding another field to the interface and is only used in the
+        /// client display anyway. You could say hack as well.
+        /// </summary>
+        public byte? ShiftSequence
+        {
+            get
+            {
+                if((this.Shipcall == null) || (this.Shipcall.Flags == null)) return null;
+                return (byte?) (this.Shipcall?.Flags >> 24);
+            }
+            set
+            {                
+                if ((value != null) && (this.Shipcall != null))
+                {
+                    int currentFlag = this.Shipcall.Flags ?? 0;
+                    int moveUp = ((value ?? 0) << 24);
+                    this.Shipcall.Flags = (currentFlag & 0xffffff) | moveUp;
+                }               
+            }
+        }
+
+        public bool AllowPortChange { get; set; } = true;
+
         #endregion
 
         #region public methods
@@ -112,7 +131,7 @@ namespace BreCalClient
             {
                 foreach (ParticipantAssignment participantAssignment in Shipcall.Participants)
                 {
-                    AssignedParticipants[(Extensions.ParticipantType)participantAssignment.Type] = participantAssignment;                    
+                    AssignedParticipants[(Extensions.ParticipantType)participantAssignment.Type] = participantAssignment;
                 }
             }
         }
@@ -157,30 +176,76 @@ namespace BreCalClient
             return false;
         }
 
-        public string? GetBerthText(Times times)
+        /// <summary>
+        /// Get berth display text for columns AGENT and TERMINAL
+        /// </summary>
+        public string? GetBerthText(Times? times)
         {
+            string? timesBerthText = null;
+            string? scArrivalBerthText = null;
+            string? scDepartureBerthText = null;
             string? berthText = null;
-            if ((BreCalLists.AllBerths != null) && times.BerthId.HasValue && (this.Shipcall?.Type != (int)Extensions.TypeEnum.Shifting))
+            Berth? berth;
+
+            if((times != null) && times.BerthId.HasValue)
             {
-                Berth? berth = BreCalLists.AllBerths.Find((x) => x.Id == times.BerthId);
-                berthText = berth?.Name;
+                berth = BreCalLists.AllBerths.Find((x) => x.Id == times.BerthId.Value);
+                timesBerthText = berth?.Name;
             }
 
-            if ((berthText == null) && (times.ParticipantType != (int)Extensions.ParticipantType.TERMINAL))
+            berth = BreCalLists.AllBerths?.Find((x) => x.Id == this.Shipcall?.ArrivalBerthId);
+            scArrivalBerthText = berth?.Name;
+
+            berth = BreCalLists.AllBerths?.Find((x) => x.Id == this.Shipcall?.DepartureBerthId);
+            scDepartureBerthText= berth?.Name;
+
+            switch(this.Shipcall?.Type)
             {
-                if (this.Shipcall?.Type == (int)Extensions.TypeEnum.Incoming)
+                case ShipcallType.Arrival:
+                    berthText = timesBerthText ?? scArrivalBerthText;
+                break;
+                case ShipcallType.Departure:
+                    berthText = timesBerthText ?? scDepartureBerthText;
+                    break;
+                case ShipcallType.Shifting:
+                    if (times?.ParticipantType != (int)Extensions.ParticipantType.TERMINAL)
+                        berthText = (scDepartureBerthText ?? "") + " / " + (timesBerthText ?? scArrivalBerthText);
+                    else
+                        berthText = scDepartureBerthText ?? "";
+                    break;
+                default: break;
+            }                       
+
+            return berthText;
+        }
+
+        public string GetETAETD(bool useShortVersion = false)
+        {
+            DateTime theDate = DateTime.Now;
+            if(this.Shipcall != null)
+            {
+                if (this.Shipcall.Type == ShipcallType.Arrival)
+                    theDate = this.Shipcall.Eta ?? DateTime.Now;
+                else
+                    theDate = this.Shipcall.Etd ?? DateTime.Now;
+            }
+            Times? agentTimes = this.GetTimesForParticipantType(Extensions.ParticipantType.AGENCY);
+            if(agentTimes != null)
+            {
+                if(this.Shipcall?.Type == ShipcallType.Arrival)
                 {
-                    Berth? berth = BreCalLists.AllBerths?.Find((x) => x.Id == this.Shipcall?.ArrivalBerthId);
-                    berthText = berth?.Name;
+                    if (agentTimes.EtaBerth != null)
+                        theDate = agentTimes.EtaBerth.Value;
                 }
                 else
                 {
-                    Berth? berth = BreCalLists.AllBerths?.Find((x) => x.Id == this.Shipcall?.DepartureBerthId);
-                    berthText = berth?.Name;
+                    if (agentTimes.EtdBerth != null)
+                        theDate = agentTimes.EtdBerth.Value;
                 }
             }
-
-            return berthText;
+            if(useShortVersion) 
+                return theDate.ToString("dd.MM. HH:mm");
+            return theDate.ToString();
         }
 
 
@@ -189,8 +254,9 @@ namespace BreCalClient
         /// This function updates the assignments for existing times records accordingly and saves them.
         /// </summary>
         /// <param name="_api">API reference to PUT eidted times</param>
-        internal async void UpdateTimesAssignments(DefaultApi _api)
-        {
+        internal async Task<bool> UpdateTimesAssignments(TimesApi api)
+        {            
+
             foreach (Extensions.ParticipantType participantType in this.AssignedParticipants.Keys)
             {
                 Times? times = this.GetTimesForParticipantType(participantType);
@@ -198,7 +264,15 @@ namespace BreCalClient
                 if(times.ParticipantId != this.AssignedParticipants[participantType].ParticipantId)
                 {
                     times.ParticipantId = this.AssignedParticipants[participantType].ParticipantId;
-                    await _api.TimesPutAsync(times);
+                    try
+                    {
+                        await api.TimesUpdateAsync(times);
+                    }
+                    catch (Exception ex)
+                    {
+                        LastErrorMessage = ex.Message;
+                        return false;
+                    }
                 }
             }
 
@@ -225,9 +299,54 @@ namespace BreCalClient
 
             foreach(Times times in deleteTimes)
             {
-                _api.TimesDelete(times.Id);
-                this.Times.Remove(times);
+                try
+                {
+                    api.TimesDelete(times.Id);
+                    this.Times.Remove(times);
+                }
+                catch (Exception ex) 
+                {
+                    LastErrorMessage = ex.Message;
+                    return false;
+                }
             }
+            return true;
+        }
+
+        public DateTime? GetLastChangeForType(Extensions.ParticipantType type)
+        {
+            DateTime? lastChange = null;
+            Times? times = GetTimesForParticipantType(type);
+            if(times != null)
+            {
+                if (times.Modified.HasValue) lastChange = times.Modified.Value;
+                else lastChange = times.Created;
+            }
+            return lastChange;
+        }
+
+        public Extensions.ParticipantType? LastParticipantTypeToUpdate()
+        {
+            Extensions.ParticipantType? last = null;
+            DateTime min = DateTime.MinValue;
+            foreach(Times times in this.Times)
+            {
+                if (times.Modified.HasValue)
+                {
+                    if (times.Modified.Value > min)
+                    {
+                        min = times.Modified.Value;
+                        last = (Extensions.ParticipantType)times.ParticipantType;
+                        continue;
+                    }
+                }
+                if(times.Created > min)
+                {
+                    min = times.Created;
+                    last = (Extensions.ParticipantType)times.ParticipantType;
+                }                
+            }
+            return last;
         }
 
         #endregion
@@ -236,11 +355,11 @@ namespace BreCalClient
 
         internal Participant? GetParticipantForType(Extensions.ParticipantType participantType)
         {
-            if(AssignedParticipants.ContainsKey(participantType) && BreCalLists.ParticipantLookupDict.ContainsKey(AssignedParticipants[participantType].ParticipantId))            
+            if(AssignedParticipants.ContainsKey(participantType) && BreCalLists.ParticipantLookupDict.ContainsKey(AssignedParticipants[participantType].ParticipantId))
                 return BreCalLists.ParticipantLookupDict[AssignedParticipants[participantType].ParticipantId];
-                        
+
             return null;
-        }        
+        }
 
         private bool IsFlagSet(StatusFlags flag)
         {
@@ -248,7 +367,7 @@ namespace BreCalClient
             return (this.Shipcall.Flags & (int) flag) != 0;
         }
 
-        #endregion        
+        #endregion
 
     }
 }

src/BreCalClient/ToastViewModel.cs

@@ -0,0 +1,73 @@
+// Copyright (c) 2024- schick Informatik
+// Description:
+// 
+
+using System;
+using System.ComponentModel;
+using System.Windows;
+
+using ToastNotifications;
+using ToastNotifications.Core;
+using ToastNotifications.Lifetime;
+using ToastNotifications.Lifetime.Clear;
+using ToastNotifications.Messages;
+using ToastNotifications.Position;
+
+namespace BreCalClient
+{
+    internal class ToastViewModel : INotifyPropertyChanged
+    {
+        private readonly Notifier _notifier;
+
+        public ToastViewModel()
+        {
+            _notifier = new Notifier(cfg =>
+            {
+                cfg.PositionProvider = new WindowPositionProvider(
+                    parentWindow: Application.Current.MainWindow,
+                    corner: Corner.BottomRight,
+                    offsetX: 25,
+                    offsetY: 100);
+
+                cfg.LifetimeSupervisor = new TimeAndCountBasedLifetimeSupervisor(
+                    notificationLifetime: TimeSpan.FromSeconds(30),
+                    maximumNotificationCount: MaximumNotificationCount.FromCount(6));
+
+                cfg.Dispatcher = Application.Current.Dispatcher;
+
+                cfg.DisplayOptions.TopMost = false;
+                cfg.DisplayOptions.Width = 250;
+            });
+
+            _notifier.ClearMessages(new ClearAll());
+        }
+
+        public void OnUnloaded()
+        {
+            _notifier.Dispose();
+        }
+
+        public void ShowAppNotification(string message, MessageOptions options)
+        {
+            _notifier?.ShowAppNotification(message, options);
+        }
+
+        public void ShowAppNotification(string message)
+        {
+            _notifier?.ShowAppNotification(message);
+        }        
+
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        protected virtual void OnPropertyChanged(string? propertyName = null)
+        {
+            var handler = PropertyChanged;
+            handler?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        public void ClearAll()
+        {
+            _notifier.ClearMessages(new ClearAll());
+        }
+    }
+}

src/BreCalClient/Util.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media.Imaging;
+
+namespace BreCalClient
+{
+    public static class Util
+    {
+        public static BitmapImage? LoadImage (byte[] imageData)
+        {
+            if (imageData == null || imageData.Length == 0) return null;
+            var image = new BitmapImage();
+            using (var mem = new MemoryStream(imageData))
+            {
+                mem.Position = 0;
+                image.BeginInit();
+                image.CreateOptions = BitmapCreateOptions.PreservePixelFormat;
+                image.CacheOption = BitmapCacheOption.OnLoad;
+                image.UriSource = null;
+                image.StreamSource = mem;
+                image.EndInit();
+            }
+            image.Freeze();
+            return image;
+        }
+    }
+}

src/RoleEditor/App.config

@@ -8,7 +8,7 @@
     <applicationSettings>
         <RoleEditor.Properties.Settings>
             <setting name="ConnectionString" serializeAs="String">
-                <value>Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling_devel;Port=33306</value>
+                <value>Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling_test;Port=33307</value>
             </setting>
         </RoleEditor.Properties.Settings>
     </applicationSettings>

src/RoleEditor/EditBerthDialog.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:RoleEditor"
         mc:Ignorable="d"
-        Title="Edit berth" Height="188" Width="450" Loaded="Window_Loaded">
+        Title="Edit berth" Height="216" Width="450" Loaded="Window_Loaded">
     <Grid x:Name="berthGrid">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width=".3*" />
@@ -16,6 +16,7 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
             <RowDefinition Height="*" />
             <RowDefinition Height="28" />
         </Grid.RowDefinitions>
@@ -45,7 +46,9 @@
         </Grid>
         <Label Content="Uses lock" HorizontalAlignment="Right" Grid.Row="3" />
         <CheckBox x:Name="checkBoxLock" Grid.Row="3" Grid.Column="1" VerticalAlignment="Center" Margin="2" IsChecked="{Binding Path=Lock, Mode=OneWay}"/>
-        <StackPanel Grid.Column="1" Grid.Row="5" Orientation="Horizontal" FlowDirection="RightToLeft">
+        <Label Content="Port" HorizontalAlignment="Right" Grid.Row="4" />
+        <ComboBox Name="comboBoxPorts" Margin="2" Grid.Column="1" Grid.Row="4" SelectedItem="{Binding Port, Mode=OneWay}" />
+        <StackPanel Grid.Column="1" Grid.Row="6" Orientation="Horizontal" FlowDirection="RightToLeft">
             <Button x:Name="buttonCancel" Width="80" Content="Cancel" Margin="2" Click="buttonCancel_Click" />
             <Button x:Name="buttonOK" Width="80" Content="OK" Margin="2" Click="buttonOK_Click"/>
         </StackPanel>

src/RoleEditor/EditBerthDialog.xaml.cs

@@ -20,6 +20,8 @@ namespace RoleEditor
 
         public List<Participant> Authorities { get; } = new List<Participant>();
 
+        public List<Port> Ports { get; } = new List<Port>();
+
         private void buttonCancel_Click(object sender, RoutedEventArgs e)
         {
             this.DialogResult = false;
@@ -43,6 +45,12 @@ namespace RoleEditor
             else
                 this.Berth.Authority_Id = null;
 
+            this.Berth.Port = this.comboBoxPorts.SelectedItem as Port;
+            if (this.Berth.Port != null)
+                this.Berth.Port_Id = this.Berth.Port.Id;
+            else
+                this.Berth.Port_Id = null;
+
             this.DialogResult = true;
             this.Close();
         }
@@ -52,6 +60,7 @@ namespace RoleEditor
             this.DataContext = this.Berth;
             this.comboBoxParticipants.ItemsSource = this.Owners;
             this.comboBoxAuthorities.ItemsSource = this.Authorities;
+            this.comboBoxPorts.ItemsSource = this.Ports;
         }
 
         private void buttonResetParticipant_Click(object sender, RoutedEventArgs e)