From b82f608f2cde95b3049083e3a1aab9229e58983c Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 2 Mar 2023 09:34:09 +0000 Subject: [PATCH] [UPD] README.rst --- web_timeline/README.rst | 51 ++++++++++++++----- web_timeline/static/description/index.html | 57 +++++++++++++++++----- 2 files changed, 84 insertions(+), 24 deletions(-) diff --git a/web_timeline/README.rst b/web_timeline/README.rst index 8a3045388..e5aed5fa2 100644 --- a/web_timeline/README.rst +++ b/web_timeline/README.rst @@ -91,25 +91,50 @@ Example: - + colors="white: user_ids == []; #2ecb71: kanban_state == 'done'; #ec7063: kanban_state == 'blocked'" + dependency_arrow="depend_on_ids" + > + + -
-
- Assigned to: - -
+ +
+ + User + + + + + + + +
+ - kanban,tree,form,calendar,gantt,timeline,graph + kanban,tree,form,calendar,timeline,pivot,graph,activity @@ -188,7 +213,6 @@ Contributors * Adrien Peiffer * Leonardo Donelli * Adrien Didenot -* Dennis Sluijk * Thong Nguyen Van * Murtaza Mithaiwala * Ammar Officewala @@ -197,6 +221,9 @@ Contributors * Pedro M. Baeza * Alexandre Díaz * César A. Sánchez +* `Onestein `_: + * Dennis Sluijk + * Anjeel Haria Maintainers ~~~~~~~~~~~ diff --git a/web_timeline/static/description/index.html b/web_timeline/static/description/index.html index 4712b43f9..597a08b73 100644 --- a/web_timeline/static/description/index.html +++ b/web_timeline/static/description/index.html @@ -470,25 +470,50 @@ These are the variables available in template rendering:

<timeline date_start="date_assign" date_stop="date_end" string="Tasks" - default_group_by="user_id" + default_group_by="project_id" event_open_popup="true" - zoomKey="ctrlKey" - colors="#ec7063:user_id == false;#2ecb71:kanban_state=='done';" - dependency_arrow="task_dependency_ids"> - <field name="user_id"/> + colors="white: user_ids == []; #2ecb71: kanban_state == 'done'; #ec7063: kanban_state == 'blocked'" + dependency_arrow="depend_on_ids" + > + <field name="user_ids" /> + <field name="planned_hours" /> <templates> - <div t-name="timeline-item"> - <div t-esc="record.display_name"/> - Assigned to: - <span t-esc="record.user_id[1]"/> - </div> + <t t-name="timeline-item"> + <div class="o_project_timeline_item"> + <t t-foreach="record.user_ids" t-as="user"> + <img + t-if="record.user_ids" + t-attf-src="/web/image/res.users/#{user}/image_128/16x16" + t-att-title="record.user" + width="16" + height="16" + class="mr8" + alt="User" + /> + </t> + <span name="display_name"> + <t t-esc="record.display_name" /> + </span> + <small + name="planned_hours" + class="text-info ml4" + t-if="record.planned_hours" + > + <t + t-esc="field_utils.format.float_time(record.planned_hours)" + /> + </small> + </div> + </t> </templates> </timeline> </field> </record> <record id="project.action_view_task" model="ir.actions.act_window"> - <field name="view_mode">kanban,tree,form,calendar,gantt,timeline,graph</field> + <field + name="view_mode" + >kanban,tree,form,calendar,timeline,pivot,graph,activity</field> </record> </odoo> @@ -561,7 +586,6 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • Adrien Peiffer <adrien.peiffer@acsone.eu>
  • Leonardo Donelli <donelli@webmonks.it>
  • Adrien Didenot <adrien.didenot@horanet.com>
    • -
  • Dennis Sluijk <d.sluijk@onestein.nl>
  • Thong Nguyen Van <thongnv@trobz.com>
  • Murtaza Mithaiwala <mmithaiwala@opensourceintegrators.com>
  • Ammar Officewala <aofficewala@opensourceintegrators.com>
    • @@ -571,6 +595,15 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • César A. Sánchez
    • +
  • +
    Onestein:
    +
    +
    +
    +