From 1222e1daeee0ea51b977a148ad390d4b898f3a66 Mon Sep 17 00:00:00 2001 From: dessanhemrayev Date: Sun, 12 Mar 2023 01:54:44 +0300 Subject: [PATCH 01/12] [ADD] project_task_recurring_activity This module allow users to add activities to the recurring tasks and have them automatically duplicated within recurring tasks at set intervals. Added form the model and add a button to call a private method --- project_task_recurring_activity/README.rst | 0 project_task_recurring_activity/__init__.py | 3 + .../__manifest__.py | 18 ++ .../data/recurring_activity.xml | 15 + .../models/__init__.py | 5 + .../models/project_task.py | 102 ++++++ .../models/project_task_recurrence.py | 31 ++ .../models/recurring_activity.py | 115 +++++++ .../readme/CONFIGURE.rst | 1 + .../readme/CONTRIBUTORS.rst | 2 + .../readme/DESCRIPTION.rst | 1 + .../readme/USAGE.rst | 4 + .../security/ir.model.access.csv | 2 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 1 + .../tests/test_project_recurrence.py | 303 ++++++++++++++++++ .../views/project_task.xml | 33 ++ .../views/recurring_activity.xml | 27 ++ 18 files changed, 663 insertions(+) create mode 100644 project_task_recurring_activity/README.rst create mode 100644 project_task_recurring_activity/__init__.py create mode 100644 project_task_recurring_activity/__manifest__.py create mode 100644 project_task_recurring_activity/data/recurring_activity.xml create mode 100644 project_task_recurring_activity/models/__init__.py create mode 100644 project_task_recurring_activity/models/project_task.py create mode 100644 project_task_recurring_activity/models/project_task_recurrence.py create mode 100644 project_task_recurring_activity/models/recurring_activity.py create mode 100644 project_task_recurring_activity/readme/CONFIGURE.rst create mode 100644 project_task_recurring_activity/readme/CONTRIBUTORS.rst create mode 100644 project_task_recurring_activity/readme/DESCRIPTION.rst create mode 100644 project_task_recurring_activity/readme/USAGE.rst create mode 100644 project_task_recurring_activity/security/ir.model.access.csv create mode 100644 project_task_recurring_activity/static/description/icon.png create mode 100644 project_task_recurring_activity/tests/__init__.py create mode 100644 project_task_recurring_activity/tests/test_project_recurrence.py create mode 100644 project_task_recurring_activity/views/project_task.xml create mode 100644 project_task_recurring_activity/views/recurring_activity.xml diff --git a/project_task_recurring_activity/README.rst b/project_task_recurring_activity/README.rst new file mode 100644 index 0000000000..e69de29bb2 diff --git a/project_task_recurring_activity/__init__.py b/project_task_recurring_activity/__init__.py new file mode 100644 index 0000000000..69f7babdfb --- /dev/null +++ b/project_task_recurring_activity/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models diff --git a/project_task_recurring_activity/__manifest__.py b/project_task_recurring_activity/__manifest__.py new file mode 100644 index 0000000000..6d83f70622 --- /dev/null +++ b/project_task_recurring_activity/__manifest__.py @@ -0,0 +1,18 @@ +{ + "name": "Project Task Recurring Activity", + "summary": """Project Task Recurring Activity""", + "author": "Cetmix, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/project", + "category": "Project Management", + "version": "14.0.1.0.0", + "license": "AGPL-3", + "depends": ["project"], + "data": [ + "security/ir.model.access.csv", + "views/recurring_activity.xml", + "views/project_task.xml", + "data/recurring_activity.xml", + ], + "application": False, + "maintainers": ["dessanhemrayev", "CetmixGitDrone"], +} diff --git a/project_task_recurring_activity/data/recurring_activity.xml b/project_task_recurring_activity/data/recurring_activity.xml new file mode 100644 index 0000000000..51b61cb56e --- /dev/null +++ b/project_task_recurring_activity/data/recurring_activity.xml @@ -0,0 +1,15 @@ + + + + Project: Create Recurring Activities + + code + model._cron_create_activities() + days + -1 + + + diff --git a/project_task_recurring_activity/models/__init__.py b/project_task_recurring_activity/models/__init__.py new file mode 100644 index 0000000000..a6614e2272 --- /dev/null +++ b/project_task_recurring_activity/models/__init__.py @@ -0,0 +1,5 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import project_task +from . import recurring_activity +from . import project_task_recurrence diff --git a/project_task_recurring_activity/models/project_task.py b/project_task_recurring_activity/models/project_task.py new file mode 100644 index 0000000000..f2fdc51cbc --- /dev/null +++ b/project_task_recurring_activity/models/project_task.py @@ -0,0 +1,102 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + + +from datetime import timedelta + +from odoo import api, fields, models + +WEEKS = { + "first": 1, + "second": 2, + "third": 3, + "last": 4, +} + + +class ProjectTask(models.Model): + _inherit = "project.task" + + recurring_activity_ids = fields.One2many( + "recurring.activity", "project_task_id", string="activity", copy=True + ) + custom_activity_ids = fields.Many2many( + "recurring.activity", compute="_compute_activity_ids", store=True, copy=True + ) + + @api.depends("recurring_activity_ids") + def _compute_activity_ids(self): + for item in self: + item.custom_activity_ids = item.recurring_activity_ids.ids + + @api.model + def _get_recurring_fields(self): + return ["custom_activity_ids"] + super()._get_recurring_fields() + + def call_create_recurring_tasks(self): + self.recurrence_id.create_recurring_tasks() + + def _get_new_next_date_recurring_task(self): + date = self.recurrence_id.next_recurrence_date + delta = self.repeat_interval if self.repeat_unit == "day" else 1 + dates = self.recurrence_id._get_next_recurring_dates( + date + timedelta(days=delta), + self.repeat_interval, + self.repeat_unit, + self.repeat_type, + self.repeat_until, + self.repeat_on_month, + self.repeat_on_year, + self._get_weekdays(WEEKS.get(self.repeat_week)), + self.repeat_day, + self.repeat_week, + self.repeat_month, + count=1, + ) + return dates[0] + + def _get_recurrence_start_date(self): + if self.env.user.has_group("base.group_no_one"): + return self.recurrence_id.next_recurrence_date or fields.Datetime.now() + return super()._get_recurrence_start_date() + + @api.model + def _forming_activity_data(self, task, custom_activity_ids): + """Returns prepared data for creating records""" + result = [] + for item in custom_activity_ids: + result.append( + ( + 0, + 0, + { + "project_task_id": task.id, + "activity_type_id": item.activity_type_id.id, + "user_id": item.user_id.id, + "summary": item.summary, + "description": item.description, + "days_after_task_creation_date": item.days_after_task_creation_date, + }, + ) + ) + return result + + @api.model + def create(self, val): + result = super().create(val) + for item in result: + item.create_date = item.recurrence_id.next_recurrence_date + if item.recurring_task and item.custom_activity_ids: + item.message_subscribe( + partner_ids=list( + set( + item.custom_activity_ids.mapped("user_id") + .mapped("partner_id") + .ids + ) + - set(item.message_follower_ids.mapped("partner_id").ids) + ) + ) + item.recurring_activity_ids = self._forming_activity_data( + item, item.custom_activity_ids + ) + return result diff --git a/project_task_recurring_activity/models/project_task_recurrence.py b/project_task_recurring_activity/models/project_task_recurrence.py new file mode 100644 index 0000000000..136d3c9c29 --- /dev/null +++ b/project_task_recurring_activity/models/project_task_recurrence.py @@ -0,0 +1,31 @@ +from odoo import api, fields, models + + +class ProjectTaskRecurrence(models.Model): + _inherit = "project.task.recurrence" + + old_date_recurring_task = fields.Date( + default=fields.Date.today(), + ) + + @api.model + def _get_recurring_fields(self): + return ["custom_activity_ids"] + super()._get_recurring_fields() + + def create_recurring_tasks(self): + """Create recurring tasks""" + if not self.env.user.has_group("project.group_project_recurring_tasks"): + return + self._create_next_task() + for recurrence in self.filtered(lambda r: r.repeat_type == "after"): + recurrence.recurrence_left -= 1 + task = self.task_ids[-1] + new_date = task._get_new_next_date_recurring_task() + + self.write( + { + "old_date_recurring_task": self.next_recurrence_date, + "next_recurrence_date": new_date, + } + ) + task.write({"create_date": new_date}) diff --git a/project_task_recurring_activity/models/recurring_activity.py b/project_task_recurring_activity/models/recurring_activity.py new file mode 100644 index 0000000000..72e7a27dc2 --- /dev/null +++ b/project_task_recurring_activity/models/recurring_activity.py @@ -0,0 +1,115 @@ +from datetime import timedelta + +from odoo import _, api, fields, models +from odoo.exceptions import UserError + + +class RecurringActivity(models.Model): + _name = "recurring.activity" + _description = "Recurring activity" + + project_task_id = fields.Many2one("project.task") + activity_type_id = fields.Many2one( + "mail.activity.type", string="Activity Type", ondelete="restrict" + ) + user_id = fields.Many2one( + "res.users", + string="Assigned to", + index=True, + required=True, + ) + summary = fields.Char( + string="Summary", + ) + description = fields.Html( + string="Description", + sanitize_style=True, + ) + days_after_task_creation_date = fields.Integer() + next_recurrence_date = fields.Date( + string="next_date", compute="_compute_next_recurrence_date", store=True + ) + + @api.depends("days_after_task_creation_date") + def _compute_next_recurrence_date(self): + for record in self: + record.next_recurrence_date = record._get_next_date() + + def _get_next_date(self): + return fields.Date.today() + timedelta( + days=self.days_after_task_creation_date + 1 + if self.days_after_task_creation_date == 0 + else self.days_after_task_creation_date + ) + + @api.model + def _cron_create_activities(self): + today = fields.Date.today() + recurring_activities = self.search([("next_recurrence_date", "<=", today)]) + for activity in recurring_activities: + activity.project_task_id.activity_schedule( + activity_type_id=activity.activity_type_id.id, + user_id=activity.user_id.id, + note=activity.description, + summary=activity.summary, + date_deadline=fields.Date.today(), + ) + activity.write({"next_recurrence_date": activity._get_next_date()}) + + @api.constrains("user_id") + def _check_user_id(self): + for record in self: + task = record.project_task_id + if not ( + record.user_id.partner_id.id + in task.message_follower_ids.mapped("partner_id").ids + ): + raise UserError( + _( + f"Assigned user {record.user_id.name} has no access" + " to the document and is not able to handle this activity." + ) + ) + + @api.onchange("activity_type_id") + def _onchange_activity_type_id(self): + self.user_id = ( + self.user_id if self.user_id else self.activity_type_id.default_user_id + ) + self.description = ( + self.activity_type_id.default_description + if not self.description or self.description == "


" + else self.description + ) + self.summary = self.summary if self.summary else self.activity_type_id.summary + + @api.model + def delta_time(self, old, new): + return (new - old).days + + @api.model + def create(self, val): + result = super().create(val) + for item in result: + next_recurrence_date = ( + item.project_task_id.recurrence_id.next_recurrence_date + ) + item.write({"create_date": next_recurrence_date}) + task = item.project_task_id + old_date = item.project_task_id.recurrence_id.old_date_recurring_task + delfa = 0 + if len(item.project_task_id.recurrence_id.task_ids) == 1: + old_date = fields.Date.today() + delfa = self.delta_time(old_date, next_recurrence_date) + task.activity_schedule( + activity_type_id=item.activity_type_id.id, + user_id=item.user_id.id, + note=item.description, + summary=item.summary, + date_deadline=fields.Date.today() + + timedelta(days=item.days_after_task_creation_date) + if not self.env.user.has_group("base.group_no_one") + else (next_recurrence_date - timedelta(days=delfa)) + + timedelta(days=item.days_after_task_creation_date), + ) + return result diff --git a/project_task_recurring_activity/readme/CONFIGURE.rst b/project_task_recurring_activity/readme/CONFIGURE.rst new file mode 100644 index 0000000000..292fb2ec33 --- /dev/null +++ b/project_task_recurring_activity/readme/CONFIGURE.rst @@ -0,0 +1 @@ +#.Enable recurring task in config settings diff --git a/project_task_recurring_activity/readme/CONTRIBUTORS.rst b/project_task_recurring_activity/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..d855f2707d --- /dev/null +++ b/project_task_recurring_activity/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ + * Cetmix + * Dessan Hemrayev diff --git a/project_task_recurring_activity/readme/DESCRIPTION.rst b/project_task_recurring_activity/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..4ef4156e17 --- /dev/null +++ b/project_task_recurring_activity/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allow users to add activities to the recurring tasks and have them automatically duplicated within recurring tasks at set intervals. diff --git a/project_task_recurring_activity/readme/USAGE.rst b/project_task_recurring_activity/readme/USAGE.rst new file mode 100644 index 0000000000..2ffb1c1cef --- /dev/null +++ b/project_task_recurring_activity/readme/USAGE.rst @@ -0,0 +1,4 @@ +Open recurring task. + +#. In tab "Recurrence", user can set the activites that should be created each time the task is duplicated. +#. For testing purposes, a button "Create next recurring task" is visible in developer mode to check how next task will be created. diff --git a/project_task_recurring_activity/security/ir.model.access.csv b/project_task_recurring_activity/security/ir.model.access.csv new file mode 100644 index 0000000000..1fbd336da3 --- /dev/null +++ b/project_task_recurring_activity/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +project_recurring_activity,recurring.activity,model_recurring_activity,,1,1,1,1 diff --git a/project_task_recurring_activity/static/description/icon.png b/project_task_recurring_activity/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/project_task_recurring_activity/tests/__init__.py b/project_task_recurring_activity/tests/__init__.py new file mode 100644 index 0000000000..e0890cfb51 --- /dev/null +++ b/project_task_recurring_activity/tests/__init__.py @@ -0,0 +1 @@ +from . import test_project_recurrence diff --git a/project_task_recurring_activity/tests/test_project_recurrence.py b/project_task_recurring_activity/tests/test_project_recurrence.py new file mode 100644 index 0000000000..c1ea51930b --- /dev/null +++ b/project_task_recurring_activity/tests/test_project_recurrence.py @@ -0,0 +1,303 @@ +from datetime import date, datetime, timedelta + +from freezegun import freeze_time + +from odoo import _, fields +from odoo.exceptions import UserError +from odoo.tests.common import Form, SavepointCase + + +class TestProjectrecurrence(SavepointCase): + @classmethod + def setUpClass(cls): + super(TestProjectrecurrence, cls).setUpClass() + + cls.env.user.groups_id += cls.env.ref("project.group_project_recurring_tasks") + cls.recurring_activity = cls.env["recurring.activity"] + cls.stage_a = cls.env["project.task.type"].create({"name": "a"}) + cls.stage_b = cls.env["project.task.type"].create({"name": "b"}) + + cls.demo_user = ( + cls.env["res.users"] + .with_context({"no_reset_password": True}) + .create( + { + "name": "demo", + "login": "demo_user", + "email": "dess@yourcompany.com", + "groups_id": [ + ( + 6, + 0, + [cls.env.ref("project.group_project_recurring_tasks").id], + ) + ], + } + ) + ) + cls.demo_user2 = ( + cls.env["res.users"] + .with_context({"no_reset_password": True}) + .create( + { + "name": "demo2", + "login": "demo_user2", + "email": "dess2@yourcompany.com", + "groups_id": [ + ( + 6, + 0, + [cls.env.ref("project.group_project_recurring_tasks").id], + ) + ], + } + ) + ) + cls.mail_activity_a = cls.env["mail.activity.type"].create( + { + "name": "activity_a", + "default_user_id": cls.demo_user.id, + "summary": "summary", + "default_description": "description", + } + ) + cls.mail_activity_b = cls.env["mail.activity.type"].create( + { + "name": "activity_b", + "default_user_id": cls.demo_user.id, + } + ) + cls.project_recurring = ( + cls.env["project.project"] + .with_context({"mail_create_nolog": True}) + .create( + { + "name": "Recurring", + "allow_recurring_tasks": True, + "type_ids": [ + (4, cls.stage_a.id), + (4, cls.stage_b.id), + ], + } + ) + ) + + cls.project_recurring2 = ( + cls.env["project.project"] + .with_context({"mail_create_nolog": True}) + .create( + { + "name": "Recurring", + "allow_recurring_tasks": True, + "type_ids": [ + (4, cls.stage_a.id), + (4, cls.stage_b.id), + ], + } + ) + ) + + def test_check_activity_fields(self): + with freeze_time("2020-01-01"): + form = Form(self.env["project.task"]) + form.name = "test recurring task" + form.description = "my super recurring task" + form.project_id = self.project_recurring + form.date_deadline = datetime(2020, 2, 1) + form.recurring_task = True + form.repeat_interval = 1 + form.repeat_unit = "month" + form.repeat_type = "forever" + form.repeat_on_month = "date" + form.repeat_day = "15" + task = form.save() + with self.assertRaisesRegex( + UserError, + ( + _( + f"Assigned user {self.demo_user2.name} has no access" + " to the document and is not able to handle this activity." + ) + ), + ): + self.recurring_activity.create( + { + "project_task_id": task.id, + "activity_type_id": self.mail_activity_a.id, + "user_id": self.demo_user2.id, + "days_after_task_creation_date": 1, + }, + ) + + def test_recurrence_cron_repeat_forever(self): + domain = [("project_id", "=", self.project_recurring.id)] + with freeze_time("2020-01-01"): + form = Form(self.env["project.task"]) + form.name = "test recurring task" + form.description = "my super recurring task" + form.project_id = self.project_recurring + form.date_deadline = datetime(2020, 2, 1) + + form.recurring_task = True + form.repeat_interval = 1 + form.repeat_unit = "month" + form.repeat_type = "forever" + form.repeat_on_month = "date" + form.repeat_day = "15" + task = form.save() + task.planned_hours = 2 + + self.assertEqual(len(task.recurring_activity_ids), 0, "Must be equal to 0") + self.assertEqual(len(task.activity_ids), 0, "Must be equal to 0") + task.message_subscribe(partner_ids=[self.demo_user.partner_id.id]) + task.write( + { + "recurring_activity_ids": [ + ( + 0, + 0, + { + "activity_type_id": self.mail_activity_a.id, + "days_after_task_creation_date": 0, + "user_id": self.demo_user.id, + "summary": "summary", + "description": "description", + }, + ) + ] + } + ) + self.assertEqual(len(task.activity_ids), 1, "Must be equal to 1") + self.assertEqual( + task.activity_ids.summary, "summary", "Must be equal to 'summary'" + ) + self.assertEqual(task.recurrence_id.next_recurrence_date, date(2020, 1, 15)) + self.assertEqual( + self.env["project.task"].search_count(domain), 1, "Must be equal to 1" + ) + self.env["project.task.recurrence"]._cron_create_recurring_tasks() + self.assertEqual( + self.env["project.task"].search_count(domain), + 1, + "no extra task should be created", + ) + + with freeze_time("2020-01-15"): + self.assertEqual( + self.env["project.task"].search_count(domain), 1, "Must be equal to 1" + ) + self.env["project.task.recurrence"]._cron_create_recurring_tasks() + self.assertEqual( + self.env["project.task"].search_count(domain), 2, "Must be equal to 2" + ) + + with freeze_time("2020-02-15"): + self.env["project.task.recurrence"]._cron_create_recurring_tasks() + self.assertEqual( + self.env["project.task"].search_count(domain), 3, "Must be equal to 3" + ) + + with freeze_time("2020-02-16"): + self.env["project.task.recurrence"]._cron_create_recurring_tasks() + self.assertEqual( + self.env["project.task"].search_count(domain), 3, "Must be equal to 3" + ) + + with freeze_time("2020-02-17"): + self.env["project.task.recurrence"]._cron_create_recurring_tasks() + self.assertEqual( + self.env["project.task"].search_count(domain), 3, "Must be equal to 3" + ) + + with freeze_time("2020-03-15"): + self.env["project.task.recurrence"]._cron_create_recurring_tasks() + self.assertEqual( + self.env["project.task"].search_count(domain), 4, "Must be equal to 4" + ) + + tasks = self.env["project.task"].search(domain) + self.assertEqual(len(tasks), 4, "Must be equal to 4") + self.assertEqual(len(tasks.mapped("activity_ids")), 4, "Must be equal to 4") + self.assertEqual( + len(tasks.mapped("recurring_activity_ids")), 4, "Must be equal to 4" + ) + + def test_create_recurring_tasks(self): + """Check custom method dev""" + domain = [("project_id", "=", self.project_recurring2.id)] + with freeze_time("2020-01-01"): + form = Form(self.env["project.task"]) + form.name = "test recurring task" + form.description = "my super recurring task" + form.project_id = self.project_recurring2 + form.date_deadline = datetime(2020, 2, 1) + + form.recurring_task = True + form.repeat_interval = 1 + form.repeat_unit = "month" + form.repeat_type = "forever" + form.repeat_on_month = "date" + form.repeat_day = "15" + task = form.save() + task.planned_hours = 2 + + task.message_subscribe(partner_ids=[self.demo_user.partner_id.id]) + task.write( + { + "recurring_activity_ids": [ + ( + 0, + 0, + { + "activity_type_id": self.mail_activity_a.id, + "days_after_task_creation_date": 0, + "user_id": self.demo_user.id, + "summary": "summary", + "description": "description", + }, + ) + ] + } + ) + with freeze_time("2020-01-15"): + self.assertEqual( + self.env["project.task"].search_count(domain), 1, "Must be equal to 1" + ) + task.recurrence_id.create_recurring_tasks() + self.assertEqual( + self.env["project.task"].search_count(domain), 2, "Must be equal to 2" + ) + self.assertEqual( + task.recurring_activity_ids[0]._get_next_date(), + fields.Date.today() + timedelta(days=1), + "Must be equal to `2020-01-16`", + ) + self.env["recurring.activity"]._cron_create_activities() + + with freeze_time("2020-01-16"): + activity = self.env["recurring.activity"].search( + [("project_task_id", "=", task.id)] + ) + self.assertEqual( + len(activity), + 1, + "Must be equal to 1", + ) + self.assertEqual( + activity.next_recurrence_date, + fields.Date.today(), + "Must be equal to `2020-01-16`", + ) + with freeze_time("2020-02-15"): + task.recurrence_id.create_recurring_tasks() + self.assertEqual( + self.env["project.task"].search_count(domain), 3, "Must be equal to 3" + ) + today = fields.Date.today() + self.assertEqual( + self.env["recurring.activity"].delta_time( + today, today + timedelta(days=1) + ), + 1, + "Must be equal to 1", + ) diff --git a/project_task_recurring_activity/views/project_task.xml b/project_task_recurring_activity/views/project_task.xml new file mode 100644 index 0000000000..2d7d91f65c --- /dev/null +++ b/project_task_recurring_activity/views/project_task.xml @@ -0,0 +1,33 @@ + + + project_task_recurring_activity_form + project.task + + + +