Skip to content
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

[11.0][mail_activity_board] Add new module that insert activities board in boards. #283

Merged
merged 23 commits into from
Nov 2, 2018
Merged

[11.0][mail_activity_board] Add new module that insert activities board in boards. #283

Changes from 3 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d56c2f0
[ADD] Module that insert activities board.
Jun 12, 2018
4b929c4
[FIX] Author error in __manifest__ file and style changes.
Jun 13, 2018
7ed0a4c
[FIX] Fix replace in view, rename files and style changes.
Jun 13, 2018
919f33e
[FIX] Enumerated list ends without a blank line; unexpected unindent.
Jun 14, 2018
cc486cb
[FIX] Name fail.
Jun 14, 2018
4caf09e
[FIX] Bug in view.
Jun 14, 2018
ad7b784
[FIX] Add button Activities in mail.thread and readme folder. Others…
Jul 8, 2018
f870bad
[FIX] Type 'tree' not found in registry: problem solved.
Jul 9, 2018
ce43235
[FIX] Dependence change: 'mail' for 'calendar'.
Jul 9, 2018
82dd15e
[FIX] Eliminated unnecessary imports.
Jul 9, 2018
470b3dc
[FIX] Bugs about js and if/else.
Jul 13, 2018
4456f9e
[FIX] Improvements following guide lines and eliminating unnecessary …
Jul 16, 2018
e93ca79
[ADD] Added counter in the 'Activities List' button.
Jul 16, 2018
676a3ed
[FIX] Bugs in javascript with 'Activities' button.
Jul 17, 2018
0146f61
[ADD] Tests folder.
dajuayen Sep 8, 2018
926cc1f
[FIX] Deleted references to modules not installed.
dajuayen Sep 9, 2018
d642084
[FIX] Formatting javascript.
dajuayen Sep 9, 2018
21b8b8a
[FIX] Bug: added a soft line before a class.
dajuayen Sep 9, 2018
28c6295
[FIX] Bug: https://github.com/OCA/social/pull/283#discussion_r204302325
dajuayen Sep 9, 2018
0bdcc94
[FIX] Escaping 'lt' in xml file. Bug: https://github.com/OCA/social/p…
dajuayen Sep 10, 2018
bbb99e7
[FIX] The meeting attendees are shown in kanban mode on the meeting b…
dajuayen Sep 16, 2018
3ddadf7
[FIX] Hide in form view of the activity board the assistant field if …
dajuayen Sep 16, 2018
97297af
[FIX] Change to default kanban view for partners.
dajuayen Sep 17, 2018
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
52 changes: 49 additions & 3 deletions mail_activity_board/views/mail_activity_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,56 @@
attrs="{'invisible': ['|',('duration', '=', False),
('calendar_event_id','=', False)]}"/>
<field name="user_id" options="{'no_open': True}"/>
<field name="calendar_event_id_partner_ids" widget="many2many_tags"
attrs="{'invisible': [('calendar_event_id','=', False)]}"/>

</group>
</group>
<group attrs="{'invisible': ['|',('calendar_event_id','=', False),('calendar_event_id_partner_ids','=', False)]}">
<field name="calendar_event_id_partner_ids" mode="kanban">
<kanban quick_create="false" create="true" delete="true">
yajo marked this conversation as resolved.
Show resolved Hide resolved
yajo marked this conversation as resolved.
Show resolved Hide resolved
<field name="id"/>
<field name="name"/>
<field name="image_small"/>
<field name="parent_id"/>
<field name="function"/>
<field name="type"/>
<field name="is_company"/>
<templates>
<t t-name="kanban-box">
<div class="oe_kanban_global_click" style="max-width: 250px">
yajo marked this conversation as resolved.
Show resolved Hide resolved
<a t-if="! read_only_mode" type="delete" class="text-danger fa fa-times"/>
<div class="o_kanban_image">
<t t-if="record.image_small.raw_value">
<img t-att-src="kanban_image('res.partner', 'image_small', record.id.raw_value)" height="40" width="40" class="oe_avatar oe_kanban_avatar_smallbox mb0"/>
yajo marked this conversation as resolved.
Show resolved Hide resolved
</t>
<t t-if="!record.image_small.raw_value">
<t t-if="record.type.raw_value === 'delivery'">
<img t-att-src='_s + "/base/static/src/img/truck.png"' class="o_kanban_image oe_kanban_avatar_smallbox"/>
yajo marked this conversation as resolved.
Show resolved Hide resolved
</t>
<t t-if="record.type.raw_value === 'invoice'">
<img t-att-src='_s + "/base/static/src/img/money.png"' class="o_kanban_image oe_kanban_avatar_smallbox"/>
</t>
<t t-if="record.type.raw_value != 'invoice' &amp;&amp; record.type.raw_value != 'delivery'">
<t t-if="record.is_company.raw_value === true">
<img t-att-src='_s + "/base/static/src/img/company_image.png"'/>
</t>
<t t-if="record.is_company.raw_value === false">
<img t-att-src='_s + "/base/static/src/img/avatar.png"'/>
</t>
</t>
</t>
</div>
<div class="oe_kanban_details">
<div class="o_kanban_record_headings ml8">
<strong class="o_kanban_record_subtitle"><field name="name"/></strong>
</div>
<field name="parent_id"/>
</div>
</div>
</t>
</templates>
</kanban>
</field>
</group>
<group>
<field name="summary" placeholder="e.g. Discuss proposal"/>
<field name="note" placeholder="Log a note..."/>
Expand Down Expand Up @@ -102,7 +148,7 @@
<div class="o_kanban_record_bottom">
<div class="oe_kanban_bottom_left">
<t t-set="act_date" t-value="new Date(record.date_deadline.raw_value)"/>
<t t-if="act_date lt (new Date())">
<t t-if="act_date &lt; (new Date())">
<span t-attf-class="text-danger"><i class="fa fa-clock-o"/></span>
<t t-if="record.activity_category.raw_value!='meeting'">
<span t-attf-class="text-danger">
Expand Down