From 18a1c638e1f8ba72e55b1a6275ae39d828c86673 Mon Sep 17 00:00:00 2001 From: Scheianu Ionut Date: Wed, 17 Sep 2025 20:47:22 +0300 Subject: [PATCH] updated --- .gitignore | 1 + .../__pycache__/order_labels.cpython-312.pyc | Bin 15063 -> 15082 bytes py_app/app/__pycache__/routes.cpython-312.pyc | Bin 53335 -> 58358 bytes py_app/app/routes.py | 124 +++++ .../app/templates/create_template copy.html | 440 ++++++++++++++++++ py_app/app/templates/create_template.html | 78 ---- .../app/templates/import_locations_csv.html | 99 ---- py_app/app/templates/label_templates.html | 21 - py_app/app/templates/main_page_etichete.html | 5 - 9 files changed, 565 insertions(+), 203 deletions(-) create mode 100644 py_app/app/templates/create_template copy.html delete mode 100644 py_app/app/templates/create_template.html delete mode 100644 py_app/app/templates/import_locations_csv.html delete mode 100644 py_app/app/templates/label_templates.html diff --git a/.gitignore b/.gitignore index b7ec88f..42b08bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ recticel/ .venv/ __pycache__/ +app/__pycache__/ diff --git a/py_app/app/__pycache__/order_labels.cpython-312.pyc b/py_app/app/__pycache__/order_labels.cpython-312.pyc index 2d88b5301c98f16b856fd2200ec362d7973a0766..07c12415b7e9474b87ea5b5b5fcb5b2d9c5fc76f 100644 GIT binary patch delta 59 zcmca!`l^)oG%qg~0}vG5J(ZEYk$08|qvGThB7X#Q6bgzm^GZ@v;&T#{QgezoFA?Qt OWY$qI*t}j$Lj?eTuoO%H delta 38 tcmaD=dcBnQG%qg~0}!wTpU8;V$U94fk#F(}kw2Tah;lP-J|w200s#6;46FbE diff --git a/py_app/app/__pycache__/routes.cpython-312.pyc b/py_app/app/__pycache__/routes.cpython-312.pyc index 702debeaf34d8001cedd33278bd54033c9aa2371..b71b5fbd5ca0be304f843d29258a969639b4077d 100644 GIT binary patch delta 7510 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 delta 3160 zcmai$4OCRe6~~!<>|eX`heT zr!+Vry8t(^5LgB*2Py@0waimhRpH}R=$VTiV?O5|&ar6SwAAe@D|c2_@(|IqNAjnk zwgG4aHUgV~WMDJE0nDP4Wn7x-L-QFb7?+@~hqzu_HZDUk`{R#}pVBK6GFUTRo>0%~ z=<$g*wv!qrE*A2YiOFmi-Je(}kec4Xk$*68DW#b?H^9VTZV*qsw->1 z#~s?Aaz-)x%NYCxAVc>mq(JDJ(3ByortI92vjf^vF%W`KxfYkx=j4ZljqYzFv3M(d zAiH@RfH--h1!&&6cnjb(@9(N0*gY;$I9y4a)?Z6Q_ zFm1m1HHdOiM~USp=D&{iz;gBAWnNFUe~aJTovu1-YTVT>xl7&XT2WQw<<-L29?xHe zr-lJ1{0;aV*fZDAlPSWU$k;yuc&ms|Am;GZZMV2h)aJ%G8eJHrbu7*_ z*avL*JFvbEybHVsTms$)KG0%{4jAk*g#y(VEQWNY+Ovw=poB{ES7a02EQ!fMUCL7A z&q9)E7AYiq1V1Z&^k5mbfq3gipU35_josDuIzF?QVdF2)bK1U@ z6~X2U=#|rk9ji-aA89x0er#ZUlv&@+ykuzTivEXC^BM%K zR-OSDpVRe*G_@b%7uuk;ZUWn|JN^lzsVN-MZjZDf(bSMKUPA2X-W+a6H0OonOi6Pm-*?yR(q5g&ccBR zAV|BmHJVNM9rpRH^L^kzG5QDKQ32iL_3;{Cg(&_iO4&Yq66z^%(sm0+W^f}QPddWu zu5_3A+%8m#o8Q5J|J-Ta_J_y&PaK_Tz{kL+0+`3ieGZpTS49bnU(T>(17N1E?b)HS zpe#a{2JMKYU*(2S+KxeNgf@A{op5%GYuz?BUT@7-qoCBSecIY&V8yiVa4}1z>xU;q z-G_yoa-`plt$j{|JflEKE{9HFAM#-2-f(XGBrpob@_>GirYzkpLb68(cFD&<3Bl## zAr0(SH*x1G|9yuo>-4wwST>SEkE~|7+J+;$)xbyG)-hIm-U~Ythcrk(z*s;Q-4wW; zLd_kWERP;P{sPOVd&l>)8MO1n{^(g^uvHNX1<-;KWuI?W=ZaRlLYK~O5pNwww^f}d zIy8kEyBlM4)#qGN>Gs+gmv;=~3uwrNq3S}Razdf33nxRw1p^i8zmS-shm?6LS5#Gd z?ZG?@iwfkwG&k@?n7W9vE+(qQLOi8V$;A)ZZOZN$8zF=K)iif#P0uj3RH*z$(O&Gi zX^1Nl@{@P2wDlJqR)46gB8PnyWqbxb|K5So@{TgqxRyFcwW(_y>Br@$TySn)!T~hzG)#(Z?=egTkkCODVVIG zfAtPi8-#dQ(X5v?kjJQiM$e8wSatD)zd@d^aFJy~iM(0!{;GfKK2o;4Ux% zYfAxg0hxn&kn({UY`h?Hk0aAKvWp{sI1+&4h&e*f5loI?aO|CLqkA7FhV2rf_z&`K P)Z(vY25Wn6J;DA1^6px9 diff --git a/py_app/app/routes.py b/py_app/app/routes.py index 1fc519b..d45cf74 100644 --- a/py_app/app/routes.py +++ b/py_app/app/routes.py @@ -939,6 +939,130 @@ def label_templates(): def create_template(): return render_template('create_template.html') +@bp.route('/get_database_tables', methods=['GET']) +def get_database_tables(): + """Get list of database tables for template creation""" + if 'role' not in session or session['role'] not in ['superadmin', 'warehouse_manager', 'etichete']: + return jsonify({'error': 'Access denied'}), 403 + + try: + # Get database connection using the same method as other functions + settings_file = current_app.instance_path + '/external_server.conf' + settings = {} + with open(settings_file, 'r') as f: + for line in f: + key, value = line.strip().split('=', 1) + settings[key] = value + + connection = mariadb.connect( + user=settings['username'], + password=settings['password'], + host=settings['server_domain'], + port=int(settings['port']), + database=settings['database_name'] + ) + + cursor = connection.cursor() + + # Get all tables in the database + cursor.execute("SHOW TABLES") + all_tables = [table[0] for table in cursor.fetchall()] + + # Filter to show relevant tables (prioritize order_for_labels) + relevant_tables = [] + if 'order_for_labels' in all_tables: + relevant_tables.append('order_for_labels') + + # Add other potentially relevant tables + for table in all_tables: + if table not in relevant_tables and any(keyword in table.lower() for keyword in ['order', 'label', 'product', 'customer']): + relevant_tables.append(table) + + connection.close() + + return jsonify({ + 'success': True, + 'tables': relevant_tables, + 'recommended': 'order_for_labels' + }) + + except Exception as e: + return jsonify({'error': f'Database error: {str(e)}'}), 500 + +@bp.route('/get_table_columns/', methods=['GET']) +def get_table_columns(table_name): + """Get column names and descriptions for a specific table""" + if 'role' not in session or session['role'] not in ['superadmin', 'warehouse_manager', 'etichete']: + return jsonify({'error': 'Access denied'}), 403 + + try: + # Get database connection + settings_file = current_app.instance_path + '/external_server.conf' + settings = {} + with open(settings_file, 'r') as f: + for line in f: + key, value = line.strip().split('=', 1) + settings[key] = value + + connection = mariadb.connect( + user=settings['username'], + password=settings['password'], + host=settings['server_domain'], + port=int(settings['port']), + database=settings['database_name'] + ) + + cursor = connection.cursor() + + # Verify table exists + cursor.execute("SHOW TABLES LIKE %s", (table_name,)) + if not cursor.fetchone(): + return jsonify({'error': f'Table {table_name} not found'}), 404 + + # Get column information + cursor.execute(f"DESCRIBE {table_name}") + columns_info = cursor.fetchall() + + columns = [] + for col_info in columns_info: + column_name = col_info[0] + column_type = col_info[1] + is_nullable = col_info[2] == 'YES' + column_default = col_info[4] + + # Get column comment if available + cursor.execute(f""" + SELECT COLUMN_COMMENT + FROM INFORMATION_SCHEMA.COLUMNS + WHERE TABLE_NAME = %s AND COLUMN_NAME = %s AND TABLE_SCHEMA = DATABASE() + """, (table_name, column_name)) + + comment_result = cursor.fetchone() + column_comment = comment_result[0] if comment_result and comment_result[0] else '' + + # Create user-friendly description + description = column_comment or column_name.replace('_', ' ').title() + + columns.append({ + 'name': column_name, + 'type': column_type, + 'nullable': is_nullable, + 'default': column_default, + 'description': description, + 'field_id': f"db_{column_name}" # Unique ID for template fields + }) + + connection.close() + + return jsonify({ + 'success': True, + 'table': table_name, + 'columns': columns + }) + + except Exception as e: + return jsonify({'error': f'Database error: {str(e)}'}), 500 + @bp.route('/edit_template/') def edit_template(template_id): # Logic for editing a template will go here diff --git a/py_app/app/templates/create_template copy.html b/py_app/app/templates/create_template copy.html new file mode 100644 index 0000000..7df0164 --- /dev/null +++ b/py_app/app/templates/create_template copy.html @@ -0,0 +1,440 @@ +{% extends "base.html" %} + +{% block title %}Create Template{% endblock %} + +{% block head %} + +{% endblock %} + +{% block content %} +
+ +
+
+

Template Settings

+

Set the dimensions and retrieve database headers for the label template:

+ + +
+

Dimensions

+
+
+ + +
+
+ + +
+ +
+
+ +
+ + +
+

Add Fields

+ + .big-card { + box-shadow: 0 4px 12px rgba(0,0,0,0.12); + border-radius: 10px; + padding: 30px 24px; + min-height: 600px; + background: #f5faff; + } + .small-card { + box-shadow: 0 2px 6px rgba(0,0,0,0.10); + border-radius: 10px; + padding: 18px 12px; + min-height: 300px; + background: #fff; + } + + + +
+ +
+

Get Database Headers

+

Retrieve column names from a selected database table:

+ +
+ +
+
+ +
+
+ +
+ + +
+
+ + +
+
+

Interactive Label Preview

+

Drag and drop fields to design your label:

+
+
+ +
+
+ +
+
+
+ + + +{% endblock %} \ No newline at end of file diff --git a/py_app/app/templates/create_template.html b/py_app/app/templates/create_template.html deleted file mode 100644 index 0802da5..0000000 --- a/py_app/app/templates/create_template.html +++ /dev/null @@ -1,78 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Create Template{% endblock %} - -{% block content %} -
- -
-
-

Template Settings

-

Set the dimensions and retrieve database headers for the label template:

- - -
-

Dimensions

-
-
- - -
-
- - -
- -
-
- -
- - -
-

Add Fields

- - - - -
- -
-

Get Database Headers

-

Retrieve column names from a selected database table:

- -
- -
-
- -
-
- -
- - -
-
- - -
-
-

Interactive Label Preview

-

Drag and drop fields to design your label:

-
-
- -
-
- -
-
-
- - - -{% endblock %} \ No newline at end of file diff --git a/py_app/app/templates/import_locations_csv.html b/py_app/app/templates/import_locations_csv.html deleted file mode 100644 index 1d287d8..0000000 --- a/py_app/app/templates/import_locations_csv.html +++ /dev/null @@ -1,99 +0,0 @@ -{% extends "base.html" %} -{% block title %}Import Warehouse Locations from CSV{% endblock %} -{% block content %} -
- -
-

Import Locations from CSV

-
- - {% if not locations %} -
- - {% else %} -
- - {% endif %} - -
-

CSV File Format

- - - - - - - - - - - - - - - - -
Location CodeSizeDescription
EX123100Zona depozitare A
-
-
- - - -
- -
-

Preview Table

- - - - - - - - - - {% if locations %} - {% for loc in locations %} - - - - - - {% endfor %} - {% else %} - - {% endif %} - -
Location CodeSizeDescription
{{ loc[0] }}{{ loc[1] }}{{ loc[2] }}
No CSV file uploaded yet.
-
- {% if report %} -
-

Import Report

-

{{ report }}

-
- {% endif %} -
-{% endblock %} diff --git a/py_app/app/templates/label_templates.html b/py_app/app/templates/label_templates.html deleted file mode 100644 index 0a167f4..0000000 --- a/py_app/app/templates/label_templates.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Label Templates{% endblock %} - -{% block content %} -
-
-

List of Label Templates

-
    - {% for template in templates %} -
  • - {{ template.name }} - - -
    • - {% endfor %} -
- -
-
-{% endblock %} \ No newline at end of file diff --git a/py_app/app/templates/main_page_etichete.html b/py_app/app/templates/main_page_etichete.html index 311e1fd..cdfd254 100644 --- a/py_app/app/templates/main_page_etichete.html +++ b/py_app/app/templates/main_page_etichete.html @@ -24,11 +24,6 @@ -
-

Manage Label Templates

-

Manage and configure label templates.

- Manage Templates -
{% endblock %} \ No newline at end of file