Tag bottone rosso, aggiunto campo img_logo

Flask/Flask04/burlesco70/webapp/project/models/corsi.py

@@ -0,0 +1 @@
+

Flask/Flask05/burlesco70/webapp/data.py

@@ -9,8 +9,6 @@
 
 CREATE_ALL = True
 
-#db.metadata.clear()
-
 if CREATE_ALL:
     # Create entities
     db.create_all()
@@ -49,6 +47,7 @@
         "Andrea Guzzo",
         "Intermedio",
         "Corso in cinque serate del microframework Flask",
+        "immagine_flask"
     )
     corsoFlask.tags = [t1, t2, t4, t5]
 
@@ -147,7 +146,6 @@
 for serata in list_serate:
     print(f"Serata: {serata.id}, {serata.nome}, in data: {serata.data}")
 
-
 # Get a serate by serate name
 list_impostare = Serata.query.filter(Serata.nome.like("%impostare%")).all()
 print(f"\nSerate da impostare:")

Flask/Flask05/burlesco70/webapp/migrations/README

@@ -0,0 +1 @@
+Generic single-database configuration.

Flask/Flask05/burlesco70/webapp/migrations/alembic.ini

@@ -0,0 +1,45 @@
+# A generic, single database configuration.
+
+[alembic]
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

Flask/Flask05/burlesco70/webapp/migrations/env.py

@@ -0,0 +1,96 @@
+from __future__ import with_statement
+
+import logging
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+
+from alembic import context
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+fileConfig(config.config_file_name)
+logger = logging.getLogger('alembic.env')
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+from flask import current_app
+config.set_main_option(
+    'sqlalchemy.url',
+    str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%'))
+target_metadata = current_app.extensions['migrate'].db.metadata
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline():
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url, target_metadata=target_metadata, literal_binds=True
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online():
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+
+    # this callback is used to prevent an auto-migration from being generated
+    # when there are no changes to the schema
+    # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
+    def process_revision_directives(context, revision, directives):
+        if getattr(config.cmd_opts, 'autogenerate', False):
+            script = directives[0]
+            if script.upgrade_ops.is_empty():
+                directives[:] = []
+                logger.info('No changes in schema detected.')
+
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section),
+        prefix='sqlalchemy.',
+        poolclass=pool.NullPool,
+    )
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection,
+            target_metadata=target_metadata,
+            process_revision_directives=process_revision_directives,
+            **current_app.extensions['migrate'].configure_args
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

Flask/Flask05/burlesco70/webapp/migrations/script.py.mako

@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}

Flask/Flask05/burlesco70/webapp/migrations/versions/60bb41479000_prima_ver.py

@@ -0,0 +1,65 @@
+"""prima ver
+
+Revision ID: 60bb41479000
+Revises: 
+Create Date: 2020-11-09 21:04:07.614174
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '60bb41479000'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('corso',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('nome', sa.String(length=100), nullable=False),
+    sa.Column('insegnante', sa.String(length=100), nullable=True),
+    sa.Column('livello', sa.String(length=100), nullable=True),
+    sa.Column('descrizione', sa.String(length=255), nullable=True),
+    sa.Column('logo_img', sa.String(length=100), nullable=True),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('nome')
+    )
+    op.create_table('tag',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('name', sa.String(length=255), nullable=False),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('name')
+    )
+    op.create_table('corso_tags',
+    sa.Column('corso_id', sa.Integer(), nullable=False),
+    sa.Column('tag_id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['corso_id'], ['corso.id'], ),
+    sa.ForeignKeyConstraint(['tag_id'], ['tag.id'], ),
+    sa.PrimaryKeyConstraint('corso_id', 'tag_id')
+    )
+    op.create_table('serata',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('nome', sa.String(length=255), nullable=False),
+    sa.Column('descrizione', sa.String(length=255), nullable=False),
+    sa.Column('data', sa.DateTime(), nullable=False),
+    sa.Column('link_partecipazione', sa.String(length=255), nullable=True),
+    sa.Column('link_registrazione', sa.String(length=255), nullable=True),
+    sa.Column('corso_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['corso_id'], ['corso.id'], ),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('id', 'data', name='contraint_serata')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('serata')
+    op.drop_table('corso_tags')
+    op.drop_table('tag')
+    op.drop_table('corso')
+    # ### end Alembic commands ###

Flask/Flask05/burlesco70/webapp/project/corsi/models.py

@@ -22,10 +22,10 @@ class Corso(db.Model):
     id = db.Column(db.Integer(), primary_key=True)
     nome = db.Column(db.String(100), unique=True, nullable=False)
     insegnante = db.Column(db.String(100))
-    # Il numero delle lezioni è un attributo calcolabile
-    # lezioni = db.Column(db.Integer())
     livello = db.Column(db.String(100))
     descrizione = db.Column(db.String(255))
+    # Immagine logo da cartella static, se presente
+    logo_img = db.Column(db.String(100))
 
     # Relazione 1:n; ordinamento serate per data
     serate = db.relationship(
@@ -38,23 +38,25 @@ class Corso(db.Model):
     )
 
     # Costruttore
-    def __init__(self, nome, insegnante, livello, descrizione):
+    def __init__(self, nome, insegnante, livello, descrizione, logo_img=""):
         self.nome = nome
         self.insegnante = insegnante
         self.livello = livello
         self.descrizione = descrizione
+        self.logo_img = logo_img
         # self.serate = serate
         # self.tags = tags
 
     # Visualize object corso informations
     def __repr__(self):
-        return "\n{}: {} è tenuto da {}. Livello {}. Id {}. Tags {}".format(
+        return "\n{}: {} è tenuto da {}. Livello {}. Id {}. Tags {}. Logo {}".format(
             self.nome,
             self.descrizione,
             self.insegnante,
             self.livello,
             self.id,
             self.tags,
+            self.logo_img,
         )
 
 

Flask/Flask05/burlesco70/webapp/project/corsi/routes.py

@@ -77,7 +77,6 @@ def create():
 def dettaglio_corso(corso_id):
 
     # Gestione aggiunta serate
-
     form = SerataForm()
     if form.validate_on_submit():
 

Flask/Flask05/burlesco70/webapp/project/corsi/templates/corsi_dettaglio.html

@@ -105,7 +105,7 @@ <h1>Aggiungi serata per {{ corso.nome }}</h1>
                         outputFormat: 'dd/MM/yyyy',
                       });
                   });
-                  </script>                
+                  </script>             
 
                   <div class="form-group">
                       <input type="text" class="form-control" id="nome" name="nome"

Flask/Flask05/burlesco70/webapp/project/corsi/templates/corsi_lista.html

@@ -1,4 +1,5 @@
-{% extends "base.html" %} {% block content %}
+{% extends "base.html" %} 
+{% block content %}
 
     <!-- Messaggi flash -->        
     <div class="container">
@@ -11,7 +12,7 @@
         {% endif %}
       {% endwith %}
       {# End Flashed messages #}
-  </div>        
+    </div>        
 
 
 <div class="container text-center">
@@ -48,13 +49,11 @@ <h5 class="card-title">{{ c.nome }}</h5>
       </div>
     </div>
   </div>
+
   <br>
    {% endfor %}
 </div>
 </div>
 
 
-
-
-
 {% endblock %}

Flask/Flask05/burlesco70/webapp/project/tags/routes.py

@@ -27,7 +27,7 @@
 '''
 @tags_blueprint.route("/", methods=('GET', 'POST'))
 def tags():
-    # Ordinamento alfabetico ascendente per titolo
+    # Ordinamento alfabetico ascendente per "name"
     lista_tags = Tag.query.order_by(asc(Tag.name)).all()
     '''
     Crea nuovo tag

Flask/Flask05/burlesco70/webapp/project/tags/templates/tags_lista.html

@@ -26,7 +26,7 @@ <h1 class="display-1">
       <div>
       <span class="badge badge-secondary">{{t.name}}</span>   
       <a class="btn btn-primary pull-right" href="{{ url_for('tags.edit_tag', id=t.id) }}">Edit</a>
-      <a class="btn btn-primary pull-right" href="{{ url_for('tags.tag_delete', id=t.id) }}">Cancella</a>
+      <a class="btn btn-danger pull-right" href="{{ url_for('tags.tag_delete', id=t.id) }}">Cancella</a>
       </div>
       {% endfor %} 
     </h1>