From 6cad7d6ed62577ebe3d0b5142f0c02011454cb7b Mon Sep 17 00:00:00 2001
From: Alex Danamir <alexandr.salny@yandex.ru>
Date: Wed, 9 Nov 2022 19:17:41 +0300
Subject: [PATCH] main page worked

---
 app.py               | 42 +++++++++++++++++++++++-------------------
 models.py            |  4 +++-
 templates/index.html |  5 ++++-
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/app.py b/app.py
index 6737c95..c1f3308 100644
--- a/app.py
+++ b/app.py
@@ -3,23 +3,24 @@ from flask import Flask, render_template, request, flash, redirect, url_for, sen
 from werkzeug.utils import secure_filename
 import os
 import secrets
-from models import db, PrintedDetal
 import logging
+from models import db, PrintedDetal
+from datetime import datetime
 
 logging.basicConfig(filename='app.log', encoding='utf-8', level=logging.DEBUG)
 
 
 app = Flask(__name__)
+
 app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///app.db'
 app.config['UPLOAD_IMG_FOLDER'] = os.path.join('static', 'uploads', 'img')
 app.config['UPLOAD_STL_FOLDER'] = os.path.join('static', 'uploads', 'stl')
 app.config['UPLOAD_SRC_FOLDER'] = os.path.join('static', 'uploads', 'src')
 
-db.init_app(app) 
+db.init_app(app)
 
 
-@app.route("/")
-def index():
+def getlldb():
 
     allDetals = {}
 
@@ -27,22 +28,28 @@ def index():
 
     for detal in detalsQuery:
         detals = {}
+        detals['id'] = detal.id
         detals['img'] = detal.img
         detals['stl'] = detal.stl
         detals['src'] = detal.src
         detals['isprinted'] = detal.isprinted
+        detals['date'] = detal.dateadd
 
         allDetals[detal.id] = detals
 
-    logging.debug(allDetals)
+    return allDetals
 
-    return render_template("index.html", detals=allDetals)
+
+@app.route("/")
+def index():
+
+    getall = getlldb()
+
+    return render_template("index.html", detals=getall)
 
 
 @app.route("/admin",  methods=['GET', 'POST'])
 def admipage():
-    logging.debug("adminpage loaded")
-
     return render_template("adminpage.html")
 
 
@@ -62,35 +69,32 @@ def upload_file():
         if len(stl_file.filename) > 0:
             filename = stl_file.filename.split('.')
             stl_file.filename = secrets.token_hex(15) + '.' + filename[-1]
-            stl_file.save(os.path.join(app.config['UPLOAD_STL_FOLDER'],stl_file.filename))
+            stl_file.save(os.path.join(
+                app.config['UPLOAD_STL_FOLDER'], stl_file.filename))
 
         if len(src_file.filename) > 0:
             filename = src_file.filename.split('.')
             src_file.filename = secrets.token_hex(15) + '.' + filename[-1]
-            src_file.save(os.path.join(app.config['UPLOAD_SRC_FOLDER'], src_file.filename))
+            src_file.save(os.path.join(
+                app.config['UPLOAD_SRC_FOLDER'], src_file.filename))
 
         if request.form.get('isprinted') == 'on':
             isprinered = True
         else:
             isprinered = False
 
-        logging.debug(image_file.filename)
-        logging.debug(stl_file.filename)
-        logging.debug(src_file.filename)
-        logging.debug(isprinered)
-
         detal = PrintedDetal(img=image_file.filename,
                              stl=stl_file.filename,
                              src=src_file.filename,
-                             isprinted=isprinered)
+                             isprinted=isprinered,
+                             dateadd=datetime.now().strftime('%d.%m.%Y'))
         db.session.add(detal)
         db.session.commit()
 
         return redirect(url_for('admipage'))
 
-@app.route('/download/<filename>', methods=['GET', 'POST'])
-def download(filename):
-    return send_file(app.config['UPLOAD_SRC_FOLDER']+'/'+ filename, as_attachment=True)
+
+
 
 
 if __name__ == "__main__":
diff --git a/models.py b/models.py
index 5c4995e..0735906 100644
--- a/models.py
+++ b/models.py
@@ -9,4 +9,6 @@ class PrintedDetal(db.Model):
     img = db.Column(db.String(3000))
     stl = db.Column(db.String(3000))
     src = db.Column(db.String(3000))
-    isprinted = db.Column(db.Boolean())
\ No newline at end of file
+    isprinted = db.Column(db.Boolean())
+    dateadd = db.Column(db.String(11))
+    
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 13829c7..eeca151 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -25,6 +25,9 @@
           
           <div class="card-body">           
             <dv class="row">
+              <div class="col">
+                <a  href="{{url_for('static', filename='uploads/img/' + value['img'])}}"  class="btn btn-block mobile-margin" download>Скачать изображение </a>
+              </div>
               <div class="col">
                 <a href="{{url_for('static', filename='uploads/src/' + value['src'])}}"  class="btn btn-block mobile-margin" download >Скачать исходник</a>
               </div>
@@ -37,7 +40,7 @@
                 <label> Напечатано </label>
               </div>
               <div class="col d-flex justify-content-center">
-                <h5> 22.10.2022</h5>
+                <h5> {{value['dateadd']}}</h5>
               </div>
             </div>       
           </div>