31.03.2025_upgrade documentation + fix bug

Author: pythonhtmlcssjsarduino

chrono_des_vignes/__init__.py

@@ -83,7 +83,7 @@
 from_addr= os.getenv('from_addr')
 mail_token= os.getenv('mail_token')
 to_addrs= json.loads(os.getenv('to_addrs'))
-ic(mail_host, from_addr, mail_token, to_addrs)
+#ic(mail_host, from_addr, mail_token, to_addrs)
 
 class MailFormatter(logging.Formatter):
     def format(self, record):
@@ -142,6 +142,7 @@ def format(self, record):
 @babel.localeselector
 def get_locale():
     # if a user is logged in, use the locale from the user settings
+    #ic(session.get('lang'), request.accept_languages.best_match(LANGAGES))
     if session.get('lang') :
         return session['lang']
     # otherwise try to guess the language from the user accept
@@ -190,8 +191,10 @@ def decorator(func):
         @blueprint.route(path, **options)
         @wraps(func)
         def wrap(*args, **kwargs):
-            lang = kwargs.pop('lang', 'fr')
+            lang = kwargs.pop('lang', None)
             #ic('hey', lang, path, func.__name__)
+            if lang == None:
+                lang = request.accept_languages.best_match(LANGAGES)
             if lang not in LANGAGES:
                 return abort(404)
             session['lang'] = lang

chrono_des_vignes/admin/__init__.py

@@ -52,19 +52,19 @@ def new_event():
 
     user = current_user
     form = NewEventForm()
-    ic('coucou')
+    #ic('coucou')
 
     if form.validate_on_submit():
         name=form.name.data
-        ic(name)
+        #ic(name)
 
         event = Event(name=name, createur_id=user.id)
         db.session.add(event)
         db.session.commit()
 
         return redirect(url_for('admin.home_event', event_name=event.name))
     else:
-        ic(form.errors)
+        #ic(form.errors)
         for error in form.name.errors:
             flash(error, 'danger')
         return redirect(url_for('home'))

chrono_des_vignes/admin/coureurs/templates/coureurs.html

@@ -1,3 +1,23 @@
+<!--
+ * Chrono Des Vignes
+ * a timing system for sports events
+ * 
+ * Copyright © 2024-2025 Romain Maurer
+ * This file is part of Chrono Des Vignes
+ * 
+ * Chrono Des Vignes is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ * 
+ * Chrono Des Vignes is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License along with Foobar.
+ * If not, see <https://www.gnu.org/licenses/>.
+ * 
+ * You may contact me at chrono-des-vignes@ikmail.com
+-->
+
 {% extends 'layout.html' %}
 {% block content %}
 <h3>{{ _('admin.view.coureurs') }}</h3>

chrono_des_vignes/admin/coureurs/templates/view_coureur.html

@@ -1,3 +1,23 @@
+<!--
+ * Chrono Des Vignes
+ * a timing system for sports events
+ * 
+ * Copyright © 2024-2025 Romain Maurer
+ * This file is part of Chrono Des Vignes
+ * 
+ * Chrono Des Vignes is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ * 
+ * Chrono Des Vignes is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License along with Foobar.
+ * If not, see <https://www.gnu.org/licenses/>.
+ * 
+ * You may contact me at chrono-des-vignes@ikmail.com
+-->
+
 {% extends 'layout.html' %} {% block content %}
 <div>
   <h3>{{ _('admin.view.info') }}</h3>
@@ -68,7 +88,7 @@ <h3>{{ _('admin.view.info') }}</h3>
   </div>
   <div>
     <h3>{{ _('admin.view.participation') }}</h3>
-    <table class="table">
+    <table class="table clickable-table">
       <thead>
         <tr>
           <th scope="col">{{ _('admin.view.parcours') }}</th>
@@ -80,16 +100,21 @@ <h3>{{ _('admin.view.participation') }}</h3>
       </thead>
       <tbody>
         {% for inscription in inscriptions %}
-        <tr>
+        <tr data-href="{{ url_for('livetrack.livetrack_page', inscription_id=inscription.id) }}">
           <th>{{inscription.parcours.name}}</th>
           <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.end=='finish' %}{{inscription.rank}}{% endif %}</th>
+          <th>{{inscription.rank if inscription.end=='finish' else inscription.status}}</th>
         </tr>
         {% endfor %}
       </tbody>
     </table>
+    <script>
+      $('table tbody tr').on('click', function() {
+        window.location.href = $(this).data('href');
+      });
+    </script>
   </div>
 </div>
 {% endblock content %}

chrono_des_vignes/admin/editions/__init__.py

@@ -122,7 +122,7 @@ def modify_edition_page(event_name, edition_name):
     #? fin desactivation des champs
 
     if form.validate_on_submit():
-        ic(edition.rdv_lat, form.rdv_lat.data, edition.rdv_lng, form.rdv_lng.data)
+        #ic(edition.rdv_lat, form.rdv_lat.data, edition.rdv_lng, form.rdv_lng.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

chrono_des_vignes/admin/editions/dossard/__init__.py

@@ -1,3 +1,23 @@
+'''
+# Chrono Des Vignes
+# a timing system for sports events
+# 
+# Copyright © 2024-2025 Romain Maurer
+# This file is part of Chrono Des Vignes
+# 
+# Chrono Des Vignes is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+# 
+# Chrono Des Vignes is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License along with Foobar.
+# If not, see <https://www.gnu.org/licenses/>.
+# 
+# You may contact me at chrono-des-vignes@ikmail.com
+'''
+
 from flask import Blueprint, flash, render_template, redirect, url_for, request, session, send_file
 from chrono_des_vignes import admin_required, db, set_route, socketio
 from chrono_des_vignes.admin.editions.form import Edition_form
@@ -42,7 +62,7 @@ def edition_dossards(event_name, edition_name):
                 'username':[DataRequired(), DbLength(User, 'username')],
                 'email':[Optional(), DbLength(User, 'email'), Email()]
             }
-            ic('first validation', form.validate(extra_validators=supp_validators), form.parcours.data)
+            #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
                 if form.username.data:
@@ -90,7 +110,7 @@ def validate_new_user(event_name, edition_name):
     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)
+    #ic(form.parcours.data)
     if form.validate_on_submit():
         user = User.query.get_or_404(form.user_id.data)
 
@@ -185,7 +205,7 @@ def export_dossard(event_name, edition_name):
 
     buffer = BytesIO()
 
-    workbook = Workbook(buffer)
+    workbook = Workbook(buffer, {'default_date_format':'dd/mm/yy'})
     worksheet = workbook.add_worksheet()
 
     headers = [_('admin.editions.dossard.dossard'),
@@ -199,24 +219,32 @@ def export_dossard(event_name, edition_name):
                 _('admin.editions.dossard.edition_date'), 
                 _('admin.editions.dossard.edition_name'), 
                 _('admin.editions.dossard.event_name')]
+    col_width = [len(h) for h in headers]
+    get_data = lambda inscription:(inscription.dossard,
+                                inscription.inscrit.name,
+                                inscription.inscrit.lastname,
+                                inscription.inscrit.email,
+                                inscription.inscrit.phone,
+                                inscription.inscrit.datenaiss,
+                                inscription.inscrit.username,
+                                inscription.parcours.name,
+                                inscription.edition.edition_date,
+                                inscription.edition.name,
+                                inscription.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)
+        line = get_data(inscription)
+        for col, cell in enumerate(line):
+            worksheet.write(row, col, cell)
+            col_width[col] = max(col_width[col], len(str(cell)))
 
     worksheet.add_table(0,0,max(edition.inscriptions.count(), 1),len(headers)-1, {'columns': [{'header': h} for h in headers], 'autofilter': False})
-    worksheet.autofit()
+
+    for col_num, max_length in enumerate(col_width):
+        worksheet.set_column(col_num, col_num, max_length + 2)
+
     workbook.close()
 
     buffer.seek(0)

chrono_des_vignes/admin/editions/dossard/templates/dossard.html

@@ -63,7 +63,7 @@
 <script>
   var socket = io('/dossard', {auth:{'event_id': {{ event_data.id }}, 'edition_id': {{ edition_data.id }} } })
   function change_dossard(inscription_id){
-    console.log(inscription_id)
+    //console.log(inscription_id)
     let new_dossard = parseInt(window.prompt('enter the new dossard number'))
     if (new_dossard){
       socket.emit('change_dossard', {'inscription_id':inscription_id, 'new_dossard':new_dossard},

chrono_des_vignes/admin/editions/parcours/__init__.py

@@ -43,6 +43,7 @@ def parcours_connect(auth):
         join_room(session['room'], request.sid)
     else:
         return False # connection not allowed
+
 @socketio.on('disconnect', namespace='/edition/parcours')
 def parcours_disconnect():
     leave_room(session['room'], request.sid)
@@ -66,6 +67,7 @@ def get_parcours_passages(parcours_id):
             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':'', 'success':None})
             data.append(pass_data)
+    #print(data)
     return data
 
 @socketio.on('launch_parcours', namespace='/edition/parcours')
@@ -74,12 +76,12 @@ def launch_parcours(data):
     edition = Edition.query.get(session['room'].split('-')[3])
     if parcours is not None and data.get('start_time'):
         start_time =datetime.fromtimestamp(data['start_time']/1000)
-        ic('start', start_time)
+        #ic('start', start_time)
         inscription:Inscription
         for inscription in edition.inscriptions.filter(Inscription.parcours==parcours).all():
-            ic(inscription, inscription.has_started(), inscription.present)
+            #ic(inscription, inscription.has_started(), inscription.present, inscription.end)
             if not inscription.has_started() and inscription.present:
-                ic('to start')
+                #ic('to start')
                 passage = Passage(time_stamp=start_time, inscription_id = inscription.id)
                 db.session.add(passage)
                 db.session.commit()
@@ -130,6 +132,7 @@ def stop_parcours(data):
 def disqualify(data):
     if data.get('inscription_id'):
         inscription = Inscription.query.get(data.get('inscription_id'))
+        #ic('disqualify', inscription)
         if inscription.end is None:
             inscription.end = 'disqual'
             db.session.commit()
@@ -139,16 +142,18 @@ def disqualify(data):
 def abandon(data):
     if data.get('inscription_id'):
         inscription = Inscription.query.get(data['inscription_id'])
+        #ic('abandon', inscription)
         if inscription.end is None:
             inscription.end = 'abandon'
             db.session.commit()
             emit('stop', {'type':'abandon', 'inscription_id':inscription.id}, namespace='/edition/parcours', to=f'edition-parcours-{inscription.event.id}-{inscription.edition.id}')
 
 @socketio.on('finish', namespace='/edition/parcours')
 def finish(data):
-    ic('finish', data)
+    #ic('finish', data)
     if data.get('inscription_id'):
         inscription:Inscription = Inscription.query.get(data['inscription_id'])
+        #ic('finish', inscription)
         if inscription.end is None:
             inscription.end = 'finish'
             db.session.commit()