Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[IMP] base_time_window: black, isort

pull/1798/head
Akim Juillerat 2020-04-15 12:45:17 +02:00
parent fabcc14588
commit ac84cb7aac
13 changed files with 54 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
base_time_window/__manifest__.py
View File

@ -9,9 +9,6 @@
"license": "AGPL-3", "license": "AGPL-3",
"website": "https://github.com/OCA/server-tools", "website": "https://github.com/OCA/server-tools",
"depends": ["base"], "depends": ["base"],
"data": [ "data": ["data/time_weekday.xml", "security/ir.model.access.xml"],
"data/time_weekday.xml",
"security/ir.model.access.xml"
],
"installable": True, "installable": True,
} }

10
base_time_window/data/time_weekday.xml
View File

@ -1,33 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2020 ACSONE SA/NV <!-- Copyright 2020 ACSONE SA/NV
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<odoo noupdate="1"> <odoo noupdate="1">
<record model="time.weekday" id="time_weekday_monday"> <record model="time.weekday" id="time_weekday_monday">
<field name="name">0</field> <field name="name">0</field>
</record> </record>
<record model="time.weekday" id="time_weekday_tuesday"> <record model="time.weekday" id="time_weekday_tuesday">
<field name="name">1</field> <field name="name">1</field>
</record> </record>
<record model="time.weekday" id="time_weekday_wednesday"> <record model="time.weekday" id="time_weekday_wednesday">
<field name="name">2</field> <field name="name">2</field>
</record> </record>
<record model="time.weekday" id="time_weekday_thursday"> <record model="time.weekday" id="time_weekday_thursday">
<field name="name">3</field> <field name="name">3</field>
</record> </record>
<record model="time.weekday" id="time_weekday_friday"> <record model="time.weekday" id="time_weekday_friday">
<field name="name">4</field> <field name="name">4</field>
</record> </record>
<record model="time.weekday" id="time_weekday_saturday"> <record model="time.weekday" id="time_weekday_saturday">
<field name="name">5</field> <field name="name">5</field>
</record> </record>
<record model="time.weekday" id="time_weekday_sunday"> <record model="time.weekday" id="time_weekday_sunday">
<field name="name">6</field> <field name="name">6</field>
</record> </record>

9
base_time_window/models/time_weekday.py
View File

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2020 ACSONE SA/NV # Copyright 2020 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
@ -22,9 +21,7 @@ class TimeWeekday(models.Model):
], ],
required=True, required=True,
) )
_sql_constraints = [ _sql_constraints = [("name_uniq", "UNIQUE(name)", _("Name must be unique"))]
("name_uniq", "UNIQUE(name)", _("Name must be unique"))
]
@api.depends("name") @api.depends("name")
def _compute_display_name(self): def _compute_display_name(self):
@ -32,9 +29,7 @@ class TimeWeekday(models.Model):
WORKAROUND since Odoo doesn't handle properly records where name is WORKAROUND since Odoo doesn't handle properly records where name is
a selection a selection
""" """
translated_values = dict( translated_values = dict(self._fields["name"]._description_selection(self.env))
self._fields["name"]._description_selection(self.env)
)
for record in self: for record in self:
record.display_name = translated_values[record.name] record.display_name = translated_values[record.name]

9
base_time_window/models/time_window_mixin.py
View File

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2020 ACSONE SA/NV # Copyright 2020 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # 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 join %(relation)s as d
on d.%(relation_window_fkey)s = w.id on d.%(relation_window_fkey)s = w.id
WHERE WHERE
NUMRANGE(w.time_window_start::numeric, w.time_window_end::numeric) && NUMRANGE(w.time_window_start::numeric,
NUMRANGE(%(start)s::numeric, %(end)s::numeric) w.time_window_end::numeric) &&
NUMRANGE(%(start)s::numeric, %(end)s::numeric)
AND w.id != %(window_id)s AND w.id != %(window_id)s
AND d.%(relation_week_day_fkey)s in %(weekday_ids)s AND d.%(relation_week_day_fkey)s in %(weekday_ids)s
AND w.%(check_field)s = %(check_field_id)s;""" AND w.%(check_field)s = %(check_field_id)s;"""
@ -76,8 +76,7 @@ class TimeWindowMixin(models.AbstractModel):
if res: if res:
other = self.browse(res[0][0]) other = self.browse(res[0][0])
raise ValidationError( raise ValidationError(
_("%s overlaps %s") _("%s overlaps %s") % (record.display_name, other.display_name)
% (record.display_name, other.display_name)
) )
@api.depends("time_window_start", "time_window_end", "time_window_weekday_ids") @api.depends("time_window_start", "time_window_end", "time_window_weekday_ids")

15
base_time_window/security/ir.model.access.xml
View File

@ -1,15 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2020 ACSONE SA/NV <!-- Copyright 2020 ACSONE SA/NV
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<odoo> <odoo>
<record model="ir.model.access" id="time_weekday_access_read"> <record model="ir.model.access" id="time_weekday_access_read">
<field name="name">time.weekday access read</field> <field name="name">time.weekday access read</field>
<field name="model_id" ref="model_time_weekday"/> <field name="model_id" ref="model_time_weekday" />
<field name="group_id" ref="base.group_user"/> <field name="group_id" ref="base.group_user" />
<field name="perm_read" eval="1"/> <field name="perm_read" eval="1" />
<field name="perm_create" eval="0"/> <field name="perm_create" eval="0" />
<field name="perm_write" eval="0"/> <field name="perm_write" eval="0" />
<field name="perm_unlink" eval="0"/> <field name="perm_unlink" eval="0" />
</record> </record>
</odoo> </odoo>

1
setup/base_time_window/odoo/addons/base_time_window 120000
View File

@ -0,0 +1 @@
../../../../base_time_window

6
setup/base_time_window/setup.py 100644
View File

@ -0,0 +1,6 @@
import setuptools
setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)

1
setup/test_base_time_window/odoo/addons/test_base_time_window 120000
View File

@ -0,0 +1 @@
../../../../test_base_time_window

6
setup/test_base_time_window/setup.py 100644
View File

@ -0,0 +1,6 @@
import setuptools
setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)

8
test_base_time_window/models/partner_time_window.py
View File

@ -1,10 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2020 ACSONE SA/NV # Copyright 2020 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import api, fields, models
import math
from odoo import _, api, fields, models
class TestPartnerTimeWindow(models.Model): class TestPartnerTimeWindow(models.Model):
@ -16,7 +12,7 @@ class TestPartnerTimeWindow(models.Model):
_time_window_overlap_check_field = "partner_id" _time_window_overlap_check_field = "partner_id"
partner_id = fields.Many2one( partner_id = fields.Many2one(
"res.partner", required=True, index=True, ondelete='cascade' "res.partner", required=True, index=True, ondelete="cascade"
) )
@api.constrains("partner_id") @api.constrains("partner_id")

3
test_base_time_window/models/res_partner.py
View File

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2020 ACSONE SA/NV # Copyright 2020 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # 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( windows = self.env["test.partner.time.window"].search(
[ [
("partner_id", "in", self.ids), ("partner_id", "in", self.ids),
("time_window_weekday_ids", "in", weekday_id) ("time_window_weekday_ids", "in", weekday_id),
] ]
) )
for window in windows: for window in windows:

28
test_base_time_window/security/ir.model.access.xml
View File

@ -1,25 +1,23 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2020 ACSONE SA/NV <!-- Copyright 2020 ACSONE SA/NV
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<odoo> <odoo>
<record model="ir.model.access" id="test_partner_time_window_access_read"> <record model="ir.model.access" id="test_partner_time_window_access_read">
<field name="name">test.partner.time.window access read</field> <field name="name">test.partner.time.window access read</field>
<field name="model_id" ref="model_test_partner_time_window"/> <field name="model_id" ref="model_test_partner_time_window" />
<field name="group_id" ref="base.group_user"/> <field name="group_id" ref="base.group_user" />
<field name="perm_read" eval="1"/> <field name="perm_read" eval="1" />
<field name="perm_create" eval="0"/> <field name="perm_create" eval="0" />
<field name="perm_write" eval="0"/> <field name="perm_write" eval="0" />
<field name="perm_unlink" eval="0"/> <field name="perm_unlink" eval="0" />
</record> </record>
<record model="ir.model.access" id="test_partner_time_window_access_manage"> <record model="ir.model.access" id="test_partner_time_window_access_manage">
<field name="name">test.partner.time.window access read</field> <field name="name">test.partner.time.window access read</field>
<field name="model_id" ref="model_test_partner_time_window"/> <field name="model_id" ref="model_test_partner_time_window" />
<field name="group_id" ref="base.group_partner_manager"/> <field name="group_id" ref="base.group_partner_manager" />
<field name="perm_read" eval="1"/> <field name="perm_read" eval="1" />
<field name="perm_create" eval="1"/> <field name="perm_create" eval="1" />
<field name="perm_write" eval="1"/> <field name="perm_write" eval="1" />
<field name="perm_unlink" eval="1"/> <field name="perm_unlink" eval="1" />
</record> </record>
</odoo> </odoo>

22
test_base_time_window/tests/test_base_time_window.py
View File

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2020 ACSONE SA/NV # Copyright 2020 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
@ -11,15 +10,11 @@ class TestTimeWindow(SavepointCase):
def setUpClass(cls): def setUpClass(cls):
super().setUpClass() super().setUpClass()
cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) 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_1 = cls.env["res.partner"].create({"name": "partner 1"})
cls.partner_2 = cls.env['res.partner'].create({'name': 'partner 2'}) cls.partner_2 = cls.env["res.partner"].create({"name": "partner 2"})
cls.TimeWindow = cls.env["test.partner.time.window"] cls.TimeWindow = cls.env["test.partner.time.window"]
cls.monday = cls.env.ref( cls.monday = cls.env.ref("base_time_window.time_weekday_monday")
"base_time_window.time_weekday_monday" cls.sunday = cls.env.ref("base_time_window.time_weekday_sunday")
)
cls.sunday = cls.env.ref(
"base_time_window.time_weekday_sunday"
)
def test_00(self): def test_00(self):
""" """
@ -68,9 +63,7 @@ class TestTimeWindow(SavepointCase):
} }
) )
self.assertTrue(self.partner_1.time_window_ids) self.assertTrue(self.partner_1.time_window_ids)
time_window = self.TimeWindow.search( time_window = self.TimeWindow.search([("partner_id", "=", partner_id)])
[("partner_id", "=", partner_id)]
)
self.assertTrue(time_window) self.assertTrue(time_window)
self.partner_1.unlink() self.partner_1.unlink()
self.assertFalse(time_window.exists()) self.assertFalse(time_window.exists())
@ -100,7 +93,10 @@ class TestTimeWindow(SavepointCase):
"partner_id": self.partner_1.id, "partner_id": self.partner_1.id,
"time_window_start": 11.0, "time_window_start": 11.0,
"time_window_end": 13.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),
],
} }
) )