Merge branch…

Merge branch '6147-SUPERCAFOUTCH-desactiver-la-possibilite-pour-les-deux-binomés-de-venir-sur-le-meme-service' into 'dev_cooperatic'

disable this feature for supercafoutch using parameter

See merge request !270

coops_configurations/config_supercafoutch.py

@@ -161,4 +161,6 @@ AUTOCONSO_LOC_ID = 27
 AUTOCONSO_PICKING_TYPE_ID = 7
 
 SUBSCRIPTION_ASK_FOR_SEX = True
-SUBSCRIPTION_ASK_FOR_JOB = True
\ No newline at end of file
+SUBSCRIPTION_ASK_FOR_JOB = True
+
+ALLOW_BOTH_AS_ANSWER_TO_WHO_IS_COMING_TO_SHIFT = False
\ No newline at end of file

members/views.py

@@ -30,7 +30,8 @@ def index(request):
                                                     'Je valide mon service "Comité"'),
         'CONFIRME_PRESENT_BTN' : getattr(settings, 'CONFIRME_PRESENT_BTN', 'Présent.e'),
         'LATE_MODE': getattr(settings, 'ENTRANCE_WITH_LATE_MODE', False),
-        'ENTRANCE_VALIDATE_PRESENCE_MESSAGE' : getattr(settings, 'ENTRANCE_VALIDATE_PRESENCE_MESSAGE', '')
+        'ENTRANCE_VALIDATE_PRESENCE_MESSAGE' : getattr(settings, 'ENTRANCE_VALIDATE_PRESENCE_MESSAGE', ''),
+        'ALLOW_BOTH_AS_ANSWER_TO_WHO_IS_COMING_TO_SHIFT' : getattr(settings, 'ALLOW_BOTH_AS_ANSWER_TO_WHO_IS_COMING_TO_SHIFT', True)
     }
 
     for_shoping_msg = getattr(settings, 'ENTRANCE_COME_FOR_SHOPING_MSG', '')

members_space/views.py

@@ -32,6 +32,7 @@ def index(request, exception=None):
         'block_actions_for_attached_people' : getattr(settings, 'BLOCK_ACTIONS_FOR_ATTACHED_PEOPLE', True),
         'permanent_message': getattr(settings, 'PERMANENT_MESSAGE_BELOW_CONNECTION_FIELDS', None),
         'block_service_exchange_24h_before' : getattr(settings, 'BLOCK_SERVICE_EXCHANGE_24H_BEFORE', True),
+        'ALLOW_BOTH_AS_ANSWER_TO_WHO_IS_COMING_TO_SHIFT' : getattr(settings, 'ALLOW_BOTH_AS_ANSWER_TO_WHO_IS_COMING_TO_SHIFT', True)
     }
 
     template = loader.get_template('members_space/index.html')

templates/members/index.html

@@ -194,7 +194,9 @@
             <div class="col-1"></div>
             <a id="associated_btn" class=" btn present">Membre</a>
             <a id="partner_btn" class=" btn present">Associé</a>
-            <a id="both_btn" class=" btn present">Les deux</a>
+            {% if ALLOW_BOTH_AS_ANSWER_TO_WHO_IS_COMING_TO_SHIFT %}
+                <a id="both_btn" class=" btn present">Les deux</a>
+            {% endif %}
             <div class="col-1 loading2-container">
               <span class="loading2"><img width="75" src="/static/img/Pedro_luis_romani_ruiz.gif" alt="Chargement en cours...." /></span>
             </div>

templates/members_space/index.html

@@ -63,9 +63,11 @@
         </div>
         <div id="shift_associate" class=" btn--primary assign_shift_button">
         </div>
+        {% if ALLOW_BOTH_AS_ANSWER_TO_WHO_IS_COMING_TO_SHIFT %}
         <div id="shift_both" class=" btn--primary assign_shift_button">
           Les deux
         </div>
+        {% endif %}
       </div>
     </div>