From 282d311e6af30ff5369f83b19e4e48cd9f857cf5 Mon Sep 17 00:00:00 2001 From: Scheianu Ionut Date: Thu, 18 Sep 2025 21:56:31 +0300 Subject: [PATCH] updated correct label and collumns in te database for label --- .../__pycache__/order_labels.cpython-312.pyc | Bin 15082 -> 16806 bytes py_app/app/order_labels.py | 65 ++++- py_app/app/print_module.py | 42 +-- py_app/app/templates/main_page_etichete.html | 7 +- py_app/app/templates/print_module.html | 97 +++++-- py_app/app/templates/upload_orders.html | 246 ++++++++++++------ py_app/app/templates/view_orders.html | 118 ++++++++- 7 files changed, 437 insertions(+), 138 deletions(-) diff --git a/py_app/app/__pycache__/order_labels.cpython-312.pyc b/py_app/app/__pycache__/order_labels.cpython-312.pyc index 07c12415b7e9474b87ea5b5b5fcb5b2d9c5fc76f..e547fba1f9e71e6b70d9d64a36e85d7fd6fa89c3 100644 GIT binary patch delta 4536 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�|;4gc|_V|jYfOE*? zhwpoap%eENHmL2n!k3^6-z)SAj%n*TYfMLU#G(drSCKx4(l_^^tjI~Y=Pz!2p=hJx zInI{&1HS03#~JUZdA zrCL4M<$K@NOz9!2!jb9YD8o;NP%IJ~Mg91%zM7f@8Tt;X@j>;3fz@`tCvCQ#|5BQ; z-Yrcn*K*HjzU;qpY^nZF#_BEL#~sDZ&Z4@sza?EznJzt?_Ee>Fybo;p{ifNzhtAZ` ziVd*3+%F8lttbQr`xSAa_l~~uj;8YQwh#CQ;Nxur@P7k7ItCRbK=D5h2k_th@6Yhy z$8A-eP3*GJt|MZ_EOiD9EBP+UnKD#n%{C_MXM>RQ^zZAPJL9l1+l^K3pFdg~h3#24*3QE#BThoP#77T7)Ob)jNhvH7OcZ!ZS_m^NRdFHk;0BM5SG!5 zjH59`V;a@dHajssf#?>Hjsi!(FQGRm4^y~E;dMM$n+N;x_1b#)ZTxX<7kLc;ut944 zo2i<*j~J=>ZvLU0`j7H^?%I3rWc6aH;rnG8a9bnv9%OGDb9zhI+a(;~Pld0A7*M|4 zWvJv}rm+Y1;=V@bOj08=)Xj-xRjE-Wr%J6Vc~$CEDX3CZrCyZ=RT@=kQl&&CxiCz- z`3HhIzE49ln(|b_15JeibCRQJ>2sA)pd=`ZnxGW^AAsZj;_(oAjpJq^~o-DZ@nM=gt!# z<1 zP@i+@Y{!*?w@1?6;wAIqKswK}5STxc_IMXUiwDx~`~~y;K)T4c1Q)x~zLKTD;+b?o z(L(=XcDl4;>9t?f?P`*FRr8ay^~$0zy}w|=Ge4?|2X4t_`Zth_(iTfr-YUYcwl?Ip z=e2vlvPbCP*yU2G1F*}DknrCDu7krjTRSRF&~407xI}>-h>~BG8+Rv+lu)DbfNtPG wn^XK1q4cF0@5aa5Dm;xacY6w!!J6%tVJn1z?ZeCo2#X({V@ja~rHJDH0N

View Orders

-

View uploaded orders and manage label data for printing.

- View Orders +

Upload new orders or view existing orders and manage label data for printing.

+
diff --git a/py_app/app/templates/print_module.html b/py_app/app/templates/print_module.html index 4eabcbb..a56c8e4 100644 --- a/py_app/app/templates/print_module.html +++ b/py_app/app/templates/print_module.html @@ -23,55 +23,82 @@ INNOFA RROMANIA SRL - +
- +
-
-
-
-
- -
-
+
+
+
+
+ +
+ +
+ +
+ -
+
Quantity ordered
-
+
- -
- -
-
+
Customer order
+
+ +
-
+
Delivery date
-
+
-
+
Description
-
+
+ + +
+ Size +
+
+ +
+ + +
+ Article Code +
+
+ +
+ + +
+ Prod Order +
+
+ +
@@ -90,6 +117,8 @@ Cod Articol Descr. Com. Prod Cantitate + Data
Livrare + Dimensiune Com.Achiz.Client Nr. Linie Customer Name @@ -123,6 +152,10 @@ document.getElementById('check-db-btn').addEventListener('click', function() { ${order.cod_articol || '-'} ${order.descr_com_prod} ${order.cantitate} + + ${order.data_livrare ? new Date(order.data_livrare).toLocaleDateString() : '-'} + + ${order.dimensiune || '-'} ${order.com_achiz_client || '-'} ${order.nr_linie_com_client || '-'} ${order.customer_name || '-'} @@ -156,19 +189,36 @@ document.getElementById('check-db-btn').addEventListener('click', function() { const clientOrderInfo = comAchizClient && nrLinie ? `${comAchizClient}-${nrLinie}` : 'N/A'; document.getElementById('client-order-info').textContent = clientOrderInfo; - // Update delivery date (using created_at as placeholder since delivery_date column doesn't exist) - const deliveryDate = data[0].created_at ? new Date(data[0].created_at).toLocaleDateString() : 'N/A'; + // Update delivery date (using data_livrare column) + const deliveryDate = data[0].data_livrare ? new Date(data[0].data_livrare).toLocaleDateString() : 'N/A'; document.getElementById('delivery-date-value').textContent = deliveryDate; + // Update size (using dimensiune column) + const size = data[0].dimensiune || 'N/A'; + document.getElementById('size-value').textContent = size; + // Update description (Descr. Com. Prod) const description = data[0].descr_com_prod || 'N/A'; document.getElementById('description-value').textContent = description; + + // Update article code (using customer_article_number column) + const articleCode = data[0].customer_article_number || 'N/A'; + document.getElementById('article-code-value').textContent = articleCode; + + // Update prod order (comanda_productie - cantitate) + const comandaProductie = data[0].comanda_productie || ''; + const cantitate = data[0].cantitate || ''; + const prodOrder = comandaProductie && cantitate ? `${comandaProductie}-${cantitate}` : 'N/A'; + document.getElementById('prod-order-value').textContent = prodOrder; } else { document.getElementById('customer-name-row').textContent = 'No data available'; document.getElementById('quantity-ordered-value').textContent = '0'; document.getElementById('client-order-info').textContent = 'N/A'; document.getElementById('delivery-date-value').textContent = 'N/A'; + document.getElementById('size-value').textContent = 'N/A'; document.getElementById('description-value').textContent = 'N/A'; + document.getElementById('article-code-value').textContent = 'N/A'; + document.getElementById('prod-order-value').textContent = 'N/A'; } }) .catch(error => { @@ -177,7 +227,10 @@ document.getElementById('check-db-btn').addEventListener('click', function() { document.getElementById('quantity-ordered-value').textContent = 'Error'; document.getElementById('client-order-info').textContent = 'Error'; document.getElementById('delivery-date-value').textContent = 'Error'; + document.getElementById('size-value').textContent = 'Error'; document.getElementById('description-value').textContent = 'Error'; + document.getElementById('article-code-value').textContent = 'Error'; + document.getElementById('prod-order-value').textContent = 'Error'; }); }); diff --git a/py_app/app/templates/upload_orders.html b/py_app/app/templates/upload_orders.html index d5b72d4..33b89f4 100644 --- a/py_app/app/templates/upload_orders.html +++ b/py_app/app/templates/upload_orders.html @@ -1,5 +1,136 @@ {% extends "base.html" %} {% block title %}Upload Order Data for Labels{% endblock %} + +{% block head %} + +{% endblock %} + {% block content %}
@@ -48,29 +179,34 @@

Preview Table

- +
- - - + + + - - - - - + + + + + + + {% if orders %} {% for order in orders %} + {% if order and (order.get('comanda_productie', '') or order.get('descr_com_prod', '')) %} + + @@ -78,9 +214,10 @@ + {% endif %} {% endfor %} {% else %} - + {% endif %}
Comanda ProductieCod ArticolDescr. Com. ProdComanda
Productie		Cod
Articol		Descr. Com.
Prod		 CantitateCom.Achiz.ClientNr. Linie com. ClientCustomer NameCustomer Article NumberOpen for orderData
Livrare		DimensiuneCom.Achiz.
Client		Nr. Linie com.
Client		Customer
Name		Customer Article
Number		Open for
order		 Line
{{ order.get('comanda_productie', '') }} {{ order.get('cod_articol', '') }} {{ order.get('descr_com_prod', '') }} {{ order.get('cantitate', '') }}{{ order.get('data_livrare', '') }}{{ order.get('dimensiune', '') }} {{ order.get('com_achiz_client', '') }} {{ order.get('nr_linie_com_client', '') }} {{ order.get('customer_name', '') }}{{ order.get('open_for_order', '') }} {{ order.get('line_number', '') }}
No CSV file uploaded yet.
No CSV file uploaded yet.
@@ -123,115 +260,78 @@
+{% endblock %} + {% block content %}
@@ -46,19 +136,21 @@
{% if orders %} - +
- - - + + + - - - - - + + + + + + + @@ -72,6 +164,14 @@ + +
IDComanda ProductieCod ArticolDescr. Com. ProdComanda
Productie		Cod
Articol		Descr. Com.
Prod		 CantitateCom.Achiz.ClientNr. LinieCustomer NameCustomer Art. Nr.Open OrderData
Livrare		DimensiuneCom.Achiz.
Client		Nr.
Linie		Customer
Name		Customer
Art. Nr.		Open
Order		 Line Printed Created{{ order.cod_articol or '-' }} {{ order.descr_com_prod }} {{ order.cantitate }} + {% if order.data_livrare %} + {{ order.data_livrare.strftime('%Y-%m-%d') if order.data_livrare is not string else order.data_livrare }} + {% else %} + - + {% endif %} + {{ order.dimensiune or '-' }} {{ order.com_achiz_client or '-' }} {{ order.nr_linie_com_client or '-' }} {{ order.customer_name or '-' }}