From 0c06ac605120269848f66e6acd2f5c63747bcbb5 Mon Sep 17 00:00:00 2001
From: ske087 <scheianuionut@gmail.com>
Date: Fri, 25 Apr 2025 13:34:51 +0300
Subject: [PATCH] updated

---
 py_app/app/__pycache__/routes.cpython-311.pyc | Bin 21097 -> 22105 bytes
 py_app/app/routes.py                          |  13 ++++++++++++-
 py_app/app/templates/quality.html             |   4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/py_app/app/__pycache__/routes.cpython-311.pyc b/py_app/app/__pycache__/routes.cpython-311.pyc
index ceec01e60a9bcb554506dc04ce280419a3edf2c5..8e1e18801e74ca902f0f44d88c661eef684aacb1 100644
GIT binary patch
delta 911
zcma)&Ur1AN6vuz(-py*eGylZq)U}^!vN6(yDb9`E$=v!g-Fh+bsiM0QTAN&rN){tB
zGYcdSB_kpTu?Gv03sDad;iCl;hMEw)^wNt=iXMFG_nS~qAp1Rhew=f@=kNDf`1}&e
zUzkh=!rr=K931FaEMM~oV`X?w=hiG;84!h}sAau&fMM;e&j$K$X`-0%ozH`-UN`pm
z$1&lRaMf?CNcOXk^|HW=sj;+(A6(|WO6?pFG7o6+%8hkt{TvI=7bRQ<<PuTppF<iH
zgOAyY4R3hs@rS?Pb}+r?33)2)WOFTlKomREQjE(kXuyZ^Q8=V6$r*rcE!e#Y7G$Cg
zQB7SN<~=A?-Rx5z;n$N6Z7A3YmMLyeGyEfX-_zOfn8*Aa-5fLjt5_Kfg!GWr!l6-U
z*_MK*Y4~a)L4zqJu8#ApyBrf7_c$gw?sGiA&G4sP`nNT=vP-EY4N+E<X0?G6=G|6m
zYxb2|@<@4>56QRRfcDW}cqY_>G+@MAA;et3<vARVk6ajxE0iCXUQDS}jSr>N5!y~2
z=h+3g+u7wbs<(NaF^)SN&oCEm5K7qoc&Vd0%8JsgW;$gB!vbppEOmGd-4UlQ4Ehed
z(paO7L}mp{_8Ft=Qq@#+GFl+I`id>0GgbcNU?zis9H^a<r{$IErhIkNM9&wgGFRn!
zb8JNl<fTAP3KRrlzb+KWA7ZS}jy2JYIkGR}Cd=;qy;NM5ExmQ($2xs4#aGcqSirL}
g8@$$T#+C$UAAq$$IJZP1wC16uApG_1M2cts4b*+--2eap

delta 585
zcmcb)hVkVRM!w~|yj%=GFj<`|Bi?u;-*ro-8?2KPSPV9cTh%i%Gv=+`Jkwg9kx_Q@
zP8(T9{=OQ96tQe3kdC5`67I<h#YHCXw)URvV%Ii#jV;gQYj(1e=i7(MO4hK?W|+&g
zjFEw1H4sApBSVT*4P%P*WI+dQMw!XB4u(Ku^Bw9L8LKwGcYMbvGYP2f7IRU4c`?Wa
z1%)C5AXPL4NK`3LPIOk@EaPIqDBcGWoCqXPRZXt*FxFNAT2?d_q`(eDID&|27)pTx
z5Chr3>St{J<XXijT*c!Ypx{=TlcV6ApORYC3RE?@%3W@9pyw$(c3P+rZ{6ho9;}Qr
zHnVz);rE3NiM{}<pRu{cSCWxy70}s?K>fvWlb8ExGF!8nP0m%8*!;$C3Dabbpn5S+
zV=pO&Q&RliT+F95#l2aXPqVUmb4{Kbw2^VuWdC4U#*LeEgAX%lIx#XzeqaERADJ1L
R^sg}LePBX}L1e&z3;^QjipT%}

diff --git a/py_app/app/routes.py b/py_app/app/routes.py
index 86c536a..7913e20 100644
--- a/py_app/app/routes.py
+++ b/py_app/app/routes.py
@@ -312,7 +312,18 @@ def get_report_data():
             """, (five_days_ago.strftime('%Y-%m-%d'),))
             rows = cursor.fetchall()
             print("Fetched rows for report 4 (non-zero quality_code, last 5 days):", rows)
-            data["headers"] = ["Id", "Operator Code", "CP Full Code", "OC1 Code", "OC2 Code", "Quality Code", "Date", "Time", "Approved Quantity", "Rejected Quantity"]
+            data["headers"] = ["Id", "Operator Code", "CP Base Code", "OC1 Code", "OC2 Code", "Quality Code", "Date", "Time", "Approved Quantity", "Rejected Quantity"]
+            data["rows"] = [[str(cell) if isinstance(cell, (datetime, timedelta)) else cell for cell in row] for row in rows]
+
+        elif report == "5":  # Logic for the 5-ft report (all rows)
+            cursor.execute("""
+                SELECT Id, operator_code, CP_base_code, CP_full_code, OC1_code, OC2_code, quality_code, date, time, approved_quantity, rejected_quantity
+                FROM scan1_orders
+                ORDER BY date DESC, time DESC
+            """)
+            rows = cursor.fetchall()
+            print("Fetched rows for report 5 (all rows):", rows)
+            data["headers"] = ["Id", "Operator Code", "CP Base Code", "CP Full Code", "OC1 Code", "OC2 Code", "Quality Code", "Date", "Time", "Approved Quantity", "Rejected Quantity"]
             data["rows"] = [[str(cell) if isinstance(cell, (datetime, timedelta)) else cell for cell in row] for row in rows]
 
         conn.close()
diff --git a/py_app/app/templates/quality.html b/py_app/app/templates/quality.html
index 6704b93..c29cca9 100644
--- a/py_app/app/templates/quality.html
+++ b/py_app/app/templates/quality.html
@@ -22,8 +22,8 @@
             <button class="btn report-btn" data-report="4">Raport Articole cu defecte in ultimile 5 zile</button>
         </div>
         <div class="form-centered">
-            <label class="report-description">This report: Report 5 exports a summary of all orders from the database.</label>
-            <button class="btn report-btn" data-report="5">Report 5</button>
+            <label class="report-description">Raportarea tuturor intrarilor din baza de date</label>
+            <button class="btn report-btn" data-report="5">Raporteaza bazade date</button>
         </div>
         <div class="form-centered last-buttons">
             <label class="export-description">Export current report as:</label>