Merge branch '2207-borne' into 'dev_cooperatic'

borne

See merge request !119

members/models.py

@@ -766,7 +766,7 @@ class CagetteMember(models.Model):
                     # member = CagetteMember(m['id'], m['email'])
                     # m['next_shifts'] = member.get_next_shift()
                     if not m['parent_name'] is False:
-                        m['name'] += ' / ' + m['parent_name']
+                        m['name'] += ' en binôme avec ' + m['parent_name']
                         del m['parent_name']
                     members.append(m)
 
@@ -1206,7 +1206,7 @@ class CagetteServices(models.Model):
                             for m in s['members']:
                                 for a in associated:
                                     if int(a['parent_id'][0]) == int(m['partner_id'][0]):
-                                        m['partner_id'][1] += ' / ' + a['name']
+                                        m['partner_id'][1] += ' en binôme avec ' + a['name']
 
         return services
 

members/static/css/member.css

@@ -72,3 +72,6 @@ h1 .member_name {font-weight: bold;}
 #member_advice {background: #FFF; color: red;}
 
 .easy_shift_validate {text-align: center; margin-top: 3em;}
+
+.button_is_member {background-color: #439D44;}
+.button_is_associated_people {background: #0275D8;}

members/static/js/members.js

@@ -147,14 +147,16 @@ function preview_results() {
     for (i in results) {
 
         if (results[i].is_member != false) {
-            var m = $('<button style="background-color: #00A573;">').attr('data-i', i)
-                .text(results[i].name);
+            var m = $('<button class="button_is_member">').attr('data-i', i)
+                .text(results[i].barcode_base + ' - ' + results[i].name);
 
             html_elts.multi_results.append(m);
         }
         if (results[i].is_associated_people != false) {
-            var m = $('<button style="background: #0275D8;">').attr('data-i', i)
-                .text(results[i].name);
+            m = $('<button class="button_is_associated_people"></button_is_member>').attr('data-i', i)
+                .text('B ' + results[i].barcode_base + ' - ' + results[i].name);
+
+
 
             html_elts.multi_results.append(m);
         }

templates/members/index.html

@@ -52,7 +52,7 @@
         <div class="row-1 grid-2">
             <div class="col-1">
               <div class="label">
-              Biper le badge, ou saisissez le n° de coop. ou le nom
+              Biper le badge, ou saisir le n° de coop. ou le nom
               </div>
               Recherche :
               <input type="text" name="search_string" autocomplete="off" />
@@ -112,7 +112,7 @@
                  <div id="next_shifts">
                 </div>
               </div>
-              <a class="btn" data-next="first_page">Coopérateur suivant</a>
+              <a class="btn" data-next="first_page">Coopérateur.rice suivant.e</a>
             </div>
             <div class="col-1">
               <section id="member_advice">
@@ -208,7 +208,7 @@
         {% endif %}
     </section>
     <div class="col-2"></div>
-    <a class="btn col-2" data-next="first_page">Coopérateur suivant</a>
+    <a class="btn col-2" data-next="first_page">Coopérateur.ice suivant.e</a>
     <div class="col-2"></div>
 </section>
 <section class="grid-6 has-gutter" id="rattrapage_1">