Merge branch 'evolution_bdm' of…

Merge branch 'evolution_bdm' of https://gl.cooperatic.fr/cooperatic-foodcoops/third-party into evolution_bdm

members_space/static/css/members-space-shifts-exchange.css

-#shifts_exchange_content {
+.shifts_exchange_page_content {
     width: 95%;
     margin: 3rem auto;
+    display: flex;
+    flex-direction: column;
+}
+
+/* -- Suspended screen */
+
+#suspended_content, #unsuscribed_content {
+    align-items: center;
+    text-align: center;
+}
+
+#shifts_exchange .select_makeups, #shifts_exchange .unsuscribed_form_link {
+    margin: 1.5rem 0;
 }
 
+/* -- Calendar screen, shifts list */
+
 #shifts_list {
     flex-direction: column;
     display: none;
-    width: min-content; /* ??? */
+    width: min-content;
+    max-width: 100%;
+}
+
+@media screen and (max-width:768px) {
+    #partner_shifts_list {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+    }
 }
 
 .selectable_shift_line {
     display: flex;
     align-items: center;
     margin-left: 15px;
-    margin: 1rem 0;
+    margin: 0.75rem 0;
     border-radius: 5px;
 }
 
@@ -21,14 +45,47 @@
     margin-right: 10px;
 }
 
-/* .selectable_shift_line_text {
-    border: 2px solid #424242;
-    border-radius: 5px;
-    padding: 0.75rem;
-} */
+.selectable_shift_line.btn {
+    cursor: not-allowed;
+}
+
+/* -- Calendar screen, makeups message */
+
+#need_to_select_makeups_message {
+    display: none;
+    align-self: center;
+    background-color: #d9534f;
+    color: white;
+    margin: 0 1rem 2rem 1rem;
+    padding: 1rem 1.25rem;
+    text-align: center;
+}
+
+.makeups_warning {
+    margin-right: 3px;
+}
+
+@media screen and (max-width:768px) {
+    .select_makeups_message_block {
+        display: block;
+    }
+}
+
+/* -- Calendar screen, calendar */
 
 #calendar {
+    margin: 2rem 1rem;
+}
+
+.loading-calendar {
     margin: 3rem auto;
+    display: none;
+}
+
+@media screen and (max-width:768px) {
+    #calendar {
+        display: none;
+    }
 }
 
 .fc .fc-event {
@@ -36,6 +93,30 @@
     margin: 1px 10px !important;
 }
 
+.fc-event.shift_booked {
+    background-color: #585858;
+    cursor: auto;
+    border-color: #585858;
+}
+
+.fc-list-event.shift_booked {
+    color: white;
+}
+
 #calendar .fc-list-table {
     table-layout: auto;
+}
+
+.resp-header-toolbar {
+    display: flex;
+    flex-direction: column;
+}
+
+.resp-header-toolbar .fc-toolbar-chunk {
+    text-align: center;
+    margin: 0.25rem;
+}
+
+.date_old_shift, .time_old_shift, .date_new_shift, .time_new_shift {
+    font-weight: bold;
 }
\ No newline at end of file

members_space/static/js/members-space-header.js

@@ -18,23 +18,27 @@ $(document).ready(function() {
         if (current_location !== "home") {
             goto('home');
         }
+        toggleHeader();
     });
     $('#nav_my_info').on('click', (e) => {
         e.preventDefault();
         if (current_location !== "my_info") {
             goto('mes-infos');
         }
+        toggleHeader();
     });
     $('#nav_my_shifts').on('click', (e) => {
         e.preventDefault();
         if (current_location !== "my_shifts") {
             goto('mes-services');
         }
+        toggleHeader();
     });
     $('#nav_shifts_exchange').on('click', (e) => {
         e.preventDefault();
         if (current_location !== "shifts_exchange") {
             goto('echange-de-services');
         }
+        toggleHeader();
     });
 });

members_space/static/js/members-space-home.js

@@ -39,15 +39,24 @@ function request_delay() {
                 resolve();
             },
             error: function(data) {
-                err = {msg: "erreur serveur lors de la création du délai", ctx: 'request_delay'};
-                if (typeof data.responseJSON != 'undefined' && typeof data.responseJSON.error != 'undefined') {
-                    err.msg += ' : ' + data.responseJSON.error;
+                if (data.status == 403
+                        && typeof data.responseJSON != 'undefined'
+                        && data.responseJSON.message === "delays limit reached") {
+                    closeModal();
+                    alert("Vous avez mis plus de 6 mois pour rattraper un service, " +
+                            "vous ne pouvez plus sélectionner de rattrapage depuis l'espace membre. " +
+                            "Merci de contacter le BDM.");
+                } else {
+                    err = {msg: "erreur serveur lors de la création du délai", ctx: 'request_delay'};
+                    if (typeof data.responseJSON != 'undefined' && typeof data.responseJSON.error != 'undefined') {
+                        err.msg += ' : ' + data.responseJSON.error;
+                    }
+                    report_JS_error(err, 'members_space.home');
+
+                    closeModal();
+                    alert('Erreur lors de la création du délai.');
                 }
-                report_JS_error(err, 'members_space.home');
 
-                closeModal();
-                // TODO Notify
-                alert('Erreur lors de la création du délai.');
             }
         });
     });

members_space/static/js/members-space-my-shifts.js

@@ -55,7 +55,7 @@ function prepare_server_data(data) {
 
         f_date_shift_start = f_date_shift_start.charAt(0).toUpperCase() + f_date_shift_start.slice(1);
 
-        history_item.movement_date = f_date_shift_start + " - " + datetime_shift_start.toLocaleTimeString("fr-fr");
+        history_item.movement_date = f_date_shift_start + " - " + datetime_shift_start.toLocaleTimeString("fr-fr", time_options);
 
         // Text replacements
         history_item.name = (history_item.name === "Clôturer le service") ? "Décompte 28j" : history_item.name;//Clôlturer le service

members_space/static/js/members-space.js

@@ -8,6 +8,7 @@ var base_location = null,
     partner_history = null;
 
 var date_options = {weekday: "long", year: "numeric", month: "long", day: "numeric"};
+var time_options = {hour: '2-digit', minute:'2-digit'};
 
 /* - Data */
 
@@ -124,7 +125,7 @@ function prepare_shift_line_template(date_begin) {
     f_date_shift_start = f_date_shift_start.charAt(0).toUpperCase() + f_date_shift_start.slice(1);
 
     shift_line_template.find(".shift_line_date").text(f_date_shift_start);
-    shift_line_template.find(".shift_line_time").text(datetime_shift_start.toLocaleTimeString("fr-fr"));
+    shift_line_template.find(".shift_line_time").text(datetime_shift_start.toLocaleTimeString("fr-fr", time_options));
 
     return shift_line_template;
 }
@@ -190,6 +191,8 @@ function init_my_info_data() {
 }
 
 $(document).ready(function() {
+    // TODO essayer de ne charger les js que au besoin
+
     $.ajaxSetup({ headers: { "X-CSRFToken": getCookie('csrftoken') } });
 
     // If partner is associated (attached), display the pair's main partner shift data

outils/static/css/common.css

@@ -60,6 +60,11 @@ footer { position: fixed;
     margin: auto;
     padding:15px;
 }
+@media screen and (max-width:768px) {
+    .overlay-content .mconfirm {
+        width: 100%;
+    }
+}
 .overlay-content .mconfirm button {margin:5px;}
 .overlay-content > em {
     color: #fff;

shifts/models.py

@@ -300,3 +300,21 @@ class CagetteShift(models.Model):
 
     def get_test(self, odooModel, cond, fieldsDatas):
         return self.o_api.search_read(odooModel, cond, fieldsDatas, limit = 1000)
+
+    def decrement_makeups_to_do(self, partner_id):
+        """ Decrements partners makeups to do if > 0 """
+        cond = [['id', '=', partner_id]]
+        fields = ['makeups_to_do']
+        makeups_to_do = self.o_api.search_read('res.partner', cond, fields)[0]["makeups_to_do"]
+
+        if makeups_to_do > 0:
+            makeups_to_do -= 1
+            f = { "makeups_to_do": makeups_to_do }
+
+            return self.o_api.update('res.partner', partner_id,  f)
+        else:
+            return "makeups already at 0"
+
+    def member_can_have_delay(self, partner_id):
+        """ Can a member have a delay? """
+        return self.o_api.execute('res.partner', 'can_have_extension', [partner_id])
\ No newline at end of file

shifts/views.py

@@ -119,9 +119,6 @@ def get_list_shift_calendar(request, partner_id):
                 smax = int(value['seats_available']) + int(value['seats_reserved'])
  
                 title_prefix = ''
-                # if use_new_members_space is True:
-                #     title_prefix = value["name"] + " ~ "
-                # else:
                 if len(value['address_id']) == 2 and ',' in value['address_id'][1]:
                     title_prefix = str(value['address_id'][1]).split(",")[1] + " -- "
 
@@ -131,19 +128,31 @@ def get_list_shift_calendar(request, partner_id):
                 event["end"] = dateIsoUTC(value['date_begin_tz'])
 
                 if len(l) > 0:
-                    event["className"] = "shift_booked"
+                    if use_new_members_space is True:
+                        event["classNames"] = ["shift_booked"]
+                    else:
+                        event["className"] = "shift_booked"
                     event["changed"] = False
                 # elif int(value['seats_reserved']) == int(value['seats_max']):
                 #     event["className"] = "shift_full"
                 #     event["changed"] = False
                 elif int(value['seats_reserved']) == 0:
-                    event["className"] = "shift_empty"
+                    if use_new_members_space is True:
+                        event["classNames"] = ["shift_empty"]
+                    else:
+                        event["className"] = "shift_empty"
                     event["changed"] = True
                 elif _is_middled_filled_considered(value['seats_reserved'], smax) is True:
-                    event["className"] = "shift_less_alf"
+                    if use_new_members_space is True:
+                        event["classNames"] = ["shift_less_alf"]
+                    else:
+                        event["className"] = "shift_less_alf"
                     event["changed"] = True
                 else:
-                    event["className"] = "shift_other"
+                    if use_new_members_space is True:
+                        event["classNames"] = ["shift_other"]
+                    else:
+                        event["className"] = "shift_other"
                     event["changed"] = True
 
                 event["registration_ids"] = value['registration_ids']
@@ -215,18 +224,36 @@ def add_shift(request):
             cs = CagetteShift()
 
             if 'idNewShift' in request.POST and 'idPartner' in request.POST:
-
-                data = {"idPartner": int(request.POST['idPartner']), "idShift":int(request.POST['idNewShift']), "in_ftop_team":request.POST['in_ftop_team']}
+                data = {
+                    "idPartner": int(request.POST['idPartner']), 
+                    "idShift":int(request.POST['idNewShift']), 
+                    "in_ftop_team":request.POST['in_ftop_team']
+                }
+                
                 #Insertion du nouveau shift
                 st_r_id = False
                 try:
                     st_r_id = cs.set_shift(data)
                 except Exception as e:
                     coop_logger.error("Add shift : %s, %s", str(e), str(data))
+
                 if st_r_id:
                     response = {'result': True}
                 else:
                     response = {'result': False}
+
+                # decrement makeups_to_do
+                res_decrement = False
+                try:
+                    res_decrement = cs.decrement_makeups_to_do(int(request.POST['idPartner']))
+                except Exception as e:
+                    coop_logger.error("Decrement makeups to do : %s, %s", str(e), str(data))
+
+                if res_decrement:
+                    response["decrement_makeups"] = res_decrement
+                else:
+                    response["decrement_makeups"] = False
+
             else:
                 response = {'result': False}
             return JsonResponse(response)
@@ -238,8 +265,16 @@ def add_shift(request):
 def request_delay(request):
     if 'verif_token' in request.POST:
         if Verification.verif_token(request.POST.get('verif_token'), int(request.POST.get('idPartner'))) is True:
-            
             cs = CagetteShift()
+
+            # TODO do we need this?
+            # use_new_members_space = getattr(settings, 'USE_NEW_MEMBERS_SPACE', False) 
+            # if use_new_members_space is True:
+            #     member_can_have_delay = cs.member_can_have_delay(int(request.POST.get('idPartner')))
+            #     if member_can_have_delay is False:
+            #         res = { 'message' : 'delays limit reached'}
+            #         return JsonResponse(res, status=403)
+            
             data = {
                 "idPartner": int(request.POST['idPartner']),
                 "start_date" : request.POST['start_date']

templates/members_space/index.html

@@ -42,6 +42,16 @@
         </div>
       </div>
     </div>
+
+    <div id="modal_shift_exchange_template">
+      <div>Je suis sur le point d'échanger le service du : </div>
+      <div><span class="date_old_shift"></span> à <span class="time_old_shift"></span></div>
+      <div>par celui du : </div>
+      <div><span class="date_new_shift"></span> à <span class="time_new_shift"></span></div>
+    </div>
+    <div id="modal_add_shift_template">
+      <div>Je suis sur le point de m'inscrire au service du : <span class="date_new_shift"></span> à <span class="time_new_shift"></span></div>
+    </div>
   </div>
 </div>
 

templates/members_space/shifts_exchange.html

 <div id="shifts_exchange">
-    <div id="shifts_exchange_content">
+    <div id="unsuscribed_content" class="shifts_exchange_page_content">
+        <h3>Je suis désinscrit.e, je dois remplir un formulaire pour qu'on me réinscrive à un créneau.</h3>
+        <a href="#" target="_blank" class="btn--warning unsuscribed_form_link">
+            J'accède au formulaire
+        </a>
+    </div>
+    <div id="suspended_content" class="shifts_exchange_page_content">
+        <h3>Je suis suspendu.e, je dois sélectionner mes rattrapages pour pouvoir refaire mes courses.</h3>
+        <button type="button" class="btn--danger select_makeups">
+            Je sélectionne mes rattrapages
+        </button>
+    </div>
+    <div id="shifts_exchange_content" class="shifts_exchange_page_content">
+        <div id="need_to_select_makeups_message">
+            <span class="select_makeups_message_block">
+                <i class="fas fa-exclamation-triangle makeups_warning"></i>  
+                J'ai <span class="makeups_nb"></span> rattrapage(s) à faire. </span>
+            <span class="select_makeups_message_block">Je dois les sélectionner dans le calendrier. </span>
+            <span class="select_makeups_message_block">Je ne peux pas échanger de service tant que je n'ai pas choisi mes rattrapages. </span>
+        </div>
         <div id="partner_shifts_list">
-            Liste de mes services :
+            <h4>Liste de mes services :</h4>
             <div class="loading-incoming-shifts">
                 <i class="fas fa-spinner fa-spin fa-lg"></i>
             </div>
             <div id="shifts_list"></div>
         </div>
+        <div class="loading-calendar">
+            <i class="fas fa-spinner fa-spin fa-2x"></i>
+        </div>
         <div id="calendar"></div>
     </div>
 </div>