Merge branch 'dev' of https://git.danamir.su/danamir/asuinventory into dev

.gitignore

@@ -14,3 +14,15 @@ project.db
 c*.txt
 __pycache__/app.cpython-312.pyc
 __pycache__/models.cpython-312.pyc
+migrations/__pycache__/
+migrations/versions/__pycache__/ec6bbcd361bd_.cpython-312.pyc
+migrations/versions/__pycache__/ec6bbcd361bd_.cpython-312.pyc
+migrations/versions/__pycache__/ec6bbcd361bd_.cpython-312.pyc
+migrations/versions/__pycache__/be7c94c549e5_.cpython-312.pyc
+migrations/versions/__pycache__/b2a61aef79e9_.cpython-312.pyc
+migrations/versions/__pycache__/873defe09f22_.cpython-312.pyc
+migrations/versions/__pycache__/256c3a3e91a2_.cpython-312.pyc
+migrations/versions/__pycache__/50f85881169e_.cpython-312.pyc
+migrations/versions/__pycache__/8e838956713f_.cpython-312.pyc
+migrations/versions/__pycache__/4f95d12a8352_.cpython-312.pyc
+migrations/__pycache__/env.cpython-312.pyc

models.py

@@ -19,7 +19,9 @@ class Oboruds(db.Model):
     balancenumber = db.Column(db.String(30))
     raspologenie = db.Column(db.String(200))
     numberved = db.Column(db.String(100))
+    numberppasu = db.Column(db.String(100))
     kolichestvo = db.Column(db.Integer)
+
     aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id))
 
 

templates/all.html

@@ -31,5 +31,6 @@
                
         </div>
     </div>
+    <script  src="{{url_for('static', filename='js/allmatc.js') }}"></script>
 
     {% endblock %}

templates/js.html

@@ -10,4 +10,3 @@
 <script  src="{{url_for('static', filename='js/searchonaud.js') }}"></script>
 <script  src="{{url_for('static', filename='js/print.js') }}"></script>
 <script  src="{{url_for('static', filename='js/modal.js') }}"></script>
-<script  src="{{url_for('static', filename='js/allmatc.js') }}"></script>