diff --git a/app.py b/app.py index 4571ff5..e51a222 100644 --- a/app.py +++ b/app.py @@ -126,7 +126,7 @@ def getall(): 'nazvanie': oborud.nazvanie, 'raspologenie': oborud.raspologenie, 'numberved': oborud.numberved, - 'buhnumberpp': oborud.buhnumberpp, + 'balancenumber': oborud.balancenumber, 'kolichestvo': oborud.kolichestvo, 'balancenumber': oborud.balancenumber, 'aud_id': oborud.aud_id diff --git a/migrations/versions/885bdd7b5161_.py b/migrations/versions/885bdd7b5161_.py new file mode 100644 index 0000000..c1ac071 --- /dev/null +++ b/migrations/versions/885bdd7b5161_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 885bdd7b5161 +Revises: be7c94c549e5 +Create Date: 2024-04-02 23:03:59.401369 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '885bdd7b5161' +down_revision = 'be7c94c549e5' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('oboruds', schema=None) as batch_op: + batch_op.add_column(sa.Column('kolichestvo', sa.Integer(), nullable=True)) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('oboruds', schema=None) as batch_op: + batch_op.drop_column('kolichestvo') + + # ### end Alembic commands ### diff --git a/migrations/versions/__pycache__/885bdd7b5161_.cpython-312.pyc b/migrations/versions/__pycache__/885bdd7b5161_.cpython-312.pyc new file mode 100644 index 0000000..a89cef4 Binary files /dev/null and b/migrations/versions/__pycache__/885bdd7b5161_.cpython-312.pyc differ diff --git a/models.py b/models.py index 26c783c..3f9a363 100644 --- a/models.py +++ b/models.py @@ -19,6 +19,7 @@ class Oboruds(db.Model): balancenumber = db.Column(db.String(30)) raspologenie = db.Column(db.String(200)) numberved = db.Column(db.String(100)) + kolichestvo = db.Column(db.Integer) aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id)) diff --git a/static/js/allmatcen.js b/static/js/allmatcen.js new file mode 100644 index 0000000..0d39b48 --- /dev/null +++ b/static/js/allmatcen.js @@ -0,0 +1,35 @@ +function getData(){ + + const audid = document.getElementById('auditory') + $.ajax({ + + url: "/getall", + type: "get", + contentType: 'application/json', + dataType: 'json', + + success: function(response){ + + var data = response; + const table = document.getElementById('datatable') + table.innerHTML = '' + var headTable = '