11111

.gitignore

@@ -3,7 +3,7 @@
 instance
 venv/
 
-__pychache__/
+__pychache__/*
 123
 
 
@@ -12,5 +12,6 @@ project.db
 
 
 c*.txt
-__pycache__/app.cpython-312.pyc
-__pycache__/models.cpython-312.pyc
+
+migrations/__pycache__/*
+migrations/versions/__pycache__/*   

models.py

@@ -1,40 +0,0 @@
-
-from flask_sqlalchemy import SQLAlchemy
-import datetime
-
-db = SQLAlchemy()
-
-
-class Auditory(db.Model):
-    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
-    audnazvanie=db.Column(db.String)
-    oboruds = db.relationship('Oboruds')
-    
-
-    
-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))    
-    raspologenie = db.Column(db.String(200))
-    numberved = db.Column(db.String(100))
-<<<<<<< HEAD
-    kolichestvo = db.Column(db.Integer)
-=======
-    buhnumberpp = db.Column(db.String(100))      
-    kolichestvo = db.Column(db.Integer)
-    balancenumber = db.Column(db.String(30))
->>>>>>> 87c4ebe33e69ec19b443f976557a6f5fa2905476
-    aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id))
-
-
-
-
-
-class Zametki(db.Model):
-    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
-    txtzam=db.Column(db.String(10000))
-    created_date = db.Column(db.DateTime, default=datetime.datetime.utcnow)
-    rmdt = db.Column(db.DateTime)
-
-

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>