pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] hr_holidays: Misc layout fixes + leaves_stat widget

Browse Source
This commit is contained in:
Yannick Tivisse
2019-08-30 11:03:33 +00:00
parent 81d0f39480
commit cf9eb7e02d
3 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/static/src/js/leave_stats_widget.js
+1
View File
@@ -112,6 +112,7 @@ odoo.define('hr_holidays.LeaveStatsWidget', function (require) {
return _.extend(leave, {
date_from: moment(leave.date_from).format(dateFormat),
date_to: moment(leave.date_to).format(dateFormat),
number_of_days: moment(leave.date_to).diff(moment(leave.date_from), 'days'),
});
});
});
addons/hr_holidays/static/src/xml/leave_stats_templates.xml
+11 -10
View File
@@ -6,7 +6,7 @@
<thead>
<tr>
<td colspan="2">
<div class="o_horizontal_separator">Time Off taken by <t t-esc="widget.employee.data.display_name"/> in <t t-esc="widget.date.format('YYYY')"/></div>
<div class="o_horizontal_separator"><t t-esc="widget.employee.data.display_name"/> in <t t-esc="widget.date.format('YYYY')"/></div>
</td>
</tr>
</thead>
@@ -19,7 +19,7 @@
<t t-foreach="widget.leavesPerType" t-as="leave_type">
<tr>
<td><t t-esc="leave_type.holiday_status_id[1]"/></td>
<td class="w-50"><t t-esc="leave_type.number_of_days"/></td>
<td class="w-50"><t t-esc="leave_type.number_of_days"/> day(s)</td>
</tr>
</t>
</tbody>
@@ -31,8 +31,7 @@
<thead>
<tr>
<td colspan="2">
<div class="o_horizontal_separator">In <t t-esc="widget.date.format('MMMM')"/> for <t t-esc="widget.department.data.display_name"/> Department
</div>
<div class="o_horizontal_separator"><t t-esc="widget.department.data.display_name"/> in <t t-esc="widget.date.format('MMMM')"/></div>
</td>
</tr>
</thead>
@@ -44,7 +43,7 @@
</t>
<t t-foreach="widget.departmentLeaves" t-as="leave">
<tr t-attf-class="{{leave.employee_id[0] === widget.employee.res_id ? 'font-weight-bold' : ''}}">
<td><t t-esc="leave.employee_id[1]"/></td>
<td><t t-esc="leave.employee_id[1]"/>: <t t-esc="leave.number_of_days"/> day(s) </td>
<td class="w-50"><t t-esc="leave.date_from"/> - <t t-esc="leave.date_to"/></td>
</tr>
</t>
@@ -53,11 +52,13 @@
</t>
<div t-name="hr_holidays.leave_stats" class="o_leave_stats">
<t t-if="widget.leavesPerType">
<t t-call="hr_holidays.leave_per_type"/>
</t>
<t t-if="widget.departmentLeaves">
<t t-call="hr_holidays.department_leave"/>
<t t-if="widget.employee">
<t t-if="widget.leavesPerType">
<t t-call="hr_holidays.leave_per_type"/>
</t>
<t t-if="widget.departmentLeaves">
<t t-call="hr_holidays.department_leave"/>
</t>
</t>
</div>
addons/hr_holidays/views/hr_leave_views.xml
+41 -13
View File
@@ -210,12 +210,12 @@
</header>
<sheet>
<field name="leave_type_request_unit" invisible="1"/>
<div class="oe_title" attrs="{'invisible': [('display_name', '=', False)]}">
<div class="oe_title" attrs="{'invisible': [('display_name', '=', False)]}" name="title">
<h1>
<field name="display_name"/>
</h1>
</div>
<div class="row">
<div class="row" name="status_id">
<label class="col-2" for="holiday_status_id"/>
<!-- RLI FIXME: we should avoid redefining the domain in the view when there already is a domain on the model -->
<field name="holiday_status_id" domain="['&amp;', ('virtual_remaining_leaves', '&gt;', 0), '|', ('allocation_type', 'in', ['fixed_allocation', 'no']),'&amp;',('allocation_type', '=', 'fixed'), ('max_leaves', '>', '0')]" context="{'employee_id':employee_id, 'default_date_from':date_from}" options="{'no_create': True, 'no_open': True}" class="col-9" nolabel="1"/>
@@ -314,7 +314,7 @@
<field name="department_id" groups="hr_holidays.group_hr_holidays_user" invisible="1"/>
</group>
</group>
<div class="row">
<div class="row" name="description">
<label class="col-2" for="name"/>
<field name="name" attrs="{'readonly': [('state', 'not in', ('draft', 'confirm'))]}" class="col-9" nolabel="1"/>
</div>
@@ -358,6 +358,19 @@
<field name="mode">primary</field>
<field name="priority">16</field>
<field name="arch" type="xml">
<div name="status_id" position="replace"/>
<div name="title" position="replace">
<field name="display_name" invisible="1"/>
<div class="oe_title" name="title">
<h2>
<field name="holiday_status_id" nolabel="1"/>
</h2>
</div>
</div>
<div name="description" position="replace"/>
<field name="user_id" position="before">
<field name="name"/>
</field>
<xpath expr="//group[@name='col_right']" position="replace">
<group>
<field name="holiday_type" string="Mode"
@@ -381,7 +394,7 @@
<field name="payslip_status" groups="hr_holidays.group_hr_holidays_user" widget="toggle_button"/>
</group>
<div groups="hr_holidays.group_hr_holidays_manager">
<separator string="Comment by Manager"/>
<separator string="Manager's Comment"/>
<field name="report_note" placeholder="e.g. Report to the next month..."/>
</div>
</xpath>
@@ -405,19 +418,34 @@
<field name="mode">primary</field>
<field name="priority">5</field>
<field name="arch" type="xml">
<xpath expr="//field[@name='holiday_status_id']" position="before">
<field name="employee_id"/>
</xpath>
<xpath expr="//group[@name='col_right']" position="replace">
<field name="department_id" invisible="1"/>
<group>
<widget name="hr_leave_stats"/>
</group>
<div name="status_id" position="replace"/>
<div name="title" position="replace">
<field name="display_name" invisible="1"/>
<div class="oe_title" name="title">
<h1>
<field name="employee_id" nolabel="1"/>
</h1>
<h2>
<field name="holiday_status_id" nolabel="1"/>
</h2>
</div>
</div>
<div name="description" position="replace"/>
<field name="user_id" position="before">
<field name="name"/>
</field>
<xpath expr="//sheet" position="inside">
<div groups="hr_holidays.group_hr_holidays_manager">
<separator string="Comment by Manager"/>
<separator string="Manager's Comment"/>
<field name="report_note" placeholder="e.g. Report to the next month..."/>
</div>
</xpath>
<xpath expr="//group[@name='col_right']" position="replace">
<group class="mt-0">
<widget name="hr_leave_stats"/>
</group>
<field name="department_id" invisible="1"/>
</xpath>
</field>
</record>