Commit Graph

419 Commits

Author SHA1 Message Date
ced68b504d Expanded all dialogs to include end times for eta, etd and operations 2024-04-03 11:29:07 +02:00
4106b9a0ef For intervals there are now 2 fields in the times object: eta_interval_end and etd_interval_end 2024-04-03 10:39:32 +02:00
3e4ab3660f Fixed window layout positions 2024-04-03 10:12:54 +02:00
cbcbf8937f Testversion erstellt 2024-04-03 07:37:33 +02:00
441bb9a6b7 Fixed ATA / ATD setting for mooring company 2024-04-02 15:31:12 +02:00
5f7a4ab874 ATA / ATD in Times. In between version with single field 2024-04-02 11:49:03 +02:00
1dfa4e7b5e fixed merge 2024-04-02 11:31:38 +02:00
d42b3753e7 split up ata_atd in two separate fields ata and atd 2024-03-31 21:58:56 +02:00
7894ba0323 Set fixed order in shipcall control by using a tooltip enabled icon with a closed lock 2024-03-31 11:52:36 +02:00
11f72b370d fixed a bug where shipcall id was not set on times delete 2024-03-30 21:41:03 +01:00
d1c3115a8f Idea what to do with lock icon on shipcall control 2024-03-30 21:40:16 +01:00
ac2ad3bc18 fixed bug for POST new shipcalls 2024-03-30 19:48:53 +01:00
b8c0d665af Fixed orders part 1 2024-03-29 19:28:41 +01:00
0ca8e1f916 Added Filter flag (checkbox) to select only shipcalls the users participant is assigned to 2024-03-29 11:05:48 +01:00
32296f7d15 Change history Part 3
Finished layout of history control, reversed sort order (newest on top)
May need to move labels to HistoryDialog
2024-03-29 10:13:23 +01:00
e845c919fd Setup history window, fixed a small bug in the yaml and loaded history entries 2024-03-28 18:09:57 +01:00
54a5b4bb50 Change history Part 1
Here a button was added in the status bar that should eventually open a separate
window with all history information. I also added some tooltips.
2024-03-28 16:36:45 +01:00
7dc37b6fe6 Updated external NuGet packages 2024-03-28 16:35:27 +01:00
5e4ada4389 Added last update label and made progress bar alive 2024-03-28 12:08:23 +01:00
87eaf124d9 Draft is now a required field.
There is now logic in each agent window that checks the required fields if they
change and enable the OK button accordingly
2024-03-28 11:14:32 +01:00
a845135650 Bugfix for saving shipcall values 2024-03-28 09:46:23 +01:00
63baa0c2c2 Display ETA/ETDs with correct timeref labels now 2024-03-28 09:46:02 +01:00
fb3413cac0 Version bump to 1.2.0.0 2024-03-28 08:06:49 +01:00
166d886698 re-created API and fixed some small errors 2024-03-28 08:04:33 +01:00
a5b16154c6 Fixed saving of shipcall by correctly interpreting enums now
The trick was to use a helper-field and a (decorated) @post_load method in the model that allows to fill the helper
fields with the values (ints) instead of strings for enums.
Trouble is: We are parsing strings from API/JSON and want to serialize as int (value in IntEnum). The helper
fields also must be skipped when setting up the query. Pretty convoluted, but gets the jon done (finally).

Also extended the database by new field 'interval_end' which is a preparation to allow not only timestamps but also
intervals when specifying times for participants.
2024-03-27 19:20:54 +01:00
049cdaaf73 Fixed filtering by date interval.
The lamba used to filter out arrivals/Departures was all wrong.
2024-03-27 17:15:49 +01:00
f311d75c73 added ata_atd and time_point_ref fields to database, yaml and python access layer 2024-03-27 10:52:12 +01:00
862ef9fe88 Merge branch 'feature/api_enhancements' into develop 2024-03-27 10:08:48 +01:00
63b815c274 fixed enum serialization by using custom optional to_json() method 2024-02-27 07:31:04 +01:00
e88f3fa1de synched enum fields to lower case like yaml 2024-02-26 07:23:09 +01:00
06e9c9b8ae log incoming message 2024-02-24 10:05:43 +01:00
b47c261487 added existence check to dictionary key usage 2024-02-14 16:55:21 +01:00
e8f6a17e7f change parameter order 2024-02-14 16:42:55 +01:00
c6bbbf94e3 do not use execute_scalar 2024-02-14 16:24:06 +01:00
77722703ac added trace output 2024-02-14 16:12:07 +01:00
fc1b55c7b9 added remaining fields to user query 2024-02-14 15:51:12 +01:00
8a6ded2813 fixes for errors reported in server log 2024-02-14 15:41:21 +01:00
898cfdf07d Merged current state of develop 2024-02-14 10:56:35 +01:00
6e114d15e7 Set default shipcall lookup to max 1 day in the past 2024-02-09 12:42:18 +01:00
e5ed4f83b9 Rename fields 2024-02-05 16:55:59 +01:00
b7ac38ca99 startup window size sanity check 2024-02-05 16:35:08 +01:00
59c6efcd7f Merge branch 'bugfix/retry_token' into develop 2024-02-05 16:09:55 +01:00
e3017349b0 added finally statement to close pooledConnection under all circumstances 2024-02-05 09:48:34 +01:00
53fcefd6c9 token refresh - new take 2024-02-05 07:36:14 +01:00
50b7dd8cc5 fix shipcall query to include times eta/etd 2024-02-04 11:20:32 +01:00
92d7bccdd4 fix small binding error 2024-02-04 11:19:34 +01:00
833a71169e fixed deleted ship display in grid 2024-01-15 17:29:19 +01:00
801c4a1383 fixed deleted in ship (was int, is now: bool) 2024-01-15 17:16:22 +01:00
708fa5ce37 fixed naming in query 2024-01-15 17:10:21 +01:00
801800df92 added missing fields in query 2024-01-15 17:04:49 +01:00
a4e51f2483 changed local path 2024-01-15 17:00:19 +01:00
c51264a55d added new fields to evaluation object 2024-01-15 16:25:08 +01:00
722ea94ae0 fixed some bugs in the dialog, but still cannot save a ship 2024-01-15 16:02:27 +01:00
86b2380cb2 fixed some bugs compiles now but not finished 2024-01-14 20:39:27 +01:00
fbd636943e Ship editing pt. 1 (doesn't compile) 2024-01-14 15:40:00 +01:00
f50497b7db added edit button for ships in EditShipcallControl 2024-01-14 13:57:44 +01:00
106247527e Added ship post/put/delete to API 2024-01-14 13:35:35 +01:00
c1d8b2e855 fixed notification endpoint to return real data for a shipcall 2024-01-13 19:09:50 +01:00
1ef74b51ba added ship delete and fixed schema loading error for shipclass 2024-01-13 19:09:50 +01:00
dd4ae7def8 fixed error, but enum values are still serialized as int 2024-01-13 19:09:50 +01:00
01dda53425 Tried to create history endpoint but failed. Not working. 2024-01-13 19:09:50 +01:00
a52cc27d69 Fixed SQL and added endpoint for history data 2024-01-13 19:09:50 +01:00
ae9053bcaf Added POST and PUT endpoint for /ship 2024-01-13 19:09:50 +01:00
23a903997a now the code is compiling. Yaml file documented via description tags. 2024-01-13 19:09:49 +01:00
bd81f01d76 fixed a lot of small problems in yaml file, returned to OpenApi 3.0 format 2024-01-13 19:09:49 +01:00
c6b16c4fa7 Enums, work in progress 2024-01-13 19:09:49 +01:00
c50f82354f Removed spinner from IMO integerUpDown 2024-01-13 19:03:08 +01:00
aba1d9d00b Changed validation rule 002 A-C so that the agency time is set as reference time allowing 15 minute deviation 2024-01-13 19:02:43 +01:00
d8fabe0f97 Fixed time comparison validation func. Now compares min/max value of array. 2024-01-13 19:01:56 +01:00
c24bc981b0 :fixed filtering by berth id, also including outgoing and shifting moves 2024-01-13 18:59:21 +01:00
94fcf75d4c fixes for some idiotic mistakes 2023-12-28 20:08:47 +01:00
c264390ac1 Set max lengh for times and terminal text info fields 2023-12-28 11:29:58 +01:00
29cd8f57bb fixed typo 2023-12-28 11:26:59 +01:00
d488193923 removed bold text 2023-12-28 11:22:56 +01:00
4b17647ca5 Open all dialogs at the same stored position 2023-12-28 11:20:09 +01:00
d601120c5e Add context menu to delete pierside assignments 2023-12-28 11:09:38 +01:00
9463bde64d fixed label 2023-12-28 10:55:52 +01:00
e3834b6ffb adjusted draft input 2023-12-28 10:43:15 +01:00
db2ba28d61 Merge branch 'bugfix/ui_fixes_1.1' into develop 2023-12-26 17:15:13 +01:00
e7e9d79c5d Version bump to 1.1.1 2023-12-26 17:13:10 +01:00
898452a55b Storing window location and size for main window and all six dialogs 2023-12-26 17:05:16 +01:00
dc630e66b6 Mark required fields bold and prevent empty entries 2023-12-26 09:17:52 +01:00
d116c06b9e Enabled combobox ship search by adding helper container class ShipModel 2023-12-26 08:41:54 +01:00
01ab755638 renamed gedreht to port 2023-12-24 16:16:53 +01:00
f9f1fc011d static startup notification text 2023-12-24 12:42:34 +01:00
2651aa6886 fixed typo textBlockAgencyBerthRemarks 2023-12-24 11:33:48 +01:00
b4764e29b6 disable port authority validation logic 2023-12-24 11:20:43 +01:00
cbc77ae157 probably fixed the bug but cannot test because server side is not compatible 2023-12-24 11:08:10 +01:00
ae349b3781 made cancelled row look cancelled 2023-12-23 20:43:46 +01:00
86e6c8caa7 Corrections Pt.1 2023-12-23 18:20:20 +01:00
84a5cc862a Merge branch 'feature/RoleEditor_logical_delete' into develop 2023-12-20 08:09:40 +01:00
scopesorting
191aff720b Implemented the feature to ignore port administration. However, the flag is currently disabled. 2023-12-19 09:51:29 +01:00
scopesorting
e7b7d7e18f correcting 0004A & 0004B 2023-12-19 09:51:29 +01:00
scopesorting
ca8a7ab291 updating rule 0004A&0004B by using a rounding method for time differences. 2023-12-19 09:51:29 +01:00
scopesorting
a29b3ead0e bugfix of 0004A and B, where the tide window may have deviated by few seconds, so the wrong state would be concluded. 2023-12-19 09:51:29 +01:00
3c7268f9f2 new development version 2023-12-18 09:37:20 +01:00
e49b788b3d Added Canceled Checkbox to BSMD dialog box 2023-12-17 17:29:39 +01:00
73e729010d Automatically open a dialog for an outgoing call after an incoming call was created.
The dialog is filled with the defaults of the incoming call, adding two days to ETA to set the ETD.
2023-12-17 17:05:26 +01:00
24757c1702 Version bump 1.0.0 -> 1.1.0 2023-12-17 11:12:52 +01:00
305cc0d3e1 only undeleted berths and ships to select, but display all 2023-12-15 16:58:50 +01:00
scopesorting
99c798bfe0 changing 'exit' with sys.exit to avoid 'NameError' for the exit call 2023-12-15 16:40:51 +01:00
scopesorting
31a5034e17 Solving: RemovedInMarshmallow4Warning: Passing field metadata as keyword arguments is deprecated. Use the explicit argument instead. Additional metadata: {'Required': False} 2023-12-15 16:40:51 +01:00
scopesorting
dfdd4da1d8 correcting minor typos in the documentation and verbosity 2023-12-15 16:40:51 +01:00
scopesorting
2f67e58ace created a feature flag, which disables the PORT_ADMINISTRATION validation rules. Currently, the flag is 'hardcoded' once in the library. Adapting the test to properly facilitate the feature flag
cherry picking all open adjustments to the develop branch.
2023-12-15 16:40:51 +01:00
scopesorting
ad7637368b removing unused if-statements 2023-12-15 16:40:51 +01:00
scopesorting
08ab984096 updating the sql handler's method of filtering for the filled-in header 2023-12-15 16:40:51 +01:00
scopesorting
836c1aa802 fixing the 'KeyError' when using an empty times dataframe. Returning 'green' 2023-12-15 16:40:51 +01:00
scopesorting
6ce6e882e9 more concise evaluation messages for 0001. Adding newlines (works on Windows) when multiple evaluation messages are shown. Properly adding the ShipcallType filters for each rule (whether incoming, outgoing or shifting). Added a regular expression to abbreviate an evaluation message when 512 characters are exceeded.
fixing a version conflict for validation rule functions.
2023-12-15 16:40:51 +01:00
scopesorting
d004e77650 created a feature flag, which disables the PORT_ADMINISTRATION validation rules. Currently, the flag is 'hardcoded' once in the library. Adapting the test to properly facilitate the feature flag
cherry picking the feature flag of 'port administration' rules
2023-12-15 16:40:51 +01:00
378274a176 Logical delete of berths and ships in RoleEditor.
The deleted rows will still be shown however a little grayed out
2023-12-15 16:31:28 +01:00
ba424b18b0 clear controls properly when assignment gets reset in shipcall control 2023-12-14 16:58:53 +01:00
9945cc139b Reset tooltip if evaluation message is empty 2023-12-14 16:09:46 +01:00
f323ae44ff Tab always moves to the next control 2023-12-14 15:46:10 +01:00
dfc09fe833 set maximum for draft to 50 2023-12-14 15:27:27 +01:00
ee071d6b9d Pflichtfelder bei Neuanlage gefixt 2023-12-07 10:49:32 +01:00
08edd7d1d8 add localized message if username/password is wrong 2023-12-07 10:08:08 +01:00
fcbe554248 renamed Gedreht to Anlegeseite 2023-12-07 09:57:31 +01:00
bea2a147d8 Changed search box watermark for better understanding 2023-12-05 09:06:48 +01:00
fe6d1424e5 limit text remark input to 512 characters 2023-12-05 09:06:01 +01:00
scopesorting
ad593ff2a2 more concise evaluation messages for 0001. Adding newlines (works on Windows) when multiple evaluation messages are shown. Properly adding the ShipcallType filters for each rule (whether incoming, outgoing or shifting). Added a regular expression to abbreviate an evaluation message when 512 characters are exceeded. 2023-12-01 09:44:22 +02:00
scopesorting
fce8ce0c68 changing the ParticipantType to an IntFlag, so multiple roles are possible. Adapting every validation rule (0001, 0003, 0004, 0005), which may be affected by this change. Changing the filter for a participant type to properly include the change. Changing the pier_side rule (0006B), which uses the shipcall and times_terminal. New shipcalls should now be evaluated properly, unless no participant is assigned at all. If the ladder case can occur, the validation rules 0001N+0001O will be added (held back for now). 2023-12-01 09:44:09 +02:00
scopesorting
6f9b4a6b5a removing verbosity in validation rule functions, and returning 'None', when a selected times dataframe is empty. In case of empty results, the function now properly computes the delta towards a query time and returns YELLOW, when a violation is observed. This should finally fix the bugs for 0001 A-M 2023-12-01 09:43:49 +02:00
scopesorting
9a12d74e77 updating validation rules 0001 A-M. Instead of filtering by times_df (which may not exist), the rules make use of the shipcall_participant_map. When one of the participants in a rule is not assigned, no violation is observed. When there are multiple entries of a participant (due to an input bug), the function still verifies properly. When critical time is observed, and there is not yet an entry for the respective key time, there will be a 'yellow' state. 2023-12-01 09:43:31 +02:00
scopesorting
9f61e2af38 updating check_time_delta_violation_query_time_to_now: no longer ignoring events of the past (delta<=0) 2023-12-01 09:43:17 +02:00
scopesorting
4859ff6803 ensuring that len(df_times) always works. Preventing 'None' from occuring 2023-12-01 09:42:48 +02:00
scopesorting
834da84786 minot adjustments & refactoring 2023-11-28 16:49:16 +02:00
scopesorting
8027620f22 fixing the 'KeyError' when using an empty times dataframe. Returning 'green' 2023-11-28 16:48:53 +02:00
c36e913472 added trace output and fixed a bug when saving shipcalls without times 2023-11-28 16:48:16 +02:00
81a45f57cf Catch exception if one occurrs during saving 2023-11-27 17:26:37 +01:00
8d63fece15 Version bump to 1.0.0.0 2023-11-25 16:01:03 +01:00
56ade40aef fixed creating new shipcalls and cleaned up logon error message display 2023-11-25 12:15:38 +01:00
5c6d41470c created 0.9.7 version with some minor fixes 2023-11-25 11:39:45 +01:00
721baa3a06 moved schedule import after venv sitepackage path set 2023-11-22 10:48:27 +01:00
scopesorting
fd0efe0046 adding schedule routine jobs, which will be executed in a background thread within WSGI while running the Flask application. 2023-11-21 12:47:04 +01:00
scopesorting
9346920a97 potentially solving the 'shipcall_id' error log 2023-11-21 11:51:49 +01:00
scopesorting
3cc1591aba potentially correcting 0006A/0006B 2023-11-21 11:41:56 +01:00
scopesorting
a5220fd6f2 refactoring: simplification of error messages. These now stem from a string, which is the function name. Previously, the inspect module was used with a rather complex function call to obtain the method's name. The simplification makes code more readable for future work. 2023-11-20 16:43:27 +01:00
scopesorting
49bbb77624 refactoring a few methods 2023-11-20 16:35:31 +01:00
scopesorting
40dc022b25 fixing np to_list error, which may have caused the evaluation function to stop altogether. 2023-11-20 16:22:58 +01:00
scopesorting
21e9c75781 typo. 2023-11-14 12:07:59 +01:00
scopesorting
c6d1bf30a6 adapting rules 0001-L & 0001-M (times terminal) and 0006-B. However, for 0006-B the provided solution is not verified, as the errors could not be reproduced locally. 2023-11-14 12:06:39 +01:00
fd5bd76db2
Merge pull request #15 from puls200/feature/hotfix_20231110
Feature/hotfix 20231110
2023-11-10 18:07:12 +01:00
scopesorting
e9aace6268 creating stub objects for every single validation function. Unit tests are created for each function to check whether they return 'GREEN' whenever no violation is expected, or 'YELLOW'/'RED' when a rule violation is artificially forced. The test framework now successfully runs 116 unit tests. Adapted some validation functions, applied refactoring and solved potential obstacles along the way. At least from the perspective of unit tests, every function now works as expected. 2023-11-10 17:59:08 +01:00
scopesorting
b2cde8b6f5 correcting the open issues from 09.11.2023 (0001 A-M was previously commited, 0006A+B are corrected herein) 2023-11-10 17:50:01 +01:00
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