18.1.2025_ ajout documentation (subdomain doc.) avec mkdocs + last minute inscription des coureurs

Author: pythonhtmlcssjsarduino

flask_app/__init__.py

@@ -1,4 +1,4 @@
-from flask import Flask, redirect, flash, request, session, url_for
+from flask import Flask, redirect, flash, request, session, url_for, render_template
 from flask_login import LoginManager, current_user
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate

flask_app/admin/__init__.py

@@ -3,9 +3,9 @@
 from flask_app import admin_required, set_route, db
 from flask_app.models import Event
 from .form import EventForm
-from flask_app.admin.editions import editions
-from flask_app.admin.parcours import parcours_bp
-from flask_app.admin.coureurs import coureurs
+from .editions import editions
+from .parcours import parcours_bp
+from .coureurs import coureurs
 
 admin = Blueprint('admin', __name__, template_folder='templates')
 admin.register_blueprint(parcours_bp)

flask_app/admin/editions/__init__.py

@@ -4,10 +4,10 @@
 from flask_login import login_required, current_user
 from flask_app.models import  Event, Parcours, Edition
 from datetime import datetime
-from flask_app.admin.editions.dossard import dossard
-from flask_app.admin.editions.passages import passages
-from flask_app.admin.editions.parcours import parcours
-from flask_app.admin.editions.result import result
+from .dossard import dossard
+from .passages import passages
+from .parcours import parcours
+from .result import result
 from sqlalchemy import or_
 
 editions = Blueprint('editions', __name__, template_folder='templates')

flask_app/admin/editions/dossard/__init__.py

@@ -1,10 +1,16 @@
-from flask import Blueprint, flash, render_template, redirect, url_for, request, session
+from flask import Blueprint, flash, render_template, redirect, url_for, request, session, send_file
 from flask_app import admin_required, db, set_route, socketio
 from flask_app.admin.editions.form import Edition_form
 from flask_login import login_required, current_user
-from flask_app.models import  Event, Parcours, Edition, Inscription
+from flask_app.models import  Event, Parcours, Edition, Inscription, User
 from datetime import datetime
 from flask_socketio import join_room, leave_room
+from xlsxwriter import Workbook
+from io import BytesIO
+from flask_babel import _
+from flask_app.custom_validators import DataRequired, Length, EqualTo, DonTExist, DbLength
+from .form import NewCoureurForm, ValidateNewCoureurForm
+from sqlalchemy import func, and_, or_, not_
 
 dossard = Blueprint('dossard', __name__, template_folder='templates')
 
@@ -24,8 +30,88 @@ def generate_dossard(event_name, edition_name):
     edition : Edition= event.editions.filter_by(name=edition_name).first_or_404()
     user = current_user
 
+    form = NewCoureurForm()
+    choices = edition.parcours
+    form.parcours.choices = [str((p.name, p.description)) for p in choices]
 
-    return render_template('generate_dossard.html', user_data=user, event_data=event, edition_data=edition, now=datetime.now(), inscriptions=edition.inscriptions, event_modif=True, edition_sidebar=True)
+    if form.validate_on_submit():
+        users = User.query.filter(and_(or_(func.lower(User.username)==func.lower(form.username.data),
+                                and_(func.lower(User.name)==func.lower(form.name.data), func.lower(User.lastname)==func.lower(form.lastname.data))),
+                            User.datenaiss==form.datenaiss.data)).all()
+        if len(users) > 0:
+            validate_form = ValidateNewCoureurForm()
+        else:
+            validate_form = None
+
+            supp_validators = {
+                'name':[DataRequired(), DbLength(User, 'name')],
+                'lastname':[DataRequired(), DbLength(User, 'lastname')],
+                'username':[DataRequired(), DbLength(User, 'username')],
+                'email':[DataRequired(), DbLength(User, 'email')]
+            }
+            ic('first validation', form.validate(extra_validators=supp_validators), form.parcours.data)
+            if form.validate(extra_validators=supp_validators):
+                # create a new user with the form data and add it to all the parcours
+                username=f'{form.name.data}.{form.lastname.data}'
+                nb = User.query.filter(User.username.contains(username)).count()
+                username += str(nb) if nb>0 else ''
+                hash_pwd= 'dev' #! ''.join(secrets.choice(alphabet) for _ in range(10))
+
+                choices = event.parcours.filter(Parcours.name.in_([eval(data)[0] for data in form.parcours.data])).all()
+                user = User(name=form.name.data,
+                            lastname=form.lastname.data,
+                            username=username,
+                            email=form.email.data if form.email.data else None,
+                            phone=form.phone.data if form.phone.data else None,
+                            datenaiss= form.datenaiss.data,
+                            password=hash_pwd)
+                db.session.add(user)
+                db.session.commit()
+                db.session.refresh(user)
+                inscriptions = []
+                for parcours in choices:
+                    inscriptions.append(Inscription(user_id = user.id,
+                                                    event_id=event.id,
+                                                    edition_id=edition.id,
+                                                    parcours_id=parcours.id))
+                db.session.add_all(inscriptions)
+                db.session.commit()
+
+    else:
+        users = []
+        validate_form = None
+
+    return render_template('generate_dossard.html', user_data=user, event_data=event, edition_data=edition, now=datetime.now(), inscriptions=edition.inscriptions, event_modif=True, edition_sidebar=True, form=form, validate_form=validate_form, validate_users=users)
+
+@set_route(dossard, '/event/<event_name>/editions/<edition_name>/dossard/newuser', methods=['POST'])
+@login_required
+@admin_required
+def validate_new_user(event_name, edition_name):
+    event = Event.query.filter_by(name=event_name).first_or_404()
+    edition : Edition= event.editions.filter_by(name=edition_name).first_or_404()
+    form = ValidateNewCoureurForm()
+    form.parcours.choices = [str((p.name, p.description)) for p in edition.parcours]
+    ic(form.parcours.data)
+    if form.validate_on_submit():
+        user = User.query.get_or_404(form.user_id.data)
+
+        choices = event.parcours.filter(Parcours.name.in_([eval(data)[0] for data in form.parcours.data]),
+                                        not_(Parcours.inscriptions.any(Inscription.user_id==user.id))).all()
+        
+        inscriptions = []
+        for parcours in choices:
+            inscriptions.append(Inscription(user_id = user.id,
+                                            event_id=event.id,
+                                            edition_id=edition.id,
+                                            parcours_id=parcours.id))
+        db.session.add_all(inscriptions)
+        db.session.commit()
+
+        flash(_('flash.success.newuser:username:name:lastname').format(username=user.username, name=user.name, lastname=user.lastname), 'success')
+
+        return redirect(url_for('admin.editions.dossard.generate_dossard', event_name=event_name, edition_name=edition_name))
+    else:
+        return {'ok':False}
 
 @socketio.on('connect', namespace='/dossard')
 def dossard_connect(auth):
@@ -87,3 +173,52 @@ def generate_all_dossard(event_name, edition_name):
     db.session.commit()
 
     return redirect(url_for("admin.editions.dossard.generate_dossard", event_name=event.name, edition_name=edition.name))
+
+
+# methode for download dossard as excel
+@set_route(dossard, '/event/<event_name>/editions/<edition_name>/dossard/download', methods=['POST', 'GET'])
+@login_required
+@admin_required
+def export_dossard(event_name, edition_name):
+    event : Event = Event.query.filter_by(name=event_name).first_or_404()
+    edition : Edition= event.editions.filter_by(name=edition_name).first_or_404()
+    user = current_user
+
+    buffer = BytesIO()
+
+    workbook = Workbook(buffer)
+    worksheet = workbook.add_worksheet()
+
+    headers = [_('admin.editions.dossard.dossard'),
+                _('admin.editions.dossard.name'), 
+                _('admin.editions.dossard.lastname'), 
+                _('admin.editions.dossard.email'), 
+                _('admin.editions.dossard.phone'), 
+                _('admin.editions.dossard.datenaiss'), 
+                _('admin.editions.dossard.username'), 
+                _('admin.editions.dossard.parcours'), 
+                _('admin.editions.dossard.edition_date'), 
+                _('admin.editions.dossard.edition_name'), 
+                _('admin.editions.dossard.event_name')]
+
+    row :int
+    for row, inscription in enumerate(edition.inscriptions.all(), 1):
+        # dossard, name, lastname, email, phone, datenaiss, username, parcours, edition_date, edition_name, event_name
+        worksheet.write(row, 0, inscription.dossard)
+        worksheet.write(row, 1, inscription.inscrit.name)
+        worksheet.write(row, 2, inscription.inscrit.lastname)
+        worksheet.write(row, 3, inscription.inscrit.email)
+        worksheet.write(row, 4, inscription.inscrit.phone)
+        worksheet.write(row, 5, inscription.inscrit.datenaiss)
+        worksheet.write(row, 6, inscription.inscrit.username)
+        worksheet.write(row, 7, inscription.parcours.name)
+        worksheet.write(row, 8, inscription.edition.edition_date)
+        worksheet.write(row, 9, inscription.edition.name)
+        worksheet.write(row, 10, inscription.event.name)
+
+    worksheet.add_table(0,0,max(edition.inscriptions.count(), 1),len(headers)-1, {'columns': [{'header': h} for h in headers], 'autofilter': False})
+    worksheet.autofit()
+    workbook.close()
+
+    buffer.seek(0)
+    return send_file(buffer, download_name='dossard.xlsx', as_attachment=True)

flask_app/admin/editions/dossard/form.py

@@ -0,0 +1,32 @@
+from flask_wtf import FlaskForm
+from wtforms import StringField, DateTimeLocalField, FloatField, SubmitField, TextAreaField, EmailField, DateField, IntegerField, TelField
+from flask_app.custom_validators import DataRequired, Length, DateTimeNotPast, DateTimeBefore, InputRequired
+from flask_app.custom_field import MultiCheckboxFieldWithDescription
+from flask_babel import lazy_gettext as _
+from flask_app.models import User
+
+from flask_app.custom_validators import DbLength
+
+class NewCoureurForm(FlaskForm):
+    name = StringField(_('form.name'), validators=[DbLength(table=User, column='name')])
+    lastname = StringField(_('form.lastname'), validators=[DbLength(table=User, column='lastname')])
+    username = StringField(_('form.username'))
+    email = EmailField(_('form.email'))
+    phone = TelField(_('form.tel'))
+    datenaiss = DateField(_('form.birth'), validators=[DataRequired()])
+
+    parcours = MultiCheckboxFieldWithDescription(_('form.choosedparcours'), validators=[DataRequired()])
+
+    submit_btn = SubmitField(_('form.register'))
+
+class ValidateNewCoureurForm(FlaskForm):
+    user_id = IntegerField('user_id', validators=[DataRequired()])
+    
+    name = StringField(_('form.name'), validators=[DbLength(table=User, column='name')])
+    lastname = StringField(_('form.lastname'), validators=[DbLength(table=User, column='lastname')])
+    username = StringField(_('form.username'))
+    email = EmailField(_('form.email'))
+    phone = TelField(_('form.tel'))
+    datenaiss = DateField(_('form.birth'), validators=[DataRequired()])
+
+    parcours = MultiCheckboxFieldWithDescription(_('form.choosedparcours'), validators=[DataRequired()])

flask_app/admin/editions/dossard/templates/generate_dossard.html

@@ -6,11 +6,11 @@
 <table class="table">
   <thead>
     <tr>
-      <th scope="col">coureur</th>
-      <th scope="col">dossard</th>
-      <th scope="col">parcours</th>
+      <th scope="col">{{ _('admin.editions.dossard.coureur') }}</th>
+      <th scope="col">{{ _('admin.editions.dossard.dossard') }}</th>
+      <th scope="col">{{ _('admin.editions.dossard.parcours') }}</th>
       {% if now > edition_data.edition_date %}
-        <th scope="col">present</th>
+        <th scope="col">{{ _('admin.editions.dossard.present') }}</th>
       {% endif %}
     </tr>
   </thead>
@@ -34,7 +34,10 @@
   </tbody>
 </table>
 
-<a class="btn bg-info" href="{{ url_for('admin.editions.dossard.generate_all_dossard', event_name=event_data.name, edition_name=edition_data.name) }}">generer</a>
+<a class="btn bg-info" href="{{ url_for('admin.editions.dossard.generate_all_dossard', event_name=event_data.name, edition_name=edition_data.name) }}">{{ _('admin.editions.dossard.generer') }}</a>
+<a class="btn bg-success" href="{{ url_for('admin.editions.dossard.export_dossard', event_name=event_data.name, edition_name=edition_data.name) }}" target="_blank" rel="noopener noreferrer">{{ _('admin.editions.dossard.export_excel') }}</a>
+<br><br>
+<a class="btn bg-info" onclick="modal.show()">{{ _('admin.editions.dossard.addnewcoureur') }}</a>
 
 <script>
   var socket = io('/dossard', {auth:{'event_id': {{ event_data.id }}, 'edition_id': {{ edition_data.id }} } })
@@ -73,4 +76,6 @@
 
 </script>
 
+{% include "new_coureur_modal.html" %}
+
 {% endblock content %}