diff options
| author | Kevin Baptiste <kba@odoo.com> | 2019-12-03 08:48:46 +0000 |
|---|---|---|
| committer | Kevin Baptiste <kba@odoo.com> | 2019-12-09 07:45:13 +0000 |
| commit | b7856d6ea70a85463eea2e99ec4d8e23c227edbd (patch) | |
| tree | 736d46aeed1667d5af8bd50e6a59c23e0b37d4ec /addons | |
| parent | a60b90c530e3efee1a4435c66bea39c5368b2693 (diff) | |
[IMP] project: display remaining hours on tasks
The remaining hours on a task are now displayed unless there are no
planned hours defined.
- Between 0 and 79%: green border
- Between 80 and 100%: yellow border
- Above 100%: red border
closes odoo/odoo#41222
Taskid: 2150121
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/hr_timesheet/views/project_views.xml | 8 | ||||
| -rw-r--r-- | addons/project/static/src/css/project.css | 14 |
2 files changed, 20 insertions, 2 deletions
diff --git a/addons/hr_timesheet/views/project_views.xml b/addons/hr_timesheet/views/project_views.xml index 6608bfa4165..f5ade504c73 100644 --- a/addons/hr_timesheet/views/project_views.xml +++ b/addons/hr_timesheet/views/project_views.xml @@ -233,10 +233,14 @@ <templates position="before"> <field name="progress" /> <field name="remaining_hours" /> + <field name="planned_hours" /> </templates> <div class="oe_kanban_bottom_left" position="inside"> - <t t-if="record.progress.raw_value > 80 and record.progress.raw_value < 100"> - <div t-att-class="'oe_kanban_align badge badge-' + (record.progress.raw_value >= 99 ? 'danger': 'warning')" title="Remaining hours"> + <t t-if="record.planned_hours.raw_value > 0"> + <t t-set="badge" t-value="" t-if="record.progress.raw_value < 80"/> + <t t-set="badge" t-value="'badge-warning'" t-if="record.progress.raw_value >= 80 and record.progress.raw_value <= 100"/> + <t t-set="badge" t-value="'badge-danger'" t-if="record.remaining_hours.raw_value < 0"/> + <div t-attf-class="oe_kanban_align badge {{ badge }}" title="Remaining hours"> <field name="remaining_hours" widget="float_time" /> </div> </t> diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index e3c9656063c..f1599a7b21d 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -51,3 +51,17 @@ max-width: 688px; margin-right: auto; } + +.o_kanban_project_tasks .badge { + background: inherit; + color: inherit; + border: 1px solid var(--success); +} + +.o_kanban_project_tasks .badge-warning { + border-color: var(--warning); +} + +.o_kanban_project_tasks .badge-danger { + border-color: var(--danger); +} |