change default icon + add zipper to crate release zip file

Author: pythonhtmlcssjsarduino

.gitignore

@@ -2,6 +2,7 @@
 .venv_3.12
 sql-dumps
 .vscode
+release.zip
 
 
 # Byte-compiled / optimized / DLL files

chrono_des_vignes/__init__.py

@@ -218,13 +218,14 @@ def http_error(error:exceptions.HTTPException):
 
 # defini les pages du site web
 from chrono_des_vignes.users import users
-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)
+from chrono_des_vignes.admin import admin
 app.register_blueprint(admin)
+from chrono_des_vignes.view import view
 app.register_blueprint(view)
-app.register_blueprint(dev)
+if app.debug:
+    from chrono_des_vignes.dev import dev
+    app.register_blueprint(dev)
+from chrono_des_vignes.livetrack import livetrack
 app.register_blueprint(livetrack)
 from chrono_des_vignes import routes

chrono_des_vignes/admin/editions/__init__.py

@@ -77,6 +77,9 @@ def delete_edition_page(event_name, edition_name):
     if edition.first_inscription <= datetime.now():
         flash('l\'edition ne peut pas être supprimée car les inscriptions sont déjà ouvertes', 'danger')
         return redirect(url_for('admin.editions.modify_edition_page',event_name=event.name, edition_name=edition.name))
+    elif edition.passage_keys.count()>0:
+        flash('l\'edition ne peut pas être supprimée car des passages keys existent', 'danger')
+        return redirect(url_for('admin.editions.modify_edition_page',event_name=event.name, edition_name=edition.name))
 
     db.session.delete(edition)
     db.session.commit()

chrono_des_vignes/admin/editions/parcours/__init__.py

@@ -103,7 +103,8 @@ def launch_parcours(data):
                                     '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}')
-
+    else:
+        ic('error value false', parcours is not None and data.get('start_time'), parcours ,data.get('start_time'), data)
 @socketio.on('stop_parcours', namespace='/edition/parcours')
 def stop_parcours(data):
     parcours = Parcours.query.get(data.get('parcours_id'))

chrono_des_vignes/admin/editions/passages/__init__.py

@@ -147,6 +147,7 @@ def get_passage_data(passage:Passage, json=False)->dict:
           'name':passage.inscription.inscrit.name,
           'time_stamp':passage.time_stamp if not json else passage.time_stamp.timestamp(),
           'parcours':[]}
+    ic(passage.inscription, passage, passage.id)
 
     user_passages:list[Passage] = Passage.query.filter(Passage.inscription==passage.inscription, Passage.time_stamp<=passage.time_stamp).all()
     if len(user_passages)>0:
@@ -179,6 +180,7 @@ def get_passage_data(passage:Passage, json=False)->dict:
             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}"
+            ic(p, p.get_stand(), p.key.stands.all(), p.inscription.parcours)
             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
@@ -243,14 +245,15 @@ def get_passages_data():
 
 @socketio.on('set_passage', namespace='/key')
 def set_passage(data):
-    inscription:Inscription = Inscription.query.filter(Inscription.dossard == data['dossard']).first()
-    if not inscription:
-        emit('passage_response', {"success": False, 'saved':False, 'error':'not valide dossard', 'request':data}, to=session['room'])
-        return
     key = PassageKey.query.filter_by(key=session['room']).first()
     if not key:
         emit('passage_response', {"success": False, 'saved':False, 'error':'not valide key', 'request':data}, to=session['room'])
         return
+
+    inscription:Inscription = Inscription.query.filter(Inscription.dossard == data['dossard'], Inscription.edition==key.edition).first()
+    if not inscription:
+        emit('passage_response', {"success": False, 'saved':False, 'error':'not valide dossard', 'request':data}, to=session['room'])
+        return
 
     if inscription.end == 'finish':
         emit('passage_response', {"success": False, 'saved':False, 'error':'has already finish', 'request':data}, to=session['room'])

chrono_des_vignes/admin/editions/templates/editions.html

@@ -69,7 +69,7 @@ <h5 class="modal-title" id="new_edition_label">{{ _('admin.editions.newedition')
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <div class="modal-body">
-        {{render_form(form, id='new_edition_form', submit=False, map_label='rendez vous pour cette edition')}}
+        {{render_form(form, id='new_edition_form', submit=False, map_label=_('admin.editions.rdv'))}}
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">

chrono_des_vignes/models.py

@@ -313,7 +313,7 @@ class Inscription(db.Model):
     end=db.Column(db.String(10)) # abandon, disqual, absent, finish or None
 
     def __repr__(self) -> str:
-        return f'<Inscription id:{self.id} dossard:{self.dossard} >'
+        return f'<Inscription id:{self.id} dossard:{self.dossard} user:{self.inscrit.username}>'
 
     def has_started(self)->bool:
         return bool(self.passages.count())
@@ -416,7 +416,7 @@ class Passage(db.Model):
     inscription:Inscription
 
     def __repr__(self) -> str:
-        return f'<Passage time={self.time_stamp} key={self.key.name} inscription={self.inscription.inscrit.username} >'
+        return f'<Passage time={self.time_stamp} key={self.key.name if self.key else None} inscription={self.inscription.inscrit.username} >'
 
     def get_stand(self)->Stand:
         if self.key is None:

chrono_des_vignes/routes.py

@@ -42,7 +42,7 @@ def home():
         participations = None
         form = None
     date = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
-    next_events = Event.query.filter(Event.editions.any(and_(Edition.edition_date>=date,Edition.last_inscription>=date))).all()
+    next_events = Event.query.filter(Event.editions.any(and_(Edition.edition_date>=date,Edition.last_inscription>=date))).filter(Event.id!=1).all()
     return render_template("0-home.html", user_data=user, inscriptions=inscriptions, events = next_events, participations=participations, form=form)
 
 @app.route('/lang/<lang>')