Fit code for Supercoop Coolisses shift easy validation

members/static/js/members.js

@@ -805,7 +805,7 @@ html_elts.image_medium.on('click', function() {
 
 function ask_for_easy_shift_validation() {
     //alert("operator = " + JSON.stringify(operator))
-    msg = "<p>Je suis bien " + operator.name + "<br/> et <br/>je valide mon service 'Comité' </p>";
+    msg = "<p>Je suis bien " + operator.name + "<br/> et <br/>je valide mon service '" + window.committees_shift_name + "' </p>";
     openModal(msg, function() {
         try {
             post_form(
@@ -867,7 +867,7 @@ function display_possible_members() {
             });
         }
     } else {
-        $('.search_member_results').html('<p><i>Aucun résultat ! Faites-vous partie d\'un comité ? <br/> Si oui, vérifiez la recherche..</i></p>');
+        $('.search_member_results').html('<p><i>Aucun résultat ! Faites-vous partie des ' + window.committees_shift_name + ' ? <br/> Si oui, vérifiez la recherche..</i></p>');
     }
 }
 $(document).ready(function() {

members/views.py

@@ -48,6 +48,7 @@ def index(request):
             return HttpResponse("Le créneau des comités n'est pas configuré dans Odoo !")
         else:
             context['committees_shift_id'] = committees_shift_id
+        context['committees_shift_name'] = getattr(settings, 'COMMITTEES_SHIFT_NAME', "Comités")
 
     if 'no_picture_member_advice' in msettings:
         if len(msettings['no_picture_member_advice']['value']) > 0:

shifts/models.py

@@ -2,6 +2,7 @@ from django.db import models
 from outils.common_imports import *
 
 from outils.common import OdooAPI
+from members.models import CagetteMember
 
 from pytz import timezone
 

templates/members/index.html

@@ -20,6 +20,7 @@
     window.late_mode = {% if LATE_MODE %}true{% else %}false{% endif %};
     {% if committees_shift_id %}
        window.committees_shift_id = {{committees_shift_id}};
+       window.committees_shift_name = '{{committees_shift_name}}';
     {% endif %} 
   </script>
   <script src="{% static "js/webcam.min.js" %}">