14.02.2024_Add Optional validator to email fields in Flask forms

Author: pythonhtmlcssjsarduino

chrono_des_vignes/__init__.py

@@ -11,6 +11,7 @@
 from flask_bcrypt import Bcrypt
 import os
 from dotenv import load_dotenv
+from datetime import datetime
 install()
 load_dotenv()
 from sqlalchemy import make_url
@@ -28,7 +29,7 @@
 app = Flask(__name__)
 app.config['SERVER_NAME'] = 'localhost:5000'
 password= os.environ.get('db_password')
-app.config['SECRET_KEY'] = password #! change that for deployment
+app.config['SECRET_KEY'] = os.environ.get('SECRET_KEY') #! change that for deployment
 url_object = URL.create(
     "mysql+pymysql",
     username="root",
@@ -84,10 +85,6 @@ def get_timezone():
 
 babel = Babel(app, locale_selector=get_locale, timezone_selector=get_timezone)
 
-@app.context_processor
-def inject_babel():
-    return dict(_=gettext)
-
 from chrono_des_vignes.models import User
 @login_manager.user_loader
 def load_user(user_id:str ):
@@ -119,8 +116,8 @@ def lang_url_for(*args, **kwargs):
     return url_for(*args, lang=lang, **kwargs)
 
 @app.context_processor
-def inject_lang_url_for():
-    return dict(url_for=lang_url_for)
+def jinja_context():
+    return dict(_=gettext, url_for=lang_url_for, now=datetime.now())
 
 def set_route(blueprint, path, **options):
     def decorator(func):
@@ -141,8 +138,10 @@ def wrap(*args, **kwargs):
 from chrono_des_vignes.admin import admin
 from chrono_des_vignes.view import view
 from chrono_des_vignes.dev import dev
+from chrono_des_vignes.livetrack import livetrack
 app.register_blueprint(users)
 app.register_blueprint(admin)
 app.register_blueprint(view)
 app.register_blueprint(dev)
+app.register_blueprint(livetrack)
 from chrono_des_vignes import routes

chrono_des_vignes/admin/coureurs/templates/view_coureur.html

@@ -85,7 +85,7 @@ <h3>{{ _('admin.view.participation') }}</h3>
           <th>{{inscription.edition.name}}</th>
           <th>{{inscription.edition.edition_date.strftime('%d.%m.%Y')}}</th>
           <th>{% if inscription.dossard %}{{inscription.dossard}}{% endif %}</th>
-          <th>{# {% if inscription.dossard %}{{inscription.dossard}}{% endif %} #}</th>
+          <th>{% if inscription.end=='finish' %}{{inscription.rank}}{% endif %}</th>
         </tr>
         {% endfor %}
       </tbody>

chrono_des_vignes/admin/editions/dossard/__init__.py

@@ -11,6 +11,7 @@
 from chrono_des_vignes.custom_validators import DataRequired, Length, EqualTo, DonTExist, DbLength, Email
 from .form import NewCoureurForm, ValidateNewCoureurForm
 from sqlalchemy import func, and_, or_, not_
+from wtforms.validators import Optional
 
 dossard = Blueprint('dossard', __name__, template_folder='templates')
 
@@ -39,7 +40,7 @@ def edition_dossards(event_name, edition_name):
                 'name':[DataRequired(), DbLength(User, 'name')],
                 'lastname':[DataRequired(), DbLength(User, 'lastname')],
                 'username':[DataRequired(), DbLength(User, 'username')],
-                'email':[DataRequired(), DbLength(User, 'email'), Email()]
+                'email':[Optional(), DbLength(User, 'email'), Email()]
             }
             ic('first validation', form.validate(extra_validators=supp_validators), form.parcours.data)
             if form.validate(extra_validators=supp_validators):

chrono_des_vignes/admin/editions/dossard/form.py

@@ -1,17 +1,17 @@
 from flask_wtf import FlaskForm
 from wtforms import StringField, DateTimeLocalField, FloatField, SubmitField, TextAreaField, EmailField, DateField, IntegerField, TelField
-from chrono_des_vignes.custom_validators import DataRequired, Length, DateTimeNotPast, DateTimeBefore, InputRequired
+from chrono_des_vignes.custom_validators import DataRequired, Length, DateTimeNotPast, DateTimeBefore, InputRequired, Email
 from chrono_des_vignes.custom_field import MultiCheckboxFieldWithDescription
 from flask_babel import lazy_gettext as _
 from chrono_des_vignes.models import User
-
+from wtforms.validators import Optional
 from chrono_des_vignes.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'))
+    email = EmailField(_('form.email'), validators=[Optional(), Email()])
     phone = TelField(_('form.tel'))
     datenaiss = DateField(_('form.birth'), validators=[DataRequired()])
 
@@ -25,7 +25,7 @@ class ValidateNewCoureurForm(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'))
+    email = EmailField(_('form.email'), validators=[Optional(), Email()])
     phone = TelField(_('form.tel'))
     datenaiss = DateField(_('form.birth'), validators=[DataRequired()])
 

chrono_des_vignes/admin/editions/parcours/__init__.py

@@ -44,7 +44,7 @@ def get_parcours_passages(parcours):
         else:
             pass_data = {'parcours':[], 'started':False, 'id':coureur.id, 'dossard':coureur.dossard, 'name':coureur.inscrit.name}
             for stand, dist in zip(coureur.parcours.iter_chrono_list(), coureur.parcours.get_chrono_dists()):
-                pass_data['parcours'].append({'stand':{'name':stand.name}, 'dist':round(dist, 3), 'delta':'', 'succes':None})
+                pass_data['parcours'].append({'stand':{'name':stand.name}, 'dist':round(dist, 3), 'delta':'', 'success':None})
             data.append(pass_data)
     return data
 
@@ -68,7 +68,7 @@ def launch_parcours(data):
                 pass_data.update({'started':True, 'parcours_id':inscription.parcours.id, 'start_time':first_passage.time_stamp.timestamp() , 'id':inscription.id, 'finish':inscription.has_finish(), 'all_right':inscription.has_all_right(), 'end':inscription.end})
                 emit('new_passage', pass_data, namespace='/edition/parcours', to=f'edition-parcours-{inscription.event.id}-{inscription.edition.id}')
 
-@socketio.on('launch_parcours', namespace='/edition/parcours')
+@socketio.on('stop_parcours', namespace='/edition/parcours')
 def stop_parcours(data):
     parcours = Parcours.query.get(data.get('parcours_id'))
     edition = Edition.query.get(session['room'].split('-')[3])

chrono_des_vignes/admin/editions/parcours/templates/edition_parcours.html

@@ -59,7 +59,7 @@
                                     <th class="text-center pe-1"> <i class="`+(passage.current?'fa-solid fa-circle fa-l':'fa-regular fa-circle fa-xs')+`"></i></th>
                                     <td class="pe-3">${passage.stand.name}</td>
                                     <td class="pe-3">`+
-                                        (passage.succes==true?passage.delta:(passage.succes==false?'<i class="fa-solid fa-xmark"></i>':''))+
+                                        (passage.success==true?passage.delta:(passage.success==false?'<i class="fa-solid fa-xmark"></i>':''))+
                                     `</td>
                                     <td>
                                         ${ passage.dist !=null?passage.dist+' km':'' }
@@ -138,7 +138,7 @@
                                 <th class="text-center pe-1"> <i class="`+(passage.current?'fa-solid fa-circle fa-l':'fa-regular fa-circle fa-xs')+`"></i></th>
                                 <td class="pe-3">${passage.stand.name}</td>
                                 <td class="pe-3">`+
-                                    (passage.succes==true||passage.succes==null?passage.delta:(passage.succes==false?'<i class="fa-solid fa-xmark"></i>':''))+
+                                    (passage.success==true||passage.success==null?passage.delta:(passage.success==false?'<i class="fa-solid fa-xmark"></i>':''))+
                                 `</td>
                                 <td>
                                     ${ passage.dist !=null?passage.dist+' km':'' }
@@ -283,7 +283,7 @@
                 document.getElementById("end-parcours-{{ parcours.id }}").addEventListener('click', function(event){
                     let button = event.target
                     let start_time = Date.now()
-                    socket.emit('launch_parcours', {'parcours_id':{{ parcours.id }}, 'start_time': start_time})
+                    socket.emit('stop_parcours', {'parcours_id':{{ parcours.id }}, 'start_time': start_time})
                 }, { once: true })
             }
 

chrono_des_vignes/admin/editions/passages/__init__.py

@@ -137,26 +137,26 @@ def get_passage_data(passage:Passage, json=False)->dict:
                 minutes, seconds = divmod(remainder, 60)
                 delta= f"{f'{days} days, 'if days>0 else ''}{hours:02}:{minutes:02}:{seconds:02}"
                 user_passages.pop(0)
-                succes=True
+                success=True
             elif len(user_passages)>0:
                 delta=None
-                succes=False
+                success=False
             else:
                 if not current:
                     current=True
                     data['parcours'][-1]['current']=True
-                succes=None
+                success=None
                 delta=None
 
-            data['parcours'].append({'stand':stand if not json else {'name':stand.name}, 'dist':round(dist, 3), 'delta':delta, 'succes':succes})
+            data['parcours'].append({'stand':stand if not json else {'name':stand.name}, 'dist':round(dist, 3), 'delta':delta, 'success':success})
         for p in user_passages:
-            succes=None
+            success=None
             delta = p.time_stamp-first_passage.time_stamp
             days = delta.days
             hours, remainder = divmod(delta.seconds, 3600)
             minutes, seconds = divmod(remainder, 60)
             delta= f"{f'{days} days, 'if days>0 else ''}{hours:02}:{minutes:02}:{seconds:02}"
-            data['parcours'].append({'stand':p.get_stand() if not json else {'name':p.get_stand().name}, 'dist':None, 'delta':delta, 'succes':succes})
+            data['parcours'].append({'stand':p.get_stand() if not json else {'name':p.get_stand().name}, 'dist':None, 'delta':delta, 'success':success})
         if not current:
             data['parcours'][-1]['current']=True
     return data

chrono_des_vignes/admin/editions/passages/templates/chrono.html

@@ -175,7 +175,7 @@
                                         <th class="text-center pe-1"> <i class="`+(passage.current?'fa-solid fa-circle fa-l':'fa-regular fa-circle fa-xs')+`"></i></th>
                                         <td class="pe-3">${passage.stand.name}</td>
                                         <td class="pe-3">`+
-                                            (passage.succes==true||passage.succes==null?passage.delta:(passage.succes==false?'<i class="fa-solid fa-xmark"></i>':''))+
+                                            (passage.success==true||passage.success==null?passage.delta:(passage.success==false?'<i class="fa-solid fa-xmark"></i>':''))+
                                         `</td>
                                         <td>
                                             ${ passage.dist !=null?passage.dist+' km':'' }

chrono_des_vignes/admin/editions/result/templates/result.html

@@ -34,10 +34,5 @@ <h2>{{ parcours }}</h2>
                 {% endfor %}
             </tbody>
         </table>
-        <script>
-            $('table tbody tr').on('click', function() {
-            window.location.href = $(this).data('href');
-            });
-        </script>
     {% endfor %}
 {% endblock content %}

chrono_des_vignes/babel.cfg

@@ -19,6 +19,7 @@
 [python: chrono_des_vignes/admin/parcours/forms.py]
 [python: chrono_des_vignes/admin/parcours/__init__.py]
 [python: chrono_des_vignes/dev/__init__.py]
+[python: chrono_des_vignes/livetrack/__init__.py]
 [python: chrono_des_vignes/static/pyscript/main.py]
 [python: chrono_des_vignes/users/forms.py]
 [python: chrono_des_vignes/users/__init__.py]
@@ -32,7 +33,6 @@
 [jinja2: chrono_des_vignes/admin/editions/passages/templates/chrono_home.html]
 [jinja2: chrono_des_vignes/admin/editions/passages/templates/dashboard.html]
 [jinja2: chrono_des_vignes/admin/editions/result/templates/result.html]
-[jinja2: chrono_des_vignes/admin/editions/templates/edition-sidebar.html]
 [jinja2: chrono_des_vignes/admin/editions/templates/editions.html]
 [jinja2: chrono_des_vignes/admin/editions/templates/modify_edition.html]
 [jinja2: chrono_des_vignes/admin/parcours/templates/map_iframe.html]
@@ -43,11 +43,10 @@
 [jinja2: chrono_des_vignes/dev/template/dev_layout.html]
 [jinja2: chrono_des_vignes/dev/template/languages.html]
 [jinja2: chrono_des_vignes/dev/template/reload.html]
+[jinja2: chrono_des_vignes/livetrack/templates/livetrack.html]
 [jinja2: chrono_des_vignes/templates/0-home.html]
-[jinja2: chrono_des_vignes/templates/layout copy.html]
 [jinja2: chrono_des_vignes/templates/layout.html]
 [jinja2: chrono_des_vignes/templates/macro.html]
-[jinja2: chrono_des_vignes/templates/sidebar copy.html]
 [jinja2: chrono_des_vignes/templates/sidebar.html]
 [jinja2: chrono_des_vignes/templates/doc/site/404.html]
 [jinja2: chrono_des_vignes/templates/doc/site/index.html]