Commit 415927be by Félicie

updated

parent fe16e7d5
Pipeline #1881 failed with stage
in 1 minute 27 seconds
...@@ -432,6 +432,7 @@ def get_member_info(request,coop_id): ...@@ -432,6 +432,7 @@ def get_member_info(request,coop_id):
'is_associated_people', 'is_associated_people',
'parent_name', 'parent_name',
'barcode_base', 'barcode_base',
"makeups_to_do"
] ]
member = api.search_read('res.partner', [['barcode_base', '=', coop_id]], fields) member = api.search_read('res.partner', [['barcode_base', '=', coop_id]], fields)
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
.create_pair_button { .create_pair_button {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin: 100px 0 100px 0; margin: 120px 0 120px 0;
} }
@media screen and (max-width: 992px) { @media screen and (max-width: 992px) {
...@@ -68,6 +68,10 @@ ...@@ -68,6 +68,10 @@
font-weight: bold; font-weight: bold;
} }
.member_status_text_container {
margin: 1rem;
}
/* -- Tiles */ /* -- Tiles */
.tiles_container { .tiles_container {
......
...@@ -62,7 +62,7 @@ function display_member_infos(divId, memberData) { ...@@ -62,7 +62,7 @@ function display_member_infos(divId, memberData) {
$("#" + divId).find(".member_name").text(memberData.name) $("#" + divId).find(".member_name").text(memberData.name)
$("#" + divId).find(".member_status").text(possible_cooperative_state[memberData.cooperative_state]) $("#" + divId).find(".member_status").text(possible_cooperative_state[memberData.cooperative_state])
$("#" + divId).find(".member_shift_name").text(memberData.current_template_name); $("#" + divId).find(".member_shift_name").text(memberData.current_template_name);
$("#" + divId).find(".member_coop_number").text(memberData.barcode_base); $("#" + divId).find(".member_makeups_to_do").text(memberData.makeups_to_do);
if (memberData.is_associated_people === false) { if (memberData.is_associated_people === false) {
$("#" + divId).find(".member_associated_partner_area").hide(); $("#" + divId).find(".member_associated_partner_area").hide();
......
...@@ -44,15 +44,14 @@ ...@@ -44,15 +44,14 @@
<div class="member_status_text_container"> <div class="member_status_text_container">
<span>Mon statut : </span> <span>Mon statut : </span>
<span class="member_info member_status"></span> <span class="member_info member_status"></span>
<br>
<span>Nombre de rattrapage(s) : </span>
<span class="member_makeups_to_do member_info"></span>
</div> </div>
<div class="member_shift_name_area"> <div class="member_shift_name_area">
<span>Mon créneau : </span> <span>Mon créneau : </span>
<span class="member_shift_name member_info"></span> <span class="member_shift_name member_info"></span>
</div> </div>
<div class="member_coop_number_area">
<span>Mon numéro de coop : </span>
<span class="member_coop_number member_info"></span>
</div>
<div class="member_associated_partner_area"> <div class="member_associated_partner_area">
<span>Je suis déjà en binôme ! </span> <span>Je suis déjà en binôme ! </span>
<span class="member_associated_partner member_info"></span> <span class="member_associated_partner member_info"></span>
...@@ -70,7 +69,7 @@ ...@@ -70,7 +69,7 @@
<div class="tile"> <div class="tile">
<div class="search_member_form_area" id="search_member_form_area"> <div class="search_member_form_area" id="search_member_form_area">
<h4>Rechercher le.a coopérateur.ice co-titulaire</h4> <h4>Rechercher le.a coopérateur.ice suppléant.e</h4>
<form autocomplete="off" id="search_member_form_child" class="search_member_form" action="javascript:;" method="post"> <form autocomplete="off" id="search_member_form_child" class="search_member_form" action="javascript:;" method="post">
<input name="searchChild" type="text" id="search_child_input" value="" placeholder="Nom ou numéro du coop..." required> <input name="searchChild" type="text" id="search_child_input" value="" placeholder="Nom ou numéro du coop..." required>
</form> </form>
...@@ -86,14 +85,14 @@ ...@@ -86,14 +85,14 @@
<span>Mon statut : </span> <span>Mon statut : </span>
<span class="member_info member_status"></span> <span class="member_info member_status"></span>
</div> </div>
<div class="member_makeups_to_do_area">
<span>Nombre de rattrapage : </span>
<span class="member_makeups_to_do member_info"></span>
</div>
<div class="member_shift_name_area"> <div class="member_shift_name_area">
<span>Mon créneau : </span> <span>Mon créneau : </span>
<span class="member_shift_name member_info"></span> <span class="member_shift_name member_info"></span>
</div> </div>
<div class="member_coop_number_area">
<span>Mon numéro de coop : </span>
<span class="member_coop_number member_info"></span>
</div>
<div class="member_associated_partner_area"> <div class="member_associated_partner_area">
<span>Je suis déjà en binôme ! </span> <span>Je suis déjà en binôme ! </span>
<span class="member_associated_partner member_info"></span> <span class="member_associated_partner member_info"></span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment