From f271cea42ca7e08e680b5dda8a0a7eaadadf84da Mon Sep 17 00:00:00 2001
From: stephan <stephan@progiweb.ca>
Date: Fri, 12 Dec 2025 10:49:13 -0500
Subject: [PATCH] temps tours

---
 .../process_course.cpython-313.pyc            | Bin 5746 -> 5933 bytes
 .../__pycache__/regles.cpython-313.pyc        | Bin 5986 -> 6061 bytes
 engine/engine_components/process_course.py    |  51 ++++------
 engine/engine_components/regles.py            |  88 +++++++++++-------
 4 files changed, 72 insertions(+), 67 deletions(-)

diff --git a/engine/engine_components/__pycache__/process_course.cpython-313.pyc b/engine/engine_components/__pycache__/process_course.cpython-313.pyc
index 5d5a27351de35d48476b9c43b11f1a4d15843fae..685dd63cd9bb6dc9bcd502655b9aae714e0218f8 100644
GIT binary patch
delta 1117
zcmY*ZO=ufO6rNdG)>_g2*el7By;fw&vc1-iMQ!<yq{hy#p-PIx;t(4)%6f4eyHc24
zwWXBS$3ic4211T$p@$yYi=er+hY(0Y0*QQ((9I=~tFc`QJ%r3iY`5OS_r96;y*Ka8
z&mN_I&2YyY=LO_T%%9sj+T+6T+1}XC<LmwyC~`SSJpiD=B0m6-Tol%arkSER0Pc37
z$Y!t7R~vyD=;=nr=8j?3o-oVMJxBujvA1g#zOCKvy2-eht1|wxTU(Xexd;>@HgjwY
zr~!Mqa!?Hxh8>^H)?zmMPuahgz?x?XCh(7*F^KVV&k*772>%@mY#5GVg<XOQ-ewc<
zAG}9+67RF;r)B|AU24Ql5*E`G3u!yIV~d$A$T6L9A&oEetVWz3GLFt>G5k}{#J8lm
zHAj}UosK1~0u`!pbwnLkm0Wkn69rdb{*P0!A2~5LYsbdbh$^cAHD<?FT>z9P%E@wS
zO}=bP3)41p?EjXYP?KsZ=jr&OK;?_W3pW7RAgQh}c?P?^vo0oo7B6}ea26W`U(~+$
zW?h_&hy)<IX=o5X<5q+|LR&qSsaX}RYUwz@PwFj6zhmgz+E&>z(C4Kc4OMrHR=9d^
zqhuM{hGCVqb~Mu}SyfZ}%0QKt(9v6!D(YytQ(8nTRnje&UPT1TU!oyg;&)*V|HUWa
zIOc_r7@{SGDa=rq#WTW4_avoRd`k$zDg1??`_UYonWwNoz@!I{4}@`iD7d3&fQ(xF
zJyg*R)6{fQjY+B_ll1PHTQx;|0Da+x6t7G1M=SeMruMY=G4w1p<_h(>0{%vt^aLAX
zwk~GzZ<1U%=>zGhMryg9T5gI`Q<R%xpegn@#c)#$9&>D(f8$fWyZD3hFi)hM)bK^?
zzGz$8Q4^iNtsXiNSdKp&#V@5PHtz;v=;Tv3_V{DN*BRKGXvRnGfAX*CBUQfe_vRJm
zmC}`;bYD}>wqp3bKU~xO7a<H08d^Z~z|aZ>`dHB=3be;x$Q!4;y$S5O&ng?_&^|_A
slR5e)FjsIOm>f+WoRMDp6Z>aIciAJ+4duh2?t;tkQSookCha620KRzY{{R30

delta 918
zcmZ9LO=uHA6vt<>NwbaJByB!4ZPFx7V@w;Z+LmIi9}%TiQ$@GIYL#W#EH#>T>)TDS
z6|vw&@T4Q+Mf6fZML}}#sNh9Ju+WQC3wlum4^k_LAowP=9vs-mZ~pt<f8QHsA8lI7
zNZ%#NMQ{zL`-;D>Ng?|4T55J!CbD!ebf5{EVg%WZ9ENa}J;)J=RN0H%49zie(%(Yl
z`fkdd2!W{F&`2OA`%cEYY_h+RoUud8XdoSYvb>32@`7#}rAb|xfT96KYbs3_eA;PU
zJF67OEgdG+k^<$Dj&jqeZYd?zv=kJJ1*N2GRvC1~Dvt5jwU((^hEldP+=R*#1=Z4(
zf^MnBl44q_RW_Ar9gJyDc1(w&rgjV&U{rc+UDOf9KAYHtaExXuFNG5}f$o3Kk~K;;
zQXK(9KCn8^crYJ4$_xHmBe7NCU*_781bbJLr3n^srlMES#kJvYk{ZTcFz@QUL5Lb8
z1T!^fiaumlogtcJv(79{vCqyV{mLXUOVjMIxWkvh8X@28Ko5B%k4M|t9WhGV*)#E&
zxbd$w>#A+5^Py$OsxVXA=(~-zZaLmNOh`c>q@NDnV+mJ}KnGv2Q?4Z4!Y*T+s@!*N
z7Nihh3IYBJh_X-8fIWc7cDg$vfX)Q4V**YL>9z$yD+7k{^AKlq?isp`9r3i&47=!A
z=fx=r@I!=N9=5YtPisvl$1e896Qn)tlSgxyZKyESn~ukz8F9fq0fwfVrlJ{TFm)J5
zaXmh!Sb5;RNo&Hlj?ep2m0ZJ9YRggP@^|0~?e>Rl-!km6zf&~q#Jg@8?CgubC4P?5
z`sCY0>-F3(vkpyO)z;@E+iS_5^EnQs6ALZuLm*Vy7uZW_l;aTSqb1#h2FzWV*3XHb
zz{=b?PW%SI01v#m`*^`QSGyPc#*6}9*`06!HU1lzdG<cozO`?W>{=xKi==yz?EARJ
eH|I~zuUS7ME_od^{4F>n&^`37{DV}XYWN3RA=qjF

diff --git a/engine/engine_components/__pycache__/regles.cpython-313.pyc b/engine/engine_components/__pycache__/regles.cpython-313.pyc
index 8f94770c07a430355207cdbede6846a213b24d86..c55b56dbf9b025cc5807f10cbe2b3177de5a9077 100644
GIT binary patch
delta 1749
zcmaJ>O>7%Q6rS<^@7n91+OAzEt=%RxPDp5QT3SeGX-GxV)I!~^YGIIN*-mOTal-5x
zK{?nxpe7t3VOj}^OSx3-p%M@d2nlXT2qBRu7t2c3h(mj|lAM48Z|vGZs>De9?VI=J
z&Agv)=Fg#rFX_83mx|apGg^#wt?D5>vwHmHGsxgCN>ehCqsR~rA)*)}plV2fnjr%^
z4F%9;sDQem0lH_Mao1{fEELCe|I7lJ&)ONgFu!PJ@`YS+K0EjAPe~r@Yfhnrg#kEH
zS*wV*Fz%s$YlmsCd|WI$5L*0@Cgt(7N*XuA0x%>~F=RI~lmvJ3nKp`2cV6`&l<ft(
z3U&?bPE*j?Dxsv(bvYbXVdgPK9VO&_KSNC2TXQIHW2{p{?e}Tq5S&4}7<4l@Og~q<
z&&5Ej>vLHPawyIhEIT{DSXWx}g)*rN`NEu?t&60PwH8X22Fs)SgY?sFHLSh@+9G_`
z7Ui@acl5O%#(yoZXRd8ViyM45O=v%_{-$C?|Iyy1OU{9e$P!36_JcKrK5%Cv4~fr8
zX{j|sD6O<5Q!r!!CT*|wAM^^-k2rczTut7HrD;};MBj_ri(_OE3}gu4MnY|eZA?s0
zj9;M>TrYk|uXD#}{J>HAJ$I1);<`+~(_g5>9m!-}@0240x#x)&Hi-*_XB!3?gcz`c
z$w7d)_*{KKTUT>sLJB1)u0^1Q$PxisfslR>$%!_6%B&QiN|WwMM<Yo8a7PkPG`;2y
z?}<q9+~!us*F$|9{`jV+e^VZ)$=cF|WvwA_PO*VFK_sWaJBPpU`PX6|Hx^k~BtTDj
zCj;!Lx?)=ydm&S{b7TVM_vmf!Or`0=f@%*|c@Dna4*>3<eR`&F>X^x&WEsO~Qh3&s
zazJGRmn2in0XNdjvpI}TcT1uv860awNlslDgj-lr($9856=W*yMwZmnvZ;=6&_+H<
zU|&?nCx{OJIM=EZ^CB`+JkMrk8fL&4O%e=77_h!U>g;~njL@!*n6Ye9d7ja1y*qcU
zkh>1mDw7N;&lSiNXupBadIzA2_JSxjTH~da^4*ViIY&$cnpcwz8Oh!aDOB?vSW>p7
zz=qVl6^`CL@Kx86zODFHhL<DNH*22ohNr(ex#jP>AKo1BC#sjWHTRce>ssGB-`DD4
zhy8F^rynVL-`}g6yeXKX$&K)I(?1|VX_9|=Rr&_sHEB#-iL!{JW6@sg#SYyW+d4V_
zpN-X{X{TQYy7;6yJq<#@MG7;SVjc`l&Evq)$^%F1281EJxYXi(1mxD^;${-7I(du1
zB!I<|Xt6%pq<!60Ud(6h0=$@Zwm3(UVE>&hJP%Ms4IdKZTNiI$Y#<!)*1X*-dIL#E
zga#*j<wlPWDXyCAt;qqvh9aoqp4TNvjl;}q>gLoZ)8sV$%>P6n)36=A75F$rE`ij(
zqyLGO#)1R5pI!<c5iY}ur}X{cd5PVLWZXl43=UW7&O&LnSSk#a?c$u(Bp+dKI$>{K
zi<Rs$H3`y8gRp%bpk^amxyqyS3wa>X>*Ok!*u!qI6B-=G_$eBEgd&g8@keNIM^0lr
jxO0w+;K<H-9K_<z=@5^v;vIh&$3e#4-BT{?ZEpQ9vZ8b>

delta 1648
zcmZuxUrbw77{8~z_x858_qNbK49d!7Y%3jYp%!r2#^zQ!By1hwQkhw1X-bDgXz|?3
zG}Q=uFx#Sw;F)G7KJ3NBJ!nu~+=E6Rd^IJ!V1tTAx7P-EHh$-}WlndJ^Sj^q{+x5a
z@BF^=MfV>Oc~_Eb42(zalQW+*ugC|`_)6fp0NcV~i^>5CDi3H?Er2#v02Ea#pncjF
z6jweR`08<zMbcV7mq*+&*hpA=z~4kjAyFY=%3H|WLi~(y1<^C;P%SAz6&#FejhXvu
zT7|j%?ukZ*$s7T@4eTP=?I}*CUR>Tv{uY{>t*~;Yc$tX_PvTVm^2cjE)=`8ca>I74
z(T1Dh4D6%OO5q^+)^>100kJI4W;8vm&&=gCJu^37=B9G9dZx_dTt+M8HChE_f8Zbu
zab;i4WnW9r<n<iBo|#SKh1neL1Isi_?PoF|9=3aWR$bpGO5;~IJg<;>@jIIcHZ#m!
z7E0hJFWJv@{wsYxg&+}2$^<B+%rwOm3uud3`w+Qfk0Fu#U~fYV`Q6^sYUg01db;)R
zVJ0Xgi|wRa_B-_X0UQD!90n+c$%y1{u+_6TKX&P&GFe<BOHv2<#vCWxQgX3XO<YLC
z$Cdp;q@e&)O3l|fsZ6|>7)vPne0pX|8BmJN%Gu<glAX;!8Lk!5Qw2@SU}^~zj|L1I
zlv7{OKod2V|JnGIQaq|$8XHWEDd%2Rbi&JxR^`I*#o=)!dXj|Yz+zc`IwZ(pmZs#P
z&_sb&0eb<0{QoW(v}Id%0pnaAZdb#HL80*g)hZYliMwHKz%6Qh2(ZL#u~NwyT|Gj!
z<QI<bxfxF0<PY6Hbw5&JP}H;OX;~gB`Fd9;R);}xx@)tm@AD8y&xb0UnG5fkInGqE
z6Tidf|5cPX9j-sc#=Eg)t>o)kZwhU=!W&|w#71!c+O(q+@$~Ppn|$OP_88Q%>RMVa
zq!;uoj)Unlvg^F&>jx=IbFUAYhry+<33B-*N*z<oe7U37)Mp}B?S3-q5*G7pitVgL
zWFR8Ns%BcTEVS1&*s7~McZDjAam7-Xz{)*~V|hNssXQfBitjZ6<1EQyY@b+l3KbS`
zNNIce_V%4>jC#MuzJbMk5=`av%*-t1*I+`8?+4UKVXUzejt-iz1fL{64rqu$_L;1(
zJc|_u6Ux?V*TbJKmM!x*cO5vQ(e!IgQf+j5wlFuppy%L9fJsAO{t~990W2}wtmWp&
zjgbmt@;J5~zFYYU!yn`-oX{XtoQ&u!S)2D71kP7+Got)K=yvG6$Wr`~C@*&`Ut8%~
zZ#=T;@NPR@q2=={;?nSz?75r0*HQ9E)?2zaygeIobZKZ?bT7Ytd*EK6B(|5>cHB>X
zazAnvpR{snbnxtWLYX8FJ#V!^U5ws10KZr7h!&8m@19I9c)L)Lyy<P@MnL-``P6&P
zLaCJuO5`tZ^bJhkY2zKMHU=f2ku;|M4;W0HtA!Cx%@wBL)jN$ZfsVe{S`R?Qj1YRv
rgnwatzcGOwc;8WY=N*#|`F75sCe*!if<+T(r_qfL?M5WjVC?u0!{c;-

diff --git a/engine/engine_components/process_course.py b/engine/engine_components/process_course.py
index 5fbb42d..5cb1dc4 100644
--- a/engine/engine_components/process_course.py
+++ b/engine/engine_components/process_course.py
@@ -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)
-
+     
 
         
 
diff --git a/engine/engine_components/regles.py b/engine/engine_components/regles.py
index 7c8c72d..7d25981 100644
--- a/engine/engine_components/regles.py
+++ b/engine/engine_components/regles.py
@@ -2,6 +2,7 @@
 from engine.logger import log_info, log_debug
 from decimal import Decimal
 from datetime import datetime, timezone
+from engine.utils import format_temps_decimal
 # -------------------------------------------------
 #  Règle de priorité : remplace, rejette, ou force tour
 # -------------------------------------------------
@@ -111,7 +112,7 @@ def check_interval_rule(cur, detail_table, tp_id, dossard, timestamp, interval_s
 
     log_debug(f"[INTERVAL] tp_id={tp_id} dossard={dossard} interval_sec={interval_sec}")
 
-    last_timestamp = get_last_valid_lecture_time(cur, detail_table, tp_id, dossard, timestamp)
+    last_timestamp, last_tour = get_last_valid_lecture_time(cur, detail_table, tp_id, dossard, timestamp)
 
     log_debug(f"[INTERVAL] last_valid={last_timestamp} current={timestamp}")
 
@@ -137,27 +138,26 @@ def check_interval_rule(cur, detail_table, tp_id, dossard, timestamp, interval_s
 def get_last_valid_lecture_time(cur, detail_table, tp_id, dossard, current_ts):
     log_debug(f"[get_last_valid_lecture_time] tp={tp_id} dossard={dossard} current={current_ts}")
     cur.execute(f"""
-        SELECT timestamp_read
+        SELECT timestamp_read, tour
         FROM `{detail_table}`
         WHERE tp_id = %s
-          AND cla_info_dossard = %s
-          AND status = 1
-          AND timestamp_read < %s
+        AND cla_info_dossard = %s
+        AND status = 1
+        AND timestamp_read < %s
         ORDER BY timestamp_read DESC
         LIMIT 1
     """, (tp_id, dossard, current_ts))
-    log_debug(
-    f"SELECT timestamp_read FROM `{detail_table}` "
-    f"WHERE tp_id = {tp_id} AND cla_info_dossard = '{dossard}' "
-    f"AND status = 1 AND timestamp_read < {current_ts} "
-    f"ORDER BY timestamp_read DESC LIMIT 1;"
-)
+ 
     row = cur.fetchone()
     log_debug(f"[get_last_valid_lecture_time] result={row}")
-    if not row:
-        return None
 
-    return Decimal(str(row["timestamp_read"]))
+    if not row:
+        return None, None
+
+    return (
+        Decimal(str(row["timestamp_read"])),
+        row["tour"]
+    )
 
 
 # -------------------------------------------------
@@ -184,25 +184,48 @@ def check_tour_rule(
             ):
 
 
+    last_timestamp, last_tour = get_last_valid_lecture_time(
+    cur, detail_table, tp_id, dossard, timestamp
+    )
+ 
+    if last_tour is None:
+        last_tour=0
+ 
+    if last_timestamp is None:
+        last_timestamp = Decimal("0")
+       
+    tour=last_tour+1;   
+    tempstour = timestamp - last_timestamp
+    tempstour_str = format_temps_decimal(tempstour)
+
+    return tour, tempstour,tempstour_str
+
+
+def update_detail(
+    cur,
+    cnx,
+    detail_table,
+    detail_id,
+    tour,
+    tempstour,
+    tempstour_str
+):
     cur.execute(f"""
-        SELECT tour, timestamp_read
-        FROM `{detail_table}`
-        WHERE tp_id = %s
-          AND cla_info_dossard = %s
-          AND status = 1
-        ORDER BY detail_id DESC
-        LIMIT 1
-    """, (tp_id, dossard))
+        UPDATE `{detail_table}`
+        SET tour = %s,
+            tempstour = %s,
+            tempstour_str = %s,
+            reason_code = NULL,
+            reason_ref_id = NULL
+        WHERE detail_id = %s
+    """, (
+        tour,
+        tempstour,
+        tempstour_str,
+        detail_id
+    ))
 
-    row = cur.fetchone()
-
-    if not row or row["tour"] is None:
-        return 1, None
-
-    last_tour = row["tour"]
-    prev_ts = Decimal(str(row["timestamp_read"]))
-
-    return last_tour + 1, prev_ts
+    cnx.commit()
 
 
 def update_detail_status_zero(cur, cnx, detail_table, detail_id, reason_code, reason_ref_id):
@@ -218,4 +241,5 @@ def update_detail_status_zero(cur, cnx, detail_table, detail_id, reason_code, re
         WHERE detail_id = %s
     """, (reason_code, reason_ref_id, detail_id))
 
-    cnx.commit()
\ No newline at end of file
+    cnx.commit()
+      
\ No newline at end of file