Commit 3c23bcc9 by Félicie

coop number added

parent 58b1daa9
Pipeline #1756 failed with stage
in 1 minute 35 seconds
......@@ -765,7 +765,7 @@ class CagetteMember(models.Model):
# member = CagetteMember(m['id'], m['email'])
# m['next_shifts'] = member.get_next_shift()
if not m['parent_name'] is False:
m['name'] += ' / ' + m['parent_name']
m['name'] += ' en binôme avec ' + m['parent_name']
del m['parent_name']
members.append(m)
......@@ -1205,7 +1205,7 @@ class CagetteServices(models.Model):
for m in s['members']:
for a in associated:
if int(a['parent_id'][0]) == int(m['partner_id'][0]):
m['partner_id'][1] += ' / ' + a['name']
m['partner_id'][1] += ' en binôme avec ' + a['name']
return services
......
......@@ -72,3 +72,6 @@ h1 .member_name {font-weight: bold;}
#member_advice {background: #FFF; color: red;}
.easy_shift_validate {text-align: center; margin-top: 3em;}
.button_is_member {background-color: #00A573;}
.button_is_associated_people {background: #0275D8;}
......@@ -147,14 +147,16 @@ function preview_results() {
for (i in results) {
if (results[i].is_member != false) {
var m = $('<button style="background-color: #00A573;">').attr('data-i', i)
.text(results[i].name);
var m = $('<button class="button_is_member">').attr('data-i', i)
.text(results[i].barcode_base + ' - ' + results[i].name);
html_elts.multi_results.append(m);
}
if (results[i].is_associated_people != false) {
var m = $('<button style="background: #0275D8;">').attr('data-i', i)
.text(results[i].name);
var m = $('<button class="button_is_associated_people"></button_is_member>').attr('data-i', i)
.text('B ' + results[i].barcode_base + ' - ' + results[i].name);
html_elts.multi_results.append(m);
}
......
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