From 34ea9725603396b04a9bef572b26e7d369a27a07 Mon Sep 17 00:00:00 2001
From: Alex Danamir <alexandr.salny@yandex.ru>
Date: Tue, 2 Apr 2024 22:50:36 +0300
Subject: [PATCH] add new fictures

---
 .gitignore           |  2 ++
 app.py               | 26 +++++++++++++--------
 static/css/index.css |  9 ++++++++
 static/js/allmatc.js | 35 ++++++++++++++++++++++++++++
 templates/all.html   | 55 ++++++++++++++++++++------------------------
 templates/js.html    |  3 ++-
 6 files changed, 89 insertions(+), 41 deletions(-)
 create mode 100644 static/js/allmatc.js

diff --git a/.gitignore b/.gitignore
index cd420b7..d42868d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ project.db
 
 
 c*.txt
+__pycache__/app.cpython-312.pyc
+__pycache__/models.cpython-312.pyc
diff --git a/app.py b/app.py
index 75793c3..4571ff5 100644
--- a/app.py
+++ b/app.py
@@ -114,20 +114,26 @@ def addoborudtodb():
 
 @app.route('/all')
 def alloborud():
+    return render_template('all.html')
 
-    result = db.session.query(Oboruds).order_by(Oboruds.invNumber).all()
 
-    res = []
+@app.route('/getall')
+def getall():
+    oboruds = Oboruds.query.all()
+    oboruds_json = [{
+        'id': oborud.id,
+        'invNumber': oborud.invNumber,
+        'nazvanie': oborud.nazvanie,
+        'raspologenie': oborud.raspologenie,
+        'numberved': oborud.numberved,
+        'buhnumberpp': oborud.buhnumberpp,
+        'kolichestvo': oborud.kolichestvo,
+        'balancenumber': oborud.balancenumber,
+        'aud_id': oborud.aud_id
+    } for oborud in oboruds]
 
-    for ob in result:
-        if ob.aud_id is not None:
-            aud = db.session.query(Auditory).filter_by(id=ob.aud_id).first()
-            res.append([ob.invNumber, ob.nazvanie, aud.audnazvanie])
-        else:
-            res.append([ob.invNumber, ob.nazvanie])
-
-    return render_template('all.html', res=res)
 
+    return jsonify(oboruds_json)
 
 @app.route('/updateduplicate', methods=['GET', 'POST'])
 def updateduplicate():
diff --git a/static/css/index.css b/static/css/index.css
index 6bc3fb1..72385ec 100644
--- a/static/css/index.css
+++ b/static/css/index.css
@@ -100,6 +100,15 @@ nav{
     margin-left: 20px;
 }
 
+.datatable{
+    background-color: whitesmoke;
+}
+
+
+
+
+
+
 @media print {
 
     *{
diff --git a/static/js/allmatc.js b/static/js/allmatc.js
new file mode 100644
index 0000000..c9e2668
--- /dev/null
+++ b/static/js/allmatc.js
@@ -0,0 +1,35 @@
+function getAllData(){
+    $.ajax({
+
+        url: "/getall",
+        type: "get",
+        contentType: 'application/json',
+        dataType: 'json',
+
+        success: function(response){
+            console.log(response)
+            let data = response; 
+            $('#datatable tbody').empty();
+            $.each(response, function(index, item) {
+            $('#datatable tbody').append(
+                '<tr>' +
+                '<td>' + item.invNumber + '</td>' +
+                '<td>' + item.nazvanie + '</td>' +
+                '<td>' + item.raspologenie + '</td>' +
+                '<td>' + item.numberved + '</td>' +
+                '<td>' + item.buhnumberpp + '</td>' +
+                '<td>' + item.kolichestvo + '</td>' +
+                '<td>' + item.balancenumber + '</td>' +
+                '</tr>'
+            );
+        })
+        },
+        
+
+    })
+}
+
+$(document).ready(function(){
+
+    getAllData()
+})
\ No newline at end of file
diff --git a/templates/all.html b/templates/all.html
index 97281a9..05ac334 100644
--- a/templates/all.html
+++ b/templates/all.html
@@ -3,37 +3,32 @@
 
 {% block content %}
     
+    <div class="row col-12">
+        <div class=" card col-11">
+                    <h3 class=" no-print"> Все мат. ценности </h3>
+                    
+        </div> 
+        <div class="row col-12">
+            <button  class="button" id="printallbutton"> Печать </button>
+        </div>
+
+    </div>
     <div class="row">
-        <div class="card col-md-10 col-10">
-            <div class="card-body">
-
-                <form>
-                    <h3 class=" no-print card-title"> Все мат. ценности </h3>
-                    <button id="printallbutton"> Печать </button>
-                    <table class="table pagebreak" col-md-10>
-                        <thead>
-                            <tr>
-                                <th scope="col">Инв. номер</th>
-                                <th scope="col">Название</th>
-                                <th scope="col">Аудитория</th>
-                            </tr>
-                        </thead>
-                            
-                            {% for item in res: %}
-                            <tr>
-                                <td> <input type="hidden" name="invnomer" value="{{ item[0] }}"> {{ item[0] }} </td>
-                                <td> {{ item[1] }} </td>
-
-
-                                <td> 
-                                    {{ item[2] }}
-                                </td>
-                                </tr>
-                            {% endfor %}
-                            
-                    </table>
-                </form>
-            </div>
+        <div class="card col-md-11" >
+        <table id="datable" class="datable table pagebreak" >
+            <thead>
+                <tr>
+                    <th scope="col">№ п/п</th>
+                    <th scope="col">№ п/п вед</th>
+                    <th scope="col">Инв. номер</th>
+                    <th scope="col">Название</th>
+                    <th scope="col">Кол-во</th>
+                    <th scope="col">Счёт</th>
+                    <th scope="col">Аудитория</th>
+                </tr>
+            </thead>
+        </table>
+               
         </div>
     </div>
 
diff --git a/templates/js.html b/templates/js.html
index a9092d2..672e2f6 100644
--- a/templates/js.html
+++ b/templates/js.html
@@ -9,4 +9,5 @@
 <script  src="{{url_for('static', filename='js/zametki.js') }}"></script>
 <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>
\ No newline at end of file
+<script  src="{{url_for('static', filename='js/modal.js') }}"></script>
+<script  src="{{url_for('static', filename='js/allmatc.js') }}"></script>
\ No newline at end of file