From 0b5935092e6f4142f7e5f15823601b7ade2ea280 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Mon, 7 Dec 2015 16:59:31 +0100 Subject: [PATCH] [ADD] project: tasks & issues need-actions Shortcuts to display tasks & issues with notifications from the projects dashboards --- addons/project/project.py | 9 +++++++++ addons/project/project_dashboard.xml | 14 ++++++++++---- .../static/src/less/project_dashboard.less | 16 ++++++++++++++++ addons/project_issue/project_dashboard.xml | 14 ++++++++++---- addons/project_issue/project_issue.py | 8 ++++++++ 5 files changed, 53 insertions(+), 8 deletions(-) diff --git a/addons/project/project.py b/addons/project/project.py index e522703a451..4e9a6c879c9 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -111,6 +111,14 @@ class project(osv.osv): for project in self.browse(cr, uid, ids, context=context): res[project.id] = len(project.task_ids) return res + + def _task_needaction_count(self, cr, uid, ids, field_name, arg, context=None): + Task = self.pool['project.task'] + res = dict.fromkeys(ids, 0) + projects = Task.read_group(cr, uid, [('project_id', 'in', ids), ('message_needaction', '=', True)], ['project_id'], ['project_id'], context=context) + res.update({project['project_id'][0]: int(project['project_id_count']) for project in projects}) + return res + def _get_alias_models(self, cr, uid, context=None): """ Overriden in project_issue to offer more options """ return [('project.task', "Tasks")] @@ -162,6 +170,7 @@ class project(osv.osv): 'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ), 'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'task_count': fields.function(_task_count, type='integer', string="Tasks",), + 'task_needaction_count': fields.function(_task_needaction_count, type='integer', string="Tasks",), 'task_ids': fields.one2many('project.task', 'project_id', domain=['|', ('stage_id.fold', '=', False), ('stage_id', '=', False)]), 'color': fields.integer('Color Index'), diff --git a/addons/project/project_dashboard.xml b/addons/project/project_dashboard.xml index 25428a29ab8..20645ffc417 100644 --- a/addons/project/project_dashboard.xml +++ b/addons/project/project_dashboard.xml @@ -9,6 +9,7 @@ + @@ -50,10 +51,15 @@
- - - - + Documents diff --git a/addons/project/static/src/less/project_dashboard.less b/addons/project/static/src/less/project_dashboard.less index 8bdad525aab..723b9039092 100644 --- a/addons/project/static/src/less/project_dashboard.less +++ b/addons/project/static/src/less/project_dashboard.less @@ -48,8 +48,24 @@ .o_label { color: white; } + .o_needaction{ + position: absolute; + top: 5px; + right: 5px; + color: white; + font-size: small; + opacity: 0.5; + &:hover{ + opacity:1; + } + &::before { + content: "\f0f3"; + font: normal normal normal 14px/1 FontAwesome; + } + } .o_project_kanban_box { + position: relative; text-align: center; padding: 15px 0 15px 0; .o-flex(1, 1, auto); diff --git a/addons/project_issue/project_dashboard.xml b/addons/project_issue/project_dashboard.xml index 648eb012017..381a6173026 100644 --- a/addons/project_issue/project_dashboard.xml +++ b/addons/project_issue/project_dashboard.xml @@ -7,12 +7,18 @@ + - - - - + diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 82c65dba563..fa43aee4203 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -438,10 +438,18 @@ class project(osv.Model): for project_id in ids } + def _issue_needaction_count(self, cr, uid, ids, field_name, arg, context=None): + Issue = self.pool['project.issue'] + res = dict.fromkeys(ids, 0) + projects = Issue.read_group(cr, uid, [('project_id', 'in', ids), ('message_needaction', '=', True)], ['project_id'], ['project_id'], context=context) + res.update({project['project_id'][0]: int(project['project_id_count']) for project in projects}) + return res + _columns = { 'issue_count': fields.function(_issue_count, type='integer', string="Issues",), 'issue_ids': fields.one2many('project.issue', 'project_id', string="Issues", domain=[('stage_id.fold', '=', False)]), + 'issue_needaction_count': fields.function(_issue_needaction_count, type='integer', string="Issues",), } @api.multi