diff --git a/misc/BreCal.postman_collection.json b/misc/BreCal.postman_collection.json index f1ef9ad..23307fb 100644 --- a/misc/BreCal.postman_collection.json +++ b/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": { diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs index 539d113..68a9e32 100644 --- a/misc/BreCalApi.cs +++ b/misc/BreCalApi.cs @@ -46,7 +46,7 @@ using System.Web; * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -850,7 +850,7 @@ namespace BreCalClient.misc.Api * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -1505,7 +1505,7 @@ namespace BreCalClient.misc.Api * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -2290,7 +2290,7 @@ namespace BreCalClient.misc.Api * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -3109,7 +3109,7 @@ namespace BreCalClient.misc.Api * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -3594,7 +3594,7 @@ namespace BreCalClient.misc.Api * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -4330,7 +4330,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -4390,7 +4390,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -4530,7 +4530,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -4748,7 +4748,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -5207,7 +5207,7 @@ namespace BreCalClient.misc.Client string report = "C# SDK (BreCalClient.misc) Debug Report:\n"; report += " OS: " + System.Environment.OSVersion + "\n"; report += " .NET Framework Version: " + System.Environment.Version + "\n"; - report += " Version of the API: 1.3.0\n"; + report += " Version of the API: 1.4.0\n"; report += " SDK Package Version: 1.0.0\n"; return report; } @@ -5276,7 +5276,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -5296,7 +5296,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -5353,7 +5353,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -5386,7 +5386,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -5419,7 +5419,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -5510,7 +5510,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -5627,7 +5627,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -5711,7 +5711,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -5970,7 +5970,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -5998,7 +5998,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -6068,7 +6068,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -6095,7 +6095,7 @@ namespace BreCalClient.misc.Client * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -6162,7 +6162,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -6288,7 +6288,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -6373,7 +6373,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -6446,7 +6446,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -6486,7 +6486,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -6596,7 +6596,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -6658,7 +6658,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -6784,7 +6784,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -6888,7 +6888,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -6923,7 +6923,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -6953,7 +6953,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -6993,7 +6993,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -7150,7 +7150,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -7226,7 +7226,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -7396,7 +7396,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -7701,7 +7701,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -7741,7 +7741,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -8023,7 +8023,7 @@ namespace BreCalClient.misc.Model * * Administer DEBRE ship calls, times and notifications * - * The version of the OpenAPI document: 1.3.0 + * The version of the OpenAPI document: 1.4.0 * Contact: info@textbausteine.net * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml index aa42b53..be9d091 100644 --- a/misc/BreCalApi.yaml +++ b/misc/BreCalApi.yaml @@ -2,7 +2,7 @@ openapi: 3.0.0 x-stoplight: id: mwv4y8vcnopwr info: - version: 1.3.0 + version: 1.4.0 title: Bremen calling API description: 'Administer DEBRE ship calls, times and notifications' termsOfService: 'https://www.bsmd.de/' diff --git a/misc/disclaimer.html b/misc/disclaimer.html new file mode 100644 index 0000000..7341c15 --- /dev/null +++ b/misc/disclaimer.html @@ -0,0 +1,67 @@ + + + + Information gemäß Art. 13 und Art. 14 DSGVO für Auftraggeber Software BremenCalling + + + +

Information gemäß Art. 13 und Art. 14 DSGVO für Auftraggeber +Software BremenCalling

+
+Hier erhalten Sie Informationen gem. Art. 13 DSGVO über unseren Umgang mit Ihren Daten, wenn Sie die von uns betriebene Software „Bremen Calling“ nutzen. +

+Verantwortlicher: +

+ +

+BREMER SCHIFFSMELDEDIENST Kapt. P. Langbein e.K.
+Vertreten durch die Geschäftsführer Bastian Güttner und Benjamin Wiese
+Hafenkopf II / Überseetor 20, 28217 Bremen / Germany
+Tel. +49 (0) 421 38 48 27
+E-Mail : report@bsmd.de
+

+ +

Zweck der Datenverarbeitung:

+ +

Rechtsgrundlage für die Datenverarbeitung:

+Art. 6 Abs. 1 lit. b DSGVO (Vertrag, vorvertragliche Maßnahmen auf Anfrage der betroffenen Person) +

Berechtigte Interesse des Verantwortlichen:

+Hier nicht einschlägig. + +

Wozu benötigen wir Ihre Daten? („Hintergründe für die Bereitstellung der Daten“):

+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. +

Holen wir bei anderen Stellen außer bei Ihnen selber Informationen über Sie ein?

+Nein. +

Empfänger der Daten:

+Wir verarbeiten Ihre Daten nur innerhalb des BSMD. +

Übermittlung in Drittländer:

+Eine Übermittlung Ihrer Daten in Staaten außerhalb der EU findet nicht statt. +

Dauer der Speicherung:

+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. +

Ihre Rechte in Bezug auf Ihre Daten:

+

+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). +

+

+Sollten wir unrichtige oder unvollständige Daten von Ihnen haben, können Sie die Berichtigung dieser Daten verlangen (Art. 16 DSGVO). +

+

+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. +

+

+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. +

+

+Möchten Sie von Ihren hier beschriebenen Rechten Gebrauch machen, genügt eine E-Mail an bremencalling@bsmd.de. +

+

+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: +https://www.bfdi.bund.de/DE/Infothek/Anschriften_Links/anschriften_links-node.html. +

+
+

+Stand dieser Datenschutzinformationen: April 2024 +

+ \ No newline at end of file diff --git a/misc/product_codes.txt b/misc/product_codes.txt new file mode 100644 index 0000000..dbb4e54 --- /dev/null +++ b/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. \ No newline at end of file diff --git a/misc/version.txt b/misc/version.txt index fd76c73..77d55b2 100644 --- a/misc/version.txt +++ b/misc/version.txt @@ -1 +1 @@ -1.3.0.0 \ No newline at end of file +1.4.0.0 \ No newline at end of file diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config index cab52d2..335a433 100644 --- a/src/BreCalClient/App.config +++ b/src/BreCalClient/App.config @@ -83,6 +83,9 @@ 0 + + + \ No newline at end of file diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj index 44af52b..b42f599 100644 --- a/src/BreCalClient/BreCalClient.csproj +++ b/src/BreCalClient/BreCalClient.csproj @@ -8,8 +8,8 @@ True BreCalClient.App ..\..\misc\brecal.snk - 1.3.0.0 - 1.3.0.0 + 1.4.0.0 + 1.4.0.0 Bremen calling client A Windows WPF client for the Bremen calling API. containership.ico @@ -17,6 +17,7 @@ + @@ -38,6 +39,7 @@ + @@ -73,6 +75,7 @@ OpenApiCodeGenerator BreCalApi.cs + @@ -94,6 +97,7 @@ + diff --git a/src/BreCalClient/BreCalClient.sln b/src/BreCalClient/BreCalClient.sln index 469c133..fa8a760 100644 --- a/src/BreCalClient/BreCalClient.sln +++ b/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 diff --git a/src/BreCalClient/BreCalLists.cs b/src/BreCalClient/BreCalLists.cs index 4fe6b2f..b0316a2 100644 --- a/src/BreCalClient/BreCalLists.cs +++ b/src/BreCalClient/BreCalLists.cs @@ -144,9 +144,12 @@ namespace BreCalClient internal static void InitializeShips(List ships) { + _ships.Clear(); + _allShips.Clear(); + foreach (var ship in ships) { - ShipModel sm = new ShipModel(ship); + ShipModel sm = new(ship); _shipLookupDict[ship.Id] = sm; if (!ship.Deleted) _ships.Add(sm); diff --git a/src/BreCalClient/DateTimePickerExt.cs b/src/BreCalClient/DateTimePickerExt.cs new file mode 100644 index 0000000..d3642d4 --- /dev/null +++ b/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); + } + + } + } +} diff --git a/src/BreCalClient/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml index 6ebe2cf..006256f 100644 --- a/src/BreCalClient/EditShipcallControl.xaml +++ b/src/BreCalClient/EditShipcallControl.xaml @@ -4,11 +4,11 @@ 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:p = "clr-namespace:BreCalClient.Resources" xmlns:api="clr-namespace:BreCalClient.misc.Model" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}" - Title="{x:Static p:Resources.textEditShipcall}" Height="270" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico"> + Title="{x:Static p:Resources.textEditShipcall}" Height="298" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico"> @@ -29,6 +29,7 @@ +