diff --git a/migrations/__pycache__/env.cpython-39.pyc b/migrations/__pycache__/env.cpython-39.pyc deleted file mode 100644 index 3fc4ed7..0000000 Binary files a/migrations/__pycache__/env.cpython-39.pyc and /dev/null differ diff --git a/migrations/versions/__pycache__/256c3a3e91a2_.cpython-312.pyc b/migrations/versions/__pycache__/256c3a3e91a2_.cpython-312.pyc deleted file mode 100644 index 77081c0..0000000 Binary files a/migrations/versions/__pycache__/256c3a3e91a2_.cpython-312.pyc and /dev/null differ diff --git a/migrations/versions/__pycache__/4f95d12a8352_.cpython-312.pyc b/migrations/versions/__pycache__/4f95d12a8352_.cpython-312.pyc deleted file mode 100644 index 2889172..0000000 Binary files a/migrations/versions/__pycache__/4f95d12a8352_.cpython-312.pyc and /dev/null differ diff --git a/migrations/versions/__pycache__/50f85881169e_.cpython-312.pyc b/migrations/versions/__pycache__/50f85881169e_.cpython-312.pyc deleted file mode 100644 index aee53e0..0000000 Binary files a/migrations/versions/__pycache__/50f85881169e_.cpython-312.pyc and /dev/null differ diff --git a/migrations/versions/__pycache__/873defe09f22_.cpython-312.pyc b/migrations/versions/__pycache__/873defe09f22_.cpython-312.pyc deleted file mode 100644 index fd851b5..0000000 Binary files a/migrations/versions/__pycache__/873defe09f22_.cpython-312.pyc and /dev/null differ diff --git a/migrations/versions/__pycache__/8e838956713f_.cpython-312.pyc b/migrations/versions/__pycache__/8e838956713f_.cpython-312.pyc deleted file mode 100644 index 386f4de..0000000 Binary files a/migrations/versions/__pycache__/8e838956713f_.cpython-312.pyc and /dev/null differ diff --git a/migrations/versions/__pycache__/b24baa0d98e6_.cpython-312.pyc b/migrations/versions/__pycache__/b24baa0d98e6_.cpython-312.pyc deleted file mode 100644 index 69a74a0..0000000 Binary files a/migrations/versions/__pycache__/b24baa0d98e6_.cpython-312.pyc and /dev/null differ diff --git a/migrations/versions/__pycache__/b2a61aef79e9_.cpython-312.pyc b/migrations/versions/__pycache__/b2a61aef79e9_.cpython-312.pyc deleted file mode 100644 index 6f573f0..0000000 Binary files a/migrations/versions/__pycache__/b2a61aef79e9_.cpython-312.pyc and /dev/null differ diff --git a/migrations/versions/__pycache__/be7c94c549e5_.cpython-312.pyc b/migrations/versions/__pycache__/be7c94c549e5_.cpython-312.pyc deleted file mode 100644 index 7203052..0000000 Binary files a/migrations/versions/__pycache__/be7c94c549e5_.cpython-312.pyc and /dev/null differ diff --git a/migrations/versions/__pycache__/ec6bbcd361bd_.cpython-312.pyc b/migrations/versions/__pycache__/ec6bbcd361bd_.cpython-312.pyc deleted file mode 100644 index 1d027b0..0000000 Binary files a/migrations/versions/__pycache__/ec6bbcd361bd_.cpython-312.pyc and /dev/null differ diff --git a/models.py b/models.py index 26fa7d0..289ed24 100644 --- a/models.py +++ b/models.py @@ -18,6 +18,7 @@ class Oboruds(db.Model): nazvanie=db.Column(db.String(500)) raspologenie = db.Column(db.String(200)) numberved = db.Column(db.String(100)) +<<<<<<< HEAD <<<<<<< HEAD buhnumberpp = db.Column(db.String(100)) kolichestvo = db.Column(db.Integer) @@ -27,6 +28,14 @@ class Oboruds(db.Model): kolichestvo = db.Column(db.Integer) >>>>>>> dev +======= + kolichestvo = db.Column(db.Integer) +======= + buhnumberpp = db.Column(db.String(100)) + kolichestvo = db.Column(db.Integer) + balancenumber = db.Column(db.String(30)) +>>>>>>> 87c4ebe33e69ec19b443f976557a6f5fa2905476 +>>>>>>> 4c6166c9078d5d913b83b681af7f7241af0399ca aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id)) diff --git a/serve.py b/serve.py new file mode 100644 index 0000000..3e35f73 --- /dev/null +++ b/serve.py @@ -0,0 +1,6 @@ +from waitress import serve +from app import app + + +if __name__ == '__main__': + serve(app, port='3800') diff --git a/static/js/searchonaud.js b/static/js/searchonaud.js index ac233b4..b5a4d9d 100644 --- a/static/js/searchonaud.js +++ b/static/js/searchonaud.js @@ -16,9 +16,9 @@ function getData(){ var data = response; const table = document.getElementById('datatable') - table.innerHTML = '' + var headTable = ' Номер в Инв. вед Инв. номерНазваниеАудитория Расположение Проверено ' - table.innerHTML += headTable + var tr ="" @@ -33,7 +33,7 @@ function getData(){ tr += '' }); - table.innerHTML += tr + table.innerHTML = headTable + tr } }) }