07.02.2025_fix bug add pwd hash and modify layout style

Author: pythonhtmlcssjsarduino

README.md

@@ -1,3 +1,33 @@
-command to launch the server:
+# chrono des vignes
+chrono des vignes est une web app codée en python avec le framework [Flask](https://pypi.org/project/Flask/) pour le back-end et html javascript pour le front-end
 
-flask --app flask_app run --debug --extra-files flask-app/templates/:flask_app/translations/ 
+## lancer le serveur 
+pour lancer le serveur flask il vous faut d'abord lancer l'environement virtuel(venv) 
+```bash
+.venv/Scripts/Activate.ps1
+```
+
+puis lancer le serveur
+```bash
+flask --app flask_app run --debug --extra-files flask-app/templates/:flask_app/translations/ 
+```
+
+## documentation mkdocs
+
+### serveur de developpement
+commencer par [ouvrire l'environement virtuel](#lancer-le-serveur)
+
+puis rentrer dans le dossier de la documentation 
+```bash
+cd flask_app/templates/doc
+```
+puis lancer le serveur
+``` bash
+mkdocs serve
+```
+### construire la documentation
+[lancer l'environement](#lancer-le-serveur) et [rentrer dans le dossier de la documentation](#serveur-de-developpement)
+puis construire la documentation
+```bash
+mkdocs build
+```

flask_app/__init__.py

@@ -23,6 +23,7 @@
 LANGAGES = ['de', 'fr', 'en']
 if DEV_ENABLE:
     LANGAGES += ['ids', 'pseudo']
+PICTURE_SIZE = (200, 200)
 
 app = Flask(__name__)
 app.config['SERVER_NAME'] = 'localhost:5000'

flask_app/admin/editions/__init__.py

@@ -100,6 +100,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)
         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

flask_app/admin/editions/dossard/__init__.py

@@ -8,7 +8,7 @@
 from xlsxwriter import Workbook
 from io import BytesIO
 from flask_babel import _
-from flask_app.custom_validators import DataRequired, Length, EqualTo, DonTExist, DbLength
+from flask_app.custom_validators import DataRequired, Length, EqualTo, DonTExist, DbLength, Email
 from .form import NewCoureurForm, ValidateNewCoureurForm
 from sqlalchemy import func, and_, or_, not_
 
@@ -17,7 +17,7 @@
 @set_route(dossard, '/event/<event_name>/editions/<edition_name>/dossard', methods=['POST', 'GET'])
 @login_required
 @admin_required
-def generate_dossard(event_name, edition_name):
+def edition_dossards(event_name, edition_name):
     event : Event = Event.query.filter_by(name=event_name).first_or_404()
     edition : Edition= event.editions.filter_by(name=edition_name).first_or_404()
     user = current_user
@@ -39,15 +39,18 @@ def generate_dossard(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':[DataRequired(), DbLength(User, 'email'), Email()]
             }
             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
-                username=f'{form.name.data}.{form.lastname.data}'
-                nb = User.query.filter(User.username.contains(username)).count()
-                username += str(nb) if nb>0 else ''
-                hash_pwd= 'dev' #! ''.join(secrets.choice(alphabet) for _ in range(10))
+                if form.username.data:
+                    username = form.username.data
+                else:
+                    username = f'{form.name.data}.{form.lastname.data}'
+                    nb = User.query.filter(User.username.contains(username)).count()
+                    username += str(nb) if nb>0 else ''
+                hash_pwd= 'dev' # ! ''.join(secrets.choice(alphabet) for _ in range(10))
 
                 choices = event.parcours.filter(Parcours.name.in_([eval(data)[0] for data in form.parcours.data])).all()
                 user = User(name=form.name.data,
@@ -79,6 +82,9 @@ def generate_dossard(event_name, edition_name):
 @login_required
 @admin_required
 def validate_new_user(event_name, edition_name):
+    '''
+    validate a new user that is already registered in the database
+    '''
     event = Event.query.filter_by(name=event_name).first_or_404()
     edition : Edition= event.editions.filter_by(name=edition_name).first_or_404()
     form = ValidateNewCoureurForm()
@@ -101,7 +107,7 @@ def validate_new_user(event_name, edition_name):
 
         flash(_('flash.success.newuser:username:name:lastname').format(username=user.username, name=user.name, lastname=user.lastname), 'success')
 
-        return redirect(url_for('admin.editions.dossard.generate_dossard', event_name=event_name, edition_name=edition_name))
+        return redirect(url_for('admin.editions.dossard.edition_dossards', event_name=event_name, edition_name=edition_name))
     else:
         return {'ok':False}
 
@@ -164,7 +170,7 @@ def generate_all_dossard(event_name, edition_name):
         last_dossard+=1
     db.session.commit()
 
-    return redirect(url_for("admin.editions.dossard.generate_dossard", event_name=event.name, edition_name=edition.name))
+    return redirect(url_for("admin.editions.dossard.edition_dossards", event_name=event.name, edition_name=edition.name))
 
 
 # methode for download dossard as excel

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

@@ -33,6 +33,11 @@
     {% endfor %}
   </tbody>
 </table>
+<script>
+  $('table tbody tr').on('click', function() {
+    window.location.href = $(this).data('href');
+  });
+</script>
 
 <a class="btn bg-info" href="{{ url_for('admin.editions.dossard.generate_all_dossard', event_name=event_data.name, edition_name=edition_data.name) }}">{{ _('admin.editions.dossard.generer') }}</a>
 <a class="btn bg-success" href="{{ url_for('admin.editions.dossard.export_dossard', event_name=event_data.name, edition_name=edition_data.name) }}" target="_blank" rel="noopener noreferrer">{{ _('admin.editions.dossard.export_excel') }}</a>

flask_app/admin/editions/passages/__init__.py

@@ -8,8 +8,10 @@
 from .form import NewKeyForm, ChronoLoginForm, ChronoLoginForm
 import secrets
 from flask_socketio import join_room, leave_room, emit
+from flask_babel import _
 
 passages = Blueprint('passages', __name__, template_folder='templates')
+
 @login_required
 @admin_required
 @set_route(passages, "/event/<event_name>/editions/<edition_name>/dashboard", methods=['get', 'post'])
@@ -56,6 +58,20 @@ def dashboard(event_name, edition_name):
 
     return render_template('dashboard.html', event_data=event, edition_data = edition, user_data=user, now = datetime.now(), keys=keys, passages=passages, form=form, event_modif=True, edition_sidebar=True)
 
+@login_required
+@admin_required
+@set_route(passages, '/event/<event_name>/editions/<edition_name>/delete/<key_id>')
+def delete_key(event_name, edition_name, key_id:int):
+    key:PassageKey = PassageKey.query.filter_by(id=key_id).first_or_404()
+    if key.passages.count()==0:
+        db.session.delete(key)
+        db.session.commit()
+        flash(_('flash.key_deleted'), 'success')
+        return redirect(url_for('admin.editions.passages.dashboard', event_name=event_name, edition_name=edition_name))
+    else:
+        flash(_('flash.key_not_deleted'), 'danger')
+        return redirect(url_for('admin.editions.passages.dashboard', event_name=key.event.name, edition_name=key.edition.name))
+
 @set_route(passages, '/chrono', methods=["GET", 'post'])
 def chrono_home():
     user = current_user if current_user.is_authenticated else None

flask_app/admin/editions/passages/templates/dashboard.html

@@ -19,7 +19,12 @@
                                 {% endfor %}
                             </ul>
                         </div>
-                        <span class="badge rounded-pill bg-info">{{ key.key }}</span>
+                        <div class="d-flex justify-content-between align-items-center">
+                            <span class="badge rounded-pill bg-info me-4">{{ key.key }}</span>
+                            <a href="{{ url_for('admin.editions.passages.delete_key', event_name=event_data.name, edition_name=edition_data.name, key_id=key.id) }}">
+                                <i class="fa-regular fa-circle-xmark" style="color: #ff0000;"></i>
+                            </a>
+                        </div>
                     </li>
                 {% endfor %}
             </ul>

flask_app/admin/editions/result/templates/result.html

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

flask_app/admin/editions/templates/edition-sidebar.html

@@ -1,33 +1,21 @@
 {% extends 'layout.html' %}
-{% from 'macro.html' import form_field, submit, map_field, label_span, input_span %}
+{% from 'macro.html' import form_field, submit, map_field, label_span, input_span, multiple_select_field %}
 {% block content %}
 <form action="" method="post">
     {{ form.hidden_tag() }}
     {{ form_field(form.name) }}
     {{ form_field(form.edition_date) }}
     {{ form_field(form.description) }}
-    <div class="mb-3 row" id="parcours">{# parcours ne pas remplacer par macro car style different!! #}
-        {{ form.parcours.label(class="col-sm-"+label_span+" col-form-label") }}
-        <div class="col-sm-{{input_span}}">
-            {% if form.parcours.errors %}
-            {{ form.parcours(class="form-control form-control-lg is-invalid list-group") }}
-            <div class="invalid-feedback">
-                {% for error in form.parcours.errors %}
-                <span>{{ error }}</span>
-                {% endfor %}
-            </div>
-            {% else %}
-            {{ form.parcours(class="form-control form-control-lg list-group") }}
-            {% endif %}
-        </div>
-    </div>
+    {{ multiple_select_field(form.parcours) }}
     {{ form_field(form.first_inscription) }}
     {{ form_field(form.last_inscription) }}
     {{ form_field(form.rdv_lat, input_id='lat_id', div_class='d-none') }}
     {{ form_field(form.rdv_lng, input_id='lng_id', div_class='d-none') }}
-    {{ map_field(_('form.editionrdv'), 'lat_id', 'lng_id', form.rdv_lat.data, form.rdv_lng.data) }}
+    {{ map_field(_('form.editionrdv'), 'lat_id', 'lng_id', form.rdv_lat.data, form.rdv_lng.data, disabled=(form.rdv_lat.render_kw.disabled == 'disabled' or form.rdv_lng.render_kw.disabled == 'disabled')) }}
     {{ submit(form) }}
 </form>
+{{(form.rdv_lat.render_kw.disabled == 'disabled' or form.rdv_lng.render_kw.disabled == 'disabled')}}---
+{{form.rdv_lat.render_kw.disabled}}---{{ form.rdv_lng.render_kw.disabled}}
 
 <!-- Modal -->