Cedric Prieels (cpr)
3bcb88f410
Generic UX improvements for the task portal. Added new sort by, group by and searches options in the tasks portal. Some options have been renamed as well, while the style has been slightly revised. The timesheet details of each sub-task from the parent form view has also been removed. task-2508883 closes odoo/odoo#70305 Related: odoo/upgrade#2580 Signed-off-by: LTU-Odoo <IT-Ideas@users.noreply.github.com>
284 lines
12 KiB
Python
284 lines
12 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from collections import OrderedDict
|
|
from operator import itemgetter
|
|
|
|
from markupsafe import Markup
|
|
|
|
from odoo import http, _
|
|
from odoo.exceptions import AccessError, MissingError
|
|
from odoo.http import request
|
|
from odoo.addons.portal.controllers.portal import CustomerPortal, pager as portal_pager
|
|
from odoo.tools import groupby as groupbyelem
|
|
|
|
from odoo.osv.expression import OR
|
|
|
|
|
|
class ProjectCustomerPortal(CustomerPortal):
|
|
|
|
def _prepare_home_portal_values(self, counters):
|
|
values = super()._prepare_home_portal_values(counters)
|
|
if 'project_count' in counters:
|
|
values['project_count'] = request.env['project.project'].search_count([])
|
|
if 'task_count' in counters:
|
|
values['task_count'] = request.env['project.task'].search_count([])
|
|
return values
|
|
|
|
# ------------------------------------------------------------
|
|
# My Project
|
|
# ------------------------------------------------------------
|
|
def _project_get_page_view_values(self, project, access_token, **kwargs):
|
|
values = {
|
|
'page_name': 'project',
|
|
'project': project,
|
|
}
|
|
return self._get_page_view_values(project, access_token, values, 'my_projects_history', False, **kwargs)
|
|
|
|
@http.route(['/my/projects', '/my/projects/page/<int:page>'], type='http', auth="user", website=True)
|
|
def portal_my_projects(self, page=1, date_begin=None, date_end=None, sortby=None, **kw):
|
|
values = self._prepare_portal_layout_values()
|
|
Project = request.env['project.project']
|
|
domain = []
|
|
|
|
searchbar_sortings = {
|
|
'date': {'label': _('Newest'), 'order': 'create_date desc'},
|
|
'name': {'label': _('Name'), 'order': 'name'},
|
|
}
|
|
if not sortby:
|
|
sortby = 'date'
|
|
order = searchbar_sortings[sortby]['order']
|
|
|
|
if date_begin and date_end:
|
|
domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)]
|
|
|
|
# projects count
|
|
project_count = Project.search_count(domain)
|
|
# pager
|
|
pager = portal_pager(
|
|
url="/my/projects",
|
|
url_args={'date_begin': date_begin, 'date_end': date_end, 'sortby': sortby},
|
|
total=project_count,
|
|
page=page,
|
|
step=self._items_per_page
|
|
)
|
|
|
|
# content according to pager and archive selected
|
|
projects = Project.search(domain, order=order, limit=self._items_per_page, offset=pager['offset'])
|
|
request.session['my_projects_history'] = projects.ids[:100]
|
|
|
|
values.update({
|
|
'date': date_begin,
|
|
'date_end': date_end,
|
|
'projects': projects,
|
|
'page_name': 'project',
|
|
'default_url': '/my/projects',
|
|
'pager': pager,
|
|
'searchbar_sortings': searchbar_sortings,
|
|
'sortby': sortby
|
|
})
|
|
return request.render("project.portal_my_projects", values)
|
|
|
|
@http.route(['/my/project/<int:project_id>'], type='http', auth="public", website=True)
|
|
def portal_my_project(self, project_id=None, access_token=None, **kw):
|
|
try:
|
|
project_sudo = self._document_check_access('project.project', project_id, access_token)
|
|
except (AccessError, MissingError):
|
|
return request.redirect('/my')
|
|
|
|
values = self._project_get_page_view_values(project_sudo, access_token, **kw)
|
|
return request.render("project.portal_my_project", values)
|
|
|
|
# ------------------------------------------------------------
|
|
# My Task
|
|
# ------------------------------------------------------------
|
|
def _task_get_page_view_values(self, task, access_token, **kwargs):
|
|
try:
|
|
project_accessible = bool(task.project_id.id and self._document_check_access('project.project', task.project_id.id))
|
|
except (AccessError, MissingError):
|
|
project_accessible = False
|
|
|
|
values = {
|
|
'page_name': 'task',
|
|
'task': task,
|
|
'user': request.env.user,
|
|
'project_accessible': project_accessible,
|
|
}
|
|
return self._get_page_view_values(task, access_token, values, 'my_tasks_history', False, **kwargs)
|
|
|
|
def _task_get_searchbar_sortings(self):
|
|
return {
|
|
'date': {'label': _('Newest'), 'order': 'create_date desc'},
|
|
'name': {'label': _('Title'), 'order': 'name'},
|
|
'stage': {'label': _('Stage'), 'order': 'stage_id, project_id'},
|
|
'project': {'label': _('Project'), 'order': 'project_id, stage_id'},
|
|
'update': {'label': _('Last Stage Update'), 'order': 'date_last_stage_update desc'},
|
|
'date_deadline': {'label': _('Deadline'), 'order': 'date_deadline asc'},
|
|
}
|
|
|
|
def _task_get_searchbar_groupby(self):
|
|
values = {
|
|
'none': {'input': 'none', 'label': _('None'), 'order': 1},
|
|
'project': {'input': 'project', 'label': _('Project'), 'order': 2},
|
|
'stage': {'input': 'stage', 'label': _('Stage'), 'order': 3},
|
|
'user': {'input': 'user', 'label': _('Assigned to'), 'order': 6},
|
|
'customer': {'input': 'customer', 'label': _('Customer'), 'order': 7},
|
|
}
|
|
return dict(sorted(values.items(), key=lambda item: item[1]["order"]))
|
|
|
|
def _task_get_groupby_mapping(self):
|
|
return {
|
|
'project': 'project_id',
|
|
'stage': 'stage_id',
|
|
'user': 'user_id',
|
|
'customer': 'partner_id',
|
|
}
|
|
|
|
def _task_get_order(self, order, groupby):
|
|
groupby_mapping = self._task_get_groupby_mapping()
|
|
field_name = groupby_mapping.get(groupby, '')
|
|
if not field_name:
|
|
return order
|
|
return '%s, %s' % (field_name, order)
|
|
|
|
def _task_get_grouped_tasks(self, groupby, tasks):
|
|
if groupby:
|
|
grouped_tasks = [request.env['project.task'].concat(*g) for k, g in groupbyelem(tasks, itemgetter(groupby))]
|
|
else:
|
|
grouped_tasks = [tasks]
|
|
return grouped_tasks
|
|
|
|
def _task_get_searchbar_inputs(self):
|
|
values = {
|
|
'all': {'input': 'all', 'label': _('Search in All'), 'order': 1},
|
|
'content': {'input': 'content', 'label': Markup(_('Search <span class="nolabel"> (in Content)</span>')), 'order': 1},
|
|
'ref': {'input': 'ref', 'label': _('Search in Ref'), 'order': 1},
|
|
'project': {'input': 'project', 'label': _('Search in Project'), 'order': 2},
|
|
'stage': {'input': 'stage', 'label': _('Search in Stages'), 'order': 3},
|
|
'user': {'input': 'user', 'label': _('Search in Assigned to'), 'order': 7},
|
|
'message': {'input': 'message', 'label': _('Search in Messages'), 'order': 8},
|
|
}
|
|
return dict(sorted(values.items(), key=lambda item: item[1]["order"]))
|
|
|
|
def _task_get_search_domain(self, search_in, search):
|
|
search_domain = []
|
|
if search_in in ('content', 'all'):
|
|
search_domain.append([('name', 'ilike', search)])
|
|
search_domain.append([('description', 'ilike', search)])
|
|
if search_in in ('customer', 'all'):
|
|
search_domain.append([('partner_id', 'ilike', search)])
|
|
if search_in in ('message', 'all'):
|
|
search_domain.append([('message_ids.body', 'ilike', search)])
|
|
if search_in in ('stage', 'all'):
|
|
search_domain.append([('stage_id', 'ilike', search)])
|
|
if search_in in ('project', 'all'):
|
|
search_domain.append([('project_id', 'ilike', search)])
|
|
if search_in in ('ref', 'all'):
|
|
search_domain.append([('id', 'ilike', search)])
|
|
if search_in in ('user', 'all'):
|
|
user_ids = request.env['res.users'].sudo().search([('name', 'ilike', search)])
|
|
search_domain.append([('user_id', 'in', user_ids.ids)])
|
|
return OR(search_domain)
|
|
|
|
@http.route(['/my/tasks', '/my/tasks/page/<int:page>'], type='http', auth="user", website=True)
|
|
def portal_my_tasks(self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, search=None, search_in='content', groupby=None, **kw):
|
|
values = self._prepare_portal_layout_values()
|
|
searchbar_sortings = self._task_get_searchbar_sortings()
|
|
|
|
searchbar_filters = {
|
|
'all': {'label': _('All'), 'domain': []},
|
|
}
|
|
|
|
searchbar_inputs = self._task_get_searchbar_inputs()
|
|
searchbar_groupby = self._task_get_searchbar_groupby()
|
|
|
|
# extends filterby criteria with project the customer has access to
|
|
projects = request.env['project.project'].search([])
|
|
for project in projects:
|
|
searchbar_filters.update({
|
|
str(project.id): {'label': project.name, 'domain': [('project_id', '=', project.id)]}
|
|
})
|
|
|
|
# extends filterby criteria with project (criteria name is the project id)
|
|
# Note: portal users can't view projects they don't follow
|
|
project_groups = request.env['project.task'].read_group([('project_id', 'not in', projects.ids)],
|
|
['project_id'], ['project_id'])
|
|
for group in project_groups:
|
|
proj_id = group['project_id'][0] if group['project_id'] else False
|
|
proj_name = group['project_id'][1] if group['project_id'] else _('Others')
|
|
searchbar_filters.update({
|
|
str(proj_id): {'label': proj_name, 'domain': [('project_id', '=', proj_id)]}
|
|
})
|
|
|
|
# default sort by value
|
|
if not sortby:
|
|
sortby = 'date'
|
|
order = searchbar_sortings[sortby]['order']
|
|
|
|
# default filter by value
|
|
if not filterby:
|
|
filterby = 'all'
|
|
domain = searchbar_filters.get(filterby, searchbar_filters.get('all'))['domain']
|
|
|
|
# default group by value
|
|
if not groupby:
|
|
groupby = 'project'
|
|
|
|
if date_begin and date_end:
|
|
domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)]
|
|
|
|
# search
|
|
if search and search_in:
|
|
domain += self._task_get_search_domain(search_in, search)
|
|
|
|
# task count
|
|
task_count = request.env['project.task'].search_count(domain)
|
|
# pager
|
|
pager = portal_pager(
|
|
url="/my/tasks",
|
|
url_args={'date_begin': date_begin, 'date_end': date_end, 'sortby': sortby, 'filterby': filterby, 'groupby': groupby, 'search_in': search_in, 'search': search},
|
|
total=task_count,
|
|
page=page,
|
|
step=self._items_per_page
|
|
)
|
|
# content according to pager and archive selected
|
|
order = self._task_get_order(order, groupby)
|
|
|
|
tasks = request.env['project.task'].search(domain, order=order, limit=self._items_per_page, offset=pager['offset'])
|
|
request.session['my_tasks_history'] = tasks.ids[:100]
|
|
|
|
groupby_mapping = self._task_get_groupby_mapping()
|
|
grouped_tasks = self._task_get_grouped_tasks(groupby_mapping.get(groupby), tasks)
|
|
|
|
values.update({
|
|
'date': date_begin,
|
|
'date_end': date_end,
|
|
'grouped_tasks': grouped_tasks,
|
|
'page_name': 'task',
|
|
'default_url': '/my/tasks',
|
|
'pager': pager,
|
|
'searchbar_sortings': searchbar_sortings,
|
|
'searchbar_groupby': searchbar_groupby,
|
|
'searchbar_inputs': searchbar_inputs,
|
|
'search_in': search_in,
|
|
'search': search,
|
|
'sortby': sortby,
|
|
'groupby': groupby,
|
|
'searchbar_filters': OrderedDict(sorted(searchbar_filters.items())),
|
|
'filterby': filterby,
|
|
})
|
|
return request.render("project.portal_my_tasks", values)
|
|
|
|
@http.route(['/my/task/<int:task_id>'], type='http', auth="public", website=True)
|
|
def portal_my_task(self, task_id, access_token=None, **kw):
|
|
try:
|
|
task_sudo = self._document_check_access('project.task', task_id, access_token)
|
|
except (AccessError, MissingError):
|
|
return request.redirect('/my')
|
|
|
|
# ensure attachment are accessible with access token inside template
|
|
for attachment in task_sudo.attachment_ids:
|
|
attachment.generate_access_token()
|
|
values = self._task_get_page_view_values(task_sudo, access_token, **kw)
|
|
return request.render("project.portal_my_task", values)
|