diff --git a/setup/web_search_with_and/odoo/addons/web_search_with_and b/setup/web_search_with_and/odoo/addons/web_search_with_and new file mode 120000 index 000000000..d32981712 --- /dev/null +++ b/setup/web_search_with_and/odoo/addons/web_search_with_and @@ -0,0 +1 @@ +../../../../web_search_with_and \ No newline at end of file diff --git a/setup/web_search_with_and/setup.py b/setup/web_search_with_and/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/web_search_with_and/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/web_search_with_and/README.rst b/web_search_with_and/README.rst new file mode 100644 index 000000000..354416628 --- /dev/null +++ b/web_search_with_and/README.rst @@ -0,0 +1,102 @@ +==================================== +Use AND conditions on omnibar search +==================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github + :target: https://github.com/OCA/web/tree/16.0/web_search_with_and + :alt: OCA/web +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/web-16-0/web-16-0-web_search_with_and + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/web&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +When searching for records on same field Odoo joins multiple queries with OR. +For example: + +* Perform a search for customer "John" on field Name +* Odoo displays customers containing "John" +* Search for "Smith" on same field Name +* Odoo displays customers containing "John" OR "Smith" + +With this module installed you can press Shift key before searching for "Smith" +and Odoo finds customers containing "John" AND "Smith" + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +* Enter your value in omnibar search field +* Press and hold Shift key +* Select field with mouse or keyboard to perform search on + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/162/11.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Versada UAB +* ACSONE SA/NV +* Serincloud + +Contributors +~~~~~~~~~~~~ + +* Andrius Preimantas +* Adrien Didenot +* Francesco Apruzzese +* Numigi (tm) and all its contributors (https://bit.ly/numigiens) +* Souheil Bejaoui +* Pedro Guirao +* Nedas Žilinskas +* Sandip SerpentCS + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/web `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/web_search_with_and/__init__.py b/web_search_with_and/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/web_search_with_and/__manifest__.py b/web_search_with_and/__manifest__.py new file mode 100644 index 000000000..9f66e9969 --- /dev/null +++ b/web_search_with_and/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2015 Andrius Preimantas +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +{ + "name": "Use AND conditions on omnibar search", + "version": "16.0.1.0.0", + "author": """Sandip SCS, Versada UAB, ACSONE SA/NV, Serincloud, + Odoo Community Association (OCA)""", + "license": "AGPL-3", + "category": "web", + "website": "https://github.com/OCA/web", + "depends": ["web"], + "assets": { + "web.assets_backend": [ + "/web_search_with_and/static/src/js/search_model.esm.js", + "/web_search_with_and/static/src/js/search_bar.esm.js", + ], + }, +} diff --git a/web_search_with_and/i18n/es.po b/web_search_with_and/i18n/es.po new file mode 100644 index 000000000..7461f0845 --- /dev/null +++ b/web_search_with_and/i18n/es.po @@ -0,0 +1,14 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" diff --git a/web_search_with_and/i18n/it.po b/web_search_with_and/i18n/it.po new file mode 100644 index 000000000..44b9b5f8e --- /dev/null +++ b/web_search_with_and/i18n/it.po @@ -0,0 +1,14 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" diff --git a/web_search_with_and/i18n/pt.po b/web_search_with_and/i18n/pt.po new file mode 100644 index 000000000..a46ffdd37 --- /dev/null +++ b/web_search_with_and/i18n/pt.po @@ -0,0 +1,14 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: pt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" diff --git a/web_search_with_and/i18n/web_search_with_and.pot b/web_search_with_and/i18n/web_search_with_and.pot new file mode 100644 index 000000000..a11baf5cd --- /dev/null +++ b/web_search_with_and/i18n/web_search_with_and.pot @@ -0,0 +1,13 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 15.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" diff --git a/web_search_with_and/readme/CONTRIBUTORS.rst b/web_search_with_and/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..f77791704 --- /dev/null +++ b/web_search_with_and/readme/CONTRIBUTORS.rst @@ -0,0 +1,8 @@ +* Andrius Preimantas +* Adrien Didenot +* Francesco Apruzzese +* Numigi (tm) and all its contributors (https://bit.ly/numigiens) +* Souheil Bejaoui +* Pedro Guirao +* Nedas Žilinskas +* Sandip SerpentCS diff --git a/web_search_with_and/readme/DESCRIPTION.rst b/web_search_with_and/readme/DESCRIPTION.rst new file mode 100644 index 000000000..88cd4e8e8 --- /dev/null +++ b/web_search_with_and/readme/DESCRIPTION.rst @@ -0,0 +1,10 @@ +When searching for records on same field Odoo joins multiple queries with OR. +For example: + +* Perform a search for customer "John" on field Name +* Odoo displays customers containing "John" +* Search for "Smith" on same field Name +* Odoo displays customers containing "John" OR "Smith" + +With this module installed you can press Shift key before searching for "Smith" +and Odoo finds customers containing "John" AND "Smith" diff --git a/web_search_with_and/readme/USAGE.rst b/web_search_with_and/readme/USAGE.rst new file mode 100644 index 000000000..469f9f74e --- /dev/null +++ b/web_search_with_and/readme/USAGE.rst @@ -0,0 +1,7 @@ +* Enter your value in omnibar search field +* Press and hold Shift key +* Select field with mouse or keyboard to perform search on + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/162/11.0 diff --git a/web_search_with_and/static/description/icon.png b/web_search_with_and/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/web_search_with_and/static/description/icon.png differ diff --git a/web_search_with_and/static/description/index.html b/web_search_with_and/static/description/index.html new file mode 100644 index 000000000..59f4048a4 --- /dev/null +++ b/web_search_with_and/static/description/index.html @@ -0,0 +1,447 @@ + + + + + + +Use AND conditions on omnibar search + + + + + + diff --git a/web_search_with_and/static/src/js/search_bar.esm.js b/web_search_with_and/static/src/js/search_bar.esm.js new file mode 100644 index 000000000..86d426e56 --- /dev/null +++ b/web_search_with_and/static/src/js/search_bar.esm.js @@ -0,0 +1,23 @@ +/** @odoo-module **/ + +import {patch} from "@web/core/utils/patch"; +import {SearchBar} from "@web/search/search_bar/search_bar"; + +patch(SearchBar.prototype, "web_search_with_and/static/src/js/search_bar.js", { + selectItem(item) { + if (!item.unselectable) { + const {searchItemId, label, operator, value} = item; + this.env.searchModel.addAutoCompletionValues(searchItemId, { + label, + operator, + value, + isShiftKey: this.isShiftKey, + }); + } + this.resetState(); + }, + onSearchKeydown(ev) { + this.isShiftKey = ev.shiftKey || false; + this._super(ev); + }, +}); diff --git a/web_search_with_and/static/src/js/search_model.esm.js b/web_search_with_and/static/src/js/search_model.esm.js new file mode 100644 index 000000000..e928072c9 --- /dev/null +++ b/web_search_with_and/static/src/js/search_model.esm.js @@ -0,0 +1,84 @@ +/** @odoo-module **/ + +import {patch} from "@web/core/utils/patch"; +import {rankInterval} from "@web/search/utils/dates"; +import {SearchModel} from "@web/search/search_model"; + +patch(SearchModel.prototype, "web_search_with_and/static/src/js/search_model.js", { + _getGroups() { + const preGroups = []; + for (const queryElem of this.query) { + const {searchItemId} = queryElem; + let {groupId} = this.searchItems[searchItemId]; + if ("autocompleteValue" in queryElem) { + if (queryElem.autocompleteValue.isShiftKey) { + groupId = Math.random(); + } + } + let preGroup = preGroups.find((group) => group.id === groupId); + if (!preGroup) { + preGroup = {id: groupId, queryElements: []}; + preGroups.push(preGroup); + } + queryElem.groupId = groupId; + preGroup.queryElements.push(queryElem); + } + const groups = []; + for (const preGroup of preGroups) { + const {queryElements, id} = preGroup; + const activeItems = []; + for (const queryElem of queryElements) { + const {searchItemId} = queryElem; + let activeItem = activeItems.find( + ({searchItemId: id}) => id === searchItemId + ); + if ("generatorId" in queryElem) { + if (!activeItem) { + activeItem = {searchItemId, generatorIds: []}; + activeItems.push(activeItem); + } + activeItem.generatorIds.push(queryElem.generatorId); + } else if ("intervalId" in queryElem) { + if (!activeItem) { + activeItem = {searchItemId, intervalIds: []}; + activeItems.push(activeItem); + } + activeItem.intervalIds.push(queryElem.intervalId); + } else if ("autocompleteValue" in queryElem) { + if (!activeItem) { + activeItem = {searchItemId, autocompletValues: []}; + activeItems.push(activeItem); + } + activeItem.autocompletValues.push(queryElem.autocompleteValue); + } else if (!activeItem) { + activeItem = {searchItemId}; + activeItems.push(activeItem); + } + } + for (const activeItem of activeItems) { + if ("intervalIds" in activeItem) { + activeItem.intervalIds.sort( + (g1, g2) => rankInterval(g1) - rankInterval(g2) + ); + } + } + groups.push({id, activeItems}); + } + + return groups; + }, + deactivateGroup(groupId) { + this.query = this.query.filter((queryElem) => { + return queryElem.groupId !== groupId; + }); + + for (const partName in this.domainParts) { + const part = this.domainParts[partName]; + if (part.groupId === groupId) { + this.setDomainParts({[partName]: null}); + } + } + this._checkComparisonStatus(); + this._notify(); + }, +});