diff --git a/src/server/BreCal/services/schedule_routines.py b/src/server/BreCal/services/schedule_routines.py index a2c33dc..77470fb 100644 --- a/src/server/BreCal/services/schedule_routines.py +++ b/src/server/BreCal/services/schedule_routines.py @@ -27,7 +27,7 @@ def UpdateShipcalls(options:dict = {'past_days':2}): commands = pydapper.using(pooledConnection) 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, " - "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))) " "ORDER BY eta") % (options["past_days"], options["past_days"]) diff --git a/src/server/BreCal/stubs/shipcall.py b/src/server/BreCal/stubs/shipcall.py index c76a8e9..9a166e1 100644 --- a/src/server/BreCal/stubs/shipcall.py +++ b/src/server/BreCal/stubs/shipcall.py @@ -41,40 +41,44 @@ def get_shipcall_simple(): canceled = False evaluation = None evaluation_message = "" + evaluation_time = None + evaluation_message_sent = False created = datetime.datetime.now() 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 shipcall = Shipcall( - shipcall_id, - ship_id, + shipcall_id, + ship_id, role_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, - anchored, - moored_lock, - canceled, + 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, + anchored, + moored_lock, + canceled, evaluation, - evaluation_message, - created, - modified, - participants, + evaluation_message, + evaluation_time, + evaluation_message_sent, + created, + modified, + participants, ) return shipcall