From 3c620790af3688aa9bedd7a81bdec876fed15b30 Mon Sep 17 00:00:00 2001 From: Thibault Francois Date: Thu, 23 Nov 2017 23:10:20 +0100 Subject: [PATCH] [CLEAN] Don't need to be that strict with 80 char per line it doesn't make the code more readable, 120 is perfectly fine nowdays. [CLEAN] use anonymous variable _ when unpacking tuple. [CLEAN] use free_space instead of len(s) --- beesdoo_website_shift/controllers/main.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/beesdoo_website_shift/controllers/main.py b/beesdoo_website_shift/controllers/main.py index 885ed91..3b12d54 100644 --- a/beesdoo_website_shift/controllers/main.py +++ b/beesdoo_website_shift/controllers/main.py @@ -20,26 +20,23 @@ class ShiftPortalController(http.Controller): # Grouby task_template_id, if no task_template_id is specified # then group by start_time - groupby_func = lambda s: (s.task_template_id, - s.start_time, - s.task_type_id) + groupby_func = lambda s: (s.task_template_id, s.start_time, s.task_type_id) groupby_iter = groupby(shifts, groupby_func) shifts_and_count = [] for (keys, grouped_shifts) in groupby_iter: - (task_template, start_time, task_type) = keys + (task_template, _, _) = keys s = list(grouped_shifts) free_space = len(s) # Among shifts with at least 5 worker max, shows only shifts # where there is at least two free spaces - if task_template.worker_nb > 5 and len(s) >= 2: + if task_template.worker_nb > 5 and free_space >= 2: shifts_and_count.append([free_space, s[0]]) # Show available shifts if there is less than 5 worker max if task_template.worker_nb <= 5: shifts_and_count.append([free_space, s[0]]) - return request.render( - 'beesdoo_website_shift.shift_template', + return request.render('beesdoo_website_shift.shift_template', { 'shift_templates': shifts_and_count } @@ -49,13 +46,9 @@ class ShiftPortalController(http.Controller): def shift_template_regular_worker(self, **kwargs): # Get all the task template template = request.env['beesdoo.shift.template'] - task_templates = template.sudo().search( - [], - order="planning_id, day_nb_id, start_time" - ) + task_templates = template.sudo().search([], order="planning_id, day_nb_id, start_time") - return request.render( - 'beesdoo_website_shift.task_template', + return request.render('beesdoo_website_shift.task_template', { 'task_templates': task_templates, 'float_to_time': float_to_time