19.12.2024_ajout description event and edition en markdowm

Author: pythonhtmlcssjsarduino

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "github.vscode-pull-request-github"
+    ]
+}

.vscode/settings.json

@@ -1,7 +1,8 @@
-from flask import Blueprint, render_template
+from flask import Blueprint, render_template, flash
 from flask_login import login_required, current_user
-from flask_app import admin_required, set_route
+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
@@ -12,12 +13,22 @@
 admin.register_blueprint(coureurs)
 
 
-@set_route(admin, '/event/<event_name>')
+@set_route(admin, '/event/<event_name>', methods=['POST', 'GET'])
 @login_required
 @admin_required
 def home_event(event_name):
     #* page to access and modify an event
-    event_data = Event.query.filter_by(name=event_name).first()
+    event_data:Event = Event.query.filter_by(name=event_name).first()
     user = current_user
-    return render_template("home_event.html", user_data=user, event_data=event_data, event_modif=True)
+
+    event_form = EventForm(data={
+        'description':event_data.description
+    })
+
+    if event_form.validate_on_submit():
+        event_data.description = event_form.description.data
+        db.session.commit()
+        flash('l\'évenement a bien été mise a jour.', 'success')
+
+    return render_template("home_event.html", user_data=user, event_data=event_data, form=event_form, event_modif=True)
 

flask_app/admin/__init__.py

@@ -1,6 +1,6 @@
 {% extends 'layout.html' %} {% block content %}
 <div>
-  <h3>info</h3>
+  <h3>{{ _('admin.view.info') }}</h3>
   <div class="card mb-4">
     <div class="card-body">
       <div class="row">
@@ -60,11 +60,11 @@ <h3>{{ _('admin.view.participation') }}</h3>
     <table class="table">
       <thead>
         <tr>
-          <th scope="col">parcours</th>
-          <th scope="col">edition</th>
-          <th scope="col">date</th>
-          <th scope="col">dossard</th>
-          <th scope="col">rank</th>
+          <th scope="col">{{ _('admin.view.parcours') }}</th>
+          <th scope="col">{{ _('admin.view.edition') }}</th>
+          <th scope="col">{{ _('admin.view.date') }}</th>
+          <th scope="col">{{ _('admin.view.dossard') }}</th>
+          <th scope="col">{{ _('admin.view.rank') }}</th>
         </tr>
       </thead>
       <tbody>

flask_app/admin/coureurs/templates/view_coureur.html

@@ -1,6 +1,6 @@
 from flask import Blueprint, flash, render_template, redirect, request
 from flask_app import admin_required, db, set_route, lang_url_for as url_for
-from flask_app.admin.editions.forms import Edition_form
+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
 from datetime import datetime
@@ -32,6 +32,7 @@ def editions_page(event_name):
                               event_id=event.id,
                               parcours=event.parcours.filter(Parcours.name.in_(form.parcours.data)).all(),
                               edition_date=form.edition_date.data,
+                              description = form.description,
                               first_inscription=form.first_inscription.data,
                               last_inscription=form.last_inscription.data,
                               rdv_lat=form.rdv_lat.data,
@@ -69,6 +70,7 @@ def modify_edition_page(event_name, edition_name):
     user = current_user
     form = Edition_form(data={'name':edition.name,
                               'edition_date':edition.edition_date,
+                              'description':edition.description,
                               'first_inscription':edition.first_inscription,
                               'last_inscription':edition.last_inscription,
                               'rdv_lat':edition.rdv_lat,
@@ -98,10 +100,10 @@ def modify_edition_page(event_name, edition_name):
     #? fin desactivation des champs
 
     if form.validate_on_submit():
-        print(form.parcours.data)
         if form.name.data == edition.name or not event.editions.filter_by(name=form.name.data).first():
             edition.name = form.name.data
             edition.edition_date = form.edition_date.data
+            edition.description = form.description.data
             edition.parcours = event.parcours.filter(Parcours.name.in_([eval(p)[0] for p in form.parcours.data])).all()
             edition.first_inscription = form.first_inscription.data
             edition.last_inscription = form.last_inscription.data

flask_app/admin/editions/__init__.py

@@ -1,6 +1,6 @@
 from flask import Blueprint, flash, render_template, redirect, url_for, request, session
 from flask_app import admin_required, db, set_route, socketio
-from flask_app.admin.editions.forms import Edition_form
+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 datetime import datetime

flask_app/admin/editions/dossard/__init__.py

@@ -0,0 +1,16 @@
+from flask_wtf import FlaskForm
+from wtforms import StringField, DateTimeLocalField, FloatField, SubmitField, TextAreaField
+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 _
+
+class Edition_form(FlaskForm):
+    name = StringField(_('form.edition_name'), validators=[DataRequired(), Length(max=40)])
+    edition_date = DateTimeLocalField(_('form.edition_date'), format='%Y-%m-%dT%H:%M', render_kw={}, validators=[DataRequired(), DateTimeNotPast()])
+    description = TextAreaField(_('form.description'), render_kw={'style':'height:200px'})
+    parcours = MultiCheckboxFieldWithDescription(_('form.parcours'), validators=[DataRequired()])
+    first_inscription = DateTimeLocalField(_('form.firstinscriptiondate'), format='%Y-%m-%dT%H:%M', render_kw={}, validators=[DataRequired(), DateTimeNotPast(), DateTimeBefore('last_inscription')])
+    last_inscription = DateTimeLocalField(_('form.lastinscriptiondate'), format='%Y-%m-%dT%H:%M', render_kw={}, validators=[DataRequired(), DateTimeNotPast(), DateTimeBefore('edition_date')])
+    rdv_lat= FloatField(_('form.rdvlng'), validators=[DataRequired()], default=0)
+    rdv_lng= FloatField(_('form.rdvlat'), validators=[DataRequired()], default=0)
+    submit_btn = SubmitField(_('form.save'))

flask_app/admin/editions/form.py

@@ -1,12 +1,13 @@
 from flask_wtf import FlaskForm
 from wtforms import StringField, SelectField, SubmitField, DateTimeField, IntegerField, FloatField, FieldList
 from flask_app.custom_validators import DataRequired, Length, DateTimeNotPast, DateTimeBefore, InputRequired
+from flask_babel import lazy_gettext as _
 
 class NewKeyForm(FlaskForm):
-    name = StringField('nom', validators=[DataRequired(), Length(max=40)])
-    stands = FieldList(SelectField('stand'))
-    submit_btn= SubmitField('créer')
+    name = StringField(_('form.lastname'), validators=[DataRequired(), Length(max=40)])
+    stands = FieldList(SelectField(_('form.stand')))
+    submit_btn= SubmitField('form.create')
 
 class ChronoLoginForm(FlaskForm):
-    key = StringField('clé', validators=[DataRequired()])
-    submit_btn= SubmitField('valider')
+    key = StringField(_('form.key'), validators=[DataRequired()])
+    submit_btn= SubmitField(_('form.validate'))

flask_app/admin/editions/forms.py

@@ -4,16 +4,16 @@
 {% endblock %}
 {% block content %}
     <div>
-        <p>clé: {{ key.name }} ({{ key.key }})</p>
-        <p>événement: {{ key.event.name }}</p>
+        <p>{{ _('admin.editions.passages.key') }}: {{ key.name }} ({{ key.key }})</p>
+        <p>{{ _('admin.editions.passages.événement') }}: {{ key.event.name }}</p>
         <ul class="list-group">
             {% for stand in key.stands.all() %}
-                <li class="list-group-item">stand: {{ stand.name }}, parcours: {{ stand.parcours.name }}</li>
+                <li class="list-group-item">{{ _('admin.editions.passages.stand') }}: {{ stand.name }}, {{ _('admin.editions.passages.parcours') }}: {{ stand.parcours.name }}</li>
             {% endfor %}
         </ul>
     </div>
     <br>
-    <input type="number" class="form-control form-control-lg" id="dossard_input" placeholder="enter dossard number">
+    <input type="number" class="form-control form-control-lg" id="dossard_input" placeholder="{{ _('admin.editions.passages.enterdossardnb') }}">
     <br>
     <div class="d-flex w-100">
         <div class="w-50">