temps tours
This commit is contained in:
@ -10,11 +10,7 @@ from datetime import datetime, timezone
|
||||
from zoneinfo import ZoneInfo
|
||||
from decimal import Decimal
|
||||
from engine.utils import format_temps_decimal
|
||||
from engine.engine_components.regles import resolve_priority
|
||||
from engine.engine_components.regles import check_interval_rule
|
||||
from engine.engine_components.regles import get_last_valid_lecture_time
|
||||
from engine.engine_components.regles import ts_to_utc
|
||||
from engine.engine_components.regles import update_detail_status_zero
|
||||
from engine.engine_components import regles
|
||||
|
||||
LOCAL_TZ = ZoneInfo("America/Toronto")
|
||||
|
||||
@ -97,7 +93,7 @@ def process_course(cur, cnx, con_id: int):
|
||||
|
||||
max_id = max(max_id, rcourse_id)
|
||||
|
||||
dt_utc = ts_to_utc(timestamp)
|
||||
dt_utc = regles.ts_to_utc(timestamp)
|
||||
dt_local = dt_utc.astimezone(LOCAL_TZ)
|
||||
|
||||
log_debug(f"[READ] id={rcourse_id} utc={dt_utc} loc={chr_loc}")
|
||||
@ -195,7 +191,7 @@ def process_course(cur, cnx, con_id: int):
|
||||
interval_sec = 0
|
||||
|
||||
# Appel de la règle d’intervalle
|
||||
status_interval, rc_interval, rr_interval = check_interval_rule(
|
||||
status_interval, rc_interval, rr_interval = regles.check_interval_rule(
|
||||
cur,
|
||||
detail_table,
|
||||
tp_id,
|
||||
@ -208,7 +204,7 @@ def process_course(cur, cnx, con_id: int):
|
||||
|
||||
# Si la règle d’intervalle rejette
|
||||
if status_interval == 0:
|
||||
update_detail_status_zero(
|
||||
regles.update_detail_status_zero(
|
||||
cur,
|
||||
cnx,
|
||||
detail_table,
|
||||
@ -226,7 +222,7 @@ def process_course(cur, cnx, con_id: int):
|
||||
# -------------------------------------------------
|
||||
|
||||
# Appel de la règle tour
|
||||
status_tour = check_tour_rule(
|
||||
tour, tempstour,tempstour_str = regles.check_tour_rule(
|
||||
cur,
|
||||
detail_table,
|
||||
tp_id,
|
||||
@ -235,37 +231,22 @@ def process_course(cur, cnx, con_id: int):
|
||||
det_id
|
||||
|
||||
)
|
||||
|
||||
# Si la règle d’tour rejette
|
||||
if status_interval == 0:
|
||||
update_detail_status_zero(
|
||||
cur,
|
||||
cnx,
|
||||
detail_table,
|
||||
detail_id, # <-- l'ID que tu as obtenu juste après insert_detail_record
|
||||
rc_interval, # reason_code retourné par la règle
|
||||
rr_interval # reason_ref_id retourné par la règle
|
||||
)
|
||||
# Et on arrête le traitement de cette lecture
|
||||
continue
|
||||
regles.update_detail(
|
||||
cur,
|
||||
cnx,
|
||||
detail_table,
|
||||
detail_id,
|
||||
tour,
|
||||
tempstour,
|
||||
tempstour_str
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#tour, prev_ts = compute_tour(cur, detail_table, tp_id, dossard)
|
||||
|
||||
#if forced_tour is not None:
|
||||
# tour = forced_tour
|
||||
|
||||
#if prev_ts is None:
|
||||
# tempstour = Decimal("0")
|
||||
#else:
|
||||
# tempstour = timestamp - prev_ts
|
||||
|
||||
#tempstour_str = format_temps_decimal(tempstour)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user