From ac84cb7aacb285fed768c82822561a872e8f9fe8 Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Wed, 15 Apr 2020 12:45:17 +0200 Subject: [PATCH] [IMP] base_time_window: black, isort --- base_time_window/__manifest__.py | 5 +--- base_time_window/data/time_weekday.xml | 10 +------ base_time_window/models/time_weekday.py | 9 ++---- base_time_window/models/time_window_mixin.py | 9 +++--- base_time_window/security/ir.model.access.xml | 15 +++++----- .../odoo/addons/base_time_window | 1 + setup/base_time_window/setup.py | 6 ++++ .../odoo/addons/test_base_time_window | 1 + setup/test_base_time_window/setup.py | 6 ++++ .../models/partner_time_window.py | 8 ++---- test_base_time_window/models/res_partner.py | 3 +- .../security/ir.model.access.xml | 28 +++++++++---------- .../tests/test_base_time_window.py | 22 ++++++--------- 13 files changed, 54 insertions(+), 69 deletions(-) create mode 120000 setup/base_time_window/odoo/addons/base_time_window create mode 100644 setup/base_time_window/setup.py create mode 120000 setup/test_base_time_window/odoo/addons/test_base_time_window create mode 100644 setup/test_base_time_window/setup.py diff --git a/base_time_window/__manifest__.py b/base_time_window/__manifest__.py index 353c0b3f9..7c4b6b582 100644 --- a/base_time_window/__manifest__.py +++ b/base_time_window/__manifest__.py @@ -9,9 +9,6 @@ "license": "AGPL-3", "website": "https://github.com/OCA/server-tools", "depends": ["base"], - "data": [ - "data/time_weekday.xml", - "security/ir.model.access.xml" - ], + "data": ["data/time_weekday.xml", "security/ir.model.access.xml"], "installable": True, } diff --git a/base_time_window/data/time_weekday.xml b/base_time_window/data/time_weekday.xml index 14407fddf..8c2837e5d 100644 --- a/base_time_window/data/time_weekday.xml +++ b/base_time_window/data/time_weekday.xml @@ -1,33 +1,25 @@ - + - - 0 - 1 - 2 - 3 - 4 - 5 - 6 diff --git a/base_time_window/models/time_weekday.py b/base_time_window/models/time_weekday.py index bf6489f5b..78d17ecd3 100644 --- a/base_time_window/models/time_weekday.py +++ b/base_time_window/models/time_weekday.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2020 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). @@ -22,9 +21,7 @@ class TimeWeekday(models.Model): ], required=True, ) - _sql_constraints = [ - ("name_uniq", "UNIQUE(name)", _("Name must be unique")) - ] + _sql_constraints = [("name_uniq", "UNIQUE(name)", _("Name must be unique"))] @api.depends("name") def _compute_display_name(self): @@ -32,9 +29,7 @@ class TimeWeekday(models.Model): WORKAROUND since Odoo doesn't handle properly records where name is a selection """ - translated_values = dict( - self._fields["name"]._description_selection(self.env) - ) + translated_values = dict(self._fields["name"]._description_selection(self.env)) for record in self: record.display_name = translated_values[record.name] diff --git a/base_time_window/models/time_window_mixin.py b/base_time_window/models/time_window_mixin.py index d4bb4d192..da62f71d4 100644 --- a/base_time_window/models/time_window_mixin.py +++ b/base_time_window/models/time_window_mixin.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2020 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). @@ -52,8 +51,9 @@ class TimeWindowMixin(models.AbstractModel): join %(relation)s as d on d.%(relation_window_fkey)s = w.id WHERE - NUMRANGE(w.time_window_start::numeric, w.time_window_end::numeric) && - NUMRANGE(%(start)s::numeric, %(end)s::numeric) + NUMRANGE(w.time_window_start::numeric, + w.time_window_end::numeric) && + NUMRANGE(%(start)s::numeric, %(end)s::numeric) AND w.id != %(window_id)s AND d.%(relation_week_day_fkey)s in %(weekday_ids)s AND w.%(check_field)s = %(check_field_id)s;""" @@ -76,8 +76,7 @@ class TimeWindowMixin(models.AbstractModel): if res: other = self.browse(res[0][0]) raise ValidationError( - _("%s overlaps %s") - % (record.display_name, other.display_name) + _("%s overlaps %s") % (record.display_name, other.display_name) ) @api.depends("time_window_start", "time_window_end", "time_window_weekday_ids") diff --git a/base_time_window/security/ir.model.access.xml b/base_time_window/security/ir.model.access.xml index 440f0c5c1..886ae01b9 100644 --- a/base_time_window/security/ir.model.access.xml +++ b/base_time_window/security/ir.model.access.xml @@ -1,15 +1,14 @@ - + - time.weekday access read - - - - - - + + + + + + diff --git a/setup/base_time_window/odoo/addons/base_time_window b/setup/base_time_window/odoo/addons/base_time_window new file mode 120000 index 000000000..d4e4791f4 --- /dev/null +++ b/setup/base_time_window/odoo/addons/base_time_window @@ -0,0 +1 @@ +../../../../base_time_window \ No newline at end of file diff --git a/setup/base_time_window/setup.py b/setup/base_time_window/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/base_time_window/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/setup/test_base_time_window/odoo/addons/test_base_time_window b/setup/test_base_time_window/odoo/addons/test_base_time_window new file mode 120000 index 000000000..f86d12c9a --- /dev/null +++ b/setup/test_base_time_window/odoo/addons/test_base_time_window @@ -0,0 +1 @@ +../../../../test_base_time_window \ No newline at end of file diff --git a/setup/test_base_time_window/setup.py b/setup/test_base_time_window/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/test_base_time_window/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/test_base_time_window/models/partner_time_window.py b/test_base_time_window/models/partner_time_window.py index 346f9fbb3..8febc7913 100644 --- a/test_base_time_window/models/partner_time_window.py +++ b/test_base_time_window/models/partner_time_window.py @@ -1,10 +1,6 @@ -# -*- coding: utf-8 -*- # Copyright 2020 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -import math - -from odoo import _, api, fields, models +from odoo import api, fields, models class TestPartnerTimeWindow(models.Model): @@ -16,7 +12,7 @@ class TestPartnerTimeWindow(models.Model): _time_window_overlap_check_field = "partner_id" partner_id = fields.Many2one( - "res.partner", required=True, index=True, ondelete='cascade' + "res.partner", required=True, index=True, ondelete="cascade" ) @api.constrains("partner_id") diff --git a/test_base_time_window/models/res_partner.py b/test_base_time_window/models/res_partner.py index 5d98e1c1e..7c73164ff 100644 --- a/test_base_time_window/models/res_partner.py +++ b/test_base_time_window/models/res_partner.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2020 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). @@ -29,7 +28,7 @@ class ResPartner(models.Model): windows = self.env["test.partner.time.window"].search( [ ("partner_id", "in", self.ids), - ("time_window_weekday_ids", "in", weekday_id) + ("time_window_weekday_ids", "in", weekday_id), ] ) for window in windows: diff --git a/test_base_time_window/security/ir.model.access.xml b/test_base_time_window/security/ir.model.access.xml index 998c1de58..d40f87cec 100644 --- a/test_base_time_window/security/ir.model.access.xml +++ b/test_base_time_window/security/ir.model.access.xml @@ -1,25 +1,23 @@ - + - test.partner.time.window access read - - - - - - + + + + + + - test.partner.time.window access read - - - - - - + + + + + + diff --git a/test_base_time_window/tests/test_base_time_window.py b/test_base_time_window/tests/test_base_time_window.py index 3f3c17f1b..45be80262 100644 --- a/test_base_time_window/tests/test_base_time_window.py +++ b/test_base_time_window/tests/test_base_time_window.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2020 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). @@ -11,15 +10,11 @@ class TestTimeWindow(SavepointCase): def setUpClass(cls): super().setUpClass() cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) - cls.partner_1 = cls.env['res.partner'].create({'name': 'partner 1'}) - cls.partner_2 = cls.env['res.partner'].create({'name': 'partner 2'}) + cls.partner_1 = cls.env["res.partner"].create({"name": "partner 1"}) + cls.partner_2 = cls.env["res.partner"].create({"name": "partner 2"}) cls.TimeWindow = cls.env["test.partner.time.window"] - cls.monday = cls.env.ref( - "base_time_window.time_weekday_monday" - ) - cls.sunday = cls.env.ref( - "base_time_window.time_weekday_sunday" - ) + cls.monday = cls.env.ref("base_time_window.time_weekday_monday") + cls.sunday = cls.env.ref("base_time_window.time_weekday_sunday") def test_00(self): """ @@ -68,9 +63,7 @@ class TestTimeWindow(SavepointCase): } ) self.assertTrue(self.partner_1.time_window_ids) - time_window = self.TimeWindow.search( - [("partner_id", "=", partner_id)] - ) + time_window = self.TimeWindow.search([("partner_id", "=", partner_id)]) self.assertTrue(time_window) self.partner_1.unlink() self.assertFalse(time_window.exists()) @@ -100,7 +93,10 @@ class TestTimeWindow(SavepointCase): "partner_id": self.partner_1.id, "time_window_start": 11.0, "time_window_end": 13.0, - "time_window_weekday_ids": [(4, self.monday.id), (4, self.sunday.id)], + "time_window_weekday_ids": [ + (4, self.monday.id), + (4, self.sunday.id), + ], } )