Commit 3324d342 by François C.

Merge branch '1850-update-msg-ba' into 'dev_cooperatic'

1850 add explanation for "rattrapage"

See merge request !88
parents 78f6aa31 61146c38
Pipeline #1644 passed with stage
in 1 minute 33 seconds
...@@ -62,6 +62,7 @@ var html_elts = { ...@@ -62,6 +62,7 @@ var html_elts = {
real_capture : $('#real_capture'), real_capture : $('#real_capture'),
multi_results : $('#multi_results_preview'), multi_results : $('#multi_results_preview'),
cooperative_state : $('#cooperative_state'), cooperative_state : $('#cooperative_state'),
status_explanation: $('#status_explanation'),
next_shifts : $('#next_shifts') next_shifts : $('#next_shifts')
}; };
...@@ -91,8 +92,12 @@ function fill_member_slide(member) { ...@@ -91,8 +92,12 @@ function fill_member_slide(member) {
} }
html_elts.image_medium.html('<img src="'+img_src+'" width="128" />'); html_elts.image_medium.html('<img src="'+img_src+'" width="128" />');
html_elts.cooperative_state.html(member.cooperative_state); html_elts.cooperative_state.html(member.cooperative_state);
if (member.cooperative_state == 'Désinscrit(e)' || member.cooperative_state == 'Rattrapage') coop_info.addClass('b_red'); if (member.cooperative_state == 'Rattrapage') {
else if (member.cooperative_state == 'En alerte' || member.cooperative_state == 'Délai accordé') coop_info.addClass('b_orange'); var explanation = "Tu as dû manquer un service! Pour pouvoir faire tes courses aujourd'hui, tu dois d'abord sélectionner un rattrapage sur ton espace membre."
html_elts.status_explanation.html(explanation)
}
if (member.cooperative_state == 'Désinscrit(e)') coop_info.addClass('b_red');
else if (member.cooperative_state == 'En alerte' || member.cooperative_state == 'Délai accordé' || member.cooperative_state == 'Rattrapage') coop_info.addClass('b_orange');
if (member.shifts.length > 0) { if (member.shifts.length > 0) {
html_elts.next_shifts.append('Prochains services : '); html_elts.next_shifts.append('Prochains services : ');
......
...@@ -107,6 +107,8 @@ ...@@ -107,6 +107,8 @@
</div> </div>
<div id="cooperative_state"> <div id="cooperative_state">
</div> </div>
<div id="status_explanation">
</div>
<div id="next_shifts"> <div id="next_shifts">
</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