dschick/git_brcal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added new fields to evaluation object

Browse Source
This commit is contained in:
Daniel Schick 2024-01-15 16:25:08 +01:00
parent 722ea94ae0
commit c51264a55d
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/BreCal/services/schedule_routines.py
View File

@ -27,7 +27,7 @@ def UpdateShipcalls(options:dict = {'past_days':2}):
commands = pydapper.using(pooledConnection) commands = pydapper.using(pooledConnection)
query = ("SELECT id, ship_id, type, eta, voyage, etd, arrival_berth_id, departure_berth_id, tug_required, pilot_required, " query = ("SELECT id, ship_id, type, eta, voyage, etd, arrival_berth_id, departure_berth_id, tug_required, pilot_required, "
"flags, pier_side, bunkering, replenishing_terminal, replenishing_lock, draft, tidal_window_from, tidal_window_to, rain_sensitive_cargo, recommended_tugs, " "flags, pier_side, bunkering, replenishing_terminal, replenishing_lock, draft, tidal_window_from, tidal_window_to, rain_sensitive_cargo, recommended_tugs, "
"anchored, moored_lock, canceled, evaluation, evaluation_message, created, modified FROM shipcall WHERE ((type = 1 OR type = 3) AND eta >= DATE(NOW() - INTERVAL %d DAY)" "anchored, moored_lock, canceled, evaluation, evaluation_message, evaluation_message_sent, evaluation_time, created, modified FROM shipcall WHERE ((type = 1 OR type = 3) AND eta >= DATE(NOW() - INTERVAL %d DAY)"
"OR (type = 2 AND etd >= DATE(NOW() - INTERVAL %d DAY))) " "OR (type = 2 AND etd >= DATE(NOW() - INTERVAL %d DAY))) "
"ORDER BY eta") % (options["past_days"], options["past_days"]) "ORDER BY eta") % (options["past_days"], options["past_days"])

56
src/server/BreCal/stubs/shipcall.py
View File

@ -41,40 +41,44 @@ def get_shipcall_simple():
canceled = False canceled = False
evaluation = None evaluation = None
evaluation_message = "" evaluation_message = ""
evaluation_time = None
evaluation_message_sent = False
created = datetime.datetime.now() created = datetime.datetime.now()
modified = created+datetime.timedelta(seconds=10) modified = created+datetime.timedelta(seconds=10)
participants = [generate_uuid1_int(), generate_uuid1_int(), generate_uuid1_int(), generate_uuid1_int()] # field(default_factory=[generate_uuid1_int(), generate_uuid1_int(), generate_uuid1_int(), generate_uuid1_int()]) # list participants = [generate_uuid1_int(), generate_uuid1_int(), generate_uuid1_int(), generate_uuid1_int()] # field(default_factory=[generate_uuid1_int(), generate_uuid1_int(), generate_uuid1_int(), generate_uuid1_int()]) # list
shipcall = Shipcall( shipcall = Shipcall(
shipcall_id, shipcall_id,
ship_id, ship_id,
role_type, role_type,
eta, eta,
voyage, voyage,
etd, etd,
arrival_berth_id, arrival_berth_id,
departure_berth_id, departure_berth_id,
tug_required, tug_required,
pilot_required, pilot_required,
flags, flags,
pier_side, pier_side,
bunkering, bunkering,
replenishing_terminal, replenishing_terminal,
replenishing_lock, replenishing_lock,
draft, draft,
tidal_window_from, tidal_window_from,
tidal_window_to, tidal_window_to,
rain_sensitive_cargo, rain_sensitive_cargo,
recommended_tugs, recommended_tugs,
anchored, anchored,
moored_lock, moored_lock,
canceled, canceled,
evaluation, evaluation,
evaluation_message, evaluation_message,
created, evaluation_time,
modified, evaluation_message_sent,
participants, created,
modified,
participants,
) )
return shipcall return shipcall