From 316d5afdd3798ff75a3742e07b0640c84ab177fc Mon Sep 17 00:00:00 2001 From: Jigar Patel Date: Fri, 10 May 2019 07:27:16 +0000 Subject: [PATCH] [IMP] stock: add hierarchical view for stock location --- addons/stock/models/stock_location.py | 26 +++++ .../static/src/js/stock_location_hierarchy.js | 19 ++++ .../src/scss/stock_location_hierarchy.scss | 105 ++++++++++++++++++ addons/stock/views/stock_location_views.xml | 49 ++++++++ addons/stock/views/stock_template.xml | 2 + 5 files changed, 201 insertions(+) create mode 100644 addons/stock/static/src/js/stock_location_hierarchy.js create mode 100644 addons/stock/static/src/scss/stock_location_hierarchy.scss diff --git a/addons/stock/models/stock_location.py b/addons/stock/models/stock_location.py index 6ce9ac1019b..120bc1d590b 100644 --- a/addons/stock/models/stock_location.py +++ b/addons/stock/models/stock_location.py @@ -163,6 +163,32 @@ class Location(models.Model): self.ensure_one() return self.usage in ('supplier', 'customer', 'inventory', 'production') or self.scrap_location + def _qweb_prepare_qcontext(self, view_id, domain): + values = super()._qweb_prepare_qcontext(view_id, domain) + result = self.search_read(domain, ['name', 'location_id', 'usage', 'barcode']) + roots = [] + + locations = {location['id']: dict(location, **{'childs': []}) for location in result} + + for location in locations.values(): + parent_location_id = location['location_id'] + if parent_location_id and parent_location_id[0] in locations: + locations[parent_location_id[0]]['childs'].append(location) + else: + roots.append(location) + + values['data'] = roots + return values + + @api.model + def fields_view_get(self, view_id=None, view_type='form', toolbar=False, submenu=False): + result = super().fields_view_get(view_id, view_type, toolbar, submenu) + + view_location_qweb = self.env.ref('stock.view_location_qweb', raise_if_not_found=False) + if result['type'] == 'qweb' and view_location_qweb and result['view_id'] == view_location_qweb.id: + result['arch'] = '' + return result + class Route(models.Model): _name = 'stock.location.route' diff --git a/addons/stock/static/src/js/stock_location_hierarchy.js b/addons/stock/static/src/js/stock_location_hierarchy.js new file mode 100644 index 00000000000..29fb287de3f --- /dev/null +++ b/addons/stock/static/src/js/stock_location_hierarchy.js @@ -0,0 +1,19 @@ +odoo.define('stock.stock_location_hierarchy_qweb', function (require) { +"use strict"; + +var QwebView = require('web.qweb'); +var registry = require('web.view_registry'); + + +var QWebView = QwebView.View.extend({ + icon: 'fa-sitemap', + searchMenuTypes: ['filter', 'favorite'], +}); + +registry.add('stock_location_hierarchy_qweb', QWebView); + +return { + View: QWebView, +}; + +}); diff --git a/addons/stock/static/src/scss/stock_location_hierarchy.scss b/addons/stock/static/src/scss/stock_location_hierarchy.scss new file mode 100644 index 00000000000..6ea799ff508 --- /dev/null +++ b/addons/stock/static/src/scss/stock_location_hierarchy.scss @@ -0,0 +1,105 @@ +$o-hierarchical-highlight-color: $o-brand-primary; +$o-hierarchical-border-color: gray('500'); +$o-hierarchical-border-width: 1px; +$o-hierarchical-border-radius: 4px; + +@mixin o-stock-hierarchy-level { + position: relative; + padding: 1em 0; + text-align: center; +} + +.o_stock_location_hierarchy { + .o_hierarchy_container { + border: 1px solid gray('300'); + background-color: lighten(gray('200'), 2%); + border-radius: .5rem; + white-space: nowrap; + overflow-x: auto; + @include o-stock-hierarchy-level(); + ul.o_hierarchy_level { + @include o-stock-hierarchy-level(); + &:before { + content: ''; + @include o-position-absolute($top: 0, $left: 50%); + border-left: $o-hierarchical-border-width solid $o-hierarchical-border-color; + height: 1.2rem; + } + } + li.o_hierarchy_item { + display: inline-block; + vertical-align: top; + position: relative; + padding: 1rem .5rem 0 .5rem; + .o_hierarchy_box { + position: relative; + border: $o-hierarchical-border-width solid gray('white'); + padding: .5rem .75rem; + display: inline-block; + border-radius: $o-hierarchical-border-radius; + transition: 0.2s; + background: gray('white'); + box-shadow: 0 1px 3px rgba(gray('black'), 0.12), 0 1px 2px rgba(gray('black'), 0.14); + &.disabled { + background-color: #f1f1f1; + border-color: #f1f1f1; + } + .o_hierarchy_box_title, .o_hierarchy_box_subtitle { + max-width: 170px; + } + .o_hierarchy_action { + display: none; + @include o-position-absolute($left: 0, $right: 0, $bottom: -10px); + z-index: 1; + .o_hierarchy_add_child .fa { + background-color: gray('white'); + border-radius: 8rem; + } + } + @include media-breakpoint-up(md) { + &:hover .o_hierarchy_action { + display: block; + } + &:hover, &:hover + ul li .o_hierarchy_box { + background: lighten($o-hierarchical-highlight-color, 65); + border: $o-hierarchical-border-width solid $o-hierarchical-highlight-color; + } + &:hover + ul li::after, + &:hover + ul li::before, + &:hover + ul::before, + &:hover + ul ul::before { + border-color: $o-hierarchical-highlight-color; + } + } + } + &::before, &::after { + content: ''; + @include o-position-absolute($top: 0, $right: 50%); + border-top: $o-hierarchical-border-width solid $o-hierarchical-border-color; + width: 52%; + height: 1em; + } + &::after { + right: auto; + left: 50%; + border-left: $o-hierarchical-border-width solid $o-hierarchical-border-color; + } + &:only-child::after, &:only-child::before { + display: none; + } + &:only-child { + padding-top: 0; + } + &:first-child::before, &:last-child::after { + border: 0 none; + } + &:last-child::before { + border-right: $o-hierarchical-border-width solid $o-hierarchical-border-color; + border-radius: 0 $o-hierarchical-border-radius 0 0; + } + &:first-child::after { + border-radius: $o-hierarchical-border-radius 0 0 0; + } + } + } +} diff --git a/addons/stock/views/stock_location_views.xml b/addons/stock/views/stock_location_views.xml index dc0b83af390..7d0ea34a729 100644 --- a/addons/stock/views/stock_location_views.xml +++ b/addons/stock/views/stock_location_views.xml @@ -53,6 +53,53 @@ + + stock.location.qweb + qweb + stock.location + +
+
+ +
+
    + +
+
+ + +
+

No data available.

+
+ +
+
+ + + + + stock.location.form.editable stock.location @@ -111,6 +158,8 @@ Locations stock.location ir.actions.act_window + form + tree,form,qweb {'search_default_in_location':1} diff --git a/addons/stock/views/stock_template.xml b/addons/stock/views/stock_template.xml index 64561ddd527..54bad8cea54 100644 --- a/addons/stock/views/stock_template.xml +++ b/addons/stock/views/stock_template.xml @@ -11,7 +11,9 @@ + +