diff --git a/db/changes/10091-iberflora/00-department.sql b/db/changes/10091-iberflora/00-department.sql
index f1d1776e9..5c2889985 100644
--- a/db/changes/10091-iberflora/00-department.sql
+++ b/db/changes/10091-iberflora/00-department.sql
@@ -70,4 +70,14 @@ ALTER TABLE `vn2008`.`department`
CHANGE COLUMN `lft` `lft` INT(11) NULL ,
CHANGE COLUMN `rgt` `rgt` INT(11) NULL ;
+ALTER TABLE `vn2008`.`department`
+DROP INDEX `rgt_UNIQUE` ,
+DROP INDEX `lft_UNIQUE` ;
+;
+
+ALTER TABLE `vn2008`.`department`
+ADD INDEX `lft_rgt_depth_idx` (`lft` ASC, `rgt` ASC, `depth` ASC);
+;
+
+
UPDATE vn.department SET lft = NULL, rgt = NULL;
diff --git a/front/core/components/index.js b/front/core/components/index.js
index e8adb008e..50d0b5e94 100644
--- a/front/core/components/index.js
+++ b/front/core/components/index.js
@@ -43,4 +43,3 @@ import './input-file';
import './radio';
import './th';
import './treeview';
-import './treeview/child';
diff --git a/front/core/components/treeview/child.html b/front/core/components/treeview/childs.html
similarity index 58%
rename from front/core/components/treeview/child.html
rename to front/core/components/treeview/childs.html
index 2cf930f3d..cd0c59ec0 100644
--- a/front/core/components/treeview/child.html
+++ b/front/core/components/treeview/childs.html
@@ -1,11 +1,11 @@
+
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/front/core/components/treeview/child.js b/front/core/components/treeview/childs.js
similarity index 77%
rename from front/core/components/treeview/child.js
rename to front/core/components/treeview/childs.js
index b1d377a83..46bb776b8 100644
--- a/front/core/components/treeview/child.js
+++ b/front/core/components/treeview/childs.js
@@ -4,12 +4,15 @@ import Component from '../../lib/component';
class Controller extends Component {
constructor($element, $scope, $transclude) {
super($element, $scope);
- this.$scope = $scope;
this.$transclude = $transclude;
+ }
- $transclude($scope.$parent, tClone => {
- this.element.querySelector('.tplItem').appendChild(tClone[0]);
- }, null, 'tplItem');
+ $onInit() {
+ this.transcludeFunc((tClone, $scope) => {
+ $scope.item = this.item;
+ let content = this.element.querySelector('.content');
+ angular.element(content).append(tClone);
+ });
}
toggle(event, item) {
@@ -42,8 +45,8 @@ class Controller extends Component {
Controller.$inject = ['$element', '$scope', '$transclude'];
-ngModule.component('vnTreeviewChild', {
- template: require('./child.html'),
+ngModule.component('vnTreeviewChilds', {
+ template: require('./childs.html'),
controller: Controller,
bindings: {
items: '<',
@@ -55,10 +58,8 @@ ngModule.component('vnTreeviewChild', {
draggable: ' {
+ $scope.item = this.item;
+ this.$element.append(tClone);
+ });
+ }
+}
+Controller.$inject = ['$element'];
+
+ngModule.component('vnTreeviewContent', {
+ controller: Controller,
+ bindings: {
+ item: '<',
+ transcludeFunc: '<'
+ }
+});
diff --git a/front/core/components/treeview/index.html b/front/core/components/treeview/index.html
index a200c913a..b33c90fcf 100644
--- a/front/core/components/treeview/index.html
+++ b/front/core/components/treeview/index.html
@@ -1,7 +1,6 @@
-
-
+ vn-droppable="{{$ctrl.droppable}}"
+ transclude-func="$ctrl.$transclude">
+
diff --git a/front/core/components/treeview/index.js b/front/core/components/treeview/index.js
index 7c19b006b..2273288ac 100644
--- a/front/core/components/treeview/index.js
+++ b/front/core/components/treeview/index.js
@@ -2,6 +2,9 @@ import ngModule from '../../module';
import Component from '../../lib/component';
import './style.scss';
+import './childs';
+import './content';
+
/**
* Treeview
*
@@ -12,14 +15,7 @@ export default class Treeview extends Component {
super($element, $scope);
this.$scope = $scope;
this.$transclude = $transclude;
- this.data = [];
-
- $transclude($scope.$parent, tClone => {
- this.element.querySelector('vn-treeview-child').appendChild(tClone[0]);
- // Object.assign(scope, option);
- // li.appendChild(clone[0]);
- // this.scopes[i] = scope;
- }, null, 'tplItem');
+ this.items = [];
}
$onInit() {
@@ -28,7 +24,7 @@ export default class Treeview extends Component {
refresh() {
this.model.refresh().then(() => {
- this.data = this.model.data;
+ this.items = this.model.data;
});
}
@@ -99,7 +95,5 @@ ngModule.component('vnTreeview', {
droppable: ' li {
list-style: none;
-
- & > div > .arrow {
- min-width: 24px;
- margin-right: 10px;
- transition: transform 200ms;
- }
- &.expanded > div > .arrow {
- transform: rotate(180deg);
- }
- & > .node {
- @extend %clickable;
- display: flex;
- padding: 5px;
- align-items: center;
-
- & > vn-check:not(.indeterminate) {
- color: $color-main;
-
- & > .check {
- border-color: $color-main;
- }
- }
- & > vn-check.checked {
- color: $color-main;
- }
- }
- ul {
- padding-left: 2.2em;
- }
}
}
vn-icon-button {
- padding: 0
+ padding: 0;
+ }
+ & > ul > li > .node {
+ @extend %clickable;
+ display: flex;
+ padding: 5px;
+ align-items: center;
+
+ & > .arrow {
+ min-width: 24px;
+ margin-right: 10px;
+ transition: transform 200ms;
+ }
+ &.expanded > .arrow {
+ transform: rotate(180deg);
+ }
+ & > vn-check:not(.indeterminate) {
+ color: $color-main;
+
+ & > .check {
+ border-color: $color-main;
+ }
+ }
+ & > vn-check.checked {
+ color: $color-main;
+ }
+ }
+ ul {
+ padding-left: 2.2em;
}
}
diff --git a/modules/agency/front/location/index.html b/modules/agency/front/location/index.html
index b3025a8e0..3d00df006 100644
--- a/modules/agency/front/location/index.html
+++ b/modules/agency/front/location/index.html
@@ -18,6 +18,12 @@
acl-role="deliveryBoss"
on-selection="$ctrl.onSelection(item, value)"
selectable="true">
+
+
\ No newline at end of file
diff --git a/modules/worker/front/department/index.html b/modules/worker/front/department/index.html
index dfdb9bcfc..1eada1003 100644
--- a/modules/worker/front/department/index.html
+++ b/modules/worker/front/department/index.html
@@ -6,14 +6,14 @@