Yaltik/social
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] : black, isort, prettier

Browse Source
This commit is contained in:
Atchuthan, Sodexis 2021-01-22 13:19:08 +05:30 committed by augusto-weiss
parent fd6aad43f5
commit ddf0ea4d1e
5 changed files with 187 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mail_activity_board/static/src/js/override_chatter.js
View File

@ -1,14 +1,13 @@
/* Copyright 2018 David Juaneda /* Copyright 2018 David Juaneda
* License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */ * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */
odoo.define('mail.Chatter.activity', function (require) { odoo.define("mail.Chatter.activity", function (require) {
"use strict"; "use strict";
var chatter = require('mail.Chatter'); var chatter = require("mail.Chatter");
chatter.include({ chatter.include({
events: _.extend({}, chatter.prototype.events, { events: _.extend({}, chatter.prototype.events, {
'click .o_chatter_button_list_activity': '_onListActivity', "click .o_chatter_button_list_activity": "_onListActivity",
}), }),
/** /**
@ -19,15 +18,14 @@ odoo.define('mail.Chatter.activity', function (require) {
_onListActivity: function () { _onListActivity: function () {
this._rpc({ this._rpc({
model: this.record.model, model: this.record.model,
method: 'redirect_to_activities', method: "redirect_to_activities",
args: [[]], args: [[]],
kwargs: { kwargs: {
'id':this.record.res_id, id: this.record.res_id,
'model':this.record.model, model: this.record.model,
}, },
context: this.record.getContext(), context: this.record.getContext(),
}).then($.proxy(this, "do_action")); }).then($.proxy(this, "do_action"));
}, },
}); });
}); });

9
mail_activity_board/static/src/xml/inherit_chatter.xml
View File

@ -3,8 +3,13 @@
<t t-extend="mail.chatter.Buttons"> <t t-extend="mail.chatter.Buttons">
<t t-jquery="button.o_chatter_button_schedule_activity" t-operation="after"> <t t-jquery="button.o_chatter_button_schedule_activity" t-operation="after">
<button t-if="scheduleActivityButton" class="btn btn-link o_chatter_button_list_activity" <button
title="See activities list" type="button" disabled="disabled"> t-if="scheduleActivityButton"
class="btn btn-link o_chatter_button_list_activity"
title="See activities list"
type="button"
disabled="disabled"
>
<i class="fa fa-list" /> Activities <i class="fa fa-list" /> Activities
</button> </button>
</t> </t>

149
mail_activity_board/views/mail_activity_view.xml
View File

@ -12,7 +12,12 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Activity Form" create="false" edit="false" delete="false"> <form string="Activity Form" create="false" edit="false" delete="false">
<sheet string="Activity"> <sheet string="Activity">
<button name="open_origin" type="object" class="centre oe_link" nolabel="1"> <button
name="open_origin"
type="object"
class="centre oe_link"
nolabel="1"
>
<h1><field name="res_name" /></h1> <h1><field name="res_name" /></h1>
</button> </button>
<field name="activity_category" invisible="1" /> <field name="activity_category" invisible="1" />
@ -21,24 +26,38 @@
<field name="res_id" invisible="1" /> <field name="res_id" invisible="1" />
<group> <group>
<group> <group>
<field name="activity_type_id" required="1" options="{'no_create': True, 'no_open': True}"/> <field
name="activity_type_id"
required="1"
options="{'no_create': True, 'no_open': True}"
/>
<field name="res_model_id_name" /> <field name="res_model_id_name" />
<field name="calendar_event_id" invisible="1" /> <field name="calendar_event_id" invisible="1" />
<field name="create_date" invisible="1" /> <field name="create_date" invisible="1" />
</group> </group>
<group> <group>
<field name="date_deadline" <field
attrs="{'invisible': [('activity_category', '=', 'meeting')]}"/> name="date_deadline"
<field name="calendar_event_id_start" string="Start meeting" attrs="{'invisible': [('activity_category', '=', 'meeting')]}"
attrs="{'invisible': [('calendar_event_id','=', False)]}"/> />
<field name="duration" widget="float_time" <field
name="calendar_event_id_start"
string="Start meeting"
attrs="{'invisible': [('calendar_event_id','=', False)]}"
/>
<field
name="duration"
widget="float_time"
attrs="{'invisible': ['|',('duration', '=', False), attrs="{'invisible': ['|',('duration', '=', False),
('calendar_event_id','=', False)]}"/> ('calendar_event_id','=', False)]}"
/>
<field name="user_id" options="{'no_open': True}" /> <field name="user_id" options="{'no_open': True}" />
</group> </group>
</group> </group>
<group attrs="{'invisible': ['|',('calendar_event_id','=', False),('calendar_event_id_partner_ids','=', False)]}"> <group
attrs="{'invisible': ['|',('calendar_event_id','=', False),('calendar_event_id_partner_ids','=', False)]}"
>
<field name="calendar_event_id_partner_ids" mode="kanban" /> <field name="calendar_event_id_partner_ids" mode="kanban" />
</group> </group>
<group> <group>
@ -59,9 +78,15 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//tree" position="attributes"> <xpath expr="//tree" position="attributes">
<attribute name="default_order" /> <attribute name="default_order" />
<attribute name="decoration-danger">(date_deadline &lt; current_date)</attribute> <attribute
<attribute name="decoration-warning">(date_deadline == current_date)</attribute> name="decoration-danger"
<attribute name="decoration-success">(date_deadline &gt; current_date)</attribute> >(date_deadline &lt; current_date)</attribute>
<attribute
name="decoration-warning"
>(date_deadline == current_date)</attribute>
<attribute
name="decoration-success"
>(date_deadline &gt; current_date)</attribute>
</xpath> </xpath>
</field> </field>
@ -74,8 +99,15 @@
<field name="model">mail.activity</field> <field name="model">mail.activity</field>
<field name="priority" eval="10" /> <field name="priority" eval="10" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<kanban default_group_by="activity_type_id" class="_kanban_small_column o_opportunity_kanban" create="0" _order="date_deadline" <kanban
group_create="false" group_delete="false" group_edit="false"> default_group_by="activity_type_id"
class="_kanban_small_column o_opportunity_kanban"
create="0"
_order="date_deadline"
group_create="false"
group_delete="false"
group_edit="false"
>
<field name="user_id" /> <field name="user_id" />
<field name="res_id" /> <field name="res_id" />
<field name="res_name" /> <field name="res_name" />
@ -92,46 +124,76 @@
<div class="oe_kanban_content"> <div class="oe_kanban_content">
<div> <div>
<strong class="o_kanban_record_subtitle"> <strong class="o_kanban_record_subtitle">
<span t-attf-class="fa #{record.icon.raw_value}" /> <span
t-attf-class="fa #{record.icon.raw_value}"
/>
<field name="summary" /> <field name="summary" />
</strong> </strong>
</div> </div>
<div> <div>
<strong class="o_kanban_record_title"><field name="res_name"/></strong> <strong class="o_kanban_record_title"><field
name="res_name"
/></strong>
</div> </div>
<div class="o_kanban_record_bottom"> <div class="o_kanban_record_bottom">
<div class="oe_kanban_bottom_left"> <div class="oe_kanban_bottom_left">
<t t-set="act_date" t-value="new Date(record.date_deadline.raw_value)"/> <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> <span t-attf-class="text-danger"><i
<t t-if="record.activity_category.raw_value!='meeting'"> class="fa fa-clock-o"
/></span>
<t
t-if="record.activity_category.raw_value!='meeting'"
>
<span t-attf-class="text-danger"> <span t-attf-class="text-danger">
<field name="date_deadline" t-options='{"widget": "date"}'/> <field
name="date_deadline"
t-options='{"widget": "date"}'
/>
</span> </span>
</t> </t>
<t t-else=""> <t t-else="">
<span t-attf-class="text-danger"> <span t-attf-class="text-danger">
<field name="calendar_event_id_start" t-options='{"widget": "date"}'/> <field
name="calendar_event_id_start"
t-options='{"widget": "date"}'
/>
</span> </span>
</t> </t>
</t> </t>
<t t-else=""> <t t-else="">
<span><i class="fa fa-clock-o" /></span> <span><i class="fa fa-clock-o" /></span>
<t t-if="record.activity_category.raw_value!='meeting'"> <t
t-if="record.activity_category.raw_value!='meeting'"
>
<span> <span>
<field name="date_deadline" t-options='{"widget": "date"}'/> <field
name="date_deadline"
t-options='{"widget": "date"}'
/>
</span> </span>
</t> </t>
<t t-else=""> <t t-else="">
<field name="calendar_event_id_start" t-options='{"widget": "date"}'/> <field
name="calendar_event_id_start"
t-options='{"widget": "date"}'
/>
</t> </t>
</t> </t>
</div> </div>
<div class="oe_kanban_bottom_right"> <div class="oe_kanban_bottom_right">
<img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" <img
t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)"
t-att-title="record.user_id.value" t-att-title="record.user_id.value"
t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/> t-att-alt="record.user_id.value"
width="24"
height="24"
class="oe_kanban_avatar"
/>
</div> </div>
</div> </div>
</div> </div>
@ -157,18 +219,32 @@
</xpath> </xpath>
<xpath expr='//filter[@name="activities_overdue"]' position='before'> <xpath expr='//filter[@name="activities_overdue"]' position='before'>
<filter string="Act. next month" name="activities_month" <filter
string="Act. next month"
name="activities_month"
domain="[('date_deadline', '&lt;', (context_today()+datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]" domain="[('date_deadline', '&lt;', (context_today()+datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]"
help="Show activities scheduled for next month."/> help="Show activities scheduled for next month."
<filter string="Act. next 6 months" name="activities_6_month" />
<filter
string="Act. next 6 months"
name="activities_6_month"
domain="[('date_deadline', '&lt;', (context_today()+datetime.timedelta(days=180)).strftime('%Y-%m-%d'))]" domain="[('date_deadline', '&lt;', (context_today()+datetime.timedelta(days=180)).strftime('%Y-%m-%d'))]"
help="Show activities scheduled for next 6 months."/> help="Show activities scheduled for next 6 months."
/>
<separator /> <separator />
</xpath> </xpath>
<xpath expr='//search/group' position='inside'> <xpath expr='//search/group' position='inside'>
<filter string="User" name='assigned_user' context="{'group_by':'user_id'}"/> <filter
<filter string="Origin" name='origin' context="{'group_by': 'res_model_id'}"/> string="User"
name='assigned_user'
context="{'group_by':'user_id'}"
/>
<filter
string="Origin"
name='origin'
context="{'group_by': 'res_model_id'}"
/>
</xpath> </xpath>
</field> </field>
@ -184,14 +260,16 @@
<field name="view_mode">kanban,form</field> <field name="view_mode">kanban,form</field>
<field name="domain">[]</field> <field name="domain">[]</field>
<field name="context">{}</field> <field name="context">{}</field>
<field name="view_ids" <field
name="view_ids"
eval="[(5, 0, 0), eval="[(5, 0, 0),
(0, 0, {'view_mode': 'kanban', 'view_id': ref('mail_activity_view_kanban')}), (0, 0, {'view_mode': 'kanban', 'view_id': ref('mail_activity_view_kanban')}),
(0, 0, {'view_mode': 'tree', 'view_id': ref('mail_activity_view_tree')}), (0, 0, {'view_mode': 'tree', 'view_id': ref('mail_activity_view_tree')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('mail_activity_view_form_board')}), (0, 0, {'view_mode': 'form', 'view_id': ref('mail_activity_view_form_board')}),
(0, 0, {'view_mode': 'calendar'}), (0, 0, {'view_mode': 'calendar'}),
(0, 0, {'view_mode': 'pivot'}), (0, 0, {'view_mode': 'pivot'}),
(0, 0, {'view_mode': 'graph'})]"/> (0, 0, {'view_mode': 'graph'})]"
/>
<field name="search_view_id" ref="mail_activity_view_search" /> <field name="search_view_id" ref="mail_activity_view_search" />
</record> </record>
@ -204,6 +282,7 @@ Menus
name="Activities" name="Activities"
parent="base.menu_board_root" parent="base.menu_board_root"
action="open_boards_activities" action="open_boards_activities"
sequence="1"/> sequence="1"
/>
</odoo> </odoo>

11
mail_activity_board/views/templates.xml
View File

@ -1,8 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<template id="assets_backend" name="mail_activity_board assets" inherit_id="web.assets_backend"> <template
id="assets_backend"
name="mail_activity_board assets"
inherit_id="web.assets_backend"
>
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<script type="text/javascript" src="/mail_activity_board/static/src/js/override_chatter.js"/> <script
type="text/javascript"
src="/mail_activity_board/static/src/js/override_chatter.js"
/>
</xpath> </xpath>
</template> </template>
</odoo> </odoo>