diff --git a/__pycache__/app.cpython-312.pyc b/__pycache__/app.cpython-312.pyc index 6618bef..18d2bc2 100644 Binary files a/__pycache__/app.cpython-312.pyc and b/__pycache__/app.cpython-312.pyc differ diff --git a/__pycache__/models.cpython-311.pyc b/__pycache__/models.cpython-311.pyc new file mode 100644 index 0000000..266eac3 Binary files /dev/null and b/__pycache__/models.cpython-311.pyc differ diff --git a/__pycache__/models.cpython-312.pyc b/__pycache__/models.cpython-312.pyc index 84cd74b..3d4cca7 100644 Binary files a/__pycache__/models.cpython-312.pyc and b/__pycache__/models.cpython-312.pyc differ diff --git a/addoborudtodb b/addoborudtodb new file mode 100644 index 0000000..e69de29 diff --git a/app.py b/app.py index 1aa53ca..75793c3 100644 --- a/app.py +++ b/app.py @@ -6,6 +6,7 @@ from flask_migrate import Migrate from datetime import * import csv import random +from urllib.parse import unquote app = Flask(__name__) @@ -77,10 +78,12 @@ def searchonaud(): results = [] for auditory, oboruds in q: results.append({ + 'num_ved': oboruds.numberved, 'auditory_id': auditory.id, 'auditory_name': auditory.audnazvanie, 'inv_number': oboruds.invNumber, 'oboruds_id': oboruds.nazvanie, + 'raspolog': oboruds.raspologenie, }) return jsonify(results) @@ -183,30 +186,24 @@ def zamsearch(): @app.route('/addraspved', methods=['GET', 'POST']) def addraspved(): if request.method == 'POST': - query_string = request.data - # Convert the bytes object to a string - query_string_str = query_string.decode("utf-8") - # Split the query string by '&' to get individual key-value pairs - key_value_pairs = query_string_str.split("&") + query_string = request.data.decode() - # Create a dictionary to store the key-value pairs - query_dict = {} - for pair in key_value_pairs: - key, value = pair.split("=") - query_dict[key] = value + print(query_string) + un_query_string = unquote(unquote(query_string)).split(',') - # Retrieve the values for specific keys - rasp_value = query_dict.get("rasp") - ved_value = query_dict.get("ved") - - print(f"Value for 'rasp': {rasp_value}") - print(f"Value for 'ved': {ved_value}") + print(un_query_string) - - return jsonify({'success': True}, 200, {'ContentType': 'application/json'}) - + + ob = db.session.query(Oboruds).filter_by(invNumber=un_query_string[0]).first() + ob.raspologenie=un_query_string[2] + ob.numberved = un_query_string[1] + db.session.commit() + db.session.close() + + return jsonify({'success': True}, 200, {'ContentType': 'application/json'}) + # ================================================================================== @@ -262,16 +259,6 @@ def createdb(): db.session.commit() - """ - with open('zabalans.csv', encoding='utf-8') as csv_file: - csv_reader = csv.reader(csv_file, delimiter=';') - for row in csv_reader: - print(row) - db.session.add( - Oboruds(invNumber=row[0], nazvanie=row[1], typeBalanse="забаланс")) - - db.session.commit() - """ if __name__ == '__main__': diff --git a/migrations/__pycache__/env.cpython-312.pyc b/migrations/__pycache__/env.cpython-312.pyc index d40e79f..26bd5f4 100644 Binary files a/migrations/__pycache__/env.cpython-312.pyc and b/migrations/__pycache__/env.cpython-312.pyc differ diff --git a/migrations/versions/__pycache__/256c3a3e91a2_.cpython-312.pyc b/migrations/versions/__pycache__/256c3a3e91a2_.cpython-312.pyc index 77081c0..280709a 100644 Binary files a/migrations/versions/__pycache__/256c3a3e91a2_.cpython-312.pyc and b/migrations/versions/__pycache__/256c3a3e91a2_.cpython-312.pyc differ diff --git a/migrations/versions/__pycache__/4f95d12a8352_.cpython-312.pyc b/migrations/versions/__pycache__/4f95d12a8352_.cpython-312.pyc index 2889172..a22fbdb 100644 Binary files a/migrations/versions/__pycache__/4f95d12a8352_.cpython-312.pyc and b/migrations/versions/__pycache__/4f95d12a8352_.cpython-312.pyc differ diff --git a/migrations/versions/__pycache__/50f85881169e_.cpython-312.pyc b/migrations/versions/__pycache__/50f85881169e_.cpython-312.pyc index aee53e0..09660f0 100644 Binary files a/migrations/versions/__pycache__/50f85881169e_.cpython-312.pyc and b/migrations/versions/__pycache__/50f85881169e_.cpython-312.pyc differ diff --git a/migrations/versions/__pycache__/873defe09f22_.cpython-312.pyc b/migrations/versions/__pycache__/873defe09f22_.cpython-312.pyc index fd851b5..6f099d5 100644 Binary files a/migrations/versions/__pycache__/873defe09f22_.cpython-312.pyc and b/migrations/versions/__pycache__/873defe09f22_.cpython-312.pyc differ diff --git a/migrations/versions/__pycache__/8e838956713f_.cpython-312.pyc b/migrations/versions/__pycache__/8e838956713f_.cpython-312.pyc index 386f4de..0e15d3a 100644 Binary files a/migrations/versions/__pycache__/8e838956713f_.cpython-312.pyc and b/migrations/versions/__pycache__/8e838956713f_.cpython-312.pyc differ diff --git a/migrations/versions/__pycache__/b24baa0d98e6_.cpython-312.pyc b/migrations/versions/__pycache__/b24baa0d98e6_.cpython-312.pyc index 69a74a0..43d1576 100644 Binary files a/migrations/versions/__pycache__/b24baa0d98e6_.cpython-312.pyc and b/migrations/versions/__pycache__/b24baa0d98e6_.cpython-312.pyc differ diff --git a/migrations/versions/__pycache__/b2a61aef79e9_.cpython-312.pyc b/migrations/versions/__pycache__/b2a61aef79e9_.cpython-312.pyc index 6f573f0..a7e9152 100644 Binary files a/migrations/versions/__pycache__/b2a61aef79e9_.cpython-312.pyc and b/migrations/versions/__pycache__/b2a61aef79e9_.cpython-312.pyc differ diff --git a/migrations/versions/__pycache__/ec6bbcd361bd_.cpython-312.pyc b/migrations/versions/__pycache__/ec6bbcd361bd_.cpython-312.pyc index 1d027b0..e5f76bc 100644 Binary files a/migrations/versions/__pycache__/ec6bbcd361bd_.cpython-312.pyc and b/migrations/versions/__pycache__/ec6bbcd361bd_.cpython-312.pyc differ diff --git a/static/css/index.css b/static/css/index.css index c47c1a0..6bc3fb1 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -18,6 +18,7 @@ body { border: 1px; + } header { @@ -77,6 +78,28 @@ nav{ } +.table{ + word-break: break-all; +} + +.aud{ + width: 110px; +} + +.inv{ + width: 400px; +} + +.rasp{ + max-width: 200px; + word-break: break-word; +} + +#modal_matcenn{ + + margin-left: 20px; +} + @media print { *{ diff --git a/static/js/searchonaud.js b/static/js/searchonaud.js index ce603b8..ac233b4 100644 --- a/static/js/searchonaud.js +++ b/static/js/searchonaud.js @@ -13,21 +13,23 @@ function getData(){ }, success: function(response){ + var data = response; const table = document.getElementById('datatable') table.innerHTML = '' - var headTable = '
| Номер в Инв. вед | -Инв. номер | -Название | -Аудитория | -Расположение | +Номер в Инв. вед | +Инв. номер | +Название | +Аудитория | +Расположение | {% for item in res: %}
|---|