diff --git a/Flask/Flask05/burlesco70/webapp/README.md b/Flask/Flask05/burlesco70/webapp/README.md index 559c303..8b2efc2 100644 --- a/Flask/Flask05/burlesco70/webapp/README.md +++ b/Flask/Flask05/burlesco70/webapp/README.md @@ -1,4 +1,13 @@ # Devlog + +# 5a settimana + +10/11/2020 +- base.html - Header Completa Boostrap invece che Navigation bar +- Prossime serate + +# 4a settimana + 03/11/2020 - Aggiunto menu corsi (lista/nuovo) - Aggiunta pagina lista corsi @@ -34,6 +43,7 @@ # TO DO App - Pagina dettaglio corso: aggiunta / cancellazione serata +- Immagine statica corso - Gestione serate - Nella home page fare vedere le 4 "prossime" serate diff --git a/Flask/Flask05/burlesco70/webapp/data.py b/Flask/Flask05/burlesco70/webapp/data.py index cc2683d..8c5ef20 100644 --- a/Flask/Flask05/burlesco70/webapp/data.py +++ b/Flask/Flask05/burlesco70/webapp/data.py @@ -1,4 +1,4 @@ -##Script to import data into DB with CRUD Operations +## Script to import data into DB with CRUD Operations from project.serate.models import Serata from project.corsi.models import Corso from project.tags.models import Tag @@ -47,13 +47,13 @@ "Andrea Guzzo", "Intermedio", "Corso in cinque serate del microframework Flask", - "immagine_flask" + "flask-icon.png" ) corsoFlask.tags = [t1, t2, t4, t5] # Relazione n:n TAG - CORSO corsoPygame = Corso( - "Pygame", "Mario Nardi", "Principiante", "Introduzione a Pygame" + "Pygame", "Mario Nardi", "Principiante", "Introduzione a Pygame", "pygame-icon.png" ) corsoPygame.tags = [t1, t3, t6] diff --git a/Flask/Flask05/burlesco70/webapp/project/corsi/__pycache__/models.cpython-36.pyc b/Flask/Flask05/burlesco70/webapp/project/corsi/__pycache__/models.cpython-36.pyc index c7a217f..e8a47fa 100644 Binary files a/Flask/Flask05/burlesco70/webapp/project/corsi/__pycache__/models.cpython-36.pyc and b/Flask/Flask05/burlesco70/webapp/project/corsi/__pycache__/models.cpython-36.pyc differ diff --git a/Flask/Flask05/burlesco70/webapp/project/data.sqlite b/Flask/Flask05/burlesco70/webapp/project/data.sqlite index 938223e..745e12b 100644 Binary files a/Flask/Flask05/burlesco70/webapp/project/data.sqlite and b/Flask/Flask05/burlesco70/webapp/project/data.sqlite differ diff --git a/Flask/Flask05/burlesco70/webapp/project/serate/__pycache__/models.cpython-36.pyc b/Flask/Flask05/burlesco70/webapp/project/serate/__pycache__/models.cpython-36.pyc index 2b871bd..9894432 100644 Binary files a/Flask/Flask05/burlesco70/webapp/project/serate/__pycache__/models.cpython-36.pyc and b/Flask/Flask05/burlesco70/webapp/project/serate/__pycache__/models.cpython-36.pyc differ diff --git a/Flask/Flask05/burlesco70/webapp/project/serate/__pycache__/routes.cpython-36.pyc b/Flask/Flask05/burlesco70/webapp/project/serate/__pycache__/routes.cpython-36.pyc index 046e0fa..2ebe595 100644 Binary files a/Flask/Flask05/burlesco70/webapp/project/serate/__pycache__/routes.cpython-36.pyc and b/Flask/Flask05/burlesco70/webapp/project/serate/__pycache__/routes.cpython-36.pyc differ diff --git a/Flask/Flask05/burlesco70/webapp/project/serate/models.py b/Flask/Flask05/burlesco70/webapp/project/serate/models.py index 91b8fec..29bc09b 100644 --- a/Flask/Flask05/burlesco70/webapp/project/serate/models.py +++ b/Flask/Flask05/burlesco70/webapp/project/serate/models.py @@ -1,12 +1,11 @@ from project import db -#from project.corsi.models import Corso # Tabella di relazione 1 Corso : N Serate class Serata(db.Model): __tablename__ = "serata" - __table_args__ = (db.UniqueConstraint("id", "data", name="contraint_serata"),) + __table_args__ = (db.UniqueConstraint("id", "data", name="constraint_serata"),) id = db.Column(db.Integer(), primary_key=True) nome = db.Column(db.String(255), nullable=False) diff --git a/Flask/Flask05/burlesco70/webapp/project/serate/routes.py b/Flask/Flask05/burlesco70/webapp/project/serate/routes.py index dd6dee2..c2d5db6 100644 --- a/Flask/Flask05/burlesco70/webapp/project/serate/routes.py +++ b/Flask/Flask05/burlesco70/webapp/project/serate/routes.py @@ -8,17 +8,36 @@ session, current_app, ) -from project.corsi.forms import CorsiForm, write_to_disk, SerataForm +#from project.serate.forms import SerataForm from project.serate.models import Serata from project.corsi.models import Corso from project import db from sqlalchemy import desc,asc +from datetime import datetime + # Define blueprint serate_blueprint = Blueprint( "serate", __name__, template_folder="templates", static_folder='../static' -) +) + +''' +Lista delle serate in ordine di data +''' +@serate_blueprint.route("/prossime", methods=["GET"]) +def prossime(): + # Filtro data futura, ordinamento per data + lista_serate = Serata.query.filter(Serata.data > datetime.now()).order_by(asc(Serata.data)).all() + # Creo una lista parallela dei corsi collegati alle serate + lista_corsi = [ Corso.query.filter_by(id=s.corso_id).first() for s in lista_serate ] + # Nel template non è possibile iterare su due liste, quindi zippo le due liste e le passo + zipped_data = zip(lista_serate, lista_corsi) + return render_template( + 'serate_prossime.html', + zipped_data=zipped_data + ) + diff --git a/Flask/Flask05/burlesco70/webapp/project/serate/templates/serate_prossime.html b/Flask/Flask05/burlesco70/webapp/project/serate/templates/serate_prossime.html new file mode 100644 index 0000000..421121c --- /dev/null +++ b/Flask/Flask05/burlesco70/webapp/project/serate/templates/serate_prossime.html @@ -0,0 +1,37 @@ +{% extends "base.html" %} +{% block content %} + +
+
+

Le prossime serate

+
+
+ + + + + + + + + + + {% for s,c in zipped_data %} + + + + + + + + {% endfor -%} + +
DataNome - DescrizioneLinks partecipazioneCorso
{{ s.data.strftime('%d/%m/%Y') }}{{ s.nome }} - {{ s.descrizione }} + {% if s.link_partecipazione %} + {{ s.link_partecipazione }} + {% else %} + Non disponibile + {% endif %} + {{ c.nome }}
+ + {% endblock %} \ No newline at end of file diff --git a/Flask/Flask05/burlesco70/webapp/project/templates/base.html b/Flask/Flask05/burlesco70/webapp/project/templates/base.html index 6e85610..33c0349 100644 --- a/Flask/Flask05/burlesco70/webapp/project/templates/base.html +++ b/Flask/Flask05/burlesco70/webapp/project/templates/base.html @@ -16,111 +16,236 @@ -
-
-
-
-
- Python Biella Group -
- -
- -
-
- -
-
-
-
- +
+
+
+
+
+
+ Python Biella Group +
+ +
+
+
+ +
+
+
+
+ +
+
+ Accedi +
- - - - - -
-
- -
-
-
-
- -
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + +
+

Python Biella Group

+

Il sito della condivisione della conoscenza

+ +
+
+
+ Seguici su + +
+
+ Cerca + + + + +
-
- Logout -
+
+
+
+
+
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + {% block content %} {% endblock %} diff --git a/Flask/Flask05/burlesco70/webapp/requirements.txt b/Flask/Flask05/burlesco70/webapp/requirements.txt deleted file mode 100644 index cd78caa..0000000 --- a/Flask/Flask05/burlesco70/webapp/requirements.txt +++ /dev/null @@ -1,74 +0,0 @@ -alembic==0.9.9 -appnope==0.1.0 -attrs==19.3.0 -backcall==0.1.0 -bleach==3.1.1 -certifi==2018.1.18 -click==6.7 -cycler==0.10.0 -decorator==4.4.2 -defusedxml==0.6.0 -dominate==2.5.1 -entrypoints==0.3 -Flask==0.12.2 -Flask-Bootstrap==3.3.7.1 -Flask-Migrate==2.1.1 -Flask-SQLAlchemy==2.3.2 -Flask-WTF==0.14.2 -importlib-metadata==1.5.0 -ipykernel==5.1.4 -ipython==7.13.0 -ipython-genutils==0.2.0 -ipywidgets==7.5.1 -itsdangerous==0.24 -jedi==0.16.0 -Jinja2==2.10 -joblib==0.14.1 -jsonschema==3.2.0 -jupyter==1.0.0 -jupyter-client==6.0.0 -jupyter-console==6.1.0 -jupyter-core==4.6.3 -kiwisolver==1.1.0 -Mako==1.0.7 -MarkupSafe==1.1.1 -matplotlib==3.2.0 -mistune==0.8.4 -nbconvert==5.6.1 -nbformat==5.0.4 -notebook==6.0.3 -numpy==1.18.1 -pandas==1.0.2 -pandocfilters==1.4.2 -parso==0.6.2 -pexpect==4.8.0 -pickleshare==0.7.5 -prometheus-client==0.7.1 -prompt-toolkit==3.0.4 -ptyprocess==0.6.0 -Pygments==2.6.1 -pyparsing==2.4.6 -pyrsistent==0.15.7 -python-dateutil==2.7.2 -python-editor==1.0.3 -pytz==2019.3 -pyzmq==19.0.0 -qtconsole==4.7.1 -QtPy==1.9.0 -scipy==1.4.1 -Send2Trash==1.5.0 -six==1.11.0 -scikit-learn==0.21.3 -SQLAlchemy==1.2.6 -terminado==0.8.3 -testpath==0.4.4 -tornado==6.0.4 -traitlets==4.3.3 -visitor==0.1.3 -wcwidth==0.1.8 -webencodings==0.5.1 -Werkzeug==0.14.1 -widgetsnbextension==3.5.1 -wincertstore==0.2 -WTForms==2.1 -zipp==3.1.0