Commit Graph

375 Commits

Author SHA1 Message Date
9d61b95378 Version bump to 0.9.6 2023-11-10 14:36:25 +01:00
09623f1442 bugfixes and small improvements for 0.9.5 test results 2023-11-10 14:13:06 +01:00
f0fa9285af fixed ETA/ETD sorting by taking agency values into account 2023-11-10 11:46:43 +01:00
d439b7ed12 fixed removing of assignments (delete times record), removed green bg color 2023-11-10 11:36:17 +01:00
b7a8b3aa1b Bugfix: switch arrival/departure berth combobox for incoming / outgoing calls (just for display, not logical) 2023-11-08 07:55:21 +01:00
scopesorting
2374cf4ff0
Feature/removing pandas warning (#14)
* removing the Pandas 'sqlalchemy' warning by refactoring

* removing the Pandas 'sqlalchemy' warning by refactoring.

* reformatting
2023-11-07 07:08:52 +01:00
b75ea6891c fixed path in app.config 2023-11-01 17:03:15 +01:00
ead190d219
Merge pull request #11 from puls200/feature/hotfix_20231031_traffic_lights
Validation rule bug fixes as noted in test version 0.9.4
2023-11-01 16:07:38 +01:00
44de849430 fixed little bugs, bumped version and set API endpoint to (correct for develop branch) brecaldevel endpoint 2023-11-01 15:53:29 +01:00
a82080b970 Fixed berth display changing between add and update 2023-11-01 11:10:28 +01:00
scopesorting
8e2e676cb0 hotfixing open errors, as defined by Daniel Schick and Christin Hollman (26.10. and 27.10.). Adding descriptions for the error codes instead of using 'cryptic' function names. This should make the application much more readable. 2023-10-31 18:15:59 +01:00
4aa7d65790 updated devel publishing profile 2023-10-31 16:42:51 +01:00
1695ca101e Set development / feature branch to 'devel' settings, added scripts to move to test and to production. Added script to increase version, store version and to update the respective files 2023-10-29 17:56:06 +01:00
f2ecc7ca2e make ETA/ETD the default sort order 2023-10-28 13:02:18 +02:00
b254759562 fixed mixup in enum ids outgoing/shifting for shipcall queries 2023-10-28 12:43:36 +02:00
d24cc67554 Allow saving of user data also if password change info has not been given 2023-10-28 12:07:07 +02:00
6c87142cac added deployment info and fixed production publishing profile 2023-10-27 08:46:29 +02:00
41cae96922 Make user email and phone editable through the role editor 2023-10-26 16:29:24 +02:00
c8e634156b Allow changes of users phone and email contact info by the user 2023-10-26 16:29:17 +02:00
3e63b9ce46 added missing paranthesis 2023-10-26 16:21:26 +02:00
cc284b2612 fixed search query 2023-10-26 16:11:34 +02:00
13c5866884 Fixed eta / etd search error and evaluate searchFromEta as filter used against the back-end to retrieve shipcalls from the past 2023-10-26 15:00:15 +02:00
a763589587 9+10, undo 7 : Berth display when shifting 2023-10-26 14:58:24 +02:00
84ede9a465 8. Changed order of arr/dep. combobox in bsmd control dep -> arr 2023-10-26 09:45:37 +02:00
5f23523a9d 7. Changed layout of agency shifting dialog 2023-10-26 09:41:05 +02:00
213b3e51d9 5.+6.:ETD and correct terminal display for outgoing / shifting calls 2023-10-26 09:35:13 +02:00
e973b6804e 2+4.: Tab order fixed 2023-10-26 09:23:16 +02:00
b30892ada1 1. Controls only editable if current user is the owner of the times data record 2023-10-26 08:19:27 +02:00
scopesorting
d1f4703102 updating rules 0002 A-C (check_participants_agree_on_estimated_time) and 0004 B (typo in function) 2023-10-25 14:20:24 +02:00
a91cf7bdba Version bump to 0.9.3.0 2023-10-22 13:13:42 +02:00
9c690a91b0 Fixes for tests regarding the evaluation functions 2023-10-22 13:08:15 +02:00
scopesorting
1f29aca6d0 correcting an import error for 'evaluate_shipcall_state', updating misc/Deployment to describe the creation of a virtual environment, Python installation and running tests (pytest and pytest-coverage). 2023-10-19 18:32:49 +02:00
scopesorting
cdb7877461 Adding validation rules (traffic light status) to the system. Post & Put calls of shipcalls and times now execute the traffic light evaluation and store the result in the connected MySQL database instance. The 'brecal_utils' library is merged with 'BreCal', including the stub objects and test functions. Requirements were adapted, and installation of a virtual environment works from scratch (on a linux system). 2023-10-19 18:32:49 +02:00
9f7dd4f55c corrected header centering 2023-10-18 19:02:55 +02:00
8ba1d351b7 Version bump to 0.9.2.0 2023-10-18 18:49:45 +02:00
5f0712c799 Added some styles for evaluation result and tried to solve sync problems 2023-10-18 18:48:47 +02:00
961a2a7666 Version bump to 0.9.1.0 2023-10-18 08:54:48 +02:00
9087d68025 Fixed participant type evaluation for Times edit control 2023-10-18 08:15:38 +02:00
3044ca2621 add missing include 2023-10-16 18:47:22 +02:00
26b71052ae add missing key 2023-10-16 18:43:48 +02:00
2857c8693a fixes 2023-10-16 17:46:30 +02:00
da0287ae6e fixes 2023-10-16 17:42:45 +02:00
e5e262fd4f improve connection handling on startup 2023-10-16 17:31:57 +02:00
6597c46a9d removed connection data file 2023-10-16 15:36:38 +02:00
fe53c85447 made simple path change and added documentation pt 1 2023-10-16 15:34:18 +02:00
0b5063a9bc Version bump to 0.9.0.0 2023-10-16 11:07:18 +02:00
1e9636c47c Bugfix: avoid clearing of all assigned participants (they are *not* set in this dialog!(any more)) 2023-10-16 11:07:18 +02:00
35f0f8b204 fixed wrong label 2023-10-16 11:07:18 +02:00
2440424312 set enabled flags in times and terminal edit controls 2023-10-16 11:07:18 +02:00
2d8a895e9f bugfix enable controls correctly on dialog load 2023-10-16 11:07:18 +02:00
02705f2677 allow read-only views of not-assigned participants of any data 2023-10-10 11:50:43 +02:00
ebfa7c1fc7 fixed participant combobox display 2023-10-10 10:19:24 +02:00
d36517f63b merged participant type for assignment side quest 2023-10-09 18:02:02 +02:00
c1a2f78a14 saving is possible (again), fixed the nested parameter 2023-10-09 17:37:44 +02:00
dc30fe9c53 added type flag to participant assignment for ship call pt. 1 2023-10-07 14:18:00 +02:00
b926f413dc more fixes to grid view 2023-10-07 14:16:38 +02:00
8ceeaf82a5 Darstellung im Grid verbessert 2023-10-07 14:16:38 +02:00
36b1711189 kein 3-state Checkboxen mehr in den Agentur-Dialgoen 2023-10-07 14:16:38 +02:00
eb51074328 Fixed issues when editing the shipcall as BSMD 2023-10-07 14:16:38 +02:00
da8ef2f113 bugfix 2023-10-07 14:16:38 +02:00
f51e3fe13a version bump to 0.8 2023-10-07 14:16:38 +02:00
d807b95020 Extension of role editor to allow authority entry for berths 2023-10-06 16:13:09 +02:00
bf54b0e9d8 database extension 2023-10-06 16:13:05 +02:00
a267ddc682 version bump 0.7 2023-10-04 11:17:58 +02:00
97adf65c0c Fixed all sorts of small bugs, should be working now 2023-10-04 10:38:08 +02:00
7d5887b29d Korrektur fürs Passwort ändern 2023-10-04 07:34:18 +02:00
0936e30d00 WIP 2023-10-04 07:34:17 +02:00
8b3abec280 Edit dialogs agent WIP Pt. 2 2023-10-04 07:34:17 +02:00
92a504b668 Edit dialogs agent WIP 2023-10-04 07:34:16 +02:00
e7680afcd4 Layout agency times controls 2023-10-04 07:34:16 +02:00
5a8dae602e Agentur Times Dialog ausgehend Screendesign 2023-10-04 07:34:16 +02:00
aca7908d4c Überarbeitung Dialog Anlaufbearbeitung Pt.1 2023-10-04 07:34:15 +02:00
31ddcbb336 When applying the search filter use also the ships name in the free text input 2023-10-04 07:34:15 +02:00
2f0ca85c19 fixed saving of new shipcalls, reversed logic of cancelled ship filter 2023-10-04 07:34:15 +02:00
6872df4278 Increased token timeout to 2 hours, introduced a background task to refresh token at about 70 min interval 2023-10-04 07:34:14 +02:00
916beedbb8 added evaluation and evaluation_message to shipcall (für die Ampel) 2023-09-29 14:22:04 +02:00
ba29a8217e Add comment if BSMD is allowed to edit agents data fields (at the bottom of the edit window) 2023-09-21 09:36:35 +02:00
110ff5ccce EXTENDED TIMES TO DIFFERENTIATE BETWEEN PARTICIPANT TYPES
Participants can be of multiple types (e.g. agent and terminal), therefore the participant
type must be stored in the times data record in order to assign times correctly during
display and to differentiate in calculation.
2023-09-21 08:23:19 +02:00
df641f096c added terminal times control 2023-09-18 20:36:44 +02:00
370270eaf3 added ad readme for the role editor 2023-09-18 14:57:29 +02:00
e7614a085c Merge branch 'feature/win_client_changes_sprint_1' of ssh://lager/mnt/ext/git/git_brcal into feature/win_client_changes_sprint_1 2023-09-18 14:56:49 +02:00
cb742fb17c working on times edit control for terminal 2023-09-18 14:55:56 +02:00
13722f039c Save and restore of filter criteria (user-context) 2023-09-15 17:05:07 +02:00
47884fde7d changed key path to a relative path that works on both installations 2023-09-15 08:12:44 +02:00
d74f943994 Fixed test client setup as a separate setup.
Please see ReadMe.md in the BreCalClient folder for details.
2023-09-13 07:09:52 +02:00
7660ee72f2 Added filtering and sorting to shipcalls in the list.
While doing so, I have also refactored the shipcall processing logic in the main window.
All changes now go through the filter and sorting stage before all controls are removed
and only the controls matching to the sorted list are added to the stack panel.
2023-09-12 16:48:28 +02:00
90338f9e95 test profile is now installing but overwriting the productive profile 2023-09-11 06:48:18 +02:00
f200673023 If an agency allows BSMD entries, then the flag is set and the dialog controls are enabled 2023-09-06 09:04:30 +02:00
4093c2eb21 Moved connection string to config file 2023-09-06 08:39:46 +02:00
89ecb33ffe added signing to test publish profile 2023-09-06 07:06:45 +02:00
29a214c5f4 change settings to test version 2023-09-05 17:15:59 +02:00
89a6a4f726 extended times and use flags on participant, added code to have a test version of the client 2023-09-05 16:38:40 +02:00
05462e6332 changed arrow colors, enabled controls on edit control if participant is agency or bsmd 2023-09-04 13:07:19 +02:00
4abd5025f5 add confirmation dialog if password was changed successfully 2023-09-04 12:28:58 +02:00
c3f16f4b20 Fixed adding and removing assignments of participants and berths 2023-09-04 12:12:07 +02:00
cab09c594f Added ability to remove participant assignments in edit dialog 2023-09-04 08:39:12 +02:00
6a37bba97a fixed output 2023-08-24 14:11:11 +02:00
9ead1274bb added functionality to import ships by excel sheet 2023-08-24 10:48:44 +02:00
ef07764915 upped the UI some 2023-08-24 07:50:12 +02:00
f5b79d5d63 work in progress.. 2023-08-23 17:12:41 +02:00
f255b16ff4 Work in progress, edit dialog completed, saving new elements works 2023-08-23 09:38:44 +02:00
8fbb199aaa added times controlling but no functions 2023-08-21 19:11:23 +02:00
ee5420ff5b Save and display a new shipcall 2023-08-21 16:20:12 +02:00
95fab27229 Edit and save a shipcall 2023-08-21 15:34:09 +02:00
beb9d75a90 Excel Import berth in RoleEditor Tool 2023-08-21 08:26:32 +02:00
8939339d09 created publish version 2023-08-18 16:17:32 +02:00
ba170c9320 first steps excel import berths 2023-08-18 16:09:13 +02:00
411ea8135e Changing Password is functional through API and Client 2023-08-18 15:29:20 +02:00
083ea69961 Many little details in the client, added password change dialog 2023-08-18 09:48:37 +02:00
37827767ef Layout Shipcall editing dialog 2023-08-17 13:24:25 +02:00
65ffea1b8c Show arrows for shipcall types 2023-08-17 11:06:34 +02:00
3d7906a9f2 Synchronizing data structures including the latest changes in Excel spec
Database
API (yaml)
Flask
2023-08-17 10:05:48 +02:00
542b495d95 fixed yaml and added additional input fields 2023-08-16 16:06:15 +02:00
3af6e77d30 Select participants on edit shipcall control 2023-08-16 12:16:08 +02:00
cf5498d049 Shipcalls now showing participant relevant info in correct columns 2023-08-15 09:04:57 +02:00
84462aead4 work on shipcall control 2023-08-14 16:00:34 +02:00
7655ebe724 put and post for participants of shipcall 2023-08-14 09:15:36 +02:00
dbf2ec3c5d saving participant entries, wip 2023-08-13 12:18:49 +02:00
794cd8efaf added shipcall participant list to API GET call 2023-08-11 15:07:42 +02:00
c08ba046c9 fixed Windows tool passwort hash creation 2023-08-11 11:17:08 +02:00
6e764aa043 Added flag-type editing to participant type, allowing participant to include several types 2023-08-10 08:49:17 +02:00
383f6a38c7 Client very WIP und Fehlerkorrektur API 2023-08-08 07:43:47 +02:00
6b93f0ac3f Type für Participant, Content-Type in responses korrigiert 2023-08-07 12:19:20 +02:00
d44dbcc437 Mockup der Suche, Lokalisierung hinzugefügt (statisch via Resources) 2023-08-04 11:13:55 +02:00
9a735898ba Herunterklappbares Shipcall Control, angefangen 2023-08-04 08:33:01 +02:00
8528527aa7 misc 2023-07-31 14:48:28 +02:00
9fb3e9e751 added some useful icons and event actions for shipcall control 2023-07-28 08:21:32 +02:00
3148ed32b1 Shipcall list now working with traffic light on bound property, data from server 2023-07-27 12:55:39 +02:00
8a9e3884fe Closing pooled connections 2023-07-27 09:58:06 +02:00
12f36c5113 Fixed Token transmission to server, loading of berth and ship lists ok! 2023-07-14 16:03:45 +02:00
6d4c36d07b Client work in Progress.. 2023-07-13 21:32:28 +02:00
6d4392c1bc fixed error result values in python api 2023-07-13 10:07:23 +02:00
504131c239 Added ENI style login screen 2023-07-13 09:43:08 +02:00
b7f6996489 Renamed API yaml file
linked (instead of copied it) to client project and
recreated the cs class
2023-07-11 17:39:24 +02:00
c02e51c427 added sample client with sample autogenerated client code
as per Visual Studio Extension
2023-07-11 17:17:27 +02:00
5544d0126d fixed complete participant download and removed all TODOs regarding
token verifikation. Also removed the /verify call since it is now covered by /login.
2023-07-11 15:46:17 +02:00
d2c84f8d68 A lot of small errors fixed on deployment, some things work different with mysql and MariaDB 2023-06-27 11:32:50 +02:00
3f211919af added JWT Authentication (expiring bearer token) 2023-06-26 08:38:45 +02:00
b9d35b9244 added a user login 2023-06-23 15:20:26 +02:00
15cc4bf8da API up and running.
There are still open issues but in principle, it is working
2023-06-22 10:56:13 +02:00
20f38fff91 POST zum Laufen gebracht.. RTFM! :-) 2023-06-20 07:44:27 +02:00
d0a77b3f0f die meisten GET calls sind drin, 2 funktionieren noch nicht 2023-06-19 16:04:02 +02:00
a40df31f9d Updated models for current API 2023-06-19 11:14:44 +02:00
a0b0462302 fixed participant loading 2023-06-19 10:23:40 +02:00
f6f2f73d01 some work on returning berths (ok) and participants (so far not ok) 2023-06-16 14:11:02 +02:00
fdeacdca6e Datenmodell neu, Verbindungsdaten Flask aus einer Datei laden 2023-06-16 12:25:53 +02:00
31b52038b2 editing berths and ships Pt.2 (done) 2023-04-28 15:17:58 +02:00
4e9151f8c8 editing berths and ships Pt. 1 2023-04-27 14:24:03 +02:00
7ea16692cc role/securable editor more or less functional 2023-04-22 19:32:54 +02:00
fd0497fee4 role / securable mappings 2023-04-21 11:57:04 +02:00
a4737b8b1f started on user role assignments 2023-04-17 08:25:48 +02:00
c9aa439712 saving securables, more logic 2023-04-17 07:49:27 +02:00
66b2691c41 some more UI logic 2023-04-16 16:58:32 +02:00
a86b02d541 Implemented user create and update 2023-04-16 16:32:25 +02:00
a01b88e0c9 Loading of participant and user functional 2023-04-16 12:59:13 +02:00
bbb986260c Speicher-Logik erweitern 2023-04-15 18:58:24 +02:00
aa0c1d81d9 added models and a database controller 2023-04-12 12:08:40 +02:00
d68e92a464 added icons and menu items 2023-04-12 07:47:33 +02:00
ae232ae686 UI Role and Securables 2023-04-10 14:43:31 +02:00
485c75f06c Role-Editor: UI for Participant and User 2023-04-10 10:42:20 +02:00
a833863761 added ship endpoint 2023-04-08 18:19:26 +02:00
205ab2e9f1 Tabellen mit Infos von Christin aktualisiert 2023-03-25 19:33:49 +01:00
f929ca338f Mit berths klappt es jetzt und so wird's auch passieren 2023-03-24 07:46:14 +01:00
f64ea1b7cd WIP, berths dont work yet 2023-03-23 17:56:04 +01:00
d4cad33513 some more preparational work done 2023-03-23 17:11:42 +01:00
1bca77bf12 included simple function to create api key 2023-03-19 12:13:42 +01:00
7898a72fdb successful connect with pydapper connection pool and local DB 2023-03-19 12:10:46 +01:00
695c5afee8 wip 2023-03-18 19:23:04 +01:00
8fb1d9b4d7 added logging lib 2023-03-17 09:03:26 +01:00
c88f55427d Merge branch 'yaml_export' into feature/db_storage 2023-03-17 08:50:24 +01:00
800801bc19 added new API for berths 2023-03-17 08:44:41 +01:00
b5c7a35e3d erster Versuch Daten aus der DB zu laden erfolgreich 2023-03-14 11:33:57 +01:00
d130dc08b0 updated environment 2023-03-12 11:56:24 +01:00
29419540de tried to return a participant 2023-03-04 15:37:03 +01:00
c69d13d1f3 Open API 3.0
- Added first draft of yaml file
- Added Python stubs generated by postman export tool
2023-03-02 09:22:37 +01:00