merge

migrations/versions/be7c94c549e5_.py

@@ -0,0 +1,34 @@
+"""empty message
+
+Revision ID: be7c94c549e5
+Revises: 8e838956713f
+Create Date: 2024-04-01 15:09:52.082987
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'be7c94c549e5'
+down_revision = '8e838956713f'
+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('balancenumber', sa.String(length=30), nullable=True))
+        batch_op.drop_column('typeBalanse')
+
+    # ### 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.add_column(sa.Column('typeBalanse', sa.VARCHAR(length=30), nullable=True))
+        batch_op.drop_column('balancenumber')
+
+    # ### end Alembic commands ###

models.py

@@ -16,7 +16,7 @@ class Oboruds(db.Model):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     invNumber=db.Column(db.Integer)
     nazvanie=db.Column(db.String(500))
-    typeBalanse = db.Column(db.String(30))
+    balancenumber = db.Column(db.String(30))
     raspologenie = db.Column(db.String(200))
     numberved = db.Column(db.String(100))
     aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id))

templates/searchonaud.html

@@ -8,6 +8,12 @@
     <div class="modal-dialog modal-dialog-centered" role="document">
       <div class="modal-content">
         <div class="modal-body" id="textarea">
+<<<<<<< HEAD
+        
+          <input type="text" class="form-control" id ='vednumber' placeholder="Номер из веломости">      
+          <input type="text" class="form-control" id ='rapolog' placeholder="Введите расположение">
+                
+=======
 
           <div class="row">
             <a id="modal_invnom"> </a><a id="modal_matcenn"></a>
@@ -32,6 +38,7 @@
             <button type="button" class="btn btn-primary" id="modalsavetodb" >Сохранить изменения</button>
           </div>
   
+>>>>>>> 965695a6936eaf44348f73ca898f98c76b663157
         </div>