Skip to content

Commit 0b82d88

Browse files
[IMP] hr_timesheet_time_control_begin_end: show begin/end in portal
- add begin/end hour fields to portal table - adjusted groupby colspan logic
1 parent 10ad7f5 commit 0b82d88

5 files changed

Lines changed: 81 additions & 2 deletions

File tree

hr_timesheet_time_control_begin_end/README.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,14 @@ Authors
9797

9898
* glueckkanja AG
9999

100+
Contributors
101+
------------
102+
103+
- `NICO SOLUTIONS - ENGINEERING &
104+
IT <https://www.nico-solutions.de>`__:
105+
106+
- Nils Coenen
107+
100108
Maintainers
101109
-----------
102110

hr_timesheet_time_control_begin_end/__manifest__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"data": [
1414
"views/account_analytic_line_view.xml",
1515
"views/project_task_view.xml",
16+
"views/hr_timesheet_portal_templates.xml",
1617
],
1718
"license": "AGPL-3",
1819
"installable": True,
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- [NICO SOLUTIONS - ENGINEERING & IT](https://www.nico-solutions.de):
2+
> - Nils Coenen

hr_timesheet_time_control_begin_end/static/description/index.html

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,8 @@ <h1>HR Timesheet Time Control begin/end</h1>
390390
<li><a class="reference internal" href="#bug-tracker" id="toc-entry-5">Bug Tracker</a></li>
391391
<li><a class="reference internal" href="#credits" id="toc-entry-6">Credits</a><ul>
392392
<li><a class="reference internal" href="#authors" id="toc-entry-7">Authors</a></li>
393-
<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
393+
<li><a class="reference internal" href="#contributors" id="toc-entry-8">Contributors</a></li>
394+
<li><a class="reference internal" href="#maintainers" id="toc-entry-9">Maintainers</a></li>
394395
</ul>
395396
</li>
396397
</ul>
@@ -438,8 +439,21 @@ <h3><a class="toc-backref" href="#toc-entry-7">Authors</a></h3>
438439
<li>glueckkanja AG</li>
439440
</ul>
440441
</div>
442+
<div class="section" id="contributors">
443+
<h3><a class="toc-backref" href="#toc-entry-8">Contributors</a></h3>
444+
<ul>
445+
<li><p class="first"><a class="reference external" href="https://www.nico-solutions.de">NICO SOLUTIONS - ENGINEERING &amp;
446+
IT</a>:</p>
447+
<blockquote>
448+
<ul class="simple">
449+
<li>Nils Coenen</li>
450+
</ul>
451+
</blockquote>
452+
</li>
453+
</ul>
454+
</div>
441455
<div class="section" id="maintainers">
442-
<h3><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h3>
456+
<h3><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h3>
443457
<p>This module is maintained by the OCA.</p>
444458
<a class="reference external image-reference" href="https://odoo-community.org">
445459
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<odoo>
3+
<template
4+
id="portal_my_timesheets_inherit_begin_end"
5+
inherit_id="hr_timesheet.portal_my_timesheets"
6+
>
7+
<xpath expr="//thead/tr/th[5]" position="after">
8+
<th>Begin Hour</th>
9+
<th>End Hour</th>
10+
</xpath>
11+
<xpath expr="//tr[contains(@class,'table-light')]//th" position="attributes">
12+
<attribute name="colspan">7</attribute>
13+
</xpath>
14+
15+
<xpath
16+
expr="//tr[contains(@class,'table-light')]/th[last()]"
17+
position="attributes"
18+
>
19+
<attribute name="colspan">2</attribute>
20+
</xpath>
21+
22+
<xpath expr="//tbody//tr/td[5]" position="after">
23+
<td>
24+
<span
25+
t-esc="timesheet.time_begin"
26+
t-options='{"widget": "float_time"}'
27+
/>
28+
</td>
29+
<td>
30+
<span t-esc="timesheet.time_end" t-options='{"widget": "float_time"}' />
31+
</td>
32+
</xpath>
33+
</template>
34+
<template
35+
id="portal_timesheet_table_inherit_begin_end"
36+
inherit_id="hr_timesheet.portal_timesheet_table"
37+
>
38+
<xpath expr="//thead/tr/th[3]" position="after">
39+
<th>Begin Hour</th>
40+
<th>End Hour</th>
41+
</xpath>
42+
<xpath expr="//table/tr/td[3]" position="after">
43+
<td>
44+
<span
45+
t-esc="timesheet.time_begin"
46+
t-options='{"widget": "float_time"}'
47+
/>
48+
</td>
49+
<td>
50+
<span t-esc="timesheet.time_end" t-options='{"widget": "float_time"}' />
51+
</td>
52+
</xpath>
53+
</template>
54+
</odoo>

0 commit comments

Comments
 (0)