Skip to content

T
third-party
Commit 01c46ba9 by Damien Moulard
Options

Merge branch '2840-bdm-show-mail' into 'dev_cooperatic' 

add email field

See merge request !153
parents ab1c6821 a641492e
Pipeline #2104 passed with stage
in 1 minute 30 seconds
Showing with 12 additions and 4 deletions
members/static/js/admin/manage_attached.js
...@@ -56,6 +56,8 @@ function display_member_infos(divId, memberData) { ...@@ -56,6 +56,8 @@ function display_member_infos(divId, memberData) {
$("#" + divId).show(); $("#" + divId).show();
$("#" + divId).find(".member_name") $("#" + divId).find(".member_name")
.text(memberData.name); .text(memberData.name);
$("#" + divId).find(".member_email")
.text(memberData.email);
$("#" + divId).find(".member_status") $("#" + divId).find(".member_status")
.text(possible_cooperative_state[memberData.cooperative_state]); .text(possible_cooperative_state[memberData.cooperative_state]);
$("#" + divId).find(".member_shift_name") $("#" + divId).find(".member_shift_name")
......
templates/members/admin/manage_attached_create_pair.html
...@@ -49,17 +49,20 @@ ...@@ -49,17 +49,20 @@
<div class="tile_title"> <div class="tile_title">
<i class="fas fa-user tile_icon"></i> <i class="fas fa-user tile_icon"></i>
<span class="member_info member_name"></span> <span class="member_info member_name"></span>
<br>
<span>Email : </span>
<span class="member_info member_email"></span>
</div> </div>
<div class="tile_content"> <div class="tile_content">
<div class="member_status_text_container"> <div class="member_status_text_container">
<span>Mon statut : </span> <span>Statut : </span>
<span class="member_info member_status"></span> <span class="member_info member_status"></span>
<br> <br>
<span>Nombre de rattrapage(s) : </span> <span>Nombre de rattrapage(s) : </span>
<span class="member_makeups_to_do member_info"></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>Créneau : </span>
<span class="member_shift_name member_info"></span> <span class="member_shift_name member_info"></span>
</div> </div>
</div> </div>
...@@ -82,17 +85,20 @@ ...@@ -82,17 +85,20 @@
<div class="tile_title"> <div class="tile_title">
<i class="fas fa-user tile_icon"></i> <i class="fas fa-user tile_icon"></i>
<span class="member_info member_name"></span> <span class="member_info member_name"></span>
<br>
<span>Email : </span>
<span class="member_info member_email"></span>
</div> </div>
<div class="tile_content"> <div class="tile_content">
<div class="member_status_text_container"> <div class="member_status_text_container">
<span>Mon statut : </span> <span>Statut : </span>
<span class="member_info member_status"></span> <span class="member_info member_status"></span>
<br> <br>
<span>Nombre de rattrapage(s) : </span> <span>Nombre de rattrapage(s) : </span>
<span class="member_makeups_to_do member_info"></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>Créneau : </span>
<span class="member_shift_name member_info"></span> <span class="member_shift_name member_info"></span>
</div> </div>
</div> </div>
......
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