Commit a47130e0 by Damien Moulard

Merge branch 'evolution_bdm' into ticket_1330

parents 7a830c75 9f883d7c
...@@ -349,3 +349,14 @@ body { ...@@ -349,3 +349,14 @@ body {
width: 90%; width: 90%;
} }
} }
/* - No content page */
.message_error {
padding: 7vw;
font-size: 1.8rem;
}
.no_content_title {
margin-bottom: 1.5rem;
}
...@@ -136,7 +136,7 @@ function init_shifts_list() { ...@@ -136,7 +136,7 @@ function init_shifts_list() {
} else { } else {
shift_line_template.find(".selectable_shift_line").removeClass("btn"); shift_line_template.find(".selectable_shift_line").removeClass("btn");
shift_line_template.find(".selectable_shift_line").addClass("btn--primary"); shift_line_template.find(".selectable_shift_line").addClass("btn--primary");
shift_line_template.find(".checkbox").removeProp("disabled"); shift_line_template.find(".checkbox").prop("disabled", false);
shift_line_template.find(".checkbox").prop("value", shift.id); shift_line_template.find(".checkbox").prop("value", shift.id);
} }
......
...@@ -37,7 +37,7 @@ class CagetteShift(models.Model): ...@@ -37,7 +37,7 @@ class CagetteShift(models.Model):
'shift_type', 'date_alert_stop', 'date_delay_stop', 'extension_ids', 'shift_type', 'date_alert_stop', 'date_delay_stop', 'extension_ids',
'cooperative_state', 'final_standard_point', 'create_date', 'cooperative_state', 'final_standard_point', 'create_date',
'final_ftop_point', 'shift_type', 'leave_ids', 'makeups_to_do', 'barcode_base', 'final_ftop_point', 'shift_type', 'leave_ids', 'makeups_to_do', 'barcode_base',
'street', 'street2 ,' 'zip', 'city', 'mobile', 'phone', 'email', 'street', 'street2', 'zip', 'city', 'mobile', 'phone', 'email',
'is_associated_people', 'parent_id'] 'is_associated_people', 'parent_id']
partnerData = self.o_api.search_read('res.partner', cond, fields, 1) partnerData = self.o_api.search_read('res.partner', cond, fields, 1)
if partnerData: if partnerData:
......
...@@ -124,7 +124,7 @@ def get_list_shift_calendar(request, partner_id): ...@@ -124,7 +124,7 @@ def get_list_shift_calendar(request, partner_id):
if company_code != "lacagette" and len(value['address_id']) == 2 and ',' in value['address_id'][1]: if company_code != "lacagette" and len(value['address_id']) == 2 and ',' in value['address_id'][1]:
title_prefix = str(value['address_id'][1]).split(",")[1] + " --" title_prefix = str(value['address_id'][1]).split(",")[1] + " --"
elif company_code == "lacagette": elif company_code == "lacagette":
title_prefix = " -- " title_prefix = " - "
event["title"] = title_prefix + str(value['seats_reserved']) + "/" + str(smax) event["title"] = title_prefix + str(value['seats_reserved']) + "/" + str(smax)
......
<div class="txtcenter">Contenu invrouvable...</div> <div class="txtcenter message_error">
\ No newline at end of file <h1 class="no_content_title">Oh zut, cette page ne fonctionne pas&nbsp;!</h1>
<p>
Cette erreur est probablement due aux raisons suivantes :<br> URL mal tapée, erreur de copier-coller, lien brisé, contenu déplacé ou contenu supprimé.
</p>
<p>
Vous pouvez retrouver votre chemin depuis votre <a href='home'>Espace&nbsp;Membre</a>.
</p>
</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