Merge branch 'dev' into jgallego

Jenkinsfile

@@ -6,6 +6,7 @@ pipeline {
         disableConcurrentBuilds()
     }
     environment {
+        PROJECT_NAME = 'salix'
         REGISTRY = 'registry.verdnatura.es'
         DOCKER_HOST_1 = 'vch1.verdnatura.es'
         DOCKER_HOST_2 = 'vch2.verdnatura.es'
@@ -15,7 +16,7 @@ pipeline {
         stage('Checkout') {
             steps {
                 script {
-                    env.COMPOSE_PROJECT_NAME = env.JOB_NAME.replace('/', '-')
+                    env.COMPOSE_PROJECT_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
                     env.GIT_COMMITTER_EMAIL = sh(
                         script: 'git --no-pager show -s --format="%ae"',
                         returnStdout: true
@@ -28,9 +29,6 @@ pipeline {
                         case 'test':
                             env.PORT = 5001
                             break
-                        case 'test':
-                            env.PORT = 5000
-                            break
                     }
                     switch (env.BRANCH_NAME) {
                         case 'master':
@@ -39,9 +37,6 @@ pipeline {
                         case 'test':
                             env.NODE_ENV = 'test'
                             break
-                        case 'dev':
-                            env.NODE_ENV = 'development'
-                            break
                     }
                 }
                 echo "Committer: ${env.GIT_COMMITTER_EMAIL}"
@@ -59,9 +54,10 @@ pipeline {
             }
         }
         stage('Test') {
-            when {
+            when { not { anyOf {
-                branch 'dev'
+                branch 'test'
-            }
+                branch 'master'
+            }}}
             environment {
                 NODE_ENV = ""
                 FIREFOX_BIN = "/opt/firefox/firefox-bin"
@@ -75,9 +71,10 @@ pipeline {
             }
         }
         stage('Build') {
-            when {
+            when { anyOf {
-                not { branch 'dev' }
+                branch 'test'
-            }
+                branch 'master'
+            }}
             environment {
                 CREDS = credentials('docker-registry')
             }
@@ -92,9 +89,10 @@ pipeline {
             }
         }
         stage('Deploy') {
-            when {
+            when { anyOf {
-                not { branch 'dev' }
+                branch 'test'
-            }
+                branch 'master'
+            }}
             environment {
                 DOCKER_TLS_VERIFY = 1
             }
@@ -124,9 +122,10 @@ pipeline {
             }
         }
         stage('Cleanup') {
-            when {
+            when { anyOf {
-                not { branch 'dev' }
+                branch 'test'
-            }
+                branch 'master'
+            }}
             steps {
                 sh 'docker logout $REGISTRY'
             }
@@ -135,9 +134,13 @@ pipeline {
     post {
         always {
             script {
-                if (env.BRANCH_NAME == 'dev') {
+                if (!['master', 'test'].contains(env.BRANCH_NAME)) {
-                    junit '*/junitresults.xml'
+                    try {
-                    junit 'junitresults.xml'
+                        junit '*/junitresults.xml'
+                        junit 'junitresults.xml'
+                    } catch (e) {
+                        echo e.toString()
+                    }
                 }
 
                 if (!env.GIT_COMMITTER_EMAIL) return

front/core/components/check/check.html

@@ -1,5 +1,5 @@
 <md-checkbox 
-	aria-label="Checkbox 1"
+	aria-label="{{::$ctrl.label}}"
 	md-indeterminate="$ctrl.isIntermediate"
 	ng-disabled="$ctrl.disabled"
 	ng-checked="$ctrl.isChecked"

front/core/components/check/check.js

@@ -38,9 +38,10 @@ export default class Controller extends Component {
     }
 
     get isIntermediate() {
-        return this.intermediate
+        if (this.intermediate || (this.tripleState && (this.model === null || this.model === undefined)))
-            || this.model === null
+            return true;
-            || this.model === undefined;
+
+        return false;
     }
 
     get isChecked() {

front/core/components/check/style.scss

@@ -2,15 +2,16 @@
 
 vn-check {
     position: relative;
-    & > .mdl-checkbox {
-        width: initial;
-    }
 
     & > i {
         padding-left: 5px;
         position: absolute;
-        bottom: 3px;
         color: $color-font-secondary;
-        font-size: 20px !important
+        font-size: 20px !important;
+        cursor: help
+    }
+
+    md-checkbox.md-checked .md-icon {
+        background-color: $color-main;
     }
 }

front/core/components/label-value/label-value.js

@@ -8,23 +8,37 @@ export default class Controller {
         this.hasInfo = Boolean($attrs.info);
         this.info = $attrs.info || null;
     }
+
     set label(value) {
         let label = this.element.querySelector('vn-label');
         label.textContent = this._.instant(value);
         this._label = value;
     }
+
     get label() {
         return this._label;
     }
+
     set value(value) {
         let span = this.element.querySelector('span');
         span.title = value;
         span.textContent = value ? value : '-';
         this._value = value;
     }
+
     get value() {
         return this._value;
     }
+
+    get title() {
+        return this._title;
+    }
+
+    set title(value) {
+        let span = this.element.querySelector('span');
+        span.title = value;
+        this._title = value;
+    }
 }
 Controller.$inject = ['$element', '$translate', '$attrs'];
 
@@ -32,6 +46,7 @@ ngModule.component('vnLabelValue', {
     controller: Controller,
     template: require('./label-value.html'),
     bindings: {
+        title: '@?',
         label: '@',
         value: '@'
     }

front/core/components/treeview/child.html

@@ -1,24 +1,24 @@
 <ul ng-if="$ctrl.items">
-    <li ng-repeat="item in $ctrl.items" ng-class="{'selected' : item.selected && !item.excluded, 'included': item.included}">
+    <li ng-repeat="item in $ctrl.items" 
+        ng-class="{
+            'expanded': item.active, 
+            'collapsed': !item.active, 
+            'included': item.isIncluded == 1,
+            'excluded': item.isIncluded == 0
+        }">
         <vn-horizontal>
             <vn-auto class="actions">
-                <vn-icon icon="keyboard_arrow_up" ng-if="item.childs.length" 
+                <vn-icon icon="keyboard_arrow_down" 
-                    ng-click="$ctrl.toggle(item, $event)">
+                    ng-show="item.sons > 0"
-                </vn-icon> 
+                    ng-click="$ctrl.toggle(item, $event)" >
-                <vn-icon icon="keyboard_arrow_down" ng-if="item.sons > 0 && !item.childs" 
-                    ng-click="$ctrl.toggle(item, $event)">
                 </vn-icon> 
             </vn-auto>
-            <vn-one class="description">
+            <div class="description">
-                <vn-horizontal>
+                <vn-check vn-auto field="item.isIncluded"
-                    <vn-check vn-auto field="item.selected && !item.excluded" 
+                    on-change="$ctrl.select(item, value)" triple-state="true">
-                        on-change="$ctrl.select(item)">
+                </vn-check>
-                    </vn-check>
+                {{::item.name}}
-                    <vn-one ng-dblclick="$ctrl.toggle(item)" class="text unselectable">
+            </div>
-                        {{::item.name}}
-                    </vn-one>
-                </vn-horizontal>
-            </vn-one>
         </vn-horizontal>
         <vn-treeview-child items="item.childs"></vn-treeview-child>
     </li>

front/core/components/treeview/child.js

@@ -10,8 +10,8 @@ class Controller extends Component {
         this.treeview.onToggle(item);
     }
 
-    select(item) {
+    select(item, value) {
-        this.treeview.onSelection(item);
+        this.treeview.onSelection(item, value);
     }
 }
 

front/core/components/treeview/index.js

@@ -20,72 +20,10 @@ export default class Treeview extends Component {
     refresh() {
         this.model.refresh().then(() => {
             this.data = this.model.data;
-            console.log(this.data);
-            this.repaintAll();
         });
     }
 
-    repaintAll() {
+    /*     hasCheckedChilds(node) {
-        let oldData = this.data;
-        oldData.forEach(node => {
-            this.repaintAsc(node);
-            this.repaintDesc(node);
-        });
-    }
-
-    repaintNode(node) {
-        this.repaintAsc(node);
-        this.repaintDesc(node);
-    }
-
-    repaintAsc(node) {
-        if (!node.parent) return;
-
-        const parent = node.parent;
-        if ((node.selected || node.included) && !parent.selected) {
-            parent.included = true;
-            parent.hasCheckedChilds = true;
-        } else if (!this.hasCheckedChilds(parent) && !this.hasCheckedParents(node))
-            parent.included = false;
-
-        // FIXME - Propagate hasCheckedCHilds
-        if (!node.selected && this.hasCheckedParents(node)) {
-            node.included = true;
-            parent.hasCheckedChilds = false;
-        }
-
-        if (!this.hasCheckedChilds(node))
-            node.hasCheckedChilds = false;
-
-        this.repaintAsc(parent);
-    }
-
-    repaintDesc(node) {
-        /* if (node.hasCheckedChilds)
-            node.included = false; */
-
-        if (!node.selected && this.hasCheckedChilds(node)) {
-            node.hasCheckedChilds = true;
-            node.included = true;
-        } else if (!node.selected && node.childs && !this.hasCheckedChilds(node))
-            node.hasCheckedChilds = false;
-
-
-        const childs = node.childs || [];
-        for (let i = 0; i < childs.length; i++) {
-            childs[i].included = false;
-
-            if (((node.selected || node.included && this.hasCheckedParents(childs[i])) && !childs[i].selected) && !node.excluded)
-                childs[i].included = true;
-
-            this.repaintDesc(childs[i]);
-        }
-
-        if (!node.selected && node.hasCheckedChilds)
-            node.included = true;
-    }
-
-    hasCheckedChilds(node) {
         if (!node.childs) return false;
 
         const childs = node.childs;
@@ -105,44 +43,41 @@ export default class Treeview extends Component {
             return true;
 
         return false;
-    }
+    } */
 
-    onSelection(item) {
+    onSelection(item, value) {
-        let canBeExcluded = this.hasCheckedChilds(item) || this.hasCheckedParents(item);
+        this.emit('selection', {item, value});
-
-        if (!item.selected && item.included && canBeExcluded)
-            item.excluded = true;
-        else
-            item.excluded = false;
-
-        item.selected = !item.selected;
-
-        if (item.selected && item.included)
-            item.included = false;
-
-        if (this.hasCheckedChilds(item))
-            item.hasCheckedChilds = true;
-        else if (this.childs)
-            item.hasCheckedChilds = false;
-
-        this.emit('selection', {item});
     }
 
     onToggle(item) {
-        if (item.childs && item.childs.length == 0)
+        if (item.active)
-            return;
-
-        if (item.childs)
             item.childs = undefined;
         else {
             this.model.applyFilter({}, {parentFk: item.id}).then(() => {
-                item.childs = this.model.data;
+                const newData = this.model.data;
-                item.childs.forEach(child => {
+
-                    child.parent = item;
+                if (item.childs) {
+                    let childs = item.childs;
+                    childs.forEach(child => {
+                        let index = newData.findIndex(newChild => {
+                            return newChild.id == child.id;
+                        });
+                        newData[index] = child;
+                    });
+                }
+
+                item.childs = newData.sort((a, b) => {
+                    let priority = b.isIncluded - a.isIncluded;
+
+                    if (b.name > a.name)
+                        priority++;
+
+                    return priority;
                 });
-                this.repaintNode(item);
             });
         }
+
+        item.active = !item.active;
     }
 }
 

front/core/components/treeview/style.scss

@@ -2,19 +2,21 @@
 
 vn-treeview {
     ul {
-        margin: 0;
+        line-height: 24px;
         padding: 0;
+        margin: 0;
+        
 
         li {
             list-style: none;
             cursor: pointer;
 
             .actions {
-                padding: 0.5em;
+                min-width: 24px;
             }
 
             .description {
-                padding: 0.5em
+                padding-left: 5px
             }
         }
 
@@ -22,28 +24,42 @@ vn-treeview {
             padding: 0 1.8em;
         }
 
+        li > vn-horizontal {
+            padding: 5px
+        }
+
         li > vn-horizontal:hover {
             background-color: $color-hover-cd
         }
 
-        li.selected > vn-horizontal > .description .text,
+        li.expanded .actions > vn-icon[icon="keyboard_arrow_down"] {
-        li.included > vn-horizontal > .description .text {
+            transition: all 0.2s;
-            font-weight: bold;
+            transform: rotate(180deg);
-            color: $color-main;
+        }
+
+        li.collapsed .actions > vn-icon[icon="keyboard_arrow_down"] {
+            transition: all 0.2s;
+            transform: rotate(0deg);
         }
 
         li.included {
-            & > vn-horizontal > .description > vn-horizontal > vn-check {
+            & > vn-horizontal > .description {
-                .mdl-checkbox .mdl-checkbox__box-outline, {
+                color: $color-notice;
-                    border: 2px solid $color-main-medium;
+                font-weight: bold;
-                }
+
-                fieldset[disabled] .mdl-checkbox .mdl-checkbox__box-outline, .mdl-checkbox.is-disabled .mdl-checkbox__box-outline {
+                & > vn-check .md-icon {
-                    border: 2px solid rgba(0,0,0,.26);
+                    background-color: $color-notice
-                }
-                .mdl-checkbox .mdl-checkbox__tick-outline {
-                    background: $color-main-medium;
                 }
             }
+
+        }
+
+        li.excluded {
+            & > vn-horizontal > .description {
+                color: $color-alert;
+                font-weight: bold;
+                
+            }
         }
     }
 }

front/core/directives/uvc.html

@@ -1,5 +1,5 @@
 <div style="position: relative;">
-    <div style="position: absolute; top: 0; left: 0; padding: .5em; z-index: 1">
+    <div style="position: absolute; top: 0; left: 0; padding: .3em; z-index: 1">
         <vn-icon-button
             icon="menu"
             style="font-size: .4em;"
@@ -15,14 +15,16 @@
                 <div pad-medium>
                     <vn-horizontal ng-repeat="field in fields">
                         <vn-check
-                            vn-one label="{{field}}"
+                            vn-one label="{{titles[field]}}"
                             field="tableConfiguration.configuration[field]">
                         </vn-check> 
                     </vn-horizontal>
-                    <vn-button 
+                    <vn-horizontal>
-                        label="Save" 
+                        <vn-button 
-                        ng-click="$ctrl.saveConfiguration(tableConfiguration)">
+                            label="Save" 
-                    </vn-button>
+                            ng-click="$ctrl.saveConfiguration(tableConfiguration)">
+                        </vn-button>
+                    </vn-horizontal>
                 </div>
             </tpl-body>
         </vn-dialog>

front/core/directives/uvc.js

@@ -1,5 +1,6 @@
 import ngModule from '../module';
 import template from './uvc.html';
+import './uvc.scss';
 
 directive.$inject = ['$http', '$compile', 'vnApp', '$translate'];
 export function directive($http, $compile, vnApp, $translate) {
@@ -7,12 +8,16 @@ export function directive($http, $compile, vnApp, $translate) {
         let allHeaders = $element[0].querySelectorAll(`vn-th[field], vn-th[th-id]`);
         let headerList = Array.from(allHeaders);
         let ids = [];
+        let titles = {};
 
         headerList.forEach(header => {
-            ids.push(header.getAttribute('th-id') || header.getAttribute('field'));
+            let id = header.getAttribute('th-id') || header.getAttribute('field');
+            ids.push(id);
+            titles[id] = header.innerText || id.charAt(0).toUpperCase() + id.slice(1);
         });
 
         $scope.fields = ids;
+        $scope.titles = titles;
 
         return headerList;
     }

front/core/directives/uvc.scss

@@ -0,0 +1,11 @@
+vn-table vn-dialog[vn-id="uvc"]{
+    & > div {
+        min-width: 18em;
+        align-items: center;
+
+    }
+
+    vn-button[label="Save"] {
+        margin: 0 auto;
+    }
+}

front/salix/bootstrap.js

@@ -13,5 +13,7 @@ export const bootstrap = () => {
     if (!_element)
         throw new Error('Element is not defined');
 
-    ng.bootstrap(_element, [appName]);
+    ng.bootstrap(_element, [appName], {
+        strictDi: true
+    });
 };

front/salix/index.js

@@ -2,3 +2,5 @@ import './module';
 import './routes';
 import './components';
 import './styles';
+
+// XXX: Pull request: Test 2

front/salix/styles/effects.scss

@@ -22,4 +22,10 @@
 %active {
     background-color: $color-active;
     color: $color-active-font;
+}
+
+// Disable ng-repeat effects
+.ng-enter, .ng-leave {
+    -webkit-transition: none !important;
+    transition: none !important
 }

gulpfile.js

@@ -58,7 +58,7 @@ function backWatch(done) {
 
     nodemon({
         exec: commands.join(' && '),
-        ext: 'js html css',
+        ext: 'js html css json',
         args: ['backOnly'],
         watch: backSources,
         done: done

modules/agency/back/methods/zone-geo/getLeaves.js

@@ -6,12 +6,6 @@ module.exports = Self => {
         description: 'Returns the first shipped and landed possible for params',
         accessType: '',
         accepts: [{
-            arg: 'filter',
-            type: 'Object',
-            description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
-            http: {source: 'query'}
-        },
-        {
             arg: 'zoneFk',
             type: 'Number',
             required: true,
@@ -21,6 +15,12 @@ module.exports = Self => {
             type: 'Number',
             default: 1,
             required: false,
+        },
+        {
+            arg: 'filter',
+            type: 'Object',
+            description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
+            http: {source: 'query'}
         }],
         returns: {
             type: ['object'],
@@ -32,64 +32,120 @@ module.exports = Self => {
         }
     });
 
-    Self.getLeaves = async(filter, zoneFk, parentFk = 1) => {
+    Self.getLeaves = async(zoneFk, parentFk = 1, filter) => {
         let conn = Self.dataSource.connector;
         let stmts = [];
 
+        stmts.push(`DROP TEMPORARY TABLE IF EXISTS tmp.checkedChilds`);
         stmts.push(new ParameterizedSQL(
-            `SELECT lft, rgt, depth + 1 INTO @lft, @rgt, @depth
+            `CREATE TEMPORARY TABLE tmp.checkedChilds (
-                FROM zoneGeo WHERE id = ?`, [parentFk]));
+                id INT,
+                name VARCHAR(100),
+                lft INT,
+                rgt INT,
+                depth BIGINT(22),
+                sons DECIMAL(10, 0),
+                isIncluded TINYINT
+            ) ENGINE = MEMORY`));
 
-        stmts.push(`DROP TEMPORARY TABLE IF EXISTS tChilds`);
+        if (parentFk === 1) {
-
+            stmts.push(new ParameterizedSQL(
-        let stmt = new ParameterizedSQL(
+                `INSERT INTO tmp.checkedChilds
-            `CREATE TEMPORARY TABLE tChilds
+                        SELECT
-                ENGINE = MEMORY
+                                zg.id,
-                SELECT id, lft, rgt
+                                zg.name,
-                    FROM zoneGeo pt`);
+                                zg.lft,
-        stmt.merge(conn.makeSuffix(filter));
+                                zg.rgt,
-
+                                zg.depth,
-        if (!filter.where) {
+                                zg.sons,
-            stmt.merge(`WHERE pt.lft > @lft AND pt.rgt < @rgt
+                                zi.isIncluded
-                AND pt.depth = @depth`);
+                            FROM zoneGeo zg
+                                JOIN zoneIncluded zi ON zi.geoFk = zg.id 
+                                    AND zoneFk = ?`, [zoneFk]));
         }
 
-        stmts.push(stmt);
+        let stmt = new ParameterizedSQL(
+            `SELECT * FROM (
+                SELECT 
+                        zg.id,
+                        zg.name,
+                        zg.lft,
+                        zg.rgt,
+                        zg.depth,
+                        zg.sons,
+                        IF(ch.id = zg.id, isIncluded, null) isIncluded
+                    FROM zoneGeo zg
+                        JOIN tmp.checkedChilds ch 
+                            ON zg.lft <= ch.lft AND zg.rgt >= ch.rgt
+                                AND zg.depth > 0
+                UNION ALL
+                SELECT 
+                        child.id,
+                        child.name,
+                        child.lft,
+                        child.rgt,
+                        child.depth,
+                        child.sons,
+                        zi.isIncluded
+                    FROM zoneGeo parent 
+                        JOIN zoneGeo child ON child.lft > parent.lft 
+                            AND child.rgt < parent.rgt
+                            AND child.depth = parent.depth + 1
+                        LEFT JOIN zoneIncluded zi ON zi.geoFk = child.id 
+                            AND zoneFk = ?
+                        WHERE parent.id = ?) AS nst`, [zoneFk, parentFk]);
 
-        stmts.push(`DROP TEMPORARY TABLE IF EXISTS tZones`);
+        // Get nodes from depth greather than Origin
-        stmts.push(new ParameterizedSQL(
+        stmt.merge(conn.makeSuffix(filter));
-            `CREATE TEMPORARY TABLE tZones
+        stmt.merge('GROUP BY nst.id');
-                (INDEX (id))
-                ENGINE = MEMORY
-                SELECT t.id
-                    FROM tChilds t
-                        JOIN zoneGeo zt 
-                            ON zt.lft > t.lft AND zt.rgt < t.rgt
-                        JOIN zoneIncluded zi
-                            ON zi.geoFk = zt.id AND zi.zoneFk = ?
-                    GROUP BY t.id`, [zoneFk]));
 
-        const resultIndex = stmts.push(new ParameterizedSQL(
+        const resultIndex = stmts.push(stmt) - 1;
-            `SELECT 
-                    pt.id, 
-                    pt.name,
-                    pt.lft, 
-                    pt.rgt, 
-                    pt.depth, 
-                    pt.sons,
-                    ti.id IS NOT NULL hasCheckedChilds,
-                    zi.geoFk IS NOT NULL AS selected,
-                    zi.isIncluded AS excluded
-                FROM zoneGeo pt
-                    LEFT JOIN vn.zoneIncluded zi 
-                        ON zi.geoFk = pt.id AND zi.zoneFk = ?
-                    JOIN tChilds c ON c.id = pt.id
-                    LEFT JOIN tZones ti ON ti.id = pt.id
-                ORDER BY selected DESC, name`, [zoneFk])) - 1;
 
         const sql = ParameterizedSQL.join(stmts, ';');
         const result = await Self.rawStmt(sql);
+        const nodes = result[resultIndex];
 
-        return result[resultIndex];
+        if (nodes.length == 0)
+            return nodes;
+
+        // Get parent nodes
+        const minorDepth = nodes.reduce((a, b) => {
+            return b < a ? b : a;
+        }).depth;
+
+        const parentNodes = nodes.filter(element => {
+            return element.depth === minorDepth;
+        });
+
+        const sortedLeaves = parentNodes.sort((a, b) => {
+            let priority = b.isIncluded - a.isIncluded;
+
+            if (b.name > a.name)
+                priority++;
+
+            return priority;
+        });
+        const leaves = Object.assign([], sortedLeaves);
+
+        nestLeaves(leaves);
+
+        function nestLeaves(elements) {
+            elements.forEach(element => {
+                element.childs = Object.assign([], getLeaves(element));
+
+                nestLeaves(element.childs);
+            });
+        }
+
+        function getLeaves(parent) {
+            let elements = nodes.filter(element => {
+                return element.lft > parent.lft && element.rgt < parent.rgt
+                    && element.depth === parent.depth + 1;
+            });
+
+            return elements;
+        }
+
+        return leaves;
     };
 };

modules/agency/back/methods/zone-included/toggleIsIncluded.js

@@ -8,8 +8,8 @@ module.exports = Self => {
             required: true,
         },
         {
-            arg: 'geoFk',
+            arg: 'item',
-            type: 'Number',
+            type: 'Object',
             required: true,
         }],
         returns: {
@@ -22,31 +22,15 @@ module.exports = Self => {
         }
     });
 
-    Self.toggleIsIncluded = async(zoneFk, geoFk) => {
+    Self.toggleIsIncluded = async(zoneFk, item) => {
-        const models = Self.app.models;
+        if (item.isIncluded === null)
-        const geo = await models.ZoneGeo.findById(geoFk);
+            return Self.destroyAll({zoneFk, geoFk: item.id});
-        const isIncluded = await Self.findOne({
+        else {
-            where: {zoneFk, geoFk}
+            return Self.upsert({
-        });
+                zoneFk: zoneFk,
-
+                geoFk: item.id,
-        const hasCheckedParents = await Self.rawSql(
+                isIncluded: item.isIncluded
-            `SELECT id
+            });
-                FROM vn.zoneGeo zt 
+        }
-                    JOIN vn.zoneIncluded zi ON zi.geoFk = zt.id
-                WHERE zt.lft < ? AND zt.rgt > ?`, [geo.lft, geo.rgt]
-        );
-        const hasCheckedChilds = await Self.rawSql(
-            `SELECT id
-                FROM vn.zoneGeo zt 
-                    JOIN vn.zoneIncluded zi ON zi.geoFk = zt.id
-                WHERE zt.lft > ? AND zt.rgt < ?`, [geo.lft, geo.rgt]
-        );
-
-        const isExcluded = hasCheckedParents.length || hasCheckedChilds.length;
-
-        if (isIncluded)
-            return Self.destroyAll({zoneFk, geoFk});
-        else
-            return Self.upsert({zoneFk, geoFk, isIncluded: isExcluded});
     };
 };

modules/agency/front/calendar/index.js

@@ -33,7 +33,7 @@ class Controller {
             res.data.forEach(holiday => {
                 events.push({
                     date: holiday.dated,
-                    color: 'blue-circle',
+                    color: 'red',
                     title: holiday.description || holiday.name,
                     isRemovable: false
                 });

modules/agency/front/location/index.html

@@ -2,7 +2,7 @@
     vn-id="model"
     url="/agency/api/ZoneGeos/getLeaves"
     filter="::$ctrl.filter"
-    params="{zoneFk: $ctrl.$stateParams.id, parentFk: 1}">
+    params="{zoneFk: $ctrl.$stateParams.id}" auto-load="false">
 </vn-crud-model>
 <div class="main-with-right-menu">
     <vn-card compact pad-large>
@@ -13,7 +13,7 @@
             vn-focus>
         </vn-searchbar>
         <vn-treeview vn-id="treeview" model="model"
-            on-selection="$ctrl.onSelection(item)">
+            on-selection="$ctrl.onSelection(item, value)">
         </vn-treeview>
     </vn-card>
     <vn-side-menu side="right">

modules/agency/front/location/index.js

@@ -22,11 +22,12 @@ class Controller {
         }
     }
 
-    onSelection(item) {
+    onSelection(item, isIncluded) {
+        item.isIncluded = isIncluded;
         const path = '/agency/api/ZoneIncludeds/toggleIsIncluded';
-        const params = {geoFk: item.id, zoneFk: this.zone.id};
+        const params = {zoneFk: this.zone.id, item};
         this.$http.post(path, params).then(() => {
-            this.$scope.treeview.repaintNode(item);
+
         });
     }
 }

modules/item/front/diary/index.js

@@ -119,8 +119,7 @@ class Controller {
         } else
             offsetTop = onPreparationLine.offsetTop - headerHeight;
 
-        body.querySelector('ui-view').scrollTop = offsetTop;
+        this.$window.scrollTo(0, offsetTop);
-
 
         this.ticketFk = null;
     }

modules/item/front/index/index.html

@@ -61,7 +61,7 @@
                     <vn-td>{{::item.intrastat}}</vn-td>
                     <vn-td>{{::item.origin}}</vn-td>
                     <vn-td>{{::item.userNickname}}</vn-td>
-                    <vn-td>{{::item.density}}</vn-td>
+                    <vn-td number>{{::item.density}}</vn-td>
                     <vn-td>{{::item.taxClass}}</vn-td>
                     <vn-td>
                         <vn-check

modules/item/front/index/locale/es.yml

@@ -0,0 +1 @@
+picture: Foto

modules/item/front/index/style.scss

@@ -29,6 +29,7 @@ vn-item-product {
 vn-table {
     img {
         border-radius: 50%;
-        max-width: 50px;
+        width: 50px;
+        height: 50px;
     }
 }

modules/order/front/line/style.scss

@@ -2,7 +2,8 @@ vn-order-line{
     vn-table {
         img {
             border-radius: 50%;
-            max-width: 50px;
+            width: 50px;
+            height: 50px;
         }
     }
 }

modules/ticket/front/sale/style.scss

@@ -83,7 +83,8 @@ vn-ticket-sale {
     vn-table {
         img {
             border-radius: 50%;
-            max-width: 50px;
+            width: 50px;
+            height: 50px;
         }
     }
     .taxes {

modules/ticket/front/search-panel/index.html

@@ -96,7 +96,8 @@
             <vn-check
                 vn-one
                 label="My team"
-                field="filter.myTeam">
+                field="filter.myTeam"
+                triple-state="true">
             </vn-check>
         </vn-horizontal>
         <vn-horizontal margin-large-top>

modules/worker/front/card/index.js

@@ -25,6 +25,13 @@ class Controller {
                 }, {
                     relation: 'sip',
                     scope: {fields: ['extension']}
+                }, {
+                    relation: 'department',
+                    scope: {
+                        include: {
+                            relation: 'department'
+                        }
+                    }
                 }
             ]
         };

modules/worker/front/descriptor/index.html

@@ -10,12 +10,15 @@
     </vn-horizontal>
     <div class="body">
         <div class="attributes">
-            <h5>{{$ctrl.worker.firstName}} {{$ctrl.worker.name}}</h5>
+            <h5 title="{{$ctrl.worker.firstName}} {{$ctrl.worker.name}}">
+                {{$ctrl.worker.firstName}} {{$ctrl.worker.name}}
+            </h5>
             <vn-label-value label="Id" 
                 value="{{$ctrl.worker.id}}">
             </vn-label-value>
             <vn-label-value label="User" 
-                value="{{$ctrl.worker.user.name}}">
+                value="{{$ctrl.worker.user.name}}"
+                title="{{$ctrl.worker.firstName}} {{$ctrl.worker.name}}">
             </vn-label-value>
             <vn-label-value label="Email" 
                 value="{{$ctrl.worker.user.email}}">
@@ -24,13 +27,13 @@
                 value="{{$ctrl.worker.client.fi}}">
             </vn-label-value>
             <vn-label-value label="Department" 
-                value="{{$ctrl.worker.department.department}}">
+                value="{{$ctrl.worker.department.department.name}}">
             </vn-label-value>
             <vn-label-value label="Phone" 
                 value="{{$ctrl.worker.phone}}">
             </vn-label-value>
             <vn-label-value label="Extension" 
-                value="{{$ctrl.worker.sip.phone}}">
+                value="{{$ctrl.worker.sip.extension}}">
             </vn-label-value>
         </div>
         <div class="quicklinks">

modules/worker/front/locale/es.yml

@@ -1,8 +1,8 @@
 Workers: Trabajadores
 Last name: Apellidos
 User data: Datos de usuario
-Fiscal identifier: Identificador fiscal
+Fiscal identifier: NIF
-Email: Correo electrónico
+Email: E-mail
 Department: Departamento
 User id: Id de usuario
 Role: Rol

modules/worker/front/summary/index.html

@@ -13,7 +13,7 @@
                 value="{{worker.user.email}}">
             </vn-label-value>
             <vn-label-value label="Department" 
-                value="{{worker.department.department}}">
+                value="{{worker.department.department.name}}">
             </vn-label-value>
             <vn-label-value label="Phone" 
                 value="{{worker.phone}}">
@@ -25,13 +25,14 @@
                 value="{{worker.userFk}}">
             </vn-label-value>
             <vn-label-value label="User" 
-                value="{{worker.user.name}}">
+                value="{{worker.user.name}}"
+                title="{{worker.firstName}} {{worker.name}}">
             </vn-label-value>
             <vn-label-value label="Role" 
                 value="{{worker.user.role.name}}">
             </vn-label-value>
             <vn-label-value label="Extension" 
-                value="{{worker.sip.phone}}">
+                value="{{worker.sip.extension}}">
             </vn-label-value>
         </vn-one>
     </vn-horizontal>

modules/worker/front/summary/index.js

@@ -35,6 +35,13 @@ class Controller {
                 }, {
                     relation: 'sip',
                     scope: {fields: ['extension']}
+                }, {
+                    relation: 'department',
+                    scope: {
+                        include: {
+                            relation: 'department'
+                        }
+                    }
                 }
             ]
         };

package-lock.json

@@ -1274,7 +1274,7 @@
     },
     "ansi-escapes": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
       "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
       "dev": true
     },
@@ -1567,7 +1567,7 @@
         },
         "util": {
           "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
           "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
           "dev": true,
           "requires": {
@@ -1795,7 +1795,7 @@
     "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
       "requires": {
         "cache-base": "^1.0.1",
@@ -2167,7 +2167,7 @@
     },
     "browserify-rsa": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
@@ -2217,7 +2217,7 @@
     },
     "buffer": {
       "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
@@ -2392,7 +2392,7 @@
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "requires": {
         "collection-visit": "^1.0.0",
@@ -2436,7 +2436,7 @@
     },
     "camelcase-keys": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "requires": {
@@ -2573,7 +2573,7 @@
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
@@ -2733,7 +2733,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -2807,7 +2807,7 @@
     },
     "colors": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "resolved": "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
       "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
       "dev": true
     },
@@ -3000,7 +3000,7 @@
     },
     "content-disposition": {
       "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "resolved": "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
       "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
     },
     "content-security-policy-builder": {
@@ -3269,13 +3269,13 @@
       "dependencies": {
         "jsesc": {
           "version": "0.5.0",
-          "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
           "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
           "dev": true
         },
         "regexpu-core": {
           "version": "1.0.0",
-          "resolved": "http://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
           "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
           "dev": true,
           "requires": {
@@ -3286,13 +3286,13 @@
         },
         "regjsgen": {
           "version": "0.2.0",
-          "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
           "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
           "dev": true
         },
         "regjsparser": {
           "version": "0.1.5",
-          "resolved": "http://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
           "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
           "dev": true,
           "requires": {
@@ -3795,7 +3795,7 @@
         },
         "readable-stream": {
           "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
           "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
           "dev": true,
           "requires": {
@@ -3922,7 +3922,7 @@
       "dependencies": {
         "fs-extra": {
           "version": "0.30.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+          "resolved": "http://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
           "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
           "dev": true,
           "requires": {
@@ -4464,7 +4464,7 @@
     },
     "events": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",
       "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
       "dev": true
     },
@@ -4967,7 +4967,7 @@
     },
     "file-loader": {
       "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
+      "resolved": "http://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
       "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
       "dev": true,
       "requires": {
@@ -5181,7 +5181,7 @@
     },
     "fs-access": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
       "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
       "dev": true,
       "requires": {
@@ -5961,7 +5961,7 @@
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
         "global-prefix": "^1.0.1",
@@ -6004,7 +6004,7 @@
     },
     "globby": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
       "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
       "dev": true,
       "requires": {
@@ -6049,7 +6049,7 @@
     },
     "got": {
       "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz",
       "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
       "dev": true,
       "requires": {
@@ -6226,7 +6226,7 @@
         },
         "kind-of": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
           "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
           "dev": true
         },
@@ -6410,7 +6410,7 @@
       "dependencies": {
         "es6-promise": {
           "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
+          "resolved": "http://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
           "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
           "dev": true
         },
@@ -7209,7 +7209,7 @@
     },
     "is-builtin-module": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
       "dev": true,
       "requires": {
@@ -7356,7 +7356,7 @@
     },
     "is-obj": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
@@ -7387,7 +7387,7 @@
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "requires": {
         "isobject": "^3.0.1"
@@ -7558,7 +7558,7 @@
     },
     "jasmine-core": {
       "version": "2.99.1",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
+      "resolved": "http://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
       "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=",
       "dev": true
     },
@@ -8059,7 +8059,7 @@
     },
     "load-json-file": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "requires": {
@@ -9511,7 +9511,7 @@
     },
     "media-typer": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
     "mem": {
@@ -9534,7 +9534,7 @@
     },
     "meow": {
       "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
       "requires": {
@@ -9657,7 +9657,7 @@
     },
     "minimist": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
     "minstache": {
@@ -9750,7 +9750,7 @@
     },
     "mkdirp": {
       "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
       "requires": {
         "minimist": "0.0.8"
@@ -9758,7 +9758,7 @@
       "dependencies": {
         "minimist": {
           "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
         }
       }
@@ -9910,7 +9910,7 @@
     },
     "multipipe": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+      "resolved": "http://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
       "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
       "dev": true,
       "requires": {
@@ -10039,7 +10039,7 @@
     },
     "named-placeholders": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.1.tgz",
+      "resolved": "http://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.1.tgz",
       "integrity": "sha1-O3oNJiA910s6nfTJz7gnsvuQfmQ=",
       "dev": true,
       "requires": {
@@ -10048,7 +10048,7 @@
       "dependencies": {
         "lru-cache": {
           "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+          "resolved": "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
           "integrity": "sha1-2COIrpyWC+y+oMc7uet5tsbOmus=",
           "dev": true
         }
@@ -10136,7 +10136,7 @@
       "dependencies": {
         "jsesc": {
           "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
           "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
           "dev": true
         }
@@ -11006,7 +11006,7 @@
       "dependencies": {
         "minimist": {
           "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
           "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
           "dev": true
         },
@@ -11068,7 +11068,7 @@
     },
     "os-homedir": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
       "dev": true
     },
@@ -11084,7 +11084,7 @@
     },
     "os-tmpdir": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
@@ -11272,7 +11272,7 @@
     },
     "path-browserify": {
       "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
       "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
       "dev": true
     },
@@ -11567,7 +11567,7 @@
     },
     "pretty-bytes": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
+      "resolved": "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
       "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
       "dev": true,
       "requires": {
@@ -11656,7 +11656,7 @@
         },
         "through2": {
           "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
+          "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
           "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
           "dev": true,
           "requires": {
@@ -12525,7 +12525,7 @@
     },
     "safe-regex": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "requires": {
@@ -12650,7 +12650,7 @@
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
@@ -12790,7 +12790,7 @@
     "set-value": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=",
+      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -12977,7 +12977,7 @@
     "snapdragon-node": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
       "requires": {
         "define-property": "^1.0.0",
@@ -13028,7 +13028,7 @@
     "snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "requires": {
         "kind-of": "^3.2.0"
@@ -13358,7 +13358,7 @@
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^3.0.0"
@@ -13469,7 +13469,7 @@
     },
     "stream-browserify": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
       "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
       "dev": true,
       "requires": {
@@ -13548,7 +13548,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -13634,7 +13634,7 @@
     },
     "strip-ansi": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
       "requires": {
@@ -14015,7 +14015,7 @@
     },
     "tar": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
       "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
       "dev": true,
       "requires": {
@@ -14185,7 +14185,7 @@
     },
     "through": {
       "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
     "through2": {
@@ -14457,7 +14457,7 @@
     },
     "tty-browserify": {
       "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
       "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
       "dev": true
     },
@@ -15083,7 +15083,7 @@
     },
     "vm-browserify": {
       "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "resolved": "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
       "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
       "dev": true,
       "requires": {