28.10.2024_amelioration gestion edition + demarrage parcours

Author: pythonhtmlcssjsarduino

flask_app/admin/coureurs/templates/view_coureur.html

@@ -63,6 +63,8 @@ <h3>{{ _('admin.view.participation') }}</h3>
           <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>
         </tr>
       </thead>
       <tbody>
@@ -71,6 +73,8 @@ <h3>{{ _('admin.view.participation') }}</h3>
           <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.dossard %}{{inscription.dossard}}{% endif %} #}</th>
         </tr>
         {% endfor %}
       </tbody>

flask_app/admin/editions/dossard/__init__.py

@@ -56,6 +56,21 @@ def change_dossard(data):
     db.session.commit()
     return True
 
+@socketio.on('change_presence', namespace='/dossard')
+def set_presence(data):
+    if not data.get('presence') is not None or not data.get('inscription_id'):
+        return False
+    
+    inscription:Inscription = Inscription.query.get(data['inscription_id'])
+    if not inscription:
+        return False
+    if inscription.edition.edition_date>datetime.now():
+        return False
+
+    inscription.present = bool(data['presence'])
+    db.session.commit()
+    return True
+
 @set_route(dossard, '/event/<event_name>/editions/<edition_name>/dossard/generate', methods=['POST', 'GET'])
 @login_required
 @admin_required

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

@@ -9,6 +9,9 @@
       <th scope="col">coureur</th>
       <th scope="col">dossard</th>
       <th scope="col">parcours</th>
+      {% if now > edition_data.edition_date %}
+        <th scope="col">present</th>
+      {% endif %}
     </tr>
   </thead>
   <tbody>
@@ -17,6 +20,15 @@
       <td>{{inscription.inscrit.name}}</td>
       <td id="inscription_{{inscription.id}}"><a href="javascript:change_dossard({{inscription.id}})"><i class="fa-solid fa-pen-to-square"></i></a> {% if inscription.dossard %}{{inscription.dossard}}{% endif %}</td>
       <td>{{inscription.parcours.name}}</td>
+      {% if now > edition_data.edition_date %}
+        <td><div class="form-check form-switch"><input id="presence_{{inscription.id}}" class="form-check-input" type="checkbox" {% if inscription.present %}checked{% endif %} ></div></td>
+        <script>
+          document.getElementById("presence_{{inscription.id}}").addEventListener('click', function(event){
+            event.preventDefault()
+            change_presence({{inscription.id}}, this)
+          })
+        </script>
+        {% endif %}
     </tr>
     {% endfor %}
   </tbody>
@@ -43,6 +55,22 @@
     }
   }
 
+  function change_presence(inscription_id, button){
+    checked = button.checked
+    if(checked==false){
+      if (!window.confirm('quoi une personne vient de partire alors qu\'elle étais là??')){
+        return
+      }
+    }
+    
+    socket.emit('change_presence', {'inscription_id':inscription_id, 'presence':checked},
+      function(response){
+        if(response){
+          button.checked = checked
+        }
+      })
+  }
+
 </script>
 
 {% endblock content %}

flask_app/admin/editions/forms.py

@@ -4,7 +4,7 @@
 from flask_app.custom_field import MultiCheckboxFieldWithDescription
 
 class Edition_form(FlaskForm):
-    name = StringField('nom de l\'edition', validators=[DataRequired(), Length(max=20)])
+    name = StringField('nom de l\'edition', validators=[DataRequired(), Length(max=40)])
     edition_date = DateTimeLocalField('date le l\'edition', format='%Y-%m-%dT%H:%M', render_kw={}, validators=[DataRequired(), DateTimeNotPast()])
     parcours = MultiCheckboxFieldWithDescription('parcours', validators=[DataRequired()])
     first_inscription = DateTimeLocalField('date d\'ouverture des inscriptions', format='%Y-%m-%dT%H:%M', render_kw={}, validators=[DataRequired(), DateTimeNotPast(), DateTimeBefore('last_inscription')])

flask_app/admin/editions/parcours/__init__.py

@@ -1,12 +1,9 @@
-import time
+from datetime import datetime
 from flask import Blueprint, redirect, render_template, flash, request, jsonify, session
 from flask_app import admin_required, db, set_route, lang_url_for as url_for, socketio
 from flask_app.admin.parcours import calc_points_dist
 from flask_login import login_required, current_user
 from flask_app.models import  Event, Edition, PassageKey, Stand, Parcours, Passage, User, Inscription, Trace
-from datetime import datetime
-from flask_app.admin.editions.passages.form import NewKeyForm, ChronoLoginForm, ChronoLoginForm, SetPassageForm
-import secrets
 from flask_socketio import join_room, leave_room, emit
 from flask_app.admin.editions.passages import get_passage_data
 
@@ -35,19 +32,40 @@ def parcours_disconnect():
 def get_parcours_passages(parcours):
     parcours = Parcours.query.get(parcours)
     edition = Edition.query.get(session['room'].split('-')[3])
-    inscription:list[Inscription] = Inscription.query.filter_by(edition=edition, parcours=parcours).all()
+    inscriptions:list[Inscription] = Inscription.query.filter_by(edition=edition, parcours=parcours).all()
     data = []
-    for coureur in inscription:
+    for coureur in inscriptions:
         passage = coureur.passages.order_by(Passage.time_stamp.desc()).first()
+        first_passage:Passage = coureur.passages.order_by(Passage.time_stamp.asc()).first()
         if coureur.has_started():
-            ic(coureur.has_started(), coureur.has_finish(), coureur.has_all_right())
             pass_data = get_passage_data(passage, json=True)
-            pass_data.update({'started':True, 'finish':coureur.has_finish(), 'all_right':coureur.has_all_right()})
+            pass_data.update({'started':True, 'start_time':first_passage.time_stamp.timestamp(), 'id':coureur.id, 'finish':coureur.has_finish(), 'all_right':coureur.has_all_right(), 'end':coureur.end})
             data.append(pass_data)
         else:
-            data.append({'started':False, 'dossard':coureur.dossard, 'name':coureur.inscrit.name})
+            data.append({'started':False, 'id':coureur.id, 'dossard':coureur.dossard, 'name':coureur.inscrit.name})
     return data
 
+@socketio.on('launch_parcours', namespace='/edition/parcours')
+def launch_parcours(data):
+    parcours = Parcours.query.get(data['parcours_id'])
+    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)
+        for inscription in edition.inscriptions.filter(Inscription.parcours==parcours).all():
+            if inscription.passages.count()==0:
+                passage = Passage(time_stamp=start_time, inscription_id = inscription.id)
+                db.session.add(passage)
+                db.session.commit()
+                db.session.refresh(passage)
+                emit('new_passage', {'time':str(start_time), 'user':inscription.inscrit.username, 'dossard':inscription.dossard,'key':'', 'stand':passage.get_stand().name}, namespace='/dashboard', to=f'{passage.key.event.id}-{passage.key.edition.id}')
+                
+                first_passage:Passage = inscription.passages.order_by(Passage.time_stamp.asc()).first()
+                pass_data = get_passage_data(passage, json=True)
+                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}')
+
+        
+
 @set_route(parcours, '/event/<event_name>/editions/<edition_name>/parcours')
 @login_required
 @admin_required