WIP: Allow Special FTOP to easy validate shift

coops_configurations/config_lacagette.py

@@ -97,7 +97,8 @@ SHIFT_INFO  = """A la cagette, un service est une plage de trois heures un jour
 PB_INSTRUCTIONS = """Si j'ai un problème, que je suis désinscrit, que je veux changer de créneaux ou quoi que ce soit, merci de vous rendre dans la section \"J'ai un problème\" sur le site web de <a href=\"https://lacagette-coop.fr/?MonEspaceMembre\">La Cagette</a>"""
 
 ENTRANCE_COME_FOR_SHOPING_MSG = "Hey coucou toi ! Cet été nous sommes plus de <strong>1000 acheteur·euses</strong> pour seulement  <strong>300 coopérateur·rice·s</strong> en service. <br />Tu fais tes courses à La Cagette cet été ?<br/> Inscris-toi sur ton espace membre !"
-
+ENTRANCE_EXTRA_BUTTONS_DISPLAY = False
+ENTRANCE_EASY_SHIFT_VALIDATE = True
 # Members space / shifts
 UNSUBSCRIBED_MSG = 'Vous êtes désincrit·e, merci de remplir <a href="https://docs.google.com/forms/d/e/1FAIpQLSfPiC2PkSem9x_B5M7LKpoFNLDIz0k0V5I2W3Mra9AnqnQunw/viewform">ce formulaire</a> pour vous réinscrire sur un créneau.<br />Vous pouvez également contacter le Bureau des Membres en remplissant <a href="https://docs.google.com/forms/d/e/1FAIpQLSeZP0m5-EXPVJxEKJk6EjwSyZJtnbiGdYDuAeFI3ENsHAOikg/viewform">ce formulaire</a>'
 CONFIRME_PRESENT_BTN = 'Clique ici pour valider ta présence'

members/models.py

@@ -22,7 +22,7 @@ class CagetteMember(models.Model):
     """Class to handle cagette Odoo member."""
     m_default_fields = ['name', 'sex', 'image_medium', 'active',
                         'barcode_base', 'barcode', 'in_ftop_team',
-                        'is_associated_people', 'is_member',
+                        'is_associated_people', 'is_member', 'shift_type',
                         'display_ftop_points', 'display_std_points',
                         'is_exempted', 'cooperative_state', 'date_alert_stop']
 

members/static/css/member.css

@@ -67,3 +67,5 @@ h1 .member_name {font-weight: bold;}
 .msg-big {font-size: xx-large; background: #fff; padding:25px; text-align: center;}
 
 #member_advice {background: #FFF; color: red;}
+
+.easy_shift_validate {text-align: center; margin-top: 3em;}

members/static/js/members.js

@@ -16,6 +16,7 @@
 })(jQuery);
 
 var current_displayed_member = null,
+    operator = null,
     results = null,
     loaded_services = null,
     selected_service = null,
@@ -162,6 +163,7 @@ function canSearch() {
 
 function search_member(force_search = false) {
     chars = []; // to prevent false "as barcode-reader" input
+    operator = null
     if (canSearch() || force_search) {
 
         html_elts.member_slide.hide();
@@ -280,6 +282,10 @@ function fill_service_entry(s) {
 }
 
 function clean_service_entry() {
+    $('.search_member_results_area').hide();
+    $('.search_member_results').empty();
+    $('#sm_search_member_input').val('');
+    operator = null
     rattrapage_wanted.hide();
     shift_title.text('');
     shift_members.html('');
@@ -667,6 +673,75 @@ 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>";
+    openModal(msg, function() {
+                    try {
+                         post_form(
+                            '/members/easy_validate_shift_presence',
+                            {
+                                coop_id: operator.id,
+
+                            },
+                            function(err, result) {
+                                console.log(result);
+                                if (!err) {
+                                    if (typeof(result.msg) != "undefined") {
+                                        alert(result.msg);
+                                    } else if (result.action === null) {
+                                        console.log('ok')
+                                    }
+                                    closeModal();
+                                } else {
+                                    console.log(err)
+                                }
+                            }
+                        );
+                    } catch (e) {
+                        console.log(e);
+                    }
+    }, 'Confirmer');
+}
+// Display the members from the search result (copied from stock_movements)
+function display_possible_members() {
+    $('.search_member_results_area').show();
+    $('.search_member_results').empty();
+
+    if (members_search_results.length > 0) {
+        for (member of members_search_results) {
+            let btn_classes = "btn";
+
+            if (operator != null && operator.id == member.id) {
+                btn_classes = "btn--success";
+            }
+
+            // Display results (possible members) as buttons
+            var member_button = '<button class="' + btn_classes + ' btn_member" member_id="'
+                          + member.id + '">'
+                          + member.barcode_base + ' - ' + member.name
+                          + '</button>';
+
+            $('.search_member_results').append(member_button);
+
+            // Set action on click on a member button
+            $('.btn_member').on('click', function() {
+                for (member of members_search_results) {
+                    if (member.id == $(this).attr('member_id')) {
+                        operator = member;
+
+                        // Enable validation button when operator is selected
+                        ask_for_easy_shift_validation();
+                        break;
+                    }
+                }
+                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>');
+    }
+}
 $(document).ready(function() {
     var shopping_entry_btn = $('a[data-next="shopping_entry"]');
 
@@ -708,6 +783,38 @@ $(document).ready(function() {
         init_webcam();
     });
 
+    $('#sm_search_member_form').submit(function() {
+        let search_str = $('#sm_search_member_input').val();
+        $.ajax({
+            url: '/members/search/' + search_str,
+            dataType : 'json',
+            success: function(data) {
+                members_search_results = [];
+               
+                for (member of data.res) {
+                    console.log(member)
+                    if (member.shift_type == 'ftop') {
+                        members_search_results.push(member);
+                    }
+                }
+
+                display_possible_members();
+            },
+            error: function(data) {
+                err = {
+                    msg: "erreur serveur lors de la recherche de membres",
+                    ctx: 'easy_validate.search_members'
+                };
+                report_JS_error(err, 'members');
+
+                $.notify("Erreur lors de la recherche de membre, il faut ré-essayer plus tard...", {
+                    globalPosition:"top right",
+                    className: "error"
+                });
+            }
+        });
+    })
+    
 });
 
 Webcam.on('live', function() {

members/urls.py

@@ -46,6 +46,7 @@ urlpatterns = [
     url(r'^remove_data_from_couchdb$', views.remove_data_from_CouchDB),
     url(r'^image/([0-9]+)', views.getmemberimage),
     url(r'^add_pts_to_everybody/([0-9]+)/([a-zA-Z0-9_ ]+)$', admin.add_pts_to_everybody),
+    url(r'^easy_validate_shift_presence$', views.easy_validate_shift_presence),
     # conso / groupe recherche / socio
     url(r'^panel_get_purchases$', views.panel_get_purchases),
 ]

members/views.py

@@ -33,6 +33,8 @@ def index(request):
         for_shoping_msg = msettings['msg_accueil']['value']
     context['ENTRANCE_COME_FOR_SHOPING_MSG'] = for_shoping_msg
     context['ftop_btn_display'] = getattr(settings, 'ENTRANCE_FTOP_BUTTON_DISPLAY', True)
+    context['extra_btns_display'] = getattr(settings, 'ENTRANCE_EXTRA_BUTTONS_DISPLAY', True)
+    context['easy_shift_validate'] = getattr(settings, 'ENTRANCE_EASY_SHIFT_VALIDATE', False)
     if 'no_picture_member_advice' in msettings:
         if len(msettings['no_picture_member_advice']['value']) > 0:
             context['no_picture_member_advice'] = msettings['no_picture_member_advice']['value']
@@ -283,6 +285,9 @@ def record_service_presence(request):
         res['error'] = str(e)
     return JsonResponse({'res': res})
 
+def easy_validate_shift_presence(request):
+    return JsonResponse({})
+
 def record_absences(request):
     return JsonResponse({'res': CagetteServices.record_absences()})
 

outils/config.md

@@ -228,6 +228,10 @@
 
 - ENTRANCE_SERVICE_BTN = "…faire <b>mon service 🤝"
 
+- ENTRANCE_EXTRA_BUTTONS_DISPLAY = False (no button is shown above shift coop. list) (True if not set)
+
+- ENTRANCE_EASY_SHIFT_VALIDATE = False (default value) When set to True allow coop to identify and have 1 point (only if FTOP)
+
 ### Member space
 
 - EM_URL = ''

templates/members/index.html

@@ -137,13 +137,16 @@
     <div class="col-1"></div>
     <div class="col-4">
         <h1 class="col-4 txtcenter">Qui es-tu ?</h1>
+        {% if extra_btns_display %}
           <section class="outside_list">
           <a class="btn b_orange" data-next="rattrapage_1" data-type="rattrapage">Je viens faire un rattrapage</a>
           {% if ftop_btn_display %}
             <a class="btn b_yellow" data-next="rattrapage_1" data-type="volant">Je suis volant</a>
           {% endif %}
           </section>
+        {% endif %}
     </div>
+
     <div class="col-1"></div>
     <div class="col-1"></div>
     <section id="service_en_cours" class="col-4">
@@ -153,6 +156,12 @@
         <div id="current_shift_members">
         </div>
 
+        {% if easy_shift_validate %}
+          <div class="easy_shift_validate">
+          <p>Je valide mon service "Comité"</p>
+          {% include "members/member_selection.html" %}
+          </div>
+        {% endif %}
     </section>
 
 </section>

templates/members/member_selection.html

+<form id="sm_search_member_form" action="javascript:;" method="post">
+  <input type="text" id="sm_search_member_input" value="" placeholder="Votre nom ou numéro..." required>
+  <button type="submit" class="btn--primary" id="sm_search_member_button">Recherche</button>
+</form>
+<div class="search_member_results_area" style="display:none;">
+  <div>
+    <p>Vous êtes (cliquez sur votre nom) :</p>
+  </div>
+  <div class="search_member_results"></div>
+</div>
\ No newline at end of file

templates/stock/stock_movements.html

@@ -83,16 +83,7 @@
       <hr />
       <section class="set_member_to_movement">
         <p>Avant de valider l'opération, merci de nous dire qui vous êtes :</p>
-        <form id="sm_search_member_form" action="javascript:;" method="post">
-          <input type="text" id="sm_search_member_input" value="" placeholder="Votre nom ou numéro..." required>
-          <button type="submit" class="btn--primary" id="sm_search_member_button">Recherche</button>
-        </form>
-        <div class="search_member_results_area" style="display:none;">
-          <div>
-            <p>Vous êtes (cliquez sur votre nom) :</p>
-          </div>
-          <div class="search_member_results"></div>
-        </div>
+        {% include "members/member_selection.html" %}
       </section>
       <hr />
     </div>