Skip to content

[IMP] hr_timesheet_time_control_begin_end: show begin/end in portal #905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NICO-SOLUTIONS wants to merge 1 commit into
base: 19.0
Choose a base branch
from
Open

[IMP] hr_timesheet_time_control_begin_end: show begin/end in portal #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions hr_timesheet_time_control_begin_end/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,14 @@ Authors

* glueckkanja AG

Contributors
------------

- `NICO SOLUTIONS - ENGINEERING &
IT <https://www.nico-solutions.de>`__:

- Nils Coenen

Maintainers
-----------

Expand Down
1 change: 1 addition & 0 deletions hr_timesheet_time_control_begin_end/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"data": [
"views/account_analytic_line_view.xml",
"views/project_task_view.xml",
"views/hr_timesheet_portal_templates.xml",
],
"license": "AGPL-3",
"installable": True,
Expand Down
2 changes: 2 additions & 0 deletions hr_timesheet_time_control_begin_end/readme/CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- [NICO SOLUTIONS - ENGINEERING & IT](https://www.nico-solutions.de):
> - Nils Coenen
33 changes: 21 additions & 12 deletions hr_timesheet_time_control_begin_end/static/description/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@

/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.

See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -275,7 +274,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: gray; } /* line numbers */
pre.code .ln { color: grey; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -301,7 +300,7 @@
span.pre {
white-space: pre }

span.problematic, pre.problematic {
span.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -363,9 +362,7 @@
<div class="document">


<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
</a>
<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme"><img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" /></a>
<div class="section" id="hr-timesheet-time-control-begin-end">
<h1>HR Timesheet Time Control begin/end</h1>
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Expand All @@ -390,7 +387,8 @@ <h1>HR Timesheet Time Control begin/end</h1>
<li><a class="reference internal" href="#bug-tracker" id="toc-entry-5">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="toc-entry-6">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="toc-entry-7">Authors</a></li>
<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
<li><a class="reference internal" href="#contributors" id="toc-entry-8">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="toc-entry-9">Maintainers</a></li>
</ul>
</li>
</ul>
Expand Down Expand Up @@ -438,12 +436,23 @@ <h3><a class="toc-backref" href="#toc-entry-7">Authors</a></h3>
<li>glueckkanja AG</li>
</ul>
</div>
<div class="section" id="contributors">
<h3><a class="toc-backref" href="#toc-entry-8">Contributors</a></h3>
<ul>
<li><p class="first"><a class="reference external" href="https://www.nico-solutions.de">NICO SOLUTIONS - ENGINEERING &amp;
IT</a>:</p>
<blockquote>
<ul class="simple">
<li>Nils Coenen</li>
</ul>
</blockquote>
</li>
</ul>
</div>
<div class="section" id="maintainers">
<h3><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h3>
<h3><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h3>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
Expand Down
74 changes: 74 additions & 0 deletions hr_timesheet_time_control_begin_end/views/hr_timesheet_portal_templates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<template
id="portal_my_timesheets_inherit_begin_end"
inherit_id="hr_timesheet.portal_my_timesheets"
>
<xpath expr="//thead/tr/th[hasclass('text-end')]" position="before">
<th>Begin Hour</th>
<th>End Hour</th>
</xpath>
<xpath
expr="//tr[hasclass('table-light')]//th[.//span[contains(@t-field,'project_id')]]"
position="attributes"
>
<attribute name="t-att-colspan">7</attribute>
</xpath>
<xpath
expr="//tr[hasclass('table-light')]//th[.//span[contains(@t-field,'task_id')]]"
position="attributes"
>
<attribute name="t-att-colspan">7</attribute>
</xpath>
<xpath
expr="//tr[hasclass('table-light')]//th[.//span[contains(@t-field,'date')]]"
position="attributes"
>
<attribute name="t-att-colspan">7</attribute>
</xpath>
<xpath
expr="//tr[hasclass('table-light')]//th[.//span[contains(@t-field,'employee_id')]]"
position="attributes"
>
<attribute name="t-att-colspan">7</attribute>
</xpath>
<xpath
expr="//tr[hasclass('table-light')]//th[.//span[contains(@t-field,'parent_task_id')]]"
position="attributes"
>
<attribute name="t-att-colspan">8</attribute>
</xpath>
<xpath expr="//tbody//tr/td[hasclass('text-end')]" position="before">
<td>
<span
t-esc="timesheet.time_begin"
t-options='{"widget": "float_time"}'
/>
</td>
<td>
<span t-esc="timesheet.time_end" t-options='{"widget": "float_time"}' />
</td>
</xpath>
</template>

<template
id="portal_timesheet_table_inherit_begin_end"
inherit_id="hr_timesheet.portal_timesheet_table"
>
<xpath expr="//thead/tr/th[hasclass('text-end')]" position="before">
<th>Begin Hour</th>
<th>End Hour</th>
</xpath>
<xpath expr="//table/tr/td[hasclass('text-end')]" position="before">
<td>
<span
t-esc="timesheet.time_begin"
t-options='{"widget": "float_time"}'
/>
</td>
<td>
<span t-esc="timesheet.time_end" t-options='{"widget": "float_time"}' />
</td>
</xpath>
</template>
</odoo>
Loading