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

[MERGE] *: Easy date filters

Browse Source 
This commit allow to create easily a range of periods (related to a field
of date or datetime type) to select in the filters menu.

Two new attributes on elements with tag 'filter' are now usable
in combination in a search view arch:

- date: string.

		A valid field name with associated type date or datetime

- default_period: string (optional).

		To choose in the following list:
			- 'today'
			- 'this_week'
			- 'this_month' (default)
			- 'this_quarter'
			- 'this_year'
			- 'yesterday'
			- 'last_week'
			- 'last_month'
			- 'last_quarter'
			- 'last_year'
			- 'last_7_days'
			- 'last_30_days'
			- 'last_365_days'

Example:

<filter string="Creation Date" name="period_generator" date="create_date" default_period="this_quarter"/>

Note: the attribute 'domain' can not be used for such filters.
The generated domains are dynamic and can be saved as such
via the favorites menu.

task-10532
This commit is contained in:
Adrien Dieudonne
2018-07-06 14:22:58 +02:00
parent f9a68d5e77 11b7857af6
commit 3ebff1f472
61 changed files with 1826 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_invoice_report_view.xml
+1 -3
View File
@@ -74,9 +74,7 @@
<filter string="To Invoice" name="toinvoice" domain="[('state','=','draft')]" help = "Draft Invoices"/>
<filter string="Invoiced" name="current" domain="[('state','not in', ('draft','cancel'))]"/>
<separator/>
<filter string="This Month" name="this_month" domain="[('date', '&gt;=', context_today().strftime('%%Y-%%m-01'))]"/>
<filter string="Last Month" name="last_month" domain="['&amp;', ('date', '&gt;=', (context_today() - relativedelta(months=1)).strftime('%%Y-%%m-01')), ('date', '&lt;', context_today().strftime('%%Y-%%m-01'))]"/>
<separator/>
<filter string="Date" name="date_filter" date="date"/>
<filter string="Customer" name="customer" domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"/>
<filter string="Vendor" name="supplier" domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"/>
<separator/>
addons/board/static/src/js/favorite_menu.js
+3 -3
View File
@@ -6,7 +6,7 @@ var Context = require('web.Context');
var core = require('web.core');
var Domain = require('web.Domain');
var FavoriteMenu = require('web.FavoriteMenu');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var _t = core._t;
var QWeb = core.qweb;
@@ -64,7 +64,7 @@ FavoriteMenu.include({
});
context.add({
group_by: pyeval.eval('groupbys', search_data.groupbys || [])
group_by: pyUtils.eval('groupbys', search_data.groupbys || [])
});
// AAB: trigger_up an event that will be intercepted by the controller,
// as soon as the controller is the parent of the control panel
@@ -77,7 +77,7 @@ FavoriteMenu.include({
var currentAction = am.getCurrentAction();
var controller = am.getCurrentController();
context.add(controller.widget.getContext());
var c = pyeval.eval('context', context);
var c = pyUtils.eval('context', context);
for (var k in c) {
if (c.hasOwnProperty(k) && /^search_default_/.test(k)) {
delete c[k];
addons/crm/report/crm_activity_report_views.xml
+1 -2
View File
@@ -36,8 +36,7 @@
<filter string="Won" name="won"
domain="['&amp;', ('stage_id.probability', '=', 100), ('stage_id.on_change', '=', 1)]"/>
<separator/>
<filter string="This Month" name="this_month" domain="[('date', '&gt;=', context_today().strftime('%%Y-%%m-01'))]"/>
<filter string="Last Month" name="last_month" domain="['&amp;', ('date', '&gt;=', (context_today() - relativedelta(months=1)).strftime('%%Y-%%m-01')), ('date', '&lt;', context_today().strftime('%%Y-%%m-01'))]"/>
<filter string="Date" name="filter_date" date="date"/>
<field name="team_id" context="{'invisible_team': False}"/>
<field name="author_id" string="Created By"/>
<group expand="1" string="Group By">
addons/crm/report/crm_opportunity_report_views.xml
+5 -3
View File
@@ -101,8 +101,9 @@
<field name="team_id" context="{'invisible_team': False}"/>
<field name="user_id" string="Salesperson"/>
<separator/>
<filter string="This Month" name="this_month" domain="[('date_closed', '&gt;=', context_today().strftime('%%Y-%%m-01'))]"/>
<filter string="Last Month" name="last_month" domain="['&amp;', ('date_closed', '&gt;=', (context_today() - relativedelta(months=1)).strftime('%%Y-%%m-01')), ('date_closed', '&lt;', context_today().strftime('%%Y-%%m-01'))]"/>
<filter string="Creation Date" name="filter_create_date" date="create_date"/>
<filter string="Expected Closing" name="filter_date_deadline" date="date_deadline"/>
<filter string="Date Closed" name="date_closed_filter" date="date_closed"/>
<separator/>
<filter string="Current" name="current" domain="[('active', '=', True)]"/>
<filter string="Archived" name="archived" domain="[('active', '=', False)]"/>
@@ -127,8 +128,9 @@
<filter string="Stage" name="stage" context="{'group_by':'stage_id'}"/>
<separator orientation="vertical" />
<filter string="Creation Date" context="{'group_by':'create_date:month'}" name="month"/>
<filter string="Expected Closing" context="{'group_by':'date_deadline:month'}" name="date_deadline"/>
<filter string="Conversion Date" context="{'group_by':'date_conversion:month'}" name="conversion_date" help="Conversion Date from Lead to Opportunity"/>
<filter string="Expected Closing" context="{'group_by':'date_deadline:month'}" name="date_deadline"/>
<filter string="Closed Date" context="{'group_by':'date_closed'}" name="date_closed_groupby"/>
<filter string="Lost Reason" name="lostreason" context="{'group_by':'lost_reason'}"/>
</group>
</search>
addons/crm/views/crm_lead_views.xml
+6 -6
View File
@@ -667,15 +667,13 @@
]"/>
<separator/>
<filter string="Creation Date" name="creation_date" date="create_date"/>
<filter string="Expected Closing" name="close_this_month" date="date_deadline"/>
<filter string="Closed Date" name="close_date" date="date_closed"/>
<filter string="Overdue Opportunities" name="overdue_opp"
domain="[('date_deadline', '&lt;', context_today().strftime('%Y-%m-%d')), ('date_closed', '=', False)]"
help="Opportunities with a date of Expected Closing which is in the past"/>
<filter string="To Close This Month" name="close_this_month" domain="[
'&amp;',
('date_deadline', '&gt;=', (context_today() + relativedelta(day=1)).strftime('%Y-%m-%d')),
('date_deadline', '&lt;=', (context_today() + relativedelta(months=1, day=1, days=-1)).strftime('%Y-%m-%d')),
]"/>
<separator/>
<filter string="Lost" name="lost" domain="['&amp;', ('active', '=', False), ('probability', '=', 0)]"/>
<filter string="Won" name="won" domain="['&amp;', ('active', '=', True), ('stage_id.probability', '=', 100)]"/>
@@ -691,6 +689,7 @@
<separator orientation="vertical" />
<filter string="Creation Date" context="{'group_by':'create_date:month'}" name="month"/>
<filter string="Expected Closing Date" name="date_deadline" context="{'group_by':'date_deadline'}"/>
<filter string="Closed Date" name="close_date_groupby" context="{'group_by':'date_closed'}"/>
<filter string="Lost Reason" name="lostreason" context="{'group_by':'lost_reason'}"/>
</group>
</search>
@@ -886,6 +885,7 @@ for rec in records:
'default_type': 'opportunity',
'default_user_id': uid,
'search_default_assigned_to_me': 1,
'search_default_creation_date': 1,
}</field>
<field name="view_ids"
eval="[(5, 0, 0),
@@ -925,7 +925,7 @@ for rec in records:
<field name="context">{
'default_type': 'opportunity',
'default_user_id': uid,
'search_default_activities_my': 1
'search_default_activities_my': 1,
}
</field>
<field name="help" type="html">
addons/google_spreadsheet/static/src/js/search.js
+2 -2
View File
@@ -6,7 +6,7 @@ var core = require('web.core');
var data = require('web.data');
var Domain = require('web.Domain');
var FavoriteMenu = require('web.FavoriteMenu');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var QWeb = core.qweb;
@@ -30,7 +30,7 @@ FavoriteMenu.include({
list_view = _.findWhere(controller.widget.actionViews, {type: 'list'}),
list_view_id = list_view ? list_view.viewID : false,
domain = [],
groupbys = pyeval.eval('groupbys', sv_data.groupbys).join(" "),
groupbys = pyUtils.eval('groupbys', sv_data.groupbys).join(" "),
ds = new data.DataSet(this, 'google.drive.config');
_.each(sv_data.domains, function (d) {
addons/hr_attendance/views/hr_attendance_view.xml
+1 -3
View File
@@ -68,9 +68,7 @@
<search string="Hr Attendance Search">
<field name="employee_id"/>
<field name="department_id"/>
<filter name="today" string="Today" domain="[('check_in', '&gt;=', datetime.datetime.now().replace(hour=0, minute=0, second=0)),('check_in', '&lt;=', datetime.datetime.now().replace(hour=23, minute=59, second=59))]" />
<filter string="Current Month" name="currentmonth" domain="[('check_in', '&gt;=', datetime.datetime.now().strftime('%Y-%m-01'))]" />
<separator/>
<filter name="check_in_filter" string="Check In Date" date="check_in"/>
<filter string="No Check Out" name="nocheckout" domain="[('check_out', '=', False)]" />
<separator/>
<filter string="My Attendances" name="myattendances" domain="[('employee_id.user_id.id', '=', uid)]" />
addons/hr_recruitment/views/hr_recruitment_views.xml
+1 -1
View File
@@ -930,7 +930,7 @@
<field name="job_id"/>
<field name="department_id"/>
<field name="user_id"/>
<filter string="This Year" name="year" domain="[('create_date','&lt;=', time.strftime('%%Y-12-31')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"/>
<filter string="Creation Date" name="year" date="create_date" default_period="this_year"/>
<separator/>
<filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
<separator/>
addons/hr_timesheet/views/hr_timesheet_views.xml
+1 -12
View File
@@ -139,18 +139,7 @@
<field name="name"/>
<filter name="mine" string="My Timesheets" domain="[('user_id', '=', uid)]"/>
<separator/>
<filter name="week" string="This Week"
domain="[
'&amp;',
('date', '>=', (context_today() + relativedelta(weeks=-1,days=1,weekday=0)).strftime('%Y-%m-%d')),
('date', '&lt;=', (context_today() + relativedelta(weekday=6)).strftime('%Y-%m-%d')),
]"/>
<filter name="month" string="This Month"
domain="[
'&amp;',
('date', '>=', (context_today() + relativedelta(day=1)).strftime('%Y-%m-%d')),
('date', '&lt;=', (context_today() + relativedelta(months=1, day=1, days=-1)).strftime('%Y-%m-%d')),
]"/>
<filter name="month" string="Date" date="date"/>
<group expand="0" string="Group By">
<filter string="Employee" name="groupby_employee" domain="[]" context="{'group_by':'employee_id'}"/>
<filter string="Project" name="groupby_project" domain="[]" context="{'group_by':'project_id'}"/>
addons/hr_timesheet_attendance/report/hr_timesheet_attendance_report_view.xml
+1 -12
View File
@@ -7,18 +7,7 @@
<field name="arch" type="xml">
<search string="timesheet attendance">
<field name="user_id"/>
<filter name="week" string="This Week"
domain="[
'&amp;',
('date', '>=', (context_today() + relativedelta(weeks=-1,days=1,weekday=0)).strftime('%Y-%m-%d')),
('date', '&lt;=', (context_today() + relativedelta(weekday=6)).strftime('%Y-%m-%d')),
]"/>
<filter name="month" string="This Month"
domain="[
'&amp;',
('date', '>=', (context_today() + relativedelta(day=1)).strftime('%Y-%m-%d')),
('date', '&lt;=', (context_today() + relativedelta(months=1, day=1, days=-1)).strftime('%Y-%m-%d')),
]"/>
<filter name="month" string="Date" date="date"/>
</search>
</field>
</record>
addons/im_livechat/report/im_livechat_report_channel_views.xml
+1 -1
View File
@@ -33,7 +33,7 @@
<filter name="missed_session" string="Missed sessions" domain="[('nbr_speaker','&lt;=', 1)]"/>
<filter name="treated_session" string="Treated sessions" domain="[('nbr_speaker','&gt;', 1)]"/>
<filter name="last_24h" string="Last 24h" domain="[('start_date','&gt;', (context_today() - datetime.timedelta(days=1)).strftime('%%Y-%%m-%%d') )]"/>
<filter name="last_week" string="Last Week" domain="[('start_date','&gt;', (context_today() - datetime.timedelta(weeks=1)).strftime('%%Y-%%m-%%d') )]"/>
<filter name="start_date_filter" string="Start Date" date="start_date" default_period="this_week"/>
<group expand="0" string="Group By...">
<filter name="group_by_session" string="Code" domain="[]" context="{'group_by':'technical_name'}"/>
<filter name="group_by_channel" string="Channel" domain="[]" context="{'group_by':'channel_id'}"/>
addons/im_livechat/report/im_livechat_report_operator_views.xml
+1 -1
View File
@@ -31,7 +31,7 @@
<field name="arch" type="xml">
<search string="Search report">
<filter name="last_24h" string="Last 24h" domain="[('start_date','&gt;', (context_today() - datetime.timedelta(days=1)).strftime('%%Y-%%m-%%d') )]"/>
<filter name="last_week" string="Last Week" domain="[('start_date','&gt;', (context_today() - datetime.timedelta(weeks=1)).strftime('%%Y-%%m-%%d') )]"/>
<filter name="start_date_filter" string="Start Date" date="start_date" default_period="this_week"/>
<group expand="0" string="Group By...">
<filter name="group_by_channel" string="Channel" domain="[]" context="{'group_by':'channel_id'}"/>
<filter name="group_by_operator" string="Operator" domain="[('partner_id','!=', False)]" context="{'group_by':'partner_id'}"/>
addons/im_livechat/views/rating_views.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<filter string="Livechat Channel" name="groupby_livechat_channel" context="{'group_by': 'parent_res_name'}"/>
</xpath>
<xpath expr="/search" position="inside">
<filter string="Last 7 days" name="rating_last_7_days" domain="[('create_date', '>=', (context_today()-datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]"/>
<filter string="Creation Date" name="creation_date_filter" date="create_date" default_period="this_week"/>
</xpath>
</field>
</record>
addons/lunch/views/lunch_views.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<filter name="confirmed" string="Received" domain="[('state','=','confirmed')]"/>
<filter name="cancelled" string="Cancelled" domain="[('state','=','cancelled')]"/>
<separator/>
<filter name="today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
<filter name="date_filter" string="Date" date="date" default_period="today"/>
<field name="user_id"/>
<group expand="0" string="Group By">
<filter name="group_by_order_id" string="By Order" context="{'group_by':'order_id'}"/>
addons/mail/static/src/js/discuss.js
+2 -2
View File
@@ -12,7 +12,7 @@ var core = require('web.core');
var data = require('web.data');
var Dialog = require('web.Dialog');
var dom = require('web.dom');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var SearchView = require('web.SearchView');
var session = require('web.session');
@@ -1320,7 +1320,7 @@ var Discuss = AbstractAction.extend(ControlPanelMixin, {
_onSearch: function (ev) {
ev.stopPropagation();
var session = this.getSession();
var result = pyeval.eval_domains_and_contexts({
var result = pyUtils.eval_domains_and_contexts({
domains: ev.data.domains,
contexts: [session.user_context],
});
addons/mrp/views/mrp_workcenter_views.xml
+1 -3
View File
@@ -540,9 +540,7 @@
<field name="arch" type="xml">
<search string="Operations">
<field name="workcenter_id"/>
<filter string="Today" name="today" domain="[('date_start','&gt;=',time.strftime('%%Y-%%m-%%d'))]"/>
<filter string="This Month" name="thismonth" domain="[('date_start','&gt;=',time.strftime('%%Y-%%m-01'))]"/>
<filter string="This Year" name="thisyear" domain="[('date_start','&gt;=',time.strftime('%%Y-01-01'))]"/>
<filter string="Start Date" name="date_start_filter" date="date_start"/>
<separator/>
<field name="workcenter_id"/>
<field name="loss_id"/>
addons/mrp/views/mrp_workorder_views.xml
+2 -4
View File
@@ -6,16 +6,14 @@
<field name="arch" type="xml">
<search>
<field name="workcenter_id"/>
<filter string="Today" name="today" domain="[('date_start','&gt;=',time.strftime('%%Y-%%m-%%d'))]"/>
<filter string="This Month" name="thismonth" domain="[('date_start','&gt;=',time.strftime('%%Y-%%m-01'))]"/>
<filter string="This Year" name="thisyear" domain="[('date_start','&gt;=',time.strftime('%%Y-01-01'))]"/>
<separator/>
<filter string="Ready" name="ready" domain="[('state','=','ready')]"/>
<filter string="Pending" name="pending" domain="[('state','=','pending')]"/>
<filter string="In Progress" name="progress" domain="[('state','=','progress')]"/>
<filter string="Done" name="done" domain="[('state','=', 'done')]"/>
<filter string="Late" name="late" domain="[('date_planned_start','&lt;=',time.strftime('%%Y-%%m-%%d'))]"/>
<separator/>
<filter string="Start Date" name="date_start_filter" date="date_start"/>
<separator/>
</search>
</field>
</record>
addons/point_of_sale/views/pos_order_report_view.xml
+1 -1
View File
@@ -33,7 +33,7 @@
<filter string="Invoiced" name="invoiced" domain="[('state','=',('invoiced'))]"/>
<filter string="Not Invoiced" name="not_invoiced" domain="[('state','=',('paid'))]"/>
<separator/>
<filter string="Year" name="year" domain="[('date','&lt;=', time.strftime('%%Y-12-31')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="POS orders created during the current year"/>
<filter string="Order Date" name="filter_date" date="date" default_period="this_year"/>
<separator/>
<filter string="My Sales" name="my_sales" help="My Sales" domain="[('user_id','=',uid)]"/>
<field name="config_id"/>
addons/point_of_sale/views/pos_session_view.xml
+1 -1
View File
@@ -190,7 +190,7 @@
<field name="name" />
<filter name="open_sessions" string="Open" domain="[('state', '=', 'opened')]" />
<separator/>
<filter string="Today" name="today" domain="[('start_at', '>=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]" />
<filter string="Start Date" name="start_at_filter" date="start_at" default_period="today"/>
<field name="config_id" />
<field name="user_id" />
<group expand="0" string="Group By">
addons/project/views/rating_views.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<filter string="Project" name="groupby_project" context="{'group_by': 'parent_res_name'}"/>
</xpath>
<xpath expr="/search" position="inside">
<filter string="Last 30 days" name="rating_last_30_days" domain="[('create_date', '>=', (context_today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]"/>
<filter string="Creation Date" name="rating_last_30_days" date="create_date" default_period="last_30_days"/>
<separator/>
</xpath>
</field>
addons/sale/report/report_all_channels_sales_views.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<field name="arch" type="xml">
<search string="Sales by Channel Analysis">
<field name="date_order"/>
<filter string="Current Year Sales" name="current_year" domain="[('date_order','&gt;=',time.strftime('%%Y-01-01'))]"/>
<filter string="Date" name="current_year" date="date_order" default_period="this_year"/>
<group expand="1" string="Group By">
<filter string="Sales Channel" name="team_id" context="{'group_by':'team_id'}"/>
</group>
addons/sale/report/sale_report_views.xml
+1 -1
View File
@@ -30,7 +30,7 @@
<field name="arch" type="xml">
<search string="Sales Analysis">
<field name="date"/>
<filter string="This Year" name="year" invisible="1" domain="[('date','&lt;=', time.strftime('%%Y-12-31')),('date','&gt;=',time.strftime('%%Y-01-01'))]"/>
<filter string="Date" name="year" invisible="1" date="date" default_period="this_year"/>
<filter name="Quotations" string="Quotations" domain="[('state','in', ('draft', 'sent'))]"/>
<filter name="Sales" string="Sales" domain="[('state','not in',('draft', 'cancel', 'sent'))]"/>
<separator/>
addons/sale/views/sale_views.xml
+7
View File
@@ -475,6 +475,9 @@
<filter string="Quotations" name="draft" domain="[('state','=','draft')]"/>
<filter string="Quotations Sent" name="sent" domain="[('state','=','sent')]"/>
<filter string="Sales" name="sales" domain="[('state','in',('sale','done'))]"/>
<separator/>
<filter string="Creation Date" name="filter_create_date" date="create_date"/>
<filter string="Expiration Date" name="filter_validity_date" date="validity_date"/>
</xpath>
</field>
</record>
@@ -489,6 +492,10 @@
<filter string="To Invoice" name="to_invoice" domain="[('invoice_status','=','to invoice')]" />
<filter string="Upselling" name="upselling" domain="[('invoice_status','=','upselling')]" />
</xpath>
<xpath expr="//filter[@name='activities_upcoming_all']" position="after">
<separator/>
<filter string="Confirmation Date" name="confirmation_date_filter" date="confirmation_date"/>
</xpath>
</field>
</record>
addons/sale_timesheet/static/src/js/timesheet_plan.js
+2 -2
View File
@@ -5,7 +5,7 @@ var AbstractAction = require('web.AbstractAction');
var ControlPanelMixin = require('web.ControlPanelMixin');
var core = require('web.core');
var data = require('web.data');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var SearchView = require('web.SearchView');
var _t = core._t;
@@ -297,7 +297,7 @@ var ProjectPlan = AbstractAction.extend(ControlPanelMixin, {
event.stopPropagation();
var session = this.getSession();
// group by are disabled, so we don't take care of them
var result = pyeval.eval_domains_and_contexts({
var result = pyUtils.eval_domains_and_contexts({
domains: event.data.domains,
contexts: [session.user_context].concat(event.data.contexts)
});
addons/stock/views/stock_move_views.xml
+1 -1
View File
@@ -324,7 +324,7 @@
<filter string="To Do" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
<filter string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
<separator/>
<filter string="Today" name="today" domain="[('date','&lt;=', datetime.datetime.combine(context_today(), datetime.time(23,59,59))), ('date','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]" help="Orders processed today or scheduled for today"/>
<filter string="Date" name="today" date="date" help="Scheduled or processing date"/>
<separator/>
<filter string="Incoming" name="incoming" domain="[('location_id.usage', 'not in', ('internal', 'transit')), ('location_dest_id.usage', 'in', ('internal', 'transit'))]"/>
<filter string="Outgoing" name="outgoing" domain="[('location_id.usage', 'in', ('internal', 'transit')), ('location_dest_id.usage', 'not in', ('internal', 'transit'))]"/>
addons/web/static/lib/py.js/lib/py.js
+6
View File
@@ -862,6 +862,12 @@ var py = {};
}
return py.float.fromJSON(this._value + other._value);
},
__mod__: function (other) {
if (!py.PY_isInstance(other, py.float)) {
return py.NotImplemented;
}
return py.float.fromJSON(this._value % other._value);
},
__neg__: function () {
return py.float.fromJSON(-this._value);
},
addons/web/static/src/js/core/pyeval.js → addons/web/static/lib/py.js/lib/py_extras.js
+87 -340
View File
@@ -1,15 +1,63 @@
odoo.define('web.pyeval', function (require) {
(function (py) {
"use strict";
var core = require('web.core');
var utils = require('web.utils');
/**
* This file add extra functionality to the python interpreter exported by py.js
*
* Main extra functionality is about time management, more precisely:
* - date
* - datetime
* - relativedelta
*
* These python modules are exported in the py.extras object, and can be added
* to the evaluation context. For example,
*
* var context = {
* datetime: py.extras.datetime,
* date: py.extras.date,
* time: py.extras.time,
* };
* var result = py.eval(some_python_expression, context);
*/
var _t = core._t;
var py = window.py; // to silence linters
/*
* py.js helpers and setup
*/
/**
* computes (Math.floor(a/b), a%b and passes that to the callback.
*
* returns the callback's result
*/
function divmod (a, b, fn) {
var mod = a%b;
// in python, sign(a % b) === sign(b). Not in JS. If wrong side, add a
// round of b
if (mod > 0 && b < 0 || mod < 0 && b > 0) {
mod += b;
}
return fn(Math.floor(a/b), mod);
}
/**
* Passes the fractional and integer parts of x to the callback, returns
* the callback's result
*/
function modf(x, fn) {
var mod = x%1;
if (mod < 0) {
mod += 1;
}
return fn(mod, Math.floor(x));
}
function assert(bool) {
if (!bool) {
throw new Error("AssertionError");
}
}
var obj = function () {};
obj.prototype = py.object;
var asJS = function (arg) {
@@ -71,13 +119,13 @@ var DI4Y = days_before_year(5);
function ord2ymd(n) {
--n;
var n400, n100, n4, n1, n0;
utils.divmod(n, DI400Y, function (_n400, n) {
divmod(n, DI400Y, function (_n400, n) {
n400 = _n400;
utils.divmod(n, DI100Y, function (_n100, n) {
divmod(n, DI100Y, function (_n100, n) {
n100 = _n100;
utils.divmod(n, DI4Y, function (_n4, n) {
divmod(n, DI4Y, function (_n4, n) {
n4 = _n4;
utils.divmod(n, 365, function (_n1, n) {
divmod(n, 365, function (_n1, n) {
n1 = _n1;
n0 = n;
});
@@ -88,7 +136,7 @@ function ord2ymd(n) {
n = n0;
var year = n400 * 400 + 1 + n100 * 100 + n4 * 4 + n1;
if (n1 == 4 || n100 == 100) {
utils.assert(n0 === 0);
assert(n0 === 0);
return {
year: year - 1,
month: 12,
@@ -97,7 +145,7 @@ function ord2ymd(n) {
}
var leapyear = n1 === 3 && (n4 !== 24 || n100 == 3);
utils.assert(leapyear == is_leap(year));
assert(leapyear == is_leap(year));
var month = (n + 50) >> 5;
var preceding = DAYS_BEFORE_MONTH[month] + ((month > 2 && leapyear) ? 1 : 0);
if (preceding > n) {
@@ -120,25 +168,25 @@ function tmxxx(year, month, day, hour, minute, second, microsecond) {
microsecond = microsecond || 0;
if (microsecond < 0 || microsecond > 999999) {
utils.divmod(microsecond, 1000000, function (carry, ms) {
divmod(microsecond, 1000000, function (carry, ms) {
microsecond = ms;
second += carry;
});
}
if (second < 0 || second > 59) {
utils.divmod(second, 60, function (carry, s) {
divmod(second, 60, function (carry, s) {
second = s;
minute += carry;
});
}
if (minute < 0 || minute > 59) {
utils.divmod(minute, 60, function (carry, m) {
divmod(minute, 60, function (carry, m) {
minute = m;
hour += carry;
});
}
if (hour < 0 || hour > 23) {
utils.divmod(hour, 24, function (carry, h) {
divmod(hour, 24, function (carry, h) {
hour = h;
day += carry;
});
@@ -150,7 +198,7 @@ function tmxxx(year, month, day, hour, minute, second, microsecond) {
// themselves).
// Saying 12 months == 1 year should be non-controversial.
if (month < 1 || month > 12) {
utils.divmod(month-1, 12, function (carry, m) {
divmod(month-1, 12, function (carry, m) {
month = m + 1;
year += carry;
});
@@ -214,10 +262,10 @@ datetime.timedelta = py.type('timedelta', null, {
// Get rid of all fractions, and normalize s and us.
// Take a deep breath <wink>.
var daysecondsfrac = utils.modf(days, function (dayfrac, days) {
var daysecondsfrac = modf(days, function (dayfrac, days) {
d = days;
if (dayfrac) {
return utils.modf(dayfrac * 24 * 3600, function (dsf, dsw) {
return modf(dayfrac * 24 * 3600, function (dsf, dsw) {
s = dsw;
return dsf;
});
@@ -225,19 +273,19 @@ datetime.timedelta = py.type('timedelta', null, {
return 0;
});
var secondsfrac = utils.modf(seconds, function (sf, s) {
var secondsfrac = modf(seconds, function (sf, s) {
seconds = s;
return sf + daysecondsfrac;
});
utils.divmod(seconds, 24*3600, function (days, seconds) {
divmod(seconds, 24*3600, function (days, seconds) {
d += days;
s += seconds;
});
// seconds isn't referenced again before redefinition
microseconds += secondsfrac * 1e6;
utils.divmod(microseconds, 1000000, function (seconds, microseconds) {
utils.divmod(seconds, 24*3600, function (days, seconds) {
divmod(microseconds, 1000000, function (seconds, microseconds) {
divmod(seconds, 24*3600, function (days, seconds) {
d += days;
s += seconds;
m += Math.round(microseconds);
@@ -252,8 +300,8 @@ datetime.timedelta = py.type('timedelta', null, {
},
__str__: function () {
var hh, mm, ss;
utils.divmod(this.seconds, 60, function (m, s) {
utils.divmod(m, 60, function (h, m) {
divmod(this.seconds, 60, function (m, s) {
divmod(m, 60, function (h, m) {
hh = h;
mm = m;
ss = s;
@@ -396,6 +444,14 @@ datetime.datetime = py.type('datetime', null, {
throw new Error('ValueError: No known conversion for ' + m);
}));
},
to_utc: function () {
var d = new Date(this.year, this.month, this.day, this.hour, this.minute, this.second);
var offset = d.getTimezoneOffset();
var kwargs = {minutes: py.float.fromJSON(offset)};
var timedelta = py.PY_call(py.extras.datetime.timedelta,[],kwargs);
var s = tmxxx(this.year, this.month, this.day + timedelta.days, this.hour, this.minute, this.second + timedelta.seconds);
return datetime.datetime.fromJSON(s.year, s.month, s.day, s.hour, s.minute, s.second);
},
now: py.classmethod.fromJSON(function () {
var d = new Date();
return py.PY_call(datetime.datetime, [
@@ -414,6 +470,7 @@ datetime.datetime = py.type('datetime', null, {
d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(),
d.getUTCMilliseconds() * 1000]);
}),
combine: py.classmethod.fromJSON(function () {
var args = py.PY_parseArgs(arguments, 'date time');
return py.PY_call(datetime.datetime, [
@@ -529,17 +586,6 @@ datetime.date = py.type('date', null, {
d.getFullYear(), d.getMonth() + 1, d.getDate()]);
}),
});
/**
* Returns the current local date, which means the date on the client (which can be different
* compared to the date of the server).
*
* @return {datetime.date}
*/
function context_today() {
var d = new Date();
return py.PY_call(
datetime.date, [d.getFullYear(), d.getMonth() + 1, d.getDate()]);
}
datetime.time = py.type('time', null, {
__init__: function () {
@@ -645,7 +691,7 @@ var relativedelta = py.type('relativedelta', null, {
var months = asJS(this.ops.months);
if (Math.abs(months) > 11) {
var s = months > 0 ? 1 : -1;
var r = utils.divmod(months * s, 12);
var r = divmod(months * s, 12);
this.ops.months = py.float.fromJSON(r.mod*s);
this.ops.years = py.float.fromJSON(
asJS(this.ops.years) + r.div*s);
@@ -738,309 +784,10 @@ var relativedelta = py.type('relativedelta', null, {
}
});
// recursively wraps JS objects passed into the context to attributedicts
// which jsonify back to JS objects
function wrap(value) {
if (value === null) { return py.None; }
switch (typeof value) {
case 'undefined': throw new Error("No conversion for undefined");
case 'boolean': return py.bool.fromJSON(value);
case 'number': return py.float.fromJSON(value);
case 'string': return py.str.fromJSON(value);
}
switch(value.constructor) {
case Object: return wrapping_dict.fromJSON(value);
case Array: return wrapping_list.fromJSON(value);
}
throw new Error("ValueError: unable to wrap " + value);
}
var wrapping_dict = py.type('wrapping_dict', null, {
__init__: function () {
this._store = {};
},
__getitem__: function (key) {
var k = key.toJSON();
if (!(k in this._store)) {
throw new Error("KeyError: '" + k + "'");
}
return wrap(this._store[k]);
},
__getattr__: function (key) {
return this.__getitem__(py.str.fromJSON(key));
},
__len__: function () {
return Object.keys(this._store).length;
},
__nonzero__: function () {
return py.PY_size(this) > 0 ? py.True : py.False;
},
get: function () {
var args = py.PY_parseArgs(arguments, ['k', ['d', py.None]]);
if (!(args.k.toJSON() in this._store)) { return args.d; }
return this.__getitem__(args.k);
},
fromJSON: function (d) {
var instance = py.PY_call(wrapping_dict);
instance._store = d;
return instance;
},
toJSON: function () {
return this._store;
},
});
var wrapping_list = py.type('wrapping_list', null, {
__init__: function () {
this._store = [];
},
__getitem__: function (index) {
return wrap(this._store[index.toJSON()]);
},
__len__: function () {
return this._store.length;
},
__nonzero__: function () {
return py.PY_size(this) > 0 ? py.True : py.False;
},
fromJSON: function (ar) {
var instance = py.PY_call(wrapping_list);
instance._store = ar;
return instance;
},
toJSON: function () {
return this._store;
},
});
function wrap_context(context) {
for (var k in context) {
if (!context.hasOwnProperty(k)) { continue; }
var val = context[k];
if (val === null) { continue; }
if (val.constructor === Array) {
context[k] = wrapping_list.fromJSON(val);
} else if (val.constructor === Object
&& !py.PY_isInstance(val, py.object)) {
context[k] = wrapping_dict.fromJSON(val);
}
}
return context;
}
function eval_contexts(contexts, evaluation_context) {
evaluation_context = _.extend(pycontext(), evaluation_context || {});
return _(contexts).reduce(function (result_context, ctx) {
// __eval_context evaluations can lead to some of `contexts`'s
// values being null, skip them as well as empty contexts
if (_.isEmpty(ctx)) { return result_context; }
if (_.isString(ctx)) {
// wrap raw strings in context
ctx = { __ref: 'context', __debug: ctx };
}
var evaluated = ctx;
switch(ctx.__ref) {
case 'context':
evaluation_context.context = evaluation_context;
evaluated = py.eval(ctx.__debug, wrap_context(evaluation_context));
break;
case 'compound_context':
var eval_context = eval_contexts([ctx.__eval_context]);
evaluated = eval_contexts(
ctx.__contexts, _.extend({}, evaluation_context, eval_context));
break;
}
// add newly evaluated context to evaluation context for following
// siblings
_.extend(evaluation_context, evaluated);
return _.extend(result_context, evaluated);
}, {});
}
function eval_domains(domains, evaluation_context) {
evaluation_context = _.extend(pycontext(), evaluation_context || {});
var result_domain = [];
// Normalize only if the first domain is the array ["|"] or ["!"]
var need_normalization = (
domains &&
domains.length > 0 &&
domains[0].length === 1 &&
(domains[0][0] === "|" || domains[0][0] === "!")
);
_(domains).each(function (domain) {
if (_.isString(domain)) {
// wrap raw strings in domain
domain = { __ref: 'domain', __debug: domain };
}
var domain_array_to_combine;
switch(domain.__ref) {
case 'domain':
evaluation_context.context = evaluation_context;
domain_array_to_combine = py.eval(domain.__debug, wrap_context(evaluation_context));
break;
default:
domain_array_to_combine = domain;
}
if (need_normalization) {
domain_array_to_combine = get_normalized_domain(domain_array_to_combine);
}
result_domain.push.apply(result_domain, domain_array_to_combine);
});
return result_domain;
}
/**
* Returns a normalized copy of the given domain array. Normalization is
* is making the implicit "&" at the start of the domain explicit, e.g.
* [A, B, C] would become ["&", "&", A, B, C].
*
* @param {Array} domain_array
* @returns {Array} normalized copy of the given array
*/
function get_normalized_domain(domain_array) {
var expected = 1; // Holds the number of expected domain expressions
_.each(domain_array, function (item) {
if (item === "&" || item === "|") {
expected++;
} else if (item !== "!") {
expected--;
}
});
var new_explicit_ands = _.times(-expected, _.constant("&"));
return new_explicit_ands.concat(domain_array);
}
function eval_groupbys(contexts, evaluation_context) {
evaluation_context = _.extend(pycontext(), evaluation_context || {});
var result_group = [];
_(contexts).each(function (ctx) {
if (_.isString(ctx)) {
// wrap raw strings in context
ctx = { __ref: 'context', __debug: ctx };
}
var group;
var evaluated = ctx;
switch(ctx.__ref) {
case 'context':
evaluation_context.context = evaluation_context;
evaluated = py.eval(ctx.__debug, wrap_context(evaluation_context));
break;
case 'compound_context':
var eval_context = eval_contexts([ctx.__eval_context]);
evaluated = eval_contexts(
ctx.__contexts, _.extend({}, evaluation_context, eval_context));
break;
}
group = evaluated.group_by;
if (!group) { return; }
if (typeof group === 'string') {
result_group.push(group);
} else if (group instanceof Array) {
result_group.push.apply(result_group, group);
} else {
throw new Error('Got invalid groupby {{'
+ JSON.stringify(group) + '}}');
}
_.extend(evaluation_context, evaluated);
});
return result_group;
}
function pycontext() {
return {
datetime: datetime,
context_today: context_today,
time: time,
relativedelta: relativedelta,
current_date: py.PY_call(
time.strftime, [py.str.fromJSON('%Y-%m-%d')]),
};
}
/**
* @param {String} type "domains", "contexts" or "groupbys"
* @param {Array} object domains or contexts to evaluate
* @param {Object} [context] evaluation context
*/
function pyeval(type, object, context) {
context = _.extend(pycontext(), context || {});
//noinspection FallthroughInSwitchStatementJS
switch(type) {
case 'context':
case 'contexts':
if (type === 'context') {
object = [object];
}
return eval_contexts(object, context);
case 'domain':
case 'domains':
if (type === 'domain')
object = [object];
return eval_domains(object, context);
case 'groupbys':
return eval_groupbys(object, context);
}
throw new Error("Unknow evaluation type " + type);
}
function eval_arg(arg) {
if (typeof arg !== 'object' || !arg.__ref) { return arg; }
switch(arg.__ref) {
case 'domain':
return pyeval('domains', [arg]);
case 'context': case 'compound_context':
return pyeval('contexts', [arg]);
default:
throw new Error(_t("Unknown nonliteral type ") + ' ' + arg.__ref);
}
}
/**
* If args or kwargs are unevaluated contexts or domains (compound or not),
* evaluated them in-place.
*
* Potentially mutates both parameters.
*
* @param args
* @param kwargs
*/
function ensure_evaluated(args, kwargs) {
for (var i=0; i<args.length; ++i) {
args[i] = eval_arg(args[i]);
}
for (var k in kwargs) {
if (!kwargs.hasOwnProperty(k)) { continue; }
kwargs[k] = eval_arg(kwargs[k]);
}
}
function eval_domains_and_contexts(source) {
// see Session.eval_context in Python
return {
context: pyeval('contexts', source.contexts || [], source.eval_context),
domain: pyeval('domains', source.domains, source.eval_context),
group_by: pyeval('groupbys', source.group_by_seq || [], source.eval_context),
};
}
function py_eval(expr, context) {
return py.eval(expr, _.extend({}, context || {}, {"true": true, "false": false, "null": null}));
}
return {
context: pycontext,
ensure_evaluated: ensure_evaluated,
eval: pyeval,
eval_domains_and_contexts: eval_domains_and_contexts,
py_eval: py_eval,
py.extras = {
datetime: datetime,
time: time,
relativedelta: relativedelta,
};
});
})(typeof exports === 'undefined' ? py : exports);
addons/web/static/src/js/_deprecated/data.js
+8 -8
View File
@@ -7,7 +7,7 @@ var concurrency = require('web.concurrency');
var mixins = require('web.mixins');
var session = require('web.session');
var translation = require('web.translation');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var _t = translation._t;
@@ -85,9 +85,9 @@ var Query = Class.extend({
return session.rpc('/web/dataset/search_read', {
model: this._model.name,
fields: this._fields || false,
domain: pyeval.eval('domains',
domain: pyUtils.eval('domains',
[this._model.domain(this._filter)]),
context: pyeval.eval('contexts',
context: pyUtils.eval('contexts',
[this._model.context(this._context)]),
offset: this._offset,
limit: this._limit,
@@ -138,7 +138,7 @@ var Query = Class.extend({
* @returns {jQuery.Deferred<Array<openerp.web.QueryGroup>> | null}
*/
group_by: function (grouping) {
var ctx = pyeval.eval(
var ctx = pyUtils.eval(
'context', this._model.context(this._context));
// undefined passed in explicitly (!)
@@ -609,7 +609,7 @@ var DataSet = Class.extend(mixins.PropertiesMixin, {
return session.rpc('/web/dataset/resequence', {
model: this.model,
ids: ids,
context: pyeval.eval(
context: pyUtils.eval(
'context', this.get_context(options.context)),
}).then(function (results) {
return results;
@@ -797,7 +797,7 @@ var Model = Class.extend({
* Call a method (over RPC) on the bound OpenERP model.
*
* @param {String} method name of the method to call
* @param {Array} [args] positional arguments
* @param {Array} [args] positipyEvalonal arguments
* @param {Object} [kwargs] keyword arguments
* @param {Object} [options] additional options for the rpc() method
* @returns {jQuery.Deferred<>} call result
@@ -810,7 +810,7 @@ var Model = Class.extend({
kwargs = args;
args = [];
}
pyeval.ensure_evaluated(args, kwargs);
pyUtils.ensure_evaluated(args, kwargs);
var call_kw = '/web/dataset/call_kw/' + this.name + '/' + method;
return session.rpc(call_kw, {
model: this.name,
@@ -820,7 +820,7 @@ var Model = Class.extend({
}, options);
},
call_button: function (method, args) {
pyeval.ensure_evaluated(args, {});
pyUtils.ensure_evaluated(args, {});
return session.rpc('/web/dataset/call_button', {
model: this.name,
method: method,
addons/web/static/src/js/chrome/action_manager.js
+3 -3
View File
@@ -19,7 +19,7 @@ var core = require('web.core');
var Dialog = require('web.Dialog');
var dom = require('web.dom');
var framework = require('web.framework');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var Widget = require('web.Widget');
var _t = core._t;
@@ -781,9 +781,9 @@ var ActionManager = Widget.extend({
_preprocessAction: function (action, options) {
// ensure that the context and domain are evaluated
var context = new Context(this.userContext, options.additional_context, action.context);
action.context = pyeval.eval('context', context);
action.context = pyUtils.eval('context', context);
if (action.domain) {
action.domain = pyeval.eval('domain', action.domain, action.context);
action.domain = pyUtils.eval('domain', action.domain, action.context);
}
action._originalAction = JSON.stringify(action);
addons/web/static/src/js/chrome/action_manager_act_window.js
+5 -5
View File
@@ -11,7 +11,7 @@ var config = require('web.config');
var Context = require('web.Context');
var core = require('web.core');
var data = require('web.data'); // this will be removed at some point
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var SearchView = require('web.SearchView');
var view_registry = require('web.view_registry');
@@ -522,7 +522,7 @@ ActionManager.include({
var domains = searchData.domains;
var groupbys = searchData.groupbys;
var action_context = action.context || {};
var results = pyeval.eval_domains_and_contexts({
var results = pyUtils.eval_domains_and_contexts({
domains: [action.domain || []].concat(domains || []),
contexts: [action_context].concat(contexts || []),
group_by_seq: groupbys || [],
@@ -703,7 +703,7 @@ ActionManager.include({
var actionData = ev.data.action_data;
var env = ev.data.env;
var context = new Context(env.context, actionData.context || {});
var recordID = env.currentID || null; // pyeval handles null value, not undefined
var recordID = env.currentID || null; // pyUtils handles null value, not undefined
var def;
// determine the action to execute according to the actionData
@@ -733,7 +733,7 @@ ActionManager.include({
});
} else if (actionData.type === 'action') {
// execute a given action, so load it first
def = this._loadAction(actionData.name, _.extend(pyeval.eval('context', context), {
def = this._loadAction(actionData.name, _.extend(pyUtils.eval('context', context), {
active_model: env.model,
active_ids: env.resIDs,
active_id: recordID,
@@ -751,7 +751,7 @@ ActionManager.include({
// code below handles the first case i.e 'effect' attribute on button.
var effect = false;
if (actionData.effect) {
effect = pyeval.py_eval(actionData.effect);
effect = pyUtils.py_eval(actionData.effect);
}
if (action && action.constructor === Object) {
addons/web/static/src/js/chrome/sidebar.js
+2 -2
View File
@@ -3,7 +3,7 @@ odoo.define('web.Sidebar', function (require) {
var Context = require('web.Context');
var core = require('web.core');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var Widget = require('web.Widget');
var QWeb = core.qweb;
@@ -146,7 +146,7 @@ var Sidebar = Widget.extend({
activeIdsContext.active_domain = env.domain;
}
var context = pyeval.eval('context', new Context(env.context, activeIdsContext));
var context = pyUtils.eval('context', new Context(env.context, activeIdsContext));
self._rpc({
route: '/web/action/load',
params: {
addons/web/static/src/js/core/context.js
+2 -2
View File
@@ -2,7 +2,7 @@ odoo.define('web.Context', function (require) {
"use strict";
var Class = require('web.Class');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var Context = Class.extend({
init: function () {
@@ -24,7 +24,7 @@ var Context = Class.extend({
return this;
},
eval: function () {
return pyeval.eval('context', this);
return pyUtils.eval('context', this);
},
/**
* Set the evaluation context to be used when we actually eval.
addons/web/static/src/js/core/domain.js
+82 -2
View File
@@ -2,7 +2,7 @@ odoo.define("web.Domain", function (require) {
"use strict";
var collections = require("web.collections");
var pyeval = require("web.pyeval");
var pyUtils = require("web.py_utils");
/**
* The Domain Class allows to work with a domain as a tree and provides tools
@@ -228,6 +228,86 @@ var Domain = collections.Tree.extend({
.replace(/false/g, "False")
.replace(/true/g, "True");
},
/*
* @param {string} fieldName
* @param {string} period
* @param {string} type ('date' or 'datetime')
* @param {boolean} forTooltip indicates if domain is used to print a tooltip
*/
constructDomain: function (fieldName, period, type, forTooltip) {
var leftBoundaryParams, rightBoundaryParams;
var t = forTooltip || false;
function makeInterval () {
if (type === 'date') {
return "['&'," +
"('" + fieldName + "', '>=', (context_today() + relativedelta(" + leftBoundaryParams + ")).strftime('%Y-%m-%d'))," +
"('" + fieldName + "', '<', (context_today() + relativedelta(" + rightBoundaryParams + ")).strftime('%Y-%m-%d'))"+
"]";
}
else {
return "['&'," +
"('" + fieldName + "', '>=', " +
"(datetime.datetime.combine(context_today() + relativedelta(" + leftBoundaryParams + "), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))," +
"('" + fieldName + "', '<', " +
"(datetime.datetime.combine(context_today() + relativedelta(" + rightBoundaryParams + "), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))"+
"]";
}
}
switch (period) {
case 'today':
leftBoundaryParams = "";
rightBoundaryParams = t ? "" : "days=1";
return makeInterval();
case 'this_week':
leftBoundaryParams = "weeks=-1, days=1, weekday=0";
rightBoundaryParams = t ? "weekday=6" : "days=1, weekday=0";
return makeInterval();
case 'this_month':
leftBoundaryParams = "day=1";
rightBoundaryParams = (t ? "days=-1, " : "") + "day=1, months=1";
return makeInterval();
case 'this_quarter':
leftBoundaryParams = "months= - (context_today().month - 1) % 3, day=1";
rightBoundaryParams = (t ? "days=-1, " : "") + "months= 3 - (context_today().month -1 ) % 3, day=1";
return makeInterval();
case 'this_year':
leftBoundaryParams = "month=1, day=1";
rightBoundaryParams = (t ? "days=-1, " : "") + "month=1, day=1, years=1";
return makeInterval();
case 'yesterday':
leftBoundaryParams = "days=-1";
rightBoundaryParams = (t ? "days=-1" : "");
return makeInterval();
case 'last_week':
leftBoundaryParams = "weeks=-2, days=1, weekday=0";
rightBoundaryParams = t ? "weeks=-1, weekday=6" : "weeks=-1, days=1, weekday=0";
return makeInterval();
case 'last_month':
leftBoundaryParams = "months=-1, day=1";
rightBoundaryParams = (t ? "days=-1 , " : "") + "day=1";
return makeInterval();
case 'last_quarter':
leftBoundaryParams = "months= - 3 - (context_today().month - 1) % 3, day=1";
rightBoundaryParams = (t ? "days=-1 , " : "") + "months= - (context_today().month - 1) % 3, day=1";
return makeInterval();
case 'last_year':
leftBoundaryParams = "month=1, day=1, years=-1";
rightBoundaryParams = (t ? "days=-1 , " : "") + "month=1, day=1";
return makeInterval();
case 'last_7_days':
leftBoundaryParams = "days=-7";
rightBoundaryParams = t ? "days=-1" : "";
return makeInterval();
case 'last_30_days':
leftBoundaryParams = "days=-30";
rightBoundaryParams = t ? "days=-1" : "";
return makeInterval();
case 'last_365_days':
leftBoundaryParams = "days=-365";
rightBoundaryParams = t ? "days=-1" : "";
return makeInterval();
}
},
/**
* Converts a string representation of the Python prefix-array
* representation of a domain to a JS prefix-array representation of this
@@ -240,7 +320,7 @@ var Domain = collections.Tree.extend({
*/
stringToArray: function (domain, evalContext) {
if (!_.isString(domain)) return _.clone(domain);
return pyeval.eval("domain", domain ? domain.replace(/%%/g, '%') : "[]", evalContext);
return pyUtils.eval("domain", domain ? domain.replace(/%%/g, '%') : "[]", evalContext);
},
/**
* Makes implicit "&" operators explicit in the given JS prefix-array
addons/web/static/src/js/core/py_utils.js
+536
View File
@@ -0,0 +1,536 @@
odoo.define('web.py_utils', function (require) {
"use strict";
var core = require('web.core');
var _t = core._t;
var py = window.py; // to silence linters
// recursively wraps JS objects passed into the context to attributedicts
// which jsonify back to JS objects
function wrap(value) {
if (value === null) { return py.None; }
switch (typeof value) {
case 'undefined': throw new Error("No conversion for undefined");
case 'boolean': return py.bool.fromJSON(value);
case 'number': return py.float.fromJSON(value);
case 'string': return py.str.fromJSON(value);
}
switch(value.constructor) {
case Object: return wrapping_dict.fromJSON(value);
case Array: return wrapping_list.fromJSON(value);
}
throw new Error("ValueError: unable to wrap " + value);
}
var wrapping_dict = py.type('wrapping_dict', null, {
__init__: function () {
this._store = {};
},
__getitem__: function (key) {
var k = key.toJSON();
if (!(k in this._store)) {
throw new Error("KeyError: '" + k + "'");
}
return wrap(this._store[k]);
},
__getattr__: function (key) {
return this.__getitem__(py.str.fromJSON(key));
},
__len__: function () {
return Object.keys(this._store).length;
},
__nonzero__: function () {
return py.PY_size(this) > 0 ? py.True : py.False;
},
get: function () {
var args = py.PY_parseArgs(arguments, ['k', ['d', py.None]]);
if (!(args.k.toJSON() in this._store)) { return args.d; }
return this.__getitem__(args.k);
},
fromJSON: function (d) {
var instance = py.PY_call(wrapping_dict);
instance._store = d;
return instance;
},
toJSON: function () {
return this._store;
},
});
var wrapping_list = py.type('wrapping_list', null, {
__init__: function () {
this._store = [];
},
__getitem__: function (index) {
return wrap(this._store[index.toJSON()]);
},
__len__: function () {
return this._store.length;
},
__nonzero__: function () {
return py.PY_size(this) > 0 ? py.True : py.False;
},
fromJSON: function (ar) {
var instance = py.PY_call(wrapping_list);
instance._store = ar;
return instance;
},
toJSON: function () {
return this._store;
},
});
function wrap_context(context) {
for (var k in context) {
if (!context.hasOwnProperty(k)) { continue; }
var val = context[k];
if (val === null) { continue; }
if (val.constructor === Array) {
context[k] = wrapping_list.fromJSON(val);
} else if (val.constructor === Object
&& !py.PY_isInstance(val, py.object)) {
context[k] = wrapping_dict.fromJSON(val);
}
}
return context;
}
function eval_contexts(contexts, evaluation_context) {
evaluation_context = _.extend(pycontext(), evaluation_context || {});
return _(contexts).reduce(function (result_context, ctx) {
// __eval_context evaluations can lead to some of `contexts`'s
// values being null, skip them as well as empty contexts
if (_.isEmpty(ctx)) { return result_context; }
if (_.isString(ctx)) {
// wrap raw strings in context
ctx = { __ref: 'context', __debug: ctx };
}
var evaluated = ctx;
switch(ctx.__ref) {
case 'context':
evaluation_context.context = evaluation_context;
evaluated = py.eval(ctx.__debug, wrap_context(evaluation_context));
break;
case 'compound_context':
var eval_context = eval_contexts([ctx.__eval_context]);
evaluated = eval_contexts(
ctx.__contexts, _.extend({}, evaluation_context, eval_context));
break;
}
// add newly evaluated context to evaluation context for following
// siblings
_.extend(evaluation_context, evaluated);
return _.extend(result_context, evaluated);
}, {});
}
function eval_domains(domains, evaluation_context) {
evaluation_context = _.extend(pycontext(), evaluation_context || {});
var result_domain = [];
// Normalize only if the first domain is the array ["|"] or ["!"]
var need_normalization = (
domains &&
domains.length > 0 &&
domains[0].length === 1 &&
(domains[0][0] === "|" || domains[0][0] === "!")
);
_(domains).each(function (domain) {
if (_.isString(domain)) {
// wrap raw strings in domain
domain = { __ref: 'domain', __debug: domain };
}
var domain_array_to_combine;
switch(domain.__ref) {
case 'domain':
evaluation_context.context = evaluation_context;
domain_array_to_combine = py.eval(domain.__debug, wrap_context(evaluation_context));
break;
default:
domain_array_to_combine = domain;
}
if (need_normalization) {
domain_array_to_combine = get_normalized_domain(domain_array_to_combine);
}
result_domain.push.apply(result_domain, domain_array_to_combine);
});
return result_domain;
}
/**
* Returns a normalized copy of the given domain array. Normalization is
* is making the implicit "&" at the start of the domain explicit, e.g.
* [A, B, C] would become ["&", "&", A, B, C].
*
* @param {Array} domain_array
* @returns {Array} normalized copy of the given array
*/
function get_normalized_domain(domain_array) {
var expected = 1; // Holds the number of expected domain expressions
_.each(domain_array, function (item) {
if (item === "&" || item === "|") {
expected++;
} else if (item !== "!") {
expected--;
}
});
var new_explicit_ands = _.times(-expected, _.constant("&"));
return new_explicit_ands.concat(domain_array);
}
function eval_groupbys(contexts, evaluation_context) {
evaluation_context = _.extend(pycontext(), evaluation_context || {});
var result_group = [];
_(contexts).each(function (ctx) {
if (_.isString(ctx)) {
// wrap raw strings in context
ctx = { __ref: 'context', __debug: ctx };
}
var group;
var evaluated = ctx;
switch(ctx.__ref) {
case 'context':
evaluation_context.context = evaluation_context;
evaluated = py.eval(ctx.__debug, wrap_context(evaluation_context));
break;
case 'compound_context':
var eval_context = eval_contexts([ctx.__eval_context]);
evaluated = eval_contexts(
ctx.__contexts, _.extend({}, evaluation_context, eval_context));
break;
}
group = evaluated.group_by;
if (!group) { return; }
if (typeof group === 'string') {
result_group.push(group);
} else if (group instanceof Array) {
result_group.push.apply(result_group, group);
} else {
throw new Error('Got invalid groupby {{'
+ JSON.stringify(group) + '}}');
}
_.extend(evaluation_context, evaluated);
});
return result_group;
}
/**
* Returns the current local date, which means the date on the client (which can be different
* compared to the date of the server).
*
* @return {datetime.date}
*/
function context_today() {
var d = new Date();
return py.PY_call(
py.extras.datetime.date, [d.getFullYear(), d.getMonth() + 1, d.getDate()]);
}
/**
* Returns a timedelta object which represents the timezone offset between the
* local timezone and the UTC time.
*
* This is very useful to generate datetime strings which are 'timezone'
* dependant. For example, we can now write this to generate the correct
* datetime string representing "this morning in the user timezone":
*
* "datetime.datetime.now().replace(hour=0,minute=0,second=0) + tz_offset()).strftime('%Y-%m-%d %H:%M:%S')"
* @returns {datetime.timedelta}
*/
function tz_offset() {
var offset= new Date().getTimezoneOffset();
var kwargs = {minutes: py.float.fromJSON(offset)};
return py.PY_call(py.extras.datetime.timedelta,[],kwargs);
}
function pycontext() {
return {
datetime: py.extras.datetime,
context_today: context_today,
time: py.extras.time,
relativedelta: py.extras.relativedelta,
current_date: py.PY_call(
py.extras.time.strftime, [py.str.fromJSON('%Y-%m-%d')]),
tz_offset: tz_offset,
};
}
/**
* @param {String} type "domains", "contexts" or "groupbys"
* @param {Array} object domains or contexts to evaluate
* @param {Object} [context] evaluation context
*/
function pyeval(type, object, context) {
context = _.extend(pycontext(), context || {});
//noinspection FallthroughInSwitchStatementJS
switch(type) {
case 'context':
case 'contexts':
if (type === 'context') {
object = [object];
}
return eval_contexts(object, context);
case 'domain':
case 'domains':
if (type === 'domain')
object = [object];
return eval_domains(object, context);
case 'groupbys':
return eval_groupbys(object, context);
}
throw new Error("Unknow evaluation type " + type);
}
function eval_arg(arg) {
if (typeof arg !== 'object' || !arg.__ref) { return arg; }
switch(arg.__ref) {
case 'domain':
return pyeval('domains', [arg]);
case 'context': case 'compound_context':
return pyeval('contexts', [arg]);
default:
throw new Error(_t("Unknown nonliteral type ") + ' ' + arg.__ref);
}
}
/**
* If args or kwargs are unevaluated contexts or domains (compound or not),
* evaluated them in-place.
*
* Potentially mutates both parameters.
*
* @param args
* @param kwargs
*/
function ensure_evaluated(args, kwargs) {
for (var i=0; i<args.length; ++i) {
args[i] = eval_arg(args[i]);
}
for (var k in kwargs) {
if (!kwargs.hasOwnProperty(k)) { continue; }
kwargs[k] = eval_arg(kwargs[k]);
}
}
function eval_domains_and_contexts(source) {
// see Session.eval_context in Python
return {
context: pyeval('contexts', source.contexts || [], source.eval_context),
domain: pyeval('domains', source.domains, source.eval_context),
group_by: pyeval('groupbys', source.group_by_seq || [], source.eval_context),
};
}
function py_eval(expr, context) {
return py.eval(expr, _.extend({}, context || {}, {"true": true, "false": false, "null": null}));
}
/**
* Assemble domains into a single domains using an 'OR' or an 'AND' operator.
*
* Note: - this function does not evaluate anything inside the domain. This is
* actually quite critical because this allows the manipulation of unevaluated
* (dynamic) domains.
* - this function gives a normalized domain as result,
* - applied on a list of length 1, it returns the domain normalized.
*
* @param {string[]} domains list of string representing domains
* @param {"AND" | "OR"} operator used to combine domains (default "AND")
* @returns {string} normalized domain
*/
function assembleDomains(domains, operator) {
var ASTs = domains.map(_getPyJSAST);
if (operator === "OR") {
operator = py.tokenize("'|'")[0];
} else {
operator = py.tokenize("'&'")[0];
}
var result = _getPyJSAST("[]");
var normalizedDomains = ASTs
.filter(function (AST) {
return AST.first.length > 0;
})
.map(_normalizeDomainAST);
if (normalizedDomains.length > 0) {
result.first = normalizedDomains.reduce(function (acc, ast) {
return acc.concat(ast.first);
},
_.times(normalizedDomains.length - 1, _.constant(operator))
);
}
return _formatAST(result);
}
/**
* Normalize a domain via its string representation.
*
* Note: this function does not evaluate anything inside the domain. This is
* actually quite critical because this allows the manipulation of unevaluated
* (dynamic) domains.
*
* @param {string} domain string representing a domain
* @returns {string} normalized domain
*/
function normalizeDomain (domain) {
return _formatAST(_normalizeDomainAST(_getPyJSAST(domain)));
}
//--------------------------------------------------------------------------
// Private
//--------------------------------------------------------------------------
// Binding power for prefix operator is not accessible in the AST generated by
// py.js, so we have to hardcode some values here
var BINDING_POWERS = {
or: 30,
and: 40,
not: 50,
};
/**
* @private
* Convert a python AST (generated by py.js) to a string form, which should
* represent the same AST.
*
* @param {Object} ast a valid AST obtained by py.js, which represent a python
* expression
* @param {integer} [lbp=0] a binding power. This is necessary to be able to
* format sub expressions: the + sub expression in "3 * (a + 2)" should be
* formatted with parenthesis, because its binding power is lower than the
* binding power of *.
* @returns {string}
*/
function _formatAST(ast, lbp) {
lbp = lbp || 0;
switch (ast.id) {
// basic values
case "(number)":
return String(ast.value);
case "(string)":
return "'" + ast.value + "'";
case "(constant)":
return ast.value;
case "(name)":
return ast.value;
case "[":
if (ast.second) {
// read a value in a dictionary: d['a']
return _formatAST(ast.first) + '[' + _formatAST(ast.second) + ']';
} else {
// list: [1, 2]
var values = ast.first.map(_formatAST);
return '[' + values.join(', ') + ']';
}
case "{":
var keyValues = ast.first.map(function (kv) {
return _formatAST(kv[0]) + ': ' + _formatAST(kv[1]);
});
return '{' + keyValues.join(', ') + '}';
// relations
case "=":
return _formatAST(ast.first) + ' ' + ast.id + ' ' + _formatAST(ast.second);
// operators
case "-":
case "+":
case "~":
case "*":
case "**":
case "%":
case "//":
case "and":
case "or":
if (ast.second) {
// infix
var r = _formatAST(ast.first, ast.lbp) + ' ' + ast.id + ' ' + _formatAST(ast.second, ast.lbp);
if (ast.lbp < lbp) {
r = '(' + r + ')';
}
return r;
}
// prefix
// real lbp is not accessible, it is inside a closure
var actualBP = BINDING_POWERS[ast.id] || 130;
return ast.id + _formatAST(ast.first, actualBP);
case ".":
return _formatAST(ast.first, ast.lbp) + '.' + _formatAST(ast.second);
case "not":
return "not " + _formatAST(ast.first);
case "(comparator)":
var operator = ast.operators[0];
return _formatAST(ast.expressions[0]) + ' ' + operator + ' ' + _formatAST(ast.expressions[1]);
// function call
case "(":
if (ast.second) {
// this is a function call: f(a, b)
return _formatAST(ast.first) + '(' + ast.second.map(_formatAST).join(', ') + ')';
} else {
// this is a tuple
return '(' + ast.first.map(_formatAST).join(', ') + ')';
}
}
throw new Error("Unimplemented python construct");
}
/**
* @private
* Get the PyJs AST representing a domain starting from is string representation
*
* @param {string} domain string representing a domain
* @returns {PyJS AST} PyJS AST representation of domain
*/
function _getPyJSAST(domain) {
return py.parse(py.tokenize(domain));
}
/**
* @private
*
* Normalize a domain, at the level of the AST.
*
* Note: this function does not evaluate anything inside the domain. This is
* actually quite critical because this allows the manipulation of unevaluated
* (dynamic) domains.
*
* @param {PyJS AST} domain valid AST representing a domain
* @returns {PyJS AST} normalized domain AST
*/
function _normalizeDomainAST(domain) {
var expected = 1;
for (var i = 0; i < domain.first.length; i++) {
var value = domain.first[i].value;
if (value === '&' || value === '|') {
expected++;
} else if (value !== '!') {
expected--;
}
}
var andOperator = py.tokenize("'&'")[0];
if (expected < 0) {
domain.first.unshift.apply(domain.first, _.times(Math.abs(expected), _.constant(andOperator)));
}
return domain;
}
return {
context: pycontext,
ensure_evaluated: ensure_evaluated,
eval: pyeval,
eval_domains_and_contexts: eval_domains_and_contexts,
py_eval: py_eval,
normalizeDomain: normalizeDomain,
assembleDomains: assembleDomains,
_getPyJSAST: _getPyJSAST,
_formatAST: _formatAST,
_normalizeDomainAST: _normalizeDomainAST,
};
});
addons/web/static/src/js/core/utils.js
-25
View File
@@ -51,20 +51,6 @@ var utils = {
confine: function (val, min, max) {
return Math.max(min, Math.min(max, val));
},
/**
* computes (Math.floor(a/b), a%b and passes that to the callback.
*
* returns the callback's result
*/
divmod: function (a, b, fn) {
var mod = a%b;
// in python, sign(a % b) === sign(b). Not in JS. If wrong side, add a
// round of b
if (mod > 0 && b < 0 || mod < 0 && b > 0) {
mod += b;
}
return fn(Math.floor(a/b), mod);
},
/**
* @param {number} value
* @param {integer} decimals
@@ -289,17 +275,6 @@ var utils = {
str = "" + str;
return new Array(size - str.length + 1).join('0') + str;
},
/**
* Passes the fractional and integer parts of x to the callback, returns
* the callback's result
*/
modf: function (x, fn) {
var mod = x%1;
if (mod < 0) {
mod += 1;
}
return fn(mod, Math.floor(x));
},
/**
* performs a half up rounding with a fixed amount of decimals, correcting for float loss of precision
* See the corresponding float_round() in server/tools/float_utils.py for more info
addons/web/static/src/js/views/basic/basic_view.js
+3 -3
View File
@@ -15,7 +15,7 @@ var BasicController = require('web.BasicController');
var BasicModel = require('web.BasicModel');
var config = require('web.config');
var fieldRegistry = require('web.field_registry');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var utils = require('web.utils');
var BasicView = AbstractView.extend({
@@ -216,13 +216,13 @@ var BasicView = AbstractView.extend({
attrs.decorations = attrs.decorations || [];
attrs.decorations.push({
className: 'text-' + splitKey[1],
expression: py.parse(py.tokenize(value))
expression: pyUtils._getPyJSAST(value),
});
}
});
if (!_.isObject(attrs.options)) { // parent arch could have already been processed (TODO this should not happen)
attrs.options = attrs.options ? pyeval.py_eval(attrs.options) : {};
attrs.options = attrs.options ? pyUtils.py_eval(attrs.options) : {};
}
if (attrs.on_change && !field.onChange) {
addons/web/static/src/js/views/list/list_controller.js
+2 -2
View File
@@ -11,7 +11,7 @@ var core = require('web.core');
var BasicController = require('web.BasicController');
var DataExport = require('web.DataExport');
var Dialog = require('web.Dialog');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var Sidebar = require('web.Sidebar');
var _t = core._t;
@@ -67,7 +67,7 @@ var ListController = BasicController.extend({
if (this.$('thead .o_list_record_selector input').prop('checked')) {
var searchData = this.searchView.build_search_data();
var userContext = this.getSession().user_context;
var results = pyeval.eval_domains_and_contexts({
var results = pyUtils.eval_domains_and_contexts({
domains: searchData.domains,
contexts: [userContext].concat(searchData.contexts),
group_by_seq: searchData.groupbys || []
addons/web/static/src/js/views/search/favorites_menu.js
+19 -6
View File
@@ -4,7 +4,8 @@ odoo.define('web.FavoriteMenu', function (require) {
var config = require('web.config');
var core = require('web.core');
var data_manager = require('web.data_manager');
var pyeval = require('web.pyeval');
var Domain = require('web.Domain');
var pyUtils = require('web.py_utils');
var session = require('web.session');
var Widget = require('web.Widget');
@@ -98,15 +99,17 @@ return Widget.extend({
return;
}
var user_context = this.getSession().user_context;
var search = this.searchview.build_search_data();
// get search params with domains not evaluated
var search = this.searchview.build_search_data(true);
var domain = pyUtils.assembleDomains(search.domains, 'AND');
var controllerContext;
this.trigger_up('get_controller_context', {
callback: function (ctx) {
controllerContext = ctx;
},
});
var results = pyeval.eval_domains_and_contexts({
domains: search.domains,
var results = pyUtils.eval_domains_and_contexts({
domains: [],
contexts: [user_context].concat(search.contexts.concat(controllerContext || [])),
group_by_seq: search.groupbys || [],
});
@@ -125,7 +128,7 @@ return Widget.extend({
user_id: shared_filter ? false : session.uid,
model_id: this.target_model,
context: results.context,
domain: results.domain,
domain: domain,
sort: JSON.stringify(this.searchview.dataset._sort),
is_default: default_filter,
action_id: this.action_id,
@@ -180,13 +183,23 @@ return Widget.extend({
* @return {Object}
*/
facet_for: function (filter) {
var self = this;
return {
category: _t("Custom Filter"),
icon: 'fa-star',
field: {
get_context: function () { return filter.context; },
get_groupby: function () { return [filter.context]; },
get_domain: function () { return filter.domain; }
// facet is not used
get_domain: function (facet, noEvaluation) {
noEvaluation = noEvaluation || false;
var userContext = self.getSession().user_context;
var domain = pyUtils.assembleDomains([filter.domain]);
if (!noEvaluation) {
return Domain.prototype.stringToArray(domain, userContext);
}
return domain;
}
},
_id: filter.id,
is_custom_filter: true,
addons/web/static/src/js/views/search/filters_menu.js
+72 -14
View File
@@ -3,14 +3,15 @@ odoo.define('web.FiltersMenu', function (require) {
var config = require('web.config');
var core = require('web.core');
var Domain = require('web.Domain');
var DropdownMenu = require('web.DropdownMenu');
var search_filters = require('web.search_filters');
var time = require('web.time');
var QWeb = core.qweb;
var _t = core._t;
var FiltersMenu = DropdownMenu.extend({
custom_events: {
remove_proposition: '_onRemoveProposition',
@@ -20,6 +21,7 @@ var FiltersMenu = DropdownMenu.extend({
'click .o_add_custom_filter': '_onAddCustomFilterClick',
'click .o_add_condition': '_appendProposition',
'click .o_apply_filter': '_onApplyClick',
':hover .o_item_option': '_onOptionHover',
}),
/**
@@ -29,6 +31,8 @@ var FiltersMenu = DropdownMenu.extend({
* interface IFilter {
* itemId: string; unique id associated with the filter
* domain: string;
* isPeriod: boolean
* fieldName: string; fieldName used to generate a domain in case isDate is true (and domain empty)
* description: string; label printed on screen
* groupId: string;
* isActive: boolean; (optional) determines if the filter is considered active
@@ -46,16 +50,21 @@ var FiltersMenu = DropdownMenu.extend({
// determines where the filter menu is displayed and its style
this.isMobile = config.device.isMobile;
// determines list of options used by filter of type 'date'
// TO DO: simplify optionIds below
this.intervalOptions = [
{description: _t('Day'), optionId: '__interval__day__'},
{description: _t('Week'), optionId: '__interval__week__'},
{description: _t('Month'), optionId: '__interval__month__'},
{description: _t('Year'), optionId: '__interval__year__'},
this.periodOptions = [
{description: _t('Today'), optionId: 'today', groupId: 1},
{description: _t('This Week'), optionId: 'this_week', groupId: 1},
{description: _t('This Month'), optionId: 'this_month', groupId: 1},
{description: _t('This Quarter'), optionId: 'this_quarter', groupId: 1},
{description: _t('This Year'), optionId: 'this_year', groupId: 1},
{description: _t('Yesterday'), optionId: 'yesterday', groupId: 2},
{description: _t('Last Week'), optionId: 'last_week', groupId: 2},
{description: _t('Last Month'), optionId: 'last_month', groupId: 2},
{description: _t('Last Quarter'), optionId: 'last_quarter', groupId: 2},
{description: _t('Last Year'), optionId: 'last_year', groupId: 2},
{description: _t('Last 7 Days'), optionId: 'last_7_days', groupId: 3},
{description: _t('Last 30 Days'), optionId: 'last_30_days', groupId: 3},
{description: _t('Last 365 Days'), optionId: 'last_365_days', groupId: 3},
];
// determines the default option used in case
// it has not been provided for a filter
this.defaultOptionId = "__interval__month__";
// determines when the 'Add custom filter' submenu is open
this.generatorMenuIsOpen = false;
this.propositions = [];
@@ -111,8 +120,11 @@ var FiltersMenu = DropdownMenu.extend({
_commitSearch: function () {
var self = this;
var filters = _.invoke(this.propositions, 'get_filter');
_.each(filters, function (filter) {
filter.attrs.domain = Domain.prototype.arrayToString(filter.attrs.domain);
});
var groupId = _.uniqueId('__group__');
var toSendToSearchView = [];
var data = [];
filters.forEach(function (filter) {
var filterName = _.uniqueId('__filter__');
var filterItem = {
@@ -122,7 +134,7 @@ var FiltersMenu = DropdownMenu.extend({
isActive: true,
};
self._prepareItem(filterItem);
toSendToSearchView.push({
data.push({
itemId: filterName,
groupId: groupId,
filter: filter,
@@ -130,12 +142,58 @@ var FiltersMenu = DropdownMenu.extend({
self.items.push(filterItem);
});
this._renderMenuItems();
this.trigger_up('new_filter', toSendToSearchView);
this.trigger_up('new_filters', data);
_.invoke(this.propositions, 'destroy');
this.propositions = [];
// this._appendProposition();
this._toggleCustomFilterMenu();
},
/**
* override
*
* @private
* @param {Object} item
*/
_prepareItem: function (item) {
if (item.isPeriod) {
item.options = this.periodOptions;
}
// super has to be called here because we need to add options to groupby
// before to call it since some keys in a groupby are initialized using
// the keys 'options' and 'defaultOptionId'
this._super.apply(this, arguments);
},
/**
* override
*
* @private
*/
_renderMenuItems: function () {
var self= this;
this._super.apply(this, arguments);
// the following code adds tooltip on date options in order
// to alert the user of the meaning of intervals
var $options = this.$('ul.o_dropdown_menu .o_item_option');
$options.each(function () {
var $option = $(this);
$option.tooltip({
delay: { show: 500, hide: 0 },
title: function () {
var itemId = $option.attr('data-item_id');
var optionId = $option.attr('data-option_id');
var fieldName = _.findWhere(self.items, {itemId: itemId}).fieldName;
var domain = Domain.prototype.constructDomain(fieldName, optionId, 'date', true);
var evaluatedDomain = Domain.prototype.stringToArray(domain);
var dateFormat = time.getLangDateFormat();
var dateStart = moment(evaluatedDomain[1][2], "YYYY-MM-DD", 'en').format(dateFormat);
var dateEnd = moment(evaluatedDomain[2][2], "YYYY-MM-DD", 'en').format(dateFormat);
if (optionId === 'today' || optionId === 'yesterday') {
return dateStart;
}
return _.str.sprintf(_t('From %s To %s'), dateStart, dateEnd);
}
});
});
},
/**
* Hide and display the sub menu which allows adding custom filters
*
addons/web/static/src/js/views/search/groupby_menu.js
+12 -12
View File
@@ -9,6 +9,8 @@ var QWeb = core.qweb;
var GROUPABLE_TYPES = ['many2one', 'char', 'boolean', 'selection', 'date', 'datetime'];
var DEFAULT_INTERVAL = 'month';
var GroupByMenu = DropdownMenu.extend({
events: _.extend({}, DropdownMenu.prototype.events,
{
@@ -26,12 +28,12 @@ var GroupByMenu = DropdownMenu.extend({
* fieldName: string; field name without interval!
* description: string; label printed on screen
* groupId: string;
* isDate: boolean;
* isActive: boolean; (optional) determines if the groupby is considered active
* isOpen: boolean; (optional) in case there are options the submenu presenting the options
* is opened or closed according to isOpen
* isRemovable: boolean; (optional) can be removed from menu
* options: array of objects with 'optionId' and 'description' keys; (optional)
* defaultOptionId: string refers to an optionId (optional)
* currentOptionId: string refers to an optionId that is activated if item is active (optional)
* }
* @param {Object} fields 'field_get' of a model: mapping from field name
@@ -46,15 +48,12 @@ var GroupByMenu = DropdownMenu.extend({
this.generatorMenuIsOpen = false;
// determines list of options used by groupbys of type 'date'
this.intervalOptions = [
{description: 'Day', optionId: 'day'},
{description: 'Week', optionId: 'week'},
{description: 'Month', optionId: 'month'},
{description: 'Quarter', optionId: 'quarter'},
{description: 'Year', optionId: 'year'},
{description: 'Day', optionId: 'day', groupId: 1},
{description: 'Week', optionId: 'week', groupId: 1},
{description: 'Month', optionId: 'month', groupId: 1},
{description: 'Quarter', optionId: 'quarter', groupId: 1},
{description: 'Year', optionId: 'year', groupId: 1},
];
// determines the default option used in case
// it has not been provided for a groupby
this.defaultOptionId = "month";
this.groupableFields = [];
_.each(fields, function (field, name) {
if (field.sortable && _.contains(GROUPABLE_TYPES, field.type)) {
@@ -114,7 +113,7 @@ var GroupByMenu = DropdownMenu.extend({
* method called via the 'Add Custom Groupby' menu to create
* a new groupby and add it (activated) to the menu
* In case the field is of type date, it is activated using
* the option determined by the parameter 'this.defaultOptionId'
* the option determined by the parameter 'DEFAULT_INTERVAL'
*
* @private
* @param {string} fieldName
@@ -132,8 +131,10 @@ var GroupByMenu = DropdownMenu.extend({
var eventData = _.clone(groupby);
this._prepareItem(groupby);
if (groupby.hasOptions) {
groupby.currentOptionId = groupby.defaultOptionId;
groupby.currentOptionId = DEFAULT_INTERVAL;
groupby.isDate = true;
eventData.optionId = groupby.currentOptionId;
eventData.isDate = true;
}
this.items.push(groupby);
var fieldIndex = this.presentedFields.indexOf(field);
@@ -151,7 +152,6 @@ var GroupByMenu = DropdownMenu.extend({
_prepareItem: function (item) {
if (_.contains(['date', 'datetime'], this.fields[item.fieldName].type)) {
item.options = this.intervalOptions;
item.defaultOptionId = item.defaultOptionId || this.defaultOptionId;
}
// the idea is that we have only one group in the groupby menu
// like in the search view.
addons/web/static/src/js/views/search/search_inputs.js
+49 -16
View File
@@ -5,7 +5,7 @@ var Context = require('web.Context');
var core = require('web.core');
var Domain = require('web.Domain');
var field_utils = require('web.field_utils');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var time = require('web.time');
var utils = require('web.utils');
var Widget = require('web.Widget');
@@ -416,7 +416,7 @@ var ManyToOneField = CharField.extend({
expand: function (needle) {
var self = this;
// FIXME: "concurrent" searches (multiple requests, mis-ordered responses)
var context = pyeval.eval(
var context = pyUtils.eval(
'contexts', [this.searchview.dataset.get_context()]);
var args = this.attrs.domain;
if (typeof args === 'string') {
@@ -458,7 +458,7 @@ var ManyToOneField = CharField.extend({
// to handle this as if it were a single value.
value = value[0];
}
var context = pyeval.eval('contexts', [this.searchview.dataset.get_context()]);
var context = pyUtils.eval('contexts', [this.searchview.dataset.get_context()]);
return this._rpc({
model: this.attrs.relation,
@@ -514,14 +514,17 @@ var FilterGroup = Input.extend(/** @lends instance.web.search.FilterGroup# */{
*
* @param {Array<instance.web.search.Filter>} filters elements of the group
* @param {instance.web.SearchView} parent parent in which the filters are contained
* @param {Object} intervalMapping, a key is a field name and the corresponding value
* is the current interval used
* (necessarily the field is of type 'date' or 'datetime')
*/
init: function (filters, parent, intervalMapping) {
init: function (filters, parent, intervalMapping, periodMapping) {
// If all filters are group_by and we're not initializing a GroupbyGroup,
// create a GroupbyGroup instead of the current FilterGroup
if (!(this instanceof GroupbyGroup) &&
_(filters).all(function (f) {
if (!f.attrs.context) { return false; }
var c = pyeval.eval('context', f.attrs.context);
var c = pyUtils.eval('context', f.attrs.context);
return !_.isEmpty(c.group_by);})) {
return new GroupbyGroup(filters, parent, intervalMapping);
}
@@ -529,6 +532,7 @@ var FilterGroup = Input.extend(/** @lends instance.web.search.FilterGroup# */{
this.filters = filters;
this.searchview = parent;
this.intervalMapping = intervalMapping;
this.periodMapping = periodMapping || [];
this.searchview.query.on('add remove change reset', this.proxy('search_change'));
},
start: function () {
@@ -637,29 +641,45 @@ var FilterGroup = Input.extend(/** @lends instance.web.search.FilterGroup# */{
* Handles domains-fetching for all the filters within it: groups them.
*
* @param {VS.model.SearchFacet} facet
* @param {boolean} noEvaluation determines if the domains are evaluated or not.
By default, domains are evaluated.
* @return {*} combined domains of the enabled filters in this group
*/
get_domain: function (facet) {
get_domain: function (facet, noEvaluation) {
noEvaluation = noEvaluation || false;
var self = this;
var userContext = this.getSession().user_context;
var domains = facet.values.chain()
.map(function (f) { return f.get('value').attrs.domain; })
.map(function (f) {
var filter = f.get('value');
var attributes = filter.attrs;
var domain = attributes.domain;
var fieldName = attributes.date;
if (!domain && fieldName) {
var couple = _.findWhere(self.periodMapping, {filter: filter});
var period = couple ? couple.period: 'this_month';
var type = couple ? couple.type: 'date';
domain = Domain.prototype.constructDomain(fieldName, period, type);
}
return domain;
})
.without('[]')
.reject(_.isEmpty)
.map(function (d) {
return Domain.prototype.stringToArray(d, userContext);
.map(function (domain) {
domain = domain.replace(/%%/g, '%');
return domain;
})
.value();
if (!domains.length) {
return;
}
if (domains.length === 1) {
return domains[0];
// domains belong the same groups. We need to make a union.
var domain = pyUtils.assembleDomains(domains, 'OR');
if (!noEvaluation) {
return Domain.prototype.stringToArray(domain, userContext);
}
_.each(domains, Domain.prototype.normalizeArray);
var ors = _.times(domains.length - 1, _.constant("|"));
return ors.concat.apply(ors, domains);
return domain;
},
toggle_filter: function (e) {
e.preventDefault();
@@ -701,9 +721,22 @@ var FilterGroup = Input.extend(/** @lends instance.web.search.FilterGroup# */{
};
}));
},
/*
* @param {Object} intervalMapping
*/
updateIntervalMapping: function (intervalMapping) {
this.intervalMapping = intervalMapping;
}
},
/*
* @param {Object} periodMapping
*/
updatePeriodMapping: function (periodMapping) {
this.intervalMapping = periodMapping;
},
//--------------------------------------------------------------------------
// Private
//--------------------------------------------------------------------------
});
addons/web/static/src/js/views/search/search_view.js
+181 -83
View File
@@ -4,10 +4,11 @@ odoo.define('web.SearchView', function (require) {
var AutoComplete = require('web.AutoComplete');
var config = require('web.config');
var core = require('web.core');
var Domain = require('web.Domain');
var FavoriteMenu = require('web.FavoriteMenu');
var FiltersMenu = require('web.FiltersMenu');
var GroupByMenu = require('web.GroupByMenu');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var search_inputs = require('web.search_inputs');
var utils = require('web.utils');
var Widget = require('web.Widget');
@@ -21,6 +22,9 @@ var FacetValues = Backbone.Collection.extend({
model: FacetValue
});
var DEFAULT_INTERVAL = 'month';
var DEFAULT_PERIOD = 'this_month';
var Facet = Backbone.Model.extend({
initialize: function (attrs) {
var values = attrs.values;
@@ -187,10 +191,21 @@ var FacetView = Widget.extend({
}
}
},
init: function (parent, model, intervalMapping) {
/*
* @param {Widget} parent
* @param {Object} model
* @param {Object} intervalMapping, a key is a field name and the corresponding value
* is the current interval used
* (necessarily the field is of type 'date' or 'datetime')
* @param {Object} periodMapping, a key is a field name and the corresponding value
* is the current interval used
* (necessarily the field is of type 'date' or 'datetime')
*/
init: function (parent, model, intervalMapping, periodMapping) {
this._super(parent);
this.model = model;
this.intervalMapping = intervalMapping;
this.periodMapping = periodMapping;
this.model.on('change', this.model_changed, this);
},
destroy: function () {
@@ -205,9 +220,21 @@ var FacetView = Widget.extend({
if (index > 0) {
$('<span/>', {html: self.model.get('separator') || _t(" or ")}).addClass('o_facet_values_sep').appendTo($e);
}
var couple = _.findWhere(self.intervalMapping, {groupby: value.attributes.value});
var interval = couple ? couple.interval : undefined;
return new FacetValueView(self, value, interval).appendTo($e);
var couple;
var option;
if (value.attributes.value && value.attributes.value.attrs) {
if (value.attributes.value.attrs.isPeriod) {
couple = _.findWhere(self.periodMapping, {filter: value.attributes.value});
option = couple ? couple.period : value.attributes.value.attrs.default_period;
}
if (value.attributes.value.attrs.isDate) {
couple = _.findWhere(self.intervalMapping, {groupby: value.attributes.value});
option = couple ?
couple.interval :
(value.attributes.value.attrs.defaultInterval || DEFAULT_INTERVAL);
}
}
return new FacetValueView(self, value, option).appendTo($e);
}));
});
},
@@ -218,21 +245,41 @@ var FacetView = Widget.extend({
var FacetValueView = Widget.extend({
template: 'SearchView.FacetView.Value',
init: function (parent, model, interval) {
/*
* @param {Widget} parent
* @param {Object} model
* @param {Object} interval (optional) is used in case the facet value
* corresponds to a groupby with an associated 'date'
* 'datetime' field.
*/
init: function (parent, model, option) {
this._super(parent);
this.model = model;
var intervalDescription = {
var optionDescription = _.extend({}, {
day: 'Day',
week: 'Week',
month: 'Month',
quarter: 'Quarter',
year: 'Year',
};
// to do: put a test on interval
if (interval) {
var intervalLabel = intervalDescription[interval];
this.intervalLabel = _t(intervalLabel);
}, {
today: 'Today',
this_week: 'This Week',
this_month: 'This Month',
this_quarter: 'This Quarter',
this_year: 'This Year',
yesterday: 'Yesterday',
last_week: 'Last Week',
last_month: 'Last Month',
last_quarter: 'Last Quarter',
last_year: 'Last Year',
last_7_days: 'Last 7 Days',
last_30_days: 'Last 30 Days',
last_365_days: 'Last 365 Days',
});
if (option) {
var optionLabel = optionDescription[option];
this.optionLabel = _t(optionLabel);
}
this.model.on('change', this.model_changed, this);
},
@@ -275,10 +322,10 @@ var SearchView = Widget.extend({
},
},
custom_events: {
'menu_item_toggled': '_onItemToggled',
'item_option_changed': '_onItemOptionChanged',
'new_groupby': '_onNewGroupby',
'new_filter': '_onNewFilter',
menu_item_toggled: '_onItemToggled',
item_option_changed: '_onItemOptionChanged',
new_groupby: '_onNewGroupby',
new_filters: '_onNewFilters',
},
defaults: _.extend({}, Widget.prototype.defaults, {
hidden: false,
@@ -312,6 +359,8 @@ var SearchView = Widget.extend({
this.action = this.options.action || {};
this.search_fields = [];
this.hasFavorites = false;
this.selectedGroupIds = {
groupByCategory: [],
filterCategory: []
@@ -320,6 +369,7 @@ var SearchView = Widget.extend({
this.groupbysMapping = [];
this.filtersMapping = [];
this.intervalMapping = [];
this.periodMapping = [];
this.filters = [];
this.groupbys = [];
@@ -392,13 +442,15 @@ var SearchView = Widget.extend({
var self = this,
default_custom_filter = this.$buttons && this.favorite_menu && this.favorite_menu.get_default_filter();
if (!self.options.disable_custom_filters && default_custom_filter) {
this.hasFavorites = true;
return this.favorite_menu.toggle_filter(default_custom_filter, true);
}
if (!_.isEmpty(this.search_defaults)) {
var inputs = this.search_fields.concat(this.filters, this.groupbys),
search_defaults = _.invoke(inputs, 'facet_for_defaults', this.search_defaults);
var inputs = this.search_fields.concat(this.filters, this.groupbys);
var search_defaults = _.invoke(inputs, 'facet_for_defaults', this.search_defaults);
return $.when.apply(null, search_defaults).then(function () {
self.query.reset(_(arguments).compact(), {preventSearch: true});
var facets = _.compact(arguments);
self.query.reset(facets, {preventSearch: true});
});
}
this.query.reset([], {preventSearch: true});
@@ -424,6 +476,9 @@ var SearchView = Widget.extend({
this.trigger_up('search', search);
},
/**
* @param {boolean} noDomainEvaluation determines if domain are evaluated or not.
* By default, domains are evaluated.
*
* Extract search data from the view's facets.
*
* Result is an object with 3 (own) properties:
@@ -437,12 +492,13 @@ var SearchView = Widget.extend({
*
* @return {Object}
*/
build_search_data: function () {
build_search_data: function (noDomainEvaluation) {
var domains = [], contexts = [], groupbys = [];
noDomainEvaluation = noDomainEvaluation || false;
this.query.each(function (facet) {
// field is actually a FilterGroup!
var field = facet.get('field');
var domain = field.get_domain(facet);
var domain = field.get_domain(facet, noDomainEvaluation);
if (domain) {
domains.push(domain);
}
@@ -456,7 +512,6 @@ var SearchView = Widget.extend({
}
});
var intervalMappingNormalized = {};
_.each(this.intervalMapping, function (couple) {
var fieldName = couple.groupby.fieldName;
var interval = couple.interval;
@@ -575,7 +630,6 @@ var SearchView = Widget.extend({
groupByCategory: [],
filterCategory: [],
};
this.query.each(function (facet) {
if (facet.attributes.cat === "groupByCategory") {
@@ -609,7 +663,7 @@ var SearchView = Widget.extend({
);
}
var f = new FacetView(this, facet, this.intervalMapping);
var f = new FacetView(this, facet, this.intervalMapping, this.periodMapping);
started.push(f.appendTo(self.$('.o_searchview_input_container')));
self.input_subviews.push(f);
}, this);
@@ -669,14 +723,20 @@ var SearchView = Widget.extend({
var category = 'filters';
if (item.attrs.context) {
try {
var context = pyeval.eval('context', item.attrs.context);
var context = pyUtils.eval('context', item.attrs.context);
if (context.group_by) {
category = 'group_by';
item.attrs.fieldName = context.group_by.split(':')[0];
item.attrs.isDate = _.contains(['date', 'datetime'], self.fields[item.attrs.fieldName].type);
item.attrs.defaultInterval = context.group_by.split(':')[1];
}
} catch (e) {}
}
if (item.attrs.date) {
item.attrs.default_period = item.attrs.default_period || DEFAULT_PERIOD;
item.attrs.type = self.fields[item.attrs.date].type;
}
item.attrs.isPeriod = !!item.attrs.date;
return {
item: item,
category: category,
@@ -691,7 +751,7 @@ var SearchView = Widget.extend({
return current_group.push(new search_inputs.Filter(filter.item, self));
}
if (current_group.length) {
var group = new search_inputs.FilterGroup(current_group, self, self.intervalMapping);
var group = new search_inputs.FilterGroup(current_group, self, self.intervalMapping, self.periodMapping);
categories[current_category].push(group);
current_group = [];
}
@@ -704,7 +764,6 @@ var SearchView = Widget.extend({
if (field.type === "many2one" && attrs.widget === "selection") {
attrs.widget = undefined;
}
var Obj = core.search_widgets_registry.getAny([attrs.widget, field.type]);
if (Obj) {
self.search_fields.push(new (Obj) (filter.item, field, self));
@@ -738,11 +797,15 @@ var SearchView = Widget.extend({
updateFilters: function (newFilters, filtersToRemove) {
var self = this;
var addedFilters = _.map(newFilters, function (filter) {
var domain = filter.domain;
if (domain instanceof Array) {
domain = Domain.prototype.arrayToString(domain);
}
filter = {
attrs: {domain: filter.domain, help: filter.help},
attrs: {domain: domain, help: filter.help},
};
var filterWidget = new search_inputs.Filter(filter);
var filterGroup = new search_inputs.FilterGroup([filterWidget], self, self.intervalMapping);
var filterGroup = new search_inputs.FilterGroup([filterWidget], self, self.intervalMapping, self.periodMapping);
var facet = filterGroup.make_facet([filterGroup.make_value(filter)]);
self.query.add([facet], {silent: true});
@@ -790,14 +853,23 @@ var SearchView = Widget.extend({
group.filters.forEach(function (filter) {
if (!filter.attrs.invisible) {
var filterId = _.uniqueId('__filter__');
var isPeriod = filter.attrs.isPeriod;
var defaultPeriod = filter.attrs.default_period;
filters.push({
isActive: !!self.search_defaults[filter.attrs.name],
description: filter.attrs.string || filter.attrs.help || filter.attrs.name || filter.attrs.domain || 'Ω',
itemId: filterId,
description: filter.attrs.string || filter.attrs.help ||
filter.attrs.name || filter.attrs.domain || 'Ω',
domain: filter.attrs.domain,
fieldName: filter.attrs.date,
isPeriod: isPeriod,
currentOptionId: defaultPeriod,
isActive: !self.hasFavorites && !!self.search_defaults[filter.attrs.name],
groupId: groupId,
});
self.filtersMapping.push({filterId: filterId, filter: filter, groupId: groupId});
if (isPeriod) {
self.periodMapping.push({filter: filter, period: defaultPeriod, type: filter.attrs.type});
}
}
});
self.groupsMapping.push({groupId: groupId, group: group, category: 'Filters'});
@@ -821,20 +893,22 @@ var SearchView = Widget.extend({
var groupId = _.uniqueId('__group__');
group.filters.forEach(function (groupby) {
if (!groupby.attrs.invisible) {
var fieldName = groupby.attrs.fieldName;
var defaultOptionId = groupby.attrs.defaultInterval;
var groupbyId = _.uniqueId('__groupby__');
var fieldName = groupby.attrs.fieldName;
var isDate = groupby.attrs.isDate;
var defaultInterval = groupby.attrs.defaultInterval || DEFAULT_INTERVAL;
groupbys.push({
isActive: !!self.search_defaults[groupby.attrs.name],
description: groupby.attrs.string,
itemId: groupbyId,
description: groupby.attrs.string || groupby.attrs.help || groupby.attrs.name
|| groupby.attrs.fieldName || 'Ω',
isDate: isDate,
fieldName: fieldName,
currentOptionId: defaultInterval,
isActive: !self.hasFavorites && !!self.search_defaults[groupby.attrs.name],
groupId: groupId,
defaultOptionId: defaultOptionId,
});
if (self._fieldIsDate(fieldName)) {
self.intervalMapping.push({groupby: groupby, interval: defaultOptionId || 'month'});
if (isDate) {
self.intervalMapping.push({groupby: groupby, interval: defaultInterval});
}
self.groupbysMapping.push({groupbyId: groupbyId, groupby: groupby, groupId: groupId});
}
@@ -844,15 +918,6 @@ var SearchView = Widget.extend({
});
return new GroupByMenu(this, groupbys, this.fields);
},
_fieldIsDate: function (fieldName) {
if (_.contains(['date', 'datetime'], this.fields[fieldName].type)) {
return true;
}
return false;
},
/**
* Processes a fieldsView in place. In particular, parses its arch.
*
@@ -869,14 +934,20 @@ var SearchView = Widget.extend({
return fv;
},
/**
* This function ask the groupby menu to deactive all groupbys with
* corresponding groupId in the list selectedGroupIds.
* (TO DO: simplify method... actually there is only one group of groupbys)
*
* @private
* @param {string[]]} selectedGroupIds
* @param {string[]]} selectedGroupIds list of group ids to deactivate
*/
_unsetUnusedGroupbys: function (selectedGroupIds) {
var groupIds = this.selectedGroupIds.groupByCategory.reduce(
function (acc, id) {
if (!_.contains(selectedGroupIds, id)) {
acc.push(id);
var groupIds = this.groupsMapping.reduce(
function (acc, triple) {
if (triple.category === 'Group By') {
if (!_.contains(selectedGroupIds, triple.groupId)) {
acc.push(triple.groupId);
}
}
return acc;
},
@@ -886,14 +957,19 @@ var SearchView = Widget.extend({
this.groupby_menu.unsetGroups(groupIds);
},
/**
* This function ask the filters menu to deactive all filters with
* corresponding groupId in the list selectedGroupIds.
*
* @private
* @param {string[]]} selectedGroupIds
*/
_unsetUnusedFilters: function (selectedGroupIds) {
var groupIds = this.selectedGroupIds.filterCategory.reduce(
function (acc, id) {
if (!_.contains(selectedGroupIds, id)) {
acc.push(id);
var groupIds = this.groupsMapping.reduce(
function (acc, triple) {
if (triple.category === 'Filters') {
if (!_.contains(selectedGroupIds, triple.groupId)) {
acc.push(triple.groupId);
}
}
return acc;
},
@@ -908,6 +984,11 @@ var SearchView = Widget.extend({
//--------------------------------------------------------------------------
/**
*
* this function is called in response to an event 'on_item_toggled'.
* this kind of event is triggered by the filters menu or the groupby menu
* when a user has clicked on a item (a filter or a groupby).
* The query is modified accordingly to the new state (active or not) of that item
*
* @private
* @param {OdooEvent} event
@@ -927,27 +1008,36 @@ var SearchView = Widget.extend({
if (event.data.category === 'filterCategory') {
var filter = _.findWhere(this.filtersMapping, {filterId: event.data.itemId}).filter;
group = _.findWhere(this.groupsMapping, {groupId: event.data.groupId}).group;
if (event.data.optionId) {
var period = event.data.optionId;
_.findWhere(this.periodMapping, {filter: filter}).period = period;
group.updatePeriodMapping(this.periodMapping);
}
group.toggle(filter);
}
},
/**
* this function is called when a new groupby has been added to the groupby menu
* via the 'Add Custom Groupby' submenu. The query is modified with the new groupby
* added to it as active. The communication betwenn the groupby menu and the search view
* is maintained by properly updating the mappings.
* @private
* @param {OdooEvent} event
*/
_onNewGroupby: function (event) {
var isDate = event.data.isDate;
var attrs = {
context:"{'group_by':'" + event.data.fieldName + "''}",
name: event.data.description,
fieldName: event.data.fieldName,
};
context:"{'group_by':'" + event.data.fieldName + "''}",
name: event.data.description,
fieldName: event.data.fieldName,
isDate: isDate,
};
var groupby = new search_inputs.Filter({attrs: attrs}, this);
if (event.data.optionId) {
var interval = event.data.optionId;
this.intervalMapping.push({groupby: groupby, interval: interval});
}
var group = new search_inputs.FilterGroup([groupby], this, this.intervalMapping);
group.toggle(groupby);
var group = new search_inputs.FilterGroup([groupby], this, this.intervalMapping, this.periodMapping);
this.groupbysMapping.push({
groupbyId: event.data.itemId,
groupby: groupby,
@@ -958,44 +1048,49 @@ var SearchView = Widget.extend({
group: group,
category: 'Group By',
});
group.toggle(groupby);
},
/**
/**
* this function is called when a new filter has been added to the filters menu
* via the 'Add Custom Filter' submenu. The query is modified with the new filter
* added to it as active. The communication betwenn the filters menu and the search view
* is maintained by properly updating the mappings.
* @private
* @param {OdooEvent} event
*/
_onNewFilter: function (event) {
_onNewFilters: function (event) {
var self= this;
var filter;
var filters = [];
var groupId;
_.each(event.data, function (filterDescription) {
filter = new search_inputs.Filter(filterDescription.filter, this);
filters.push(filter);
self.filtersMapping.push({
filterId: filterDescription.itemId,
filter: filter,
groupId: filterDescription.groupId,
});
// filters belong to the same group
if (!groupId) {
groupId = filterDescription.groupId;
}
filter = new search_inputs.Filter(filterDescription.filter, this);
filters.push(filter);
self.filtersMapping.push({
filterId: filterDescription.itemId,
filter: filter,
groupId: filterDescription.groupId,
});
var group = new search_inputs.FilterGroup(filters, this, this.intervalMapping);
// filters belong to the same group
if (!groupId) {
groupId = filterDescription.groupId;
}
});
var group = new search_inputs.FilterGroup(filters, this, this.intervalMapping, this.periodMapping);
filters.forEach(function (filter) {
group.toggle(filter, {silent: true});
});
this.query.trigger('reset');
this.groupsMapping.push({
groupId: groupId,
group: group,
category: 'Filters',
});
this.query.trigger('reset');
},
/**
* this function is called when the option related to an item (filter or groupby) has been
* changed by the user. The query is modified appropriately.
*
* @private
* @param {OdooEvent} event
@@ -1012,8 +1107,11 @@ var SearchView = Widget.extend({
}
if (event.data.category === 'filterCategory') {
var filter = _.findWhere(this.filtersMapping, {filterId: event.data.itemId}).filter;
var period = event.data.optionId;
_.findWhere(this.periodMapping, {filter: filter}).period = period;
group = _.findWhere(this.groupsMapping, {groupId: event.data.groupId}).group;
group.toggle(filter);
group.updatePeriodMapping(this.periodMapping);
this.query.trigger('reset');
}
},
});
addons/web/static/src/js/views/view_dialogs.js
+3 -3
View File
@@ -7,7 +7,7 @@ var Dialog = require('web.Dialog');
var dom = require('web.dom');
var ListController = require('web.ListController');
var ListView = require('web.ListView');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var SearchView = require('web.SearchView');
var view_registry = require('web.view_registry');
@@ -293,7 +293,7 @@ var SelectCreateDialog = ViewDialog.extend({
var user_context = this.getSession().user_context;
var _super = this._super.bind(this);
var context = pyeval.eval_domains_and_contexts({
var context = pyUtils.eval_domains_and_contexts({
domains: [],
contexts: [user_context, this.context]
}).context;
@@ -397,7 +397,7 @@ var SelectCreateDialog = ViewDialog.extend({
});
},
_process_search_data: function (domains, contexts, groupbys) {
var results = pyeval.eval_domains_and_contexts({
var results = pyUtils.eval_domains_and_contexts({
domains: [this.domain].concat(domains),
contexts: [this.context].concat(contexts),
group_by_seq: groupbys || [],
addons/web/static/src/js/widgets/data_export.js
+2 -2
View File
@@ -6,7 +6,7 @@ var crash_manager = require('web.crash_manager');
var data = require('web.data');
var Dialog = require('web.Dialog');
var framework = require('web.framework');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var QWeb = core.qweb;
var _t = core._t;
@@ -467,7 +467,7 @@ var DataExport = Dialog.extend({
fields: exported_fields,
ids: this.ids_to_export,
domain: this.domain,
context: pyeval.eval('contexts', [this.record.getContext()]),
context: pyUtils.eval('contexts', [this.record.getContext()]),
import_compat: !!this.$import_compat_radios.filter(':checked').val(),
})},
complete: framework.unblockUI,
addons/web/static/src/js/widgets/dropdown_menu.js
+49 -60
View File
@@ -6,33 +6,39 @@ var Widget = require('web.Widget');
var QWeb = core.qweb;
// interface IItem {
// itemId: string;
// description: string;
// groupId: string;
// isActive: boolean; (optional)
// isOpen: boolean; (optional)
// isRemovable: boolean; (optional)
// options: array of objects with 'optionId' and 'description' keys; (optional)
// defaultOptionId: string refers to an optionId (optional)
// currentOptionId: string refers to an optionId that is activated if item is active (optional)
// }
var DropdownMenu = Widget.extend({
template: 'web.DropdownMenu',
events: {
'click li.o_menu_item': '_onItemClick',
'click li.o_item_option': '_onOptionClick',
'click li.o_menu_item span.o_submenu_switcher': '_openItemOptions',
'click span.o_trash_button': '_onTrashClick',
'hidden.bs.dropdown': '_onBootstrapClose',
},
/**
* override
*
* @param {Widget} parent
* @param {Object} dropdowHeader object with keys 'title' and 'icon'
* @param {Object} items values are arrays of items (see interface IItems)
* @param {Object} itemGenerator
* @param {Object} dropdowHeader object used to customize the dropdown menu. The keys:
* - 'title' (e.g. 'Group By')
* - 'icon' (e.g. 'fa-bars')
* - 'symbol' (e.g. 'caret')
* - 'category' (describes the type of items)
* - 'style' (button style)
* @param {Object} items list of menu items (type IGMenuItem below)
* interface IMenuItem {
* itemId: string; (optional) unique id associated with the item
* description: string; label printed on screen
* groupId: string;
* isActive: boolean; (optional) determines if the item is considered active
* isOpen: boolean; (optional) in case there are options the submenu presenting the options
* is opened or closed according to isOpen
* isRemovable: boolean; (optional) can be removed from menu
* options: array of objects with 'optionId' and 'description' keys; (optional)
* currentOptionId: string refers to an optionId that is activated if item is active (optional)
* }
*/
init: function (parent, dropdownHeader, items) {
this._super(parent);
@@ -49,7 +55,9 @@ var DropdownMenu = Widget.extend({
this.items = _.sortBy(items, 'groupId');
_.each(this.items, this._prepareItem.bind(this));
},
/**
* override
*/
start: function () {
this.$menu = this.$('.o_dropdown_menu');
},
@@ -93,7 +101,6 @@ var DropdownMenu = Widget.extend({
};
this.trigger_up('menu_item_deleted', eventData);
},
/**
* @private
*/
@@ -103,17 +110,21 @@ var DropdownMenu = Widget.extend({
this.$('ul.o_dropdown_menu').prepend($(newMenuItems));
},
/**
* this function computes some default values for some of the item keys
* according to values passed at initialization
*
* @private
* @param {Object} item
*/
_prepareItem: function (item) {
item.itemId = item.itemId || _.uniqueId('__item__');
item.isOpen = item.isOpen || false;
item.isRemovable = item.isRemovable || false;
item.hasOptions = item.options && item.options.length !== 0 ? true : false;
item.defaultOptionId = item.hasOptions ?
(item.defaultOptionId || item.options[0].optionId) :
false;
item.currentOptionId = item.isActive ? (item.currentOptionId || item.defaultOptionId ) : false;
if (item.options && item.options.length !== 0) {
item.options = _.sortBy(item.options, 'groupId');
item.hasOptions = true;
item.currentOptionId = item.isActive && item.currentOptionId ? item.currentOptionId : false;
}
},
/**
* @private
@@ -121,23 +132,21 @@ var DropdownMenu = Widget.extend({
*/
_toggleMenuItem: function (itemId) {
var item = _.findWhere(this.items, {itemId: itemId});
item.isActive = !item.isActive;
var eventData = {
category: this.dropdownCategory,
itemId: itemId,
isActive: item.isActive,
groupId: item.groupId,
};
if (item.hasOptions) {
if (item.isActive) {
item.currentOptionId = item.defaultOptionId;
eventData.optionId = item.currentOptionId;
} else {
item.currentOptionId = false;
}
if (!item.hasOptions) {
item.isActive = !item.isActive;
var eventData = {
category: this.dropdownCategory,
itemId: itemId,
isActive: item.isActive,
groupId: item.groupId,
};
this._renderMenuItems();
this.trigger_up('menu_item_toggled', eventData);
}
if (item.hasOptions) {
item.isOpen = !item.isOpen;
this._renderMenuItems();
}
this._renderMenuItems();
this.trigger_up('menu_item_toggled', eventData);
},
/**
* @private
@@ -168,19 +177,11 @@ var DropdownMenu = Widget.extend({
this.trigger_up('item_option_changed', eventData);
}
},
/**
* @private
* @param {string} itemId
*/
_toggleMenuOptions: function (itemId) {
var item = _.findWhere(this.items, {itemId: itemId});
item.isOpen = !item.isOpen;
this._renderMenuItems();
},
//--------------------------------------------------------------------------
// Handlers
//--------------------------------------------------------------------------
/**
* This method is called when Bootstrap trigger a 'close' event (for example
* when the user clicks outside the dropdown menu).
@@ -224,20 +225,8 @@ var DropdownMenu = Widget.extend({
var itemId = $(event.currentTarget).data('id');
this._removeItem(itemId);
},
/**
* @private
* @param {MouseEvent} event
*/
_openItemOptions: function (event) {
// we preventdefault the event here to avoid changing the hash # in the
// url.
event.preventDefault();
event.stopPropagation();
var itemId = $(event.currentTarget).data('id');
this._toggleMenuOptions(itemId);
},
});
return DropdownMenu;
});
});
addons/web/static/src/scss/dropdown_menu.scss
+8
View File
@@ -43,8 +43,16 @@
}
}
}
li.divider:first-child {
display: none;
}
.o_item_option {
color: $o-main-text-color;
padding-left: 20px;
&:hover {
color: darken($o-main-text-color, 10%);
background-color: $dropdown-link-hover-bg;
}
}
}
}
addons/web/static/src/scss/search_view.scss
+4
View File
@@ -179,6 +179,10 @@
display: none; // Needed by the webclient
@include o-search-options-dropdown-custom-li;
}
.o_submenu_switcher {
position: absolute;
right: 0px;
}
}
addons/web/static/src/xml/base.xml
+7 -2
View File
@@ -1055,14 +1055,19 @@
<a href="#">
<t t-esc="item.description"/>
<span t-if="item.isRemovable" t-att-data-id="item.itemId" class="o_trash_button" > <span class="fa fa-trash-o"></span> </span>
<span t-if="item.hasOptions" t-att-data-id="item.itemId" class="o_submenu_switcher"> <span class="fa fa-caret-down"></span> </span>
<span t-if="item.hasOptions" t-att-data-id="item.itemId" class="o_submenu_switcher">
<span t-att-class="item.isOpen ? 'fa fa-caret-down' : 'fa fa-caret-right'"></span>
</span>
</a>
<ul t-if="item.hasOptions &amp;&amp; item.isOpen">
<t t-set="subgroup" t-value="0"/>
<t t-foreach="_.values(item.options)" t-as="option">
<li t-if="subgroup !== option.groupId" class="divider" data-removable="1"/>
<li t-att-class="'o_item_option ' + (item.currentOptionId === option.optionId ? 'selected': '')"
t-att-data-item_id="item.itemId" t-att-data-option_id="option.optionId">
<a href="#"><t t-esc="option.description"/></a>
</li>
<t t-set="subgroup" t-value="option.groupId"/>
</t>
</ul>
</li>
@@ -1145,7 +1150,7 @@
<div class="fa fa-sm fa-remove o_facet_remove" role="img" aria-label="Remove" title="Remove"/>
</div>
<span t-name="SearchView.FacetView.Value">
<t t-esc="widget.model.get('label') + (widget.intervalLabel ? (': ' + widget.intervalLabel) : '')"/>
<t t-esc="widget.model.get('label') + (widget.optionLabel ? (': ' + widget.optionLabel) : '')"/>
</span>
<t t-name="SearchView.autocomplete">
<ul class="dropdown-menu o_searchview_autocomplete" role="menu"></ul>
addons/web/static/tests/chrome/action_manager_tests.js
+1 -1
View File
@@ -2877,7 +2877,7 @@ QUnit.module('ActionManager', {
intercepts: {
create_filter: function (event) {
var filter = event.data.filter;
assert.deepEqual(filter.domain, [['bar', '=', 1]],
assert.deepEqual(filter.domain, "[('bar', '=', 1)]",
"should save the correct domain");
assert.deepEqual(filter.context, {shouldBeInFilterContext: true},
"should save the correct context");
addons/web/static/tests/core/pyeval_tests.js → addons/web/static/tests/core/py_utils_tests.js
+275 -60
View File
@@ -1,23 +1,45 @@
odoo.define('web.pyEval_tests', function(require) {
odoo.define('web.py_utils_tests', function(require) {
"use strict";
var Context = require('web.Context');
var pyEval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var time = require('web.time');
QUnit.assert.checkAST = function (expr, message) {
var ast = pyUtils._getPyJSAST(expr);
var formattedAST = pyUtils._formatAST(ast);
this.pushResult({
result: expr === formattedAST,
actual: formattedAST,
expected: expr,
message: message
});
};
QUnit.module('core', function () {
QUnit.module('PY.eval');
QUnit.module('py_utils');
QUnit.test('simple python expression', function(assert) {
assert.expect(2);
var result = pyEval.py_eval("True and False");
var result = pyUtils.py_eval("True and False");
assert.strictEqual(result, false, "should properly evaluate basic expression");
result = pyEval.py_eval("a + b", {a: 1, b: 41});
result = pyUtils.py_eval("a + b", {a: 1, b: 41});
assert.strictEqual(result, 42, "should properly evaluate basic sum");
});
QUnit.test('simple arithmetic', function(assert) {
assert.expect(2);
var result = pyUtils.py_eval("1 + 2");
assert.strictEqual(result, 3, "should properly evaluate sum");
result = pyUtils.py_eval("42 % 5");
assert.strictEqual(result, 2, "should properly evaluate modulo operator");
});
QUnit.test('not prefix', function (assert) {
assert.expect(3);
@@ -28,7 +50,7 @@ QUnit.module('core', function () {
function makeTimeCheck (assert) {
var context = pyEval.context();
var context = pyUtils.context();
return function (expr, func, message) {
// evaluate expr between two calls to new Date(), and check that
// the result is between the transformed dates
@@ -41,7 +63,7 @@ QUnit.module('core', function () {
// Port from pypy/lib_pypy/test_datetime.py
function makeEq(assert, c2) {
var ctx = pyEval.context();
var ctx = pyUtils.context();
var c = _.extend({ td: ctx.datetime.timedelta }, c2 || {});
return function (a, b, message) {
assert.ok(py.eval(a + ' == ' + b, c), message);
@@ -71,7 +93,7 @@ QUnit.module('core', function () {
QUnit.test('context_today', function (assert) {
assert.expect(1);
var check = makeTimeCheck(assert, pyEval);
var check = makeTimeCheck(assert, pyUtils);
check("context_today().strftime('%Y-%m-%d')", function(d) {
return String(_.str.sprintf('%04d-%02d-%02d',
@@ -109,7 +131,7 @@ QUnit.module('core', function () {
QUnit.test('timedelta.test_computations', function (assert) {
assert.expect(28);
var c = pyEval.context();
var c = pyUtils.context();
var zero = py.float.fromJSON(0);
var eq = makeEq(assert, {
// one week
@@ -164,7 +186,7 @@ QUnit.module('core', function () {
QUnit.test('timedelta.test_basic_attributes', function (assert) {
assert.expect(3);
var ctx = pyEval.context();
var ctx = pyUtils.context();
assert.strictEqual(py.eval('datetime.timedelta(1, 7, 31).days', ctx), 1);
assert.strictEqual(py.eval('datetime.timedelta(1, 7, 31).seconds', ctx), 7);
assert.strictEqual(py.eval('datetime.timedelta(1, 7, 31).microseconds', ctx), 31);
@@ -173,7 +195,7 @@ QUnit.module('core', function () {
QUnit.test('timedelta.test_total_seconds', function (assert) {
assert.expect(6);
var c = { timedelta: pyEval.context().datetime.timedelta };
var c = { timedelta: pyUtils.context().datetime.timedelta };
assert.strictEqual(py.eval('timedelta(365).total_seconds()', c), 31536000);
assert.strictEqual(
py.eval('timedelta(seconds=123456.789012).total_seconds()', c),
@@ -191,7 +213,7 @@ QUnit.module('core', function () {
QUnit.test('timedelta.test_str', function (assert) {
assert.expect(10);
var c = { td: pyEval.context().datetime.timedelta };
var c = { td: pyUtils.context().datetime.timedelta };
assert.strictEqual(py.eval('str(td(1))', c), "1 day, 0:00:00");
assert.strictEqual(py.eval('str(td(-1))', c), "-1 day, 0:00:00");
@@ -218,7 +240,7 @@ QUnit.module('core', function () {
assert.expect(3);
var td = py.PY_call(
pyEval.context().datetime.timedelta,
pyUtils.context().datetime.timedelta,
{microseconds: py.float.fromJSON(-1)});
assert.strictEqual(td.days, -1);
assert.strictEqual(td.seconds, 24 * 3600 - 1);
@@ -228,7 +250,7 @@ QUnit.module('core', function () {
QUnit.test('timedelta.test_bool', function (assert) {
assert.expect(5);
var c = { td: pyEval.context().datetime.timedelta };
var c = { td: pyUtils.context().datetime.timedelta };
assert.ok(py.eval('bool(td(1))', c));
assert.ok(py.eval('bool(td(0, 1))', c));
assert.ok(py.eval('bool(td(0, 0, 1))', c));
@@ -239,7 +261,7 @@ QUnit.module('core', function () {
QUnit.test('date.test_computations', function (assert) {
assert.expect(31);
var d = pyEval.context().datetime;
var d = pyUtils.context().datetime;
var a = d.date.fromJSON(2002, 1, 31);
var b = d.date.fromJSON(1956, 1, 31);
@@ -323,23 +345,23 @@ QUnit.module('core', function () {
assert.strictEqual(
py.eval("(datetime.date(2012, 2, 15) + relativedelta(days=-1)).strftime('%Y-%m-%d 23:59:59')",
pyEval.context()),
pyUtils.context()),
"2012-02-14 23:59:59");
assert.strictEqual(
py.eval("(datetime.date(2012, 2, 15) + relativedelta(days=1)).strftime('%Y-%m-%d')",
pyEval.context()),
pyUtils.context()),
"2012-02-16");
assert.strictEqual(
py.eval("(datetime.date(2012, 2, 15) + relativedelta(days=-1)).strftime('%Y-%m-%d')",
pyEval.context()),
pyUtils.context()),
"2012-02-14");
assert.strictEqual(
py.eval("(datetime.date(2012, 2, 1) + relativedelta(days=-1)).strftime('%Y-%m-%d')",
pyEval.context()),
pyUtils.context()),
'2012-01-31');
assert.strictEqual(
py.eval("(datetime.date(2015,2,5)+relativedelta(days=-6,weekday=0)).strftime('%Y-%m-%d')",
pyEval.context()),
pyUtils.context()),
'2015-02-02');
});
@@ -348,19 +370,19 @@ QUnit.module('core', function () {
assert.expect(4);
assert.strictEqual(
py.eval("(datetime.datetime(2017, 2, 15, 1, 7, 31) + datetime.timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')",
pyEval.context()),
pyUtils.context()),
"2017-02-16 01:07:31");
assert.strictEqual(
py.eval("(datetime.datetime(2012, 2, 15, 1, 7, 31) - datetime.timedelta(hours=1)).strftime('%Y-%m-%d %H:%M:%S')",
pyEval.context()),
pyUtils.context()),
"2012-02-15 00:07:31");
assert.strictEqual(
py.eval("(datetime.datetime(2012, 2, 15, 1, 7, 31) + datetime.timedelta(hours=-1)).strftime('%Y-%m-%d %H:%M:%S')",
pyEval.context()),
pyUtils.context()),
"2012-02-15 00:07:31");
assert.strictEqual(
py.eval("(datetime.datetime(2012, 2, 15, 1, 7, 31) + datetime.timedelta(minutes=100)).strftime('%Y-%m-%d %H:%M:%S')",
pyEval.context()),
pyUtils.context()),
"2012-02-15 02:47:31");
});
@@ -369,7 +391,7 @@ QUnit.module('core', function () {
var result = py.eval(
'datetime.datetime(2012, 2, 15, 1, 7, 31)',
pyEval.context());
pyUtils.context());
assert.ok(result instanceof Date);
assert.strictEqual(result.getFullYear(), 2012);
@@ -387,14 +409,14 @@ QUnit.module('core', function () {
'datetime.datetime.combine(datetime.date(2012, 2, 15),' +
' datetime.time(1, 7, 13))' +
' .strftime("%Y-%m-%d %H:%M:%S")',
pyEval.context());
pyUtils.context());
assert.strictEqual(result, "2012-02-15 01:07:13");
result = py.eval(
'datetime.datetime.combine(datetime.date(2012, 2, 15),' +
' datetime.time())' +
' .strftime("%Y-%m-%d %H:%M:%S")',
pyEval.context());
pyUtils.context());
assert.strictEqual(result, '2012-02-15 00:00:00');
});
@@ -405,11 +427,11 @@ QUnit.module('core', function () {
'datetime.datetime(2012, 2, 15, 1, 7, 13)' +
' .replace(hour=0, minute=0, second=0)' +
' .strftime("%Y-%m-%d %H:%M:%S")',
pyEval.context());
pyUtils.context());
assert.strictEqual(result, "2012-02-15 00:00:00");
});
QUnit.module('pyeval (eval domain contexts)', {
QUnit.module('py_utils (eval domain contexts)', {
beforeEach: function() {
this.user_context = {
uid: 1,
@@ -423,7 +445,7 @@ QUnit.module('core', function () {
QUnit.test('empty, basic', function (assert) {
assert.expect(3);
var result = pyEval.eval_domains_and_contexts({
var result = pyUtils.eval_domains_and_contexts({
contexts: [this.user_context],
domains: [],
});
@@ -470,7 +492,7 @@ QUnit.module('core', function () {
},
{ "active_id": 9, "active_ids": [ 9 ], "active_model": "mail.compose.message" }
];
var result = pyEval.eval_domains_and_contexts({
var result = pyUtils.eval_domains_and_contexts({
contexts: ctx,
domins: [],
});
@@ -517,7 +539,7 @@ QUnit.module('core', function () {
"__eval_context": null,
"__ref": "compound_context"
}];
var result = pyEval.eval_domains_and_contexts({
var result = pyUtils.eval_domains_and_contexts({
contexts: ctx,
domains: [],
});
@@ -537,7 +559,7 @@ QUnit.module('core', function () {
QUnit.test('domain with time', function (assert) {
assert.expect(1);
var result = pyEval.eval_domains_and_contexts({
var result = pyUtils.eval_domains_and_contexts({
domains: [
[['type', '=', 'contract']],
["|", ["state", "in", ["open", "draft"]], [["type", "=", "contract"], ["state", "=", "pending"]]],
@@ -571,13 +593,13 @@ QUnit.module('core', function () {
__debug: "[('company_id', '=', context.get('company_id',False))]"
};
var result1 = pyEval.eval_domains_and_contexts({
var result1 = pyUtils.eval_domains_and_contexts({
domains: [d],
contexts: [],
});
assert.deepEqual(result1.domain, [['company_id', '=', false]]);
var result2 = pyEval.eval_domains_and_contexts({
var result2 = pyUtils.eval_domains_and_contexts({
domains: [d],
contexts: [],
eval_context: {company_id: 42},
@@ -592,7 +614,7 @@ QUnit.module('core', function () {
var c = "{'default_opportunity_id': active_id, 'default_duration': 1.0, 'lng': lang}";
var cc = new Context(c);
cc.set_eval_context({active_id: 42});
var result = pyEval.eval_domains_and_contexts({
var result = pyUtils.eval_domains_and_contexts({
domains:[], contexts: [this.user_context, cc]
});
@@ -610,7 +632,7 @@ QUnit.module('core', function () {
assert.expect(1);
var d = "[('state','!=','cancel'),('opening_date','>',context_today().strftime('%Y-%m-%d'))]";
var result = pyEval.eval_domains_and_contexts({
var result = pyUtils.eval_domains_and_contexts({
domains: [d],
contexts: [],
});
@@ -628,7 +650,7 @@ QUnit.module('core', function () {
assert.expect(1);
var d = "[('type','=','in'),('day','<=', time.strftime('%Y-%m-%d')),('day','>',(context_today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]";
var result = pyEval.eval_domains_and_contexts({
var result = pyUtils.eval_domains_and_contexts({
domains: [d],
contexts: [],
});
@@ -666,7 +688,7 @@ QUnit.module('core', function () {
{"__ref": "context", "__debug": "{'default_ref': 'stock.picking.out,'+str(context.get('active_id', False))}", "__id": "54d6ad1d6c45"}
], "__eval_context": null}
];
var result = pyEval.eval_domains_and_contexts({
var result = pyUtils.eval_domains_and_contexts({
domains: [],
contexts: cs,
});
@@ -686,7 +708,7 @@ QUnit.module('core', function () {
});
});
QUnit.module('pyeval (contexts)');
QUnit.module('py_utils (contexts)');
QUnit.test('context_recursive', function (assert) {
assert.expect(3);
@@ -696,13 +718,13 @@ QUnit.module('core', function () {
__debug: '{"foo": context.get("bar", "qux")}'
}];
assert.deepEqual(
pyEval.eval('contexts', context_to_eval, {bar: "ok"}),
pyUtils.eval('contexts', context_to_eval, {bar: "ok"}),
{foo: 'ok'});
assert.deepEqual(
pyEval.eval('contexts', context_to_eval, {bar: false}),
pyUtils.eval('contexts', context_to_eval, {bar: false}),
{foo: false});
assert.deepEqual(
pyEval.eval('contexts', context_to_eval),
pyUtils.eval('contexts', context_to_eval),
{foo: 'qux'});
});
@@ -712,7 +734,7 @@ QUnit.module('core', function () {
// Context n should have base evaluation context + all of contexts
// 0..n-1 in its own evaluation context
var active_id = 4;
var result = pyEval.eval('contexts', [
var result = pyUtils.eval('contexts', [
{
"__contexts": [
{
@@ -759,7 +781,7 @@ QUnit.module('core', function () {
QUnit.test('non-literal_eval_contexts', function (assert) {
assert.expect(1);
var result = pyEval.eval('contexts', [{
var result = pyUtils.eval('contexts', [{
"__ref": "compound_context",
"__contexts": [
{"__ref": "context", "__debug": "{'type':parent.type}",
@@ -841,7 +863,7 @@ QUnit.module('core', function () {
QUnit.test('return-input-value', function (assert) {
assert.expect(1);
var result = pyEval.eval('contexts', [{
var result = pyUtils.eval('contexts', [{
__ref: 'compound_context',
__contexts: ["{'line_id': line_id , 'journal_id': journal_id }"],
__eval_context: {
@@ -905,15 +927,15 @@ QUnit.module('core', function () {
});
});
QUnit.module('pyeval (domains)');
QUnit.module('py_utils (domains)');
QUnit.test('current_date', function (assert) {
assert.expect(1);
var current_date = time.date_to_str(new Date());
var result = pyEval.eval('domains',
var result = pyUtils.eval('domains',
[[],{"__ref":"domain","__debug":"[('name','>=',current_date),('name','<=',current_date)]","__id":"5dedcfc96648"}],
pyEval.context());
pyUtils.context());
assert.deepEqual(result, [
['name', '>=', current_date],
['name', '<=', current_date]
@@ -928,22 +950,22 @@ QUnit.module('core', function () {
__debug: '[("foo", "=", context.get("bar", "qux"))]'
}, [['bar', '>=', 42]]];
assert.deepEqual(
pyEval.eval('domains', domains_to_eval, {bar: "ok"}),
pyUtils.eval('domains', domains_to_eval, {bar: "ok"}),
[['foo', '=', 'ok'], ['bar', '>=', 42]]);
assert.deepEqual(
pyEval.eval('domains', domains_to_eval, {bar: false}),
pyUtils.eval('domains', domains_to_eval, {bar: false}),
[['foo', '=', false], ['bar', '>=', 42]]);
assert.deepEqual(
pyEval.eval('domains', domains_to_eval),
pyUtils.eval('domains', domains_to_eval),
[['foo', '=', 'qux'], ['bar', '>=', 42]]);
});
QUnit.module('pyeval (groupbys)');
QUnit.module('py_utils (groupbys)');
QUnit.test('groupbys_00', function (assert) {
assert.expect(1);
var result = pyEval.eval('groupbys', [
var result = pyUtils.eval('groupbys', [
{group_by: 'foo'},
{group_by: ['bar', 'qux']},
{group_by: null},
@@ -955,7 +977,7 @@ QUnit.module('core', function () {
QUnit.test('groupbys_01', function (assert) {
assert.expect(1);
var result = pyEval.eval('groupbys', [
var result = pyUtils.eval('groupbys', [
{group_by: 'foo'},
{ __ref: 'context', __debug: '{"group_by": "bar"}' },
{group_by: 'grault'}
@@ -966,7 +988,7 @@ QUnit.module('core', function () {
QUnit.test('groupbys_02', function (assert) {
assert.expect(1);
var result = pyEval.eval('groupbys', [
var result = pyUtils.eval('groupbys', [
{group_by: 'foo'},
{
__ref: 'compound_context',
@@ -981,7 +1003,7 @@ QUnit.module('core', function () {
QUnit.test('groupbys_03', function (assert) {
assert.expect(1);
var result = pyEval.eval('groupbys', [
var result = pyUtils.eval('groupbys', [
{group_by: 'foo'},
{
__ref: 'compound_context',
@@ -998,7 +1020,7 @@ QUnit.module('core', function () {
QUnit.test('groupbys_04', function (assert) {
assert.expect(1);
var result = pyEval.eval('groupbys', [
var result = pyUtils.eval('groupbys', [
{group_by: 'foo'},
{
__ref: 'compound_context',
@@ -1015,7 +1037,7 @@ QUnit.module('core', function () {
QUnit.test('groupbys_05', function (assert) {
assert.expect(1);
var result = pyEval.eval('groupbys', [
var result = pyUtils.eval('groupbys', [
{group_by: 'foo'},
{ __ref: 'context', __debug: '{"group_by": value}' },
{group_by: 'grault'}
@@ -1023,6 +1045,199 @@ QUnit.module('core', function () {
assert.deepEqual(result, ['foo', 'bar', 'grault']);
});
});
QUnit.module('pyutils (_formatAST)');
QUnit.test("basic values", function (assert) {
assert.expect(6);
assert.checkAST("1", "integer value");
assert.checkAST("1.4", "float value");
assert.checkAST("-12", "negative integer value");
assert.checkAST("True", "boolean");
assert.checkAST("'some string'", "a string");
assert.checkAST("None", "None");
});
QUnit.test("dictionary", function (assert) {
assert.expect(3);
assert.checkAST("{}", "empty dictionary");
assert.checkAST("{'a': 1}", "dictionary with a single key");
assert.checkAST("d['a']", "get a value in a dictionary");
});
QUnit.test("list", function (assert) {
assert.expect(2);
assert.checkAST("[]", "empty list");
assert.checkAST("[1]", "list with one value");
});
QUnit.test("tuple", function (assert) {
assert.expect(2);
assert.checkAST("()", "empty tuple");
assert.checkAST("(1, 2)", "basic tuple");
});
QUnit.test("simple arithmetic", function (assert) {
assert.expect(15);
assert.checkAST("1 + 2", "addition");
assert.checkAST("+(1 + 2)", "other addition, prefix");
assert.checkAST("1 - 2", "substraction");
assert.checkAST("-1 - 2", "other substraction");
assert.checkAST("-(1 + 2)", "other substraction");
assert.checkAST("1 + 2 + 3", "addition of 3 integers");
assert.checkAST("a + b", "addition of two variables");
assert.checkAST("42 % 5", "modulo operator");
assert.checkAST("a * 10", "multiplication");
assert.checkAST("a ** 10", "**");
assert.checkAST("~10", "bitwise not");
assert.checkAST("~(10 + 3)", "bitwise not");
assert.checkAST("a * (1 + 2)", "multiplication and addition");
assert.checkAST("(a + b) * 43", "addition and multiplication");
assert.checkAST("a // 10", "integer division");
});
QUnit.test("boolean operators", function (assert) {
assert.expect(6);
assert.checkAST("True and False", "boolean operator");
assert.checkAST("True or False", "boolean operator or");
assert.checkAST("(True or False) and False", "boolean operators and and or");
assert.checkAST("not False", "not prefix");
assert.checkAST("not foo", "not prefix with variable");
assert.checkAST("not a in b", "not prefix with expression");
});
QUnit.test("other operators", function (assert) {
assert.expect(7);
assert.checkAST("x == y", "== operator");
assert.checkAST("x != y", "!= operator");
assert.checkAST("x < y", "< operator");
assert.checkAST("x is y", "is operator");
assert.checkAST("x is not y", "is and not operator");
assert.checkAST("x in y", "in operator");
assert.checkAST("x not in y", "not in operator");
});
QUnit.test("equality", function (assert) {
assert.expect(1);
assert.checkAST("a == b", "simple equality");
});
QUnit.test("strftime", function (assert) {
assert.expect(3);
assert.checkAST("time.strftime('%Y')", "strftime with year");
assert.checkAST("time.strftime('%Y') + '-01-30'", "strftime with year");
assert.checkAST("time.strftime('%Y-%m-%d %H:%M:%S')", "strftime with year");
});
QUnit.test("context_today", function (assert) {
assert.expect(1);
assert.checkAST("context_today().strftime('%Y-%m-%d')", "context today call");
});
QUnit.test("function call", function (assert) {
assert.expect(5);
assert.checkAST("td()", "simple call");
assert.checkAST("td(a, b, c)", "simple call with args");
assert.checkAST('td(days = 1)', "simple call with kwargs");
assert.checkAST('f(1, 2, days = 1)', "mixing args and kwargs");
assert.checkAST('str(td(2))', "function call in function call");
});
QUnit.test("various expressions", function (assert) {
assert.expect(3);
assert.checkAST('(a - b).days', "substraction and .days");
assert.checkAST('a + day == date(2002, 3, 3)');
var expr = "[('type', '=', 'in'), ('day', '<=', time.strftime('%Y-%m-%d')), ('day', '>', (context_today() - datetime.timedelta(days = 15)).strftime('%Y-%m-%d'))]";
assert.checkAST(expr);
});
QUnit.module('pyutils (_normalizeDomain)');
QUnit.assert.checkNormalization = function (domain, normalizedDomain) {
normalizedDomain = normalizedDomain || domain;
var result = pyUtils.normalizeDomain(domain);
this.pushResult({
result: result === normalizedDomain,
actual: result,
expected: normalizedDomain
});
};
QUnit.test("return simple (normalized) domains", function (assert) {
assert.expect(3);
assert.checkNormalization("[]");
assert.checkNormalization("[('a', '=', 1)]");
assert.checkNormalization("['!', ('a', '=', 1)]");
});
QUnit.test("properly add the & in a non normalized domain", function (assert) {
assert.expect(1);
assert.checkNormalization(
"[('a', '=', 1), ('b', '=', 2)]",
"['&', ('a', '=', 1), ('b', '=', 2)]"
);
});
QUnit.test("normalize domain with ! operator", function (assert) {
assert.expect(1);
assert.checkNormalization(
"['!', ('a', '=', 1), ('b', '=', 2)]",
"['&', '!', ('a', '=', 1), ('b', '=', 2)]"
);
});
QUnit.module('pyutils (assembleDomains)');
QUnit.assert.checkAssemble = function (domains, operator, domain) {
domain = pyUtils.normalizeDomain(domain);
var result = pyUtils.assembleDomains(domains, operator);
this.pushResult({
result: result === domain,
actual: result,
expected: domain
});
};
QUnit.test("assemble domains", function (assert) {
assert.expect(7);
assert.checkAssemble([], '&', "[]");
assert.checkAssemble(["[('a', '=', 1)]"], null, "[('a', '=', 1)]");
assert.checkAssemble(
["[('a', '=', '1'), ('b', '!=', 2)]"],
'AND',
"['&',('a', '=', '1'), ('b', '!=', 2)]"
);
assert.checkAssemble(
["[('a', '=', '1')]", "[]"],
'AND',
"[('a', '=', '1')]"
);
assert.checkAssemble(
["[('a', '=', '1')]", "[('b', '<=', 3)]"],
'AND',
"['&',('a', '=', '1'),('b','<=', 3)]"
);
assert.checkAssemble(
["[('a', '=', '1'), ('c', 'in', [4, 5])]", "[('b', '<=', 3)]"],
'OR',
"['|', '&',('a', '=', '1'),('c', 'in', [4, 5]),('b','<=', 3)]"
);
assert.checkAssemble(
["[('user_id', '=', uid)]"],
null,
"[('user_id', '=', uid)]"
);
});
});
});
addons/web/static/tests/helpers/mock_server.js
+3 -3
View File
@@ -3,7 +3,7 @@ odoo.define('web.MockServer', function (require) {
var Class = require('web.Class');
var Domain = require('web.Domain');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var MockServer = Class.extend({
/**
@@ -235,7 +235,7 @@ var MockServer = Class.extend({
// 'transfer_node_to_modifiers' simulation
var attrs = node.getAttribute('attrs');
if (attrs) {
attrs = pyeval.py_eval(attrs);
attrs = pyUtils.py_eval(attrs);
_.extend(modifiers, attrs);
}
@@ -250,7 +250,7 @@ var MockServer = Class.extend({
var mod = node.getAttribute(a);
if (mod) {
var pyevalContext = window.py.dict.fromJSON(context || {});
var v = pyeval.py_eval(mod, {context: pyevalContext}) ? true: false;
var v = pyUtils.py_eval(mod, {context: pyevalContext}) ? true: false;
if (inTreeView && a === 'invisible') {
modifiers.column_invisible = v;
} else if (v || !(a in modifiers) || !_.isArray(modifiers[a])) {
addons/web/static/tests/views/form_tests.js
+2 -2
View File
@@ -9,7 +9,7 @@ var fieldRegistry = require('web.field_registry');
var FormView = require('web.FormView');
var mixins = require('web.mixins');
var NotificationService = require('web.NotificationService');
var pyeval = require('web.pyeval');
var pyUtils = require('web.py_utils');
var testUtils = require('web.test_utils');
var widgetRegistry = require('web.widget_registry');
var Widget = require('web.Widget');
@@ -6477,7 +6477,7 @@ QUnit.module('Views', {
'</form>',
intercepts: {
execute_action: function (event) {
var effectDescription = pyeval.py_eval(event.data.action_data.effect);
var effectDescription = pyUtils.py_eval(event.data.action_data.effect);
assert.deepEqual(effectDescription, {message: 'Congrats!'}, "should have correct effect description");
}
}
addons/web/static/tests/views/search_filters_menu_tests.js
+40
View File
@@ -129,7 +129,47 @@ QUnit.module('FiltersMenu', {
filterMenu.destroy();
});
QUnit.test('adding a date filter', function (assert) {
assert.expect(5);
var filters = [{
itemId: 1,
isActive: false,
description: 'some filter',
isPeriod: true,
name: 'Filter Date',
fieldName: 'date_field',
groupId: 1,
},
];
var filterMenu = createFiltersMenu(filters, this.fields, {
intercepts: {
menu_item_toggled: function (ev) {
assert.strictEqual(ev.data.optionId, 'this_quarter',
"should trigger event with proper period");
},
},
});
// open menu dropdown
filterMenu.$('span.fa-filter').click();
assert.strictEqual(filterMenu.$('.o_menu_item ul').length, 0,
"there should not be a sub menu item list");
// open date sub menu
filterMenu.$('.o_submenu_switcher').click();
assert.strictEqual(filterMenu.$('.o_menu_item ul').length, 1,
"there should be a sub menu item list");
// click on This Quarter option
assert.notOk(filterMenu.$('.o_menu_item li[data-option_id="this_quarter"]').hasClass('selected'),
"menu item should not be selected");
filterMenu.$('.o_menu_item li[data-option_id="this_quarter"] a').click();
assert.ok(filterMenu.$('.o_menu_item li[data-option_id="this_quarter"]').hasClass('selected'),
"menu item should be selected");
filterMenu.destroy();
});
});
});
addons/web/static/tests/views/search_groupby_menu_tests.js
+26 -4
View File
@@ -93,14 +93,22 @@ QUnit.module('GroupByMenu', {
groupByMenu.destroy();
});
QUnit.test('click on groupby filter should activate it', function (assert) {
QUnit.test('click on a groupby filter (not of date type) should activate it', function (assert) {
assert.expect(5);
var groupByMenu = createGroupByMenu(this.groupbys,
{fieldname: {sortable: true, string: 'Super Date', type: 'date', isDate: true}}, {
this.groupbys = [{
isActive: false,
description: 'another group by',
fieldName: 'float_field',
itemId: 'green',
groupId: 1,
}];
this.fields = {float_field: {sortable: true, string: 'Super Float', type: 'float'}};
var groupByMenu = createGroupByMenu(this.groupbys, this.fields, {
intercepts: {
menu_item_toggled: function(ev) {
assert.strictEqual(ev.data.itemId, 'red');
assert.strictEqual(ev.data.itemId, 'green');
assert.strictEqual(ev.data.isActive, true);
},
},
@@ -111,7 +119,21 @@ QUnit.module('GroupByMenu', {
assert.ok(groupByMenu.$('.o_menu_item:first').hasClass('selected'));
assert.ok(groupByMenu.$('.o_menu_item:first').is(':visible'),
'group by filter should still be visible');
groupByMenu.destroy();
});
QUnit.test('click on a groupby filter of date type should open menu option', function (assert) {
assert.expect(4);
var groupByMenu = createGroupByMenu(this.groupbys,
{fieldname: {sortable: true, string: 'Super Date', type: 'date', isDate: true}});
groupByMenu.$('button:first').click();
assert.ok(!groupByMenu.$('.o_menu_item:first').hasClass('selected'));
groupByMenu.$('.o_menu_item a').first().click();
assert.ok(!groupByMenu.$('.o_menu_item:first').hasClass('selected'));
assert.ok(groupByMenu.$('.o_menu_item:first').is(':visible'),
'group by filter should still be visible');
assert.ok(groupByMenu.$('.o_item_option').length, 5);
groupByMenu.destroy();
});
addons/web/static/tests/views/search_view_tests.js
+169 -32
View File
@@ -10,17 +10,17 @@ QUnit.module('Search View', {
partner: {
fields: {
date_field: {string: "Date", type: "date", store: true, sortable: true},
Birthday: {string: "Birthday", type: "date", store: true, sortable: true},
foo: {string: "Foo", type: "char"},
birthday: {string: "Birthday", type: "date", store: true, sortable: true},
foo: {string: "Foo", type: "char", store: true, sortable: true},
bar: {string: "Bar", type: "many2one", relation: 'partner'},
float_field: {string: "Float", type: "float"},
},
records: [
{id: 1, display_name: "First record", foo: "yop", bar: 2, date_field: "2017-01-25", Birthday: "1983-07-15", float_field: 1},
{id: 2, display_name: "Second record", foo: "blip", bar: 1, date_field: "2017-01-24", Birthday: "1982-06-04",float_field: 2},
{id: 3, display_name: "Third record", foo: "gnap", bar: 1, date_field: "2017-01-13", Birthday: "1985-09-13",float_field: 1.618},
{id: 4, display_name: "Fourth record", foo: "plop", bar: 2, date_field: "2017-02-25", Birthday: "1983-05-05",float_field: -1},
{id: 5, display_name: "Fifth record", foo: "zoup", bar: 2, date_field: "2016-01-25", Birthday: "1800-01-01",float_field: 13},
{id: 1, display_name: "First record", foo: "yop", bar: 2, date_field: "2017-01-25", birthday: "1983-07-15", float_field: 1},
{id: 2, display_name: "Second record", foo: "blip", bar: 1, date_field: "2017-01-24", birthday: "1982-06-04",float_field: 2},
{id: 3, display_name: "Third record", foo: "gnap", bar: 1, date_field: "2017-01-13", birthday: "1985-09-13",float_field: 1.618},
{id: 4, display_name: "Fourth record", foo: "plop", bar: 2, date_field: "2017-02-25", birthday: "1983-05-05",float_field: -1},
{id: 5, display_name: "Fifth record", foo: "zoup", bar: 2, date_field: "2016-01-25", birthday: "1800-01-01",float_field: 13},
],
},
pony: {
@@ -69,6 +69,13 @@ QUnit.module('Search View', {
type: 'ir.actions.act_window',
views: [[2, 'list']],
search_view_id: [4, 'search'],
}, {
id: 6,
name: 'Partners Action 6',
res_model: 'partner',
type: 'ir.actions.act_window',
views: [[2, 'list']],
search_view_id: [5, 'search'],
}
];
@@ -90,21 +97,21 @@ QUnit.module('Search View', {
// search views
'partner,false,search': '<search>'+
'<field name="foo" string="Foo"/>' +
'<filter string="candle" name="itsName" context="{\'group_by\': \'foo\'}"/>' +
'</search>',
'partner,2,search': '<search>'+
'<field name="date_field" string="Date"/>' +
'<filter string="Date" name="coolName" context="{\'group_by\': \'date_field\'}"/>' +
'</search>',
'partner,3,search': '<search>'+
'<field name="date_field" string="Date"/>' +
'<filter string="float" name="positive" domain="[(\'float_field\', \'>=\', 0)]"/>' +
'</search>',
'partner,4,search': '<search>'+
'<field name="date_field" string="Date"/>' +
'<filter string="Date" name="coolName" context="{\'group_by\': \'date_field:day\'}"/>' +
'</search>',
'partner,5,search': '<search>'+
'<filter string="Date Field Filter" name="positive" date="date_field"/>' +
'<filter string="Date Field Groupby" name="coolName" context="{\'group_by\': \'date_field:day\'}"/>' +
'</search>',
};
},
}, function () {
@@ -159,13 +166,14 @@ QUnit.module('Search View', {
actionManager.doAction(2);
$('span.fa-bars').click();
$('.o_submenu_switcher').click();
$('.o_item_option:first').click();
assert.strictEqual($('.o_searchview .o_searchview_facet .o_facet_values span').length, 1,
'should have a facet');
// Don't forget there is a hidden li.divider element at first place among children
$('.o_item_option:nth-child(2)').click();
assert.strictEqual($('.o_searchview .o_searchview_facet .o_facet_values span').length, 1,
'should have a facet');
$('.o_item_option:nth-child(2)').click();
$('.o_item_option:nth-child(3)').click();
assert.strictEqual($('.o_searchview .o_searchview_facet .o_facet_values span').length, 1,
'should have a facet');
$('.o_item_option:nth-child(3)').click();
assert.strictEqual($('.o_searchview .o_searchview_facet .o_facet_values span').length, 0,
'should have no facet');
actionManager.destroy();
@@ -213,12 +221,26 @@ QUnit.module('Search View', {
});
QUnit.test('group by a date field using interval works', function (assert) {
assert.expect(9);
assert.expect(13);
var groupbys = [
["date_field:day"],
["date_field:month"],
["birthday:month"],
["birthday:year"],
];
var actionManager = createActionManager({
actions: this.actions,
archs: this.archs,
data: this.data,
mockRPC: function (route, args) {
if (route === '/web/dataset/call_kw/partner/read_group') {
assert.deepEqual(args.kwargs.groupby, groupbys.shift());
}
return this._super.apply(this, arguments);
},
});
actionManager.doAction(5);
@@ -226,32 +248,31 @@ QUnit.module('Search View', {
$('.o_search_options .fa-bars').click();
// Activate the groupby 'Date'
$('.o_group_by_menu .o_menu_item').click();
// by default, data should be grouped by the field 'Date' using the interval 'day'
// // select option 'day'
$('.o_group_by_menu .o_menu_item .o_item_option[data-option_id="day"]').click();
assert.strictEqual($('div.o_facet_values span').text().trim(),'Date: Day');
assert.strictEqual($('.o_content tr.o_group_header').length, 5);
// open submenu with interval options
$('.o_group_by_menu .o_menu_item .o_submenu_switcher').click();
// select option 'month'
$('.o_group_by_menu .o_menu_item .o_item_option:nth-child(3)').click();
// data should be grouped by the field 'Date' using the interval 'month'
// // select option 'month'
$('.o_group_by_menu .o_menu_item .o_item_option[data-option_id="month"]').click();
// // data should be grouped by the field 'Date' using the interval 'month'
assert.strictEqual($('div.o_facet_values span').text().trim(),'Date: Month');
assert.strictEqual($('.o_content tr.o_group_header').length, 3);
// deactivate option 'month'
$('.o_group_by_menu .o_menu_item .o_item_option:nth-child(3)').click();
// no groupby is applied
// // deactivate option 'month'
$('.o_group_by_menu .o_menu_item .o_item_option[data-option_id="month"]').click();
// // no groupby is applied
assert.strictEqual($('div.o_facet_values span').length, 0);
// open 'Add custom Groupby' menu
// // open 'Add custom Groupby' menu
$('.o_group_by_menu .o_add_custom_group a').click();
// click on 'Apply' button
// // click on 'Apply' button
$('.o_group_by_menu .o_generator_menu button').click();
// data should be grouped by the field 'Birthday' using the interval 'month'
// // data should be grouped by the field 'Birthday' using the interval 'month'
assert.strictEqual($('div.o_facet_values span').text().trim(),'Birthday: Month');
assert.strictEqual($('.o_content tr.o_group_header').length, 5);
// open submenu with interval options
// // open submenu with interval options
$('.o_group_by_menu .o_menu_item .o_submenu_switcher').eq(1).click();
// select option 'year'
// // select option 'year'
$('.o_group_by_menu .o_menu_item .o_item_option').eq(9).click();
// data should be grouped by the field 'Birthday' using the interval 'year'
// // data should be grouped by the field 'Birthday' using the interval 'year'
assert.strictEqual($('div.o_facet_values span').text().trim(),'Birthday: Year');
assert.strictEqual($('.o_content tr.o_group_header').length, 4);
actionManager.destroy();
@@ -295,5 +316,121 @@ QUnit.module('Search View', {
'no facet should be in the search view');
actionManager.destroy();
});
QUnit.test('filter by a date field using period works', function (assert) {
assert.expect(14);
this.archs['partner,4,search'] = '<search>'+
'<filter string="AAA" name="some_filter" date="date_field" default_period="this_week"></filter>' +
'</search>';
var domains = [
[],
// today
['&', ["date_field", ">=", "2017-03-22"],["date_field", "<", "2017-03-23"]],
// this week
['&', ["date_field", ">=", "2017-03-20"],["date_field", "<", "2017-03-27"]],
// this month
['&', ["date_field", ">=", "2017-03-01"],["date_field", "<", "2017-04-01"]],
// this quarter
['&', ["date_field", ">=", "2017-01-01"],["date_field", "<", "2017-04-01"]],
// this year
['&', ["date_field", ">=", "2017-01-01"],["date_field", "<", "2018-01-01"]],
// yesterday
['&', ["date_field", ">=", "2017-03-21"],["date_field", "<", "2017-03-22"]],
// last week
['&', ["date_field", ">=", "2017-03-13"],["date_field", "<", "2017-03-20"]],
// last month
['&', ["date_field", ">=", "2017-02-01"],["date_field", "<", "2017-03-01"]],
// last quarter
['&', ["date_field", ">=", "2016-10-01"],["date_field", "<", "2017-01-01"]],
// last year
['&', ["date_field", ">=", "2016-01-01"],["date_field", "<", "2017-01-01"]],
// last 7 days (whole days)
['&', ["date_field", ">=", "2017-03-15"],["date_field", "<", "2017-03-22"]],
// last 30 days
['&', ["date_field", ">=", "2017-02-20"],["date_field", "<", "2017-03-22"]],
// last 365 days
['&', ["date_field", ">=", "2016-03-22"],["date_field", "<", "2017-03-22"]],
];
var RealDate = window.Date;
window.Date = function TestDate() {
// month are indexed from 0!
return new RealDate(2017,2,22);
};
window.Date.now = function Test() {
return new Date(2017,2,22);
};
var actionManager = createActionManager({
actions: this.actions,
archs: this.archs,
data: this.data,
mockRPC: function (route, args) {
if (route === '/web/dataset/search_read') {
assert.deepEqual(args.domain, domains.shift());
}
return this._super.apply(this, arguments);
},
});
actionManager.doAction(5);
// open menu 'Filter'
$('.o_search_options .fa-filter').click();
// open menu options
$('li.o_menu_item').click();
$('li.o_menu_item .o_item_option[data-option_id="today"]').click();
$('li.o_menu_item .o_item_option[data-option_id="this_week"]').click();
$('li.o_menu_item .o_item_option[data-option_id="this_month"]').click();
$('li.o_menu_item .o_item_option[data-option_id="this_quarter"]').click();
$('li.o_menu_item .o_item_option[data-option_id="this_year"]').click();
$('li.o_menu_item .o_item_option[data-option_id="yesterday"]').click();
$('li.o_menu_item .o_item_option[data-option_id="last_week"]').click();
$('li.o_menu_item .o_item_option[data-option_id="last_month"]').click();
$('li.o_menu_item .o_item_option[data-option_id="last_quarter"]').click();
$('li.o_menu_item .o_item_option[data-option_id="last_year"]').click();
$('li.o_menu_item .o_item_option[data-option_id="last_7_days"]').click();
$('li.o_menu_item .o_item_option[data-option_id="last_30_days"]').click();
$('li.o_menu_item .o_item_option[data-option_id="last_365_days"]').click();
actionManager.destroy();
window.Date = RealDate;
});
QUnit.module('Favorites Menu');
QUnit.test('dynamic filters are saved dynamic', function (assert) {
assert.expect(1);
var actionManager = createActionManager({
actions: this.actions,
archs: this.archs,
data: this.data,
intercepts: {
create_filter: function (ev) {
console.log(ev.data);
assert.equal(
ev.data.filter.domain,
"['&', " +
"('date_field', '>=', (context_today() + relativedelta()).strftime('%Y-%m-%d')), " +
"('date_field', '<', (context_today() + relativedelta(days = 1)).strftime('%Y-%m-%d'))"+
"]");
},
},
});
actionManager.doAction(6);
$('span.fa-filter').click();
$('.o_filters_menu li.o_menu_item a').click();
$('.o_item_option:first').click();
$('span.fa-star').click();
$('.o_favorites_menu .o_save_search a').click();
$('.o_favorites_menu .o_save_name button').click();
actionManager.destroy();
});
});
});
});
addons/web/static/tests/views/view_dialogs_tests.js
+1 -1
View File
@@ -391,7 +391,7 @@ QUnit.module('Views', {
intercepts: {
create_filter: function (event) {
var filter = event.data.filter;
assert.deepEqual(filter.domain, [['bar', '=', true]],
assert.deepEqual(filter.domain, "[('bar', '=', True)]",
"should save the correct domain");
assert.deepEqual(filter.context, {shouldBeInFilterContext: true},
"should save the correct context");
addons/web/static/tests/widgets/dropdown_menu_tests.js
+40 -36
View File
@@ -13,25 +13,24 @@ function createDropdownMenu(dropdownTitle, groups, params) {
return menu;
}
QUnit.module('Web', {
beforeEach: function () {
this.items = [
{
isActive: false,
isOpen: false,
description: 'Some Item',
itemId: 1,
groupId: 1,
},
{
isActive: true,
description: 'Some other Item',
itemId: 2,
options: [],
isRemovable: true,
groupId: 2,
},
{
isActive: false,
isOpen: false,
description: 'Some Item',
itemId: 1,
groupId: 1,
},
{
isActive: true,
description: 'Some other Item',
itemId: 2,
options: [],
isRemovable: true,
groupId: 2,
},
];
this.dropdownHeader = {
title: "Menu",
@@ -99,14 +98,16 @@ QUnit.module('Web', {
QUnit.test('options rendering', function (assert) {
assert.expect(3);
this.items[0].options = [{optionId: 1, description: "First Option"}, {optionId: 2, description: "Second Option"}];
this.items[0].options = [{optionId: 1, description: "First Option", groupId: 1}, {optionId: 2, description: "Second Option", groupId: 1}];
var dropdownMenu = createDropdownMenu(this.dropdownHeader, this.items);
// open dropdown
dropdownMenu.$('button:first').click();
assert.strictEqual(dropdownMenu.$('li').length, 4);
dropdownMenu.$('span.fa-caret-down').click();
assert.strictEqual(dropdownMenu.$('li').length, 6);
// open options menu
dropdownMenu.$('span.fa-caret-right').click();
assert.strictEqual(dropdownMenu.$('li').length, 7);
// close options menu
dropdownMenu.$('span.fa-caret-down').click();
assert.strictEqual(dropdownMenu.$('li').length, 4);
@@ -120,8 +121,9 @@ QUnit.module('Web', {
var dropdownMenu = createDropdownMenu(this.dropdownHeader, this.items);
dropdownMenu.$('button:first').click();
dropdownMenu.$('span.fa-caret-down').click();
assert.strictEqual(dropdownMenu.$('li').length, 6);
// open options menu
dropdownMenu.$('span.fa-caret-right').click();
assert.strictEqual(dropdownMenu.$('li').length, 7);
dropdownMenu.$('button:first').click();
dropdownMenu.$('button:first').click();
assert.strictEqual(dropdownMenu.$('li').length, 4);
@@ -159,24 +161,27 @@ QUnit.module('Web', {
},
},
});
// open dropdown menu
dropdownMenu.$('button:first').click();
dropdownMenu.$('span.fa-caret-down').click();
assert.strictEqual(dropdownMenu.$('li').length, 6);
assert.ok(!dropdownMenu.$('.o_menu_item:first').hasClass('selected'));
assert.ok(!dropdownMenu.$('.o_item_option:first').hasClass('selected'));
// open options menu
dropdownMenu.$('span.fa-caret-right').click();
assert.strictEqual(dropdownMenu.$('li').length, 7);
// Don't forget there is a hidden li.divider element at first place among children
assert.ok(!dropdownMenu.$('.o_menu_item:nth-child(2)').hasClass('selected'));
assert.ok(!dropdownMenu.$('.o_item_option:nth-child(2)').hasClass('selected'));
assert.ok(!dropdownMenu.$('.o_item_option:nth-child(3)').hasClass('selected'));
dropdownMenu.$('li.o_item_option:first').click();
assert.ok(dropdownMenu.$('.o_menu_item:first').hasClass('selected'));
assert.ok(dropdownMenu.$('.o_item_option:first').hasClass('selected'));
assert.ok(!dropdownMenu.$('.o_item_option:nth-child(2)').hasClass('selected'));
dropdownMenu.$('li.o_item_option:nth-child(2)').click();
assert.ok(dropdownMenu.$('.o_menu_item:first').hasClass('selected'));
assert.ok(!dropdownMenu.$('.o_item_option:first').hasClass('selected'));
assert.ok(dropdownMenu.$('.o_menu_item:nth-child(2)').hasClass('selected'));
assert.ok(dropdownMenu.$('.o_item_option:nth-child(2)').hasClass('selected'));
dropdownMenu.$('li.o_item_option:nth-child(2)').click();
assert.ok(!dropdownMenu.$('.o_menu_item:first').hasClass('selected'));
assert.ok(!dropdownMenu.$('.o_item_option:first').hasClass('selected'));
assert.ok(!dropdownMenu.$('.o_item_option:nth-child(3)').hasClass('selected'));
dropdownMenu.$('li.o_item_option:nth-child(3)').click();
assert.ok(dropdownMenu.$('.o_menu_item:nth-child(2)').hasClass('selected'));
assert.ok(!dropdownMenu.$('.o_item_option:nth-child(2)').hasClass('selected'));
assert.ok(dropdownMenu.$('.o_item_option:nth-child(3)').hasClass('selected'));
dropdownMenu.$('li.o_item_option:nth-child(3)').click();
assert.ok(!dropdownMenu.$('.o_menu_item:nth-child(2)').hasClass('selected'));
assert.ok(!dropdownMenu.$('.o_item_option:nth-child(2)').hasClass('selected'));
assert.ok(!dropdownMenu.$('.o_item_option:nth-child(3)').hasClass('selected'));
dropdownMenu.destroy();
});
@@ -196,6 +201,5 @@ QUnit.module('Web', {
assert.strictEqual(dropdownMenu.$('li').length, 2);
dropdownMenu.destroy();
});
});
});
});
addons/web/views/webclient_templates.xml
+3 -2
View File
@@ -173,11 +173,12 @@
</script>
<script type="text/javascript" src="/web/static/lib/py.js/lib/py.js"></script>
<script type="text/javascript" src="/web/static/lib/py.js/lib/py_extras.js"></script>
<!-- Special case: core.js declares $.browser needed by ba-bbq -->
<script type="text/javascript" src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
<script type="text/javascript" src="/web/static/src/js/core/domain.js"></script>
<script type="text/javascript" src="/web/static/src/js/core/pyeval.js"></script>
<script type="text/javascript" src="/web/static/src/js/core/py_utils.js"></script>
<script type="text/javascript" src="/web/static/src/js/chrome/abstract_action.js"></script>
<script type="text/javascript" src="/web/static/src/js/chrome/action_manager.js"></script>
<script type="text/javascript" src="/web/static/src/js/chrome/action_manager_act_window.js"></script>
@@ -532,7 +533,7 @@
<script type="text/javascript" src="/web/static/tests/widgets/dropdown_menu_tests.js"></script>
<script type="text/javascript" src="/web/static/tests/views/search_view_tests.js"></script>
<script type="text/javascript" src="/web/static/tests/core/registry_tests.js"></script>
<script type="text/javascript" src="/web/static/tests/core/pyeval_tests.js"></script>
<script type="text/javascript" src="/web/static/tests/core/py_utils_tests.js"></script>
<script type="text/javascript" src="/web/static/tests/core/class_tests.js"></script>
<script type="text/javascript" src="/web/static/tests/core/rpc_tests.js"></script>
<script type="text/javascript" src="/web/static/tests/core/domain_tests.js"></script>
addons/website_sale/views/sale_report_views.xml
+1 -18
View File
@@ -5,24 +5,7 @@
<field name="model">sale.report</field>
<field name="arch" type="xml">
<search string="Sales">
<filter name="week" string="Last Week"
domain="[
'&amp;',
('date', '&gt;=', (context_today()-relativedelta(days=7)).strftime('%Y-%m-%d')),
('date', '&lt;=', context_today().strftime('%Y-%m-%d')),
]"/>
<filter name="month" string="Last Month"
domain="[
'&amp;',
('date', '&gt;=', (context_today()-relativedelta(months=1)).strftime('%Y-%m-%d')),
('date', '&lt;=', context_today().strftime('%Y-%m-%d')),
]"/>
<filter name="year" string="Last Year"
domain="[
'&amp;',
('date', '&gt;=', (context_today()-relativedelta(years=1)).strftime('%Y-%m-%d')),
('date', '&lt;=', context_today().strftime('%Y-%m-%d')),
]"/>
<filter name="year" string="Date" date="date"/>
</search>
</field>
</record>
doc/reference/views.rst
+75 -2
View File
@@ -1423,12 +1423,85 @@ Possible children elements of the search view are:
``string`` (required)
the label of the filter
``domain``
``domain`` (optional)
an Odoo :ref:`domain <reference/orm/domains>`, will be appended to the
action's domain as part of the search domain
action's domain as part of the search domain.
``date`` (optional)
the name of a field of type ``date`` or ``datetime``.
Using this attribute has the effect to create
a set of filters available in a submenu
of the filters menu.
Example:
.. code-block:: xml
<filter name="filter_create_date" date="create_date" string="Creation Date"/>
The example above allows to easily search for records with creation date field
values in one of the periods below.
.. code-block:: text
Create Date >
Today
This Week
This Month
This Quarter
This Year
--------------
Yesterday
Last Week
Last Month
Last Quarter
Last Year
--------------
Last 7 Days
Last 30 Days
Last 365 Days
Note that the generated domains are dynamic and can be saved as such (via the favorites menu).
``default_period`` (optional)
only makes sense for a filter with non empty ``date`` attribute.
determines which period is activated if the filter is in the
default set of filters activated at the view initialization. If not provided,
'this_month' is used by default.
To choose among the following options:
today, this_week, this_month, this_quarter, this_year,
yesterday, last_week, last_month,
last_quarter, last_year, last_7_days, last_30_days, last_365_days
Example:
.. code-block:: xml
<filter name="filter_create_date" date="create_date" string="Creation Date" default_period="this_week"/>
``context``
a Python dictionary, merged into the action's domain to generate the
search domain
The key ``group_by`` can be used to define a groupby available in the
'Group By' menu.
The 'group_by' value can be a valid field name or a list of field names.
.. code-block:: xml
<filter name="groupby_category" string="Category" context = {'group_by': 'category_id'}/>
The groupby defined above allows to group data by category.
When the field is of type ``date`` or ``datetime``, the records are grouped by month by default.
This can be modified by using one of the following options: day, week, quarter, year.
Example:
.. code-block:: xml
<filter name="groupby_create_date" string="Creation Date" context = {'group_by': 'create_date:week'}/>
``name``
logical name for the filter, can be used to :ref:`enable it by default
<reference/views/search/defaults>`, can also be used as
odoo/addons/base/rng/common.rng
+2
View File
@@ -372,6 +372,8 @@
<rng:optional><rng:attribute name="context"/></rng:optional>
<rng:optional><rng:attribute name="help"/></rng:optional>
<rng:optional><rng:attribute name="domain"/></rng:optional>
<rng:optional><rng:attribute name="date"/></rng:optional>
<rng:optional><rng:attribute name="default_period"/></rng:optional>
<rng:zeroOrMore>
<rng:choice>
<rng:ref name="field" />