Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

front/core/components/combo/combo.html

@@ -1,11 +0,0 @@
-<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-	<select
-		class="*[className]*"
-		name="*[name]*"
-		ng-model="*[model]*"
-		rule="*[rule]*"
-		*[enabled]*
-		ng-transclude>
-	</select>
-	<label class="mdl-textfield__label" translate>*[label]*</label>
-</div>

front/core/components/combo/combo.js

@@ -1,25 +0,0 @@
-import ngModule from '../../module';
-import template from './combo.html';
-
-directive.$inject = ['vnTemplate'];
-export function directive(vnTemplate) {
-    return {
-        restrict: 'E',
-        transclude: true,
-        template: (_, $attrs) =>
-            vnTemplate.getNormalized(template, $attrs, {
-                label: 'Label',
-                enabled: 'enabled',
-                class: 'mdl-textfield__input'
-            }),
-        link: function(scope, element, attrs) {
-            scope.$watch(attrs.model, () => {
-                let mdlField = element[0].firstChild.MaterialTextfield;
-                if (mdlField)
-                    mdlField.updateClasses_();
-            });
-            componentHandler.upgradeElement(element[0].firstChild);
-        }
-    };
-}
-ngModule.directive('vnCombo', directive);

front/core/components/float-button/float-button.html

@@ -1,3 +1,3 @@
-<button class="*[className]*">
+<button class="mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
-    <vn-icon icon="*[icon]*"></vn-icon>
+    <vn-icon icon="{{::$ctrl.icon}}"></vn-icon>
 </button>

front/core/components/float-button/float-button.js

@@ -1,14 +1,8 @@
 import ngModule from '../../module';
-import template from './float-button.html';
 
-directive.$inject = ['vnTemplate'];
+ngModule.component('vnFloatButton', {
-export function directive(vnTemplate) {
+    template: require('./float-button.html'),
-    return {
+    bindings: {
-        restrict: 'E',
+        icon: '@'
-        template: (_, $attrs) =>
+    }
-            vnTemplate.get(template, $attrs, {
+});
-                className: 'mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored'
-            })
-    };
-}
-ngModule.directive('vnFloatButton', directive);

front/core/components/icon-menu/style.scss

@@ -2,6 +2,7 @@ vn-icon-menu {
     cursor: pointer;
 
     vn-drop-down {
-        font-family: 'vn-font'
+        font-family: 'vn-font';
+        outline: 0
     }
 }

front/core/components/index.js

@@ -24,9 +24,7 @@ import './radio-group/radio-group';
 import './textarea/textarea';
 import './icon-button/icon-button';
 import './submit/submit';
-import './combo/combo';
 import './card/card';
-import './switch/switch';
 import './float-button/float-button';
 import './step-control/step-control';
 import './label-value/label-value';

front/core/components/switch/switch.html

@@ -1,4 +0,0 @@
-<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
-    <input type="checkbox" class="*[className]*" ng-model="*[model]*" ng-change="*[change]*">
-    <span class="mdl-switch__label">*[label]*</span>
-</label>

front/core/components/switch/switch.js

@@ -1,26 +0,0 @@
-import ngModule from '../../module';
-
-directive.$inject = ['vnTemplate'];
-export default function directive(vnTemplate) {
-    return {
-        restrict: 'E',
-        template: (_, $attrs) =>
-            vnTemplate.getNormalized(template, $attrs, {
-                className: 'mdl-switch__input',
-                label: ''
-            }),
-        link: function(scope, element, attrs) {
-            scope.$watch(attrs.model, () => {
-                let mdlField = element[0].firstChild.MaterialSwitch;
-                if (mdlField)
-                    mdlField.updateClasses_();
-            });
-            componentHandler.upgradeElement(element[0].firstChild);
-        }
-    };
-}
-ngModule.directive('vnSwitch', directive);
-
-export function factory() {
-}
-ngModule.factory('vnSwitchMdlFactory', factory);

front/core/directives/droppable.js

@@ -1,5 +1,5 @@
 import ngModule from '../module';
-
+import './droppable.scss';
 
 export function directive($parse) {
     return {
@@ -22,7 +22,7 @@ export function directive($parse) {
              * Enter droppable area event
              */
             element.addEventListener('dragenter', event => {
-                element.style.backgroundColor = 'yellow';
+                element.classList.add('active');
 
                 event.stopImmediatePropagation();
                 event.preventDefault();
@@ -33,7 +33,7 @@ export function directive($parse) {
              * Exit droppable area event
              */
             element.addEventListener('dragleave', event => {
-                element.style.backgroundColor = 'transparent';
+                element.classList.remove('active');
 
                 event.stopImmediatePropagation();
                 event.preventDefault();
@@ -52,37 +52,12 @@ export function directive($parse) {
              * Fires when a drop events
              */
             element.addEventListener('drop', event => {
-                const draggedParent = this.dragged.parentNode;
+                element.classList.remove('active');
-                const targetChild = element.querySelector('ul');
 
+                onDropEvent($scope, {event});
 
-                element.style.transition = 'background 2s';
+                event.stopPropagation();
-                element.style.backgroundColor = 'transparent';
+                event.preventDefault();
-
-                if (this.dragged === element)
-                    return event.preventDefault();
-
-
-                if (targetChild) {
-                    const targetNodes = targetChild.querySelectorAll('li');
-                    const before = targetNodes[targetNodes.length - 1];
-
-                    targetChild.insertBefore(this.dragged, before);
-                } else
-                    draggedParent.removeChild(this.dragged);
-
-                onDropEvent($scope, {
-                    dragged: {
-                        element: this.dragged,
-                        scope: angular.element(this.dragged).scope()
-                    },
-                    dropped: {
-                        element: element,
-                        scope: angular.element(element).scope()
-                    }
-                });
-
-                event.stopImmediatePropagation();
             });
         }
     };

front/core/directives/droppable.scss

@@ -0,0 +1,11 @@
+@import "./variables";
+
+[vn-droppable] {
+    border: 2px dashed transparent;
+    transition: all 0.5s;
+
+    &.active {
+        background-color: $color-hover-cd;
+        border: 2px dashed $color-bg-dark;
+    }
+}

front/salix/components/app/style.scss

@@ -5,6 +5,7 @@ body {
     overflow: auto;
 }
 vn-app {
+    height: inherit;
     display: block;
 
     & > vn-topbar {
@@ -50,11 +51,16 @@ vn-app {
         }
     }
     & > .main-view {
+        box-sizing: border-box;
+        height: inherit;
+        
         &.padding {
             padding-top: $topbar-height;
         }
         .content-block {
-            margin: $margin-medium;
+            box-sizing: border-box;
+            padding: $pad-medium;
+            height: inherit;
 
             form vn-horizontal {
                 align-items: center;
@@ -68,6 +74,7 @@ vn-app {
             display: block;
             margin: 0 auto;
             padding-left: $menu-width;
+            height: 100%
                     
         }
         .main-with-right-menu {

modules/claim/front/dms/create/index.html

@@ -1,71 +0,0 @@
-<vn-watcher
-    vn-id="watcher"
-    data="$ctrl.dms">
-</vn-watcher>
-<form name="form" ng-submit="$ctrl.onSubmit()" margin-medium enctype="multipart/form-data">
-    <div compact>
-        <vn-card pad-large>
-            <vn-horizontal>
-                <vn-textfield vn-one vn-focus
-                    label="Reference" 
-                    field="$ctrl.dms.reference">
-                </vn-textfield>
-                <vn-autocomplete vn-one
-                    label="Company"
-                    field="$ctrl.dms.companyId"
-                    url="/api/Companies"
-                    show-field="code"
-                    value-field="id">
-                </vn-autocomplete>
-            </vn-horizontal>
-            <vn-horizontal>
-                <vn-autocomplete vn-one
-                    label="Warehouse"
-                    field="$ctrl.dms.warehouseId"
-                    url="/api/Warehouses"
-                    show-field="name"
-                    value-field="id">
-                </vn-autocomplete>
-                <vn-autocomplete vn-one
-                    label="Type"
-                    field="$ctrl.dms.dmsTypeId"
-                    url="/api/DmsTypes"
-                    show-field="name"
-                    value-field="id">
-                </vn-autocomplete>
-            </vn-horizontal>
-            <vn-horizontal>
-                <vn-textarea vn-one
-                    label="Description" 
-                    field="$ctrl.dms.description">
-                </vn-textarea>
-            </vn-horizontal>
-            <vn-horizontal>
-                <vn-input-file vn-one 
-                    label="File" 
-                    model="$ctrl.dms.files"
-                    on-change="$ctrl.onFileChange(files)"
-                    accept="{{$ctrl.allowedContentTypes}}"
-                    multiple="true">
-                    <t-right-icons>
-                        <vn-icon vn-none
-                            color-secondary
-                            title="{{$ctrl.contentTypesInfo}}"
-                            icon="info">
-                        </vn-icon>
-                    </t-right-icons>
-                </vn-input-file>
-            </vn-horizontal>
-            <vn-vertical>
-                <vn-check
-                    label="Generate identifier for original file" 
-                    field="$ctrl.dms.hasFile">
-                </vn-check>
-            </vn-vertical>
-        </vn-card>
-        <vn-button-bar>
-            <vn-submit label="Upload"></vn-submit>
-            <vn-button ui-sref="claim.card.dms.index" label="Cancel"></vn-button>
-        </vn-button-bar>
-    </div>
-</form>

modules/claim/front/dms/create/index.js

@@ -1,115 +0,0 @@
-import ngModule from '../../module';
-import './style.scss';
-
-class Controller {
-    constructor($scope, $http, $state, $translate, vnApp) {
-        this.$ = $scope;
-        this.$http = $http;
-        this.$state = $state;
-        this.$translate = $translate;
-        this.vnApp = vnApp;
-        this.dms = {
-            files: [],
-            hasFile: false,
-            hasFileAttached: false
-        };
-    }
-
-    get claim() {
-        return this._claim;
-    }
-
-    set claim(value) {
-        this._claim = value;
-
-        if (value) {
-            this.setDefaultParams();
-            this.getAllowedContentTypes();
-        }
-    }
-
-    getAllowedContentTypes() {
-        this.$http.get('/api/claimDms/allowedContentTypes').then(res => {
-            const contentTypes = res.data.join(', ');
-            this.allowedContentTypes = contentTypes;
-        });
-    }
-
-    get contentTypesInfo() {
-        return this.$translate.instant('ContentTypesInfo', {
-            allowedContentTypes: this.allowedContentTypes
-        });
-    }
-
-    setDefaultParams() {
-        const params = {filter: {
-            where: {code: 'claim'}
-        }};
-        this.$http.get('/api/DmsTypes/findOne', {params}).then(res => {
-            const dmsTypeId = res.data && res.data.id;
-            const companyId = window.localStorage.defaultCompanyFk;
-            const warehouseId = window.localStorage.defaultWarehouseFk;
-            const defaultParams = {
-                reference: this.claim.id,
-                warehouseId: warehouseId,
-                companyId: companyId,
-                dmsTypeId: dmsTypeId,
-                description: this.$translate.instant('FileDescription', {
-                    claimId: this.claim.id,
-                    clientId: this.claim.client.id,
-                    clientName: this.claim.client.name
-                }).toUpperCase()
-            };
-
-            this.dms = Object.assign(this.dms, defaultParams);
-        });
-    }
-
-    onSubmit() {
-        const query = `/api/claims/${this.claim.id}/uploadFile`;
-        const options = {
-            method: 'POST',
-            url: query,
-            params: this.dms,
-            headers: {
-                'Content-Type': undefined
-            },
-            transformRequest: files => {
-                const formData = new FormData();
-
-                for (let i = 0; i < files.length; i++)
-                    formData.append(files[i].name, files[i]);
-
-                return formData;
-            },
-            data: this.dms.files
-        };
-        this.$http(options).then(res => {
-            if (res) {
-                this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
-                this.$.watcher.updateOriginalData();
-                this.$state.go('claim.card.dms.index');
-            }
-        });
-    }
-
-    onFileChange(files) {
-        let hasFileAttached = false;
-        if (files.length > 0)
-            hasFileAttached = true;
-
-        this.$.$applyAsync(() => {
-            this.dms.hasFileAttached = hasFileAttached;
-        });
-    }
-}
-
-Controller.$inject = ['$scope', '$http', '$state', '$translate', 'vnApp'];
-
-ngModule.component('vnClaimDmsCreate', {
-    template: require('./index.html'),
-    controller: Controller,
-    bindings: {
-        claim: '<'
-    }
-});

modules/claim/front/dms/create/index.spec.js

@@ -1,83 +0,0 @@
-import './index';
-
-describe('Claim', () => {
-    describe('Component vnClaimDmsCreate', () => {
-        let controller;
-        let $scope;
-        let $httpBackend;
-        let $httpParamSerializer;
-
-        beforeEach(angular.mock.module('claim', $translateProvider => {
-            $translateProvider.translations('en', {});
-        }));
-
-        beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => {
-            $scope = $rootScope.$new();
-            $httpBackend = _$httpBackend_;
-            $httpParamSerializer = _$httpParamSerializer_;
-            controller = $componentController('vnClaimDmsCreate', {$scope});
-            controller._claim = {
-                id: 15,
-                client: {id: 101, name: 'Bruce wayne'},
-                ticketFk: 16
-            };
-        }));
-
-        describe('claim() setter', () => {
-            it('should set the claim data and then call setDefaultParams() and getAllowedContentTypes()', () => {
-                spyOn(controller, 'setDefaultParams');
-                spyOn(controller, 'getAllowedContentTypes');
-                controller._claim = undefined;
-                controller.claim = {
-                    id: 15,
-                    client: {id: 101, name: 'Bruce wayne'},
-                    ticketFk: 16
-                };
-
-                expect(controller.claim).toBeDefined();
-                expect(controller.setDefaultParams).toHaveBeenCalledWith();
-                expect(controller.getAllowedContentTypes).toHaveBeenCalledWith();
-            });
-        });
-
-        describe('setDefaultParams()', () => {
-            it('should perform a GET query and define the dms property on controller', () => {
-                const params = {filter: {
-                    where: {code: 'claim'}
-                }};
-                let serializedParams = $httpParamSerializer(params);
-                $httpBackend.when('GET', `/api/DmsTypes/findOne?${serializedParams}`).respond({id: 14, code: 'claim'});
-                $httpBackend.expect('GET', `/api/DmsTypes/findOne?${serializedParams}`);
-                controller.setDefaultParams();
-                $httpBackend.flush();
-
-                expect(controller.dms).toBeDefined();
-                expect(controller.dms.reference).toEqual(15);
-                expect(controller.dms.dmsTypeId).toEqual(14);
-            });
-        });
-
-        describe('onFileChange()', () => {
-            it('should set dms hasFileAttached property to true if has any files', () => {
-                const files = [{id: 1, name: 'MyFile'}];
-                controller.onFileChange(files);
-                $scope.$apply();
-
-                expect(controller.dms.hasFileAttached).toBeTruthy();
-            });
-        });
-
-        describe('getAllowedContentTypes()', () => {
-            it('should make an HTTP GET request to get the allowed content types', () => {
-                const expectedResponse = ['image/png', 'image/jpg'];
-                $httpBackend.when('GET', `/api/claimDms/allowedContentTypes`).respond(expectedResponse);
-                $httpBackend.expect('GET', `/api/claimDms/allowedContentTypes`);
-                controller.getAllowedContentTypes();
-                $httpBackend.flush();
-
-                expect(controller.allowedContentTypes).toBeDefined();
-                expect(controller.allowedContentTypes).toEqual('image/png, image/jpg');
-            });
-        });
-    });
-});

modules/claim/front/dms/create/style.scss

@@ -1,7 +0,0 @@
-vn-ticket-request {
-    vn-textfield {
-        margin: 0!important;
-        max-width: 100px;
-    }
-}
-

modules/claim/front/dms/edit/index.html

@@ -1,71 +0,0 @@
-<vn-watcher
-    vn-id="watcher"
-    data="$ctrl.dms">
-</vn-watcher>
-<form name="form" ng-submit="$ctrl.onSubmit()" margin-medium enctype="multipart/form-data">
-    <div compact>
-        <vn-card pad-large>
-            <vn-horizontal>
-                <vn-textfield vn-one vn-focus
-                    label="Reference" 
-                    field="$ctrl.dms.reference">
-                </vn-textfield>
-                <vn-autocomplete vn-one required="true"
-                    label="Company"
-                    field="$ctrl.dms.companyId"
-                    url="/api/Companies"
-                    show-field="code"
-                    value-field="id">
-                </vn-autocomplete>
-            </vn-horizontal>
-            <vn-horizontal>
-                <vn-autocomplete vn-one required="true"
-                    label="Warehouse"
-                    field="$ctrl.dms.warehouseId"
-                    url="/api/Warehouses"
-                    show-field="name"
-                    value-field="id">
-                </vn-autocomplete>
-                <vn-autocomplete vn-one required="true"
-                    label="Type"
-                    field="$ctrl.dms.dmsTypeId"
-                    url="/api/DmsTypes"
-                    show-field="name"
-                    value-field="id">
-                </vn-autocomplete>
-            </vn-horizontal>
-            <vn-horizontal>
-                <vn-textarea vn-one required="true"
-                    label="Description" 
-                    field="$ctrl.dms.description">
-                </vn-textarea>
-            </vn-horizontal>
-            <vn-horizontal>
-                <vn-input-file vn-one 
-                    label="File" 
-                    model="$ctrl.dms.files"
-                    on-change="$ctrl.onFileChange(files)"
-                    accept="{{$ctrl.allowedContentTypes}}"
-                    multiple="true">
-                    <t-right-icons>
-                        <vn-icon vn-none
-                            color-secondary
-                            title="{{$ctrl.contentTypesInfo}}"
-                            icon="info">
-                        </vn-icon>
-                    </t-right-icons>
-                </vn-input-file>
-            </vn-horizontal>
-            <vn-vertical>
-                <vn-check disabled="true"
-                    label="Generate identifier for original file" 
-                    field="$ctrl.dms.hasFile">
-                </vn-check>
-            </vn-vertical>
-        </vn-card>
-        <vn-button-bar>
-            <vn-submit label="Save"></vn-submit>
-            <vn-button ui-sref="claim.card.dms.index" label="Cancel"></vn-button>
-        </vn-button-bar>
-    </div>
-</form>

modules/claim/front/dms/edit/index.js

@@ -1,104 +0,0 @@
-import ngModule from '../../module';
-import './style.scss';
-
-class Controller {
-    constructor($scope, $http, $state, $translate, vnApp) {
-        this.$ = $scope;
-        this.$http = $http;
-        this.$state = $state;
-        this.$stateParams = $state.params;
-        this.$translate = $translate;
-        this.vnApp = vnApp;
-    }
-
-    get claim() {
-        return this._claim;
-    }
-
-    set claim(value) {
-        this._claim = value;
-
-        if (value) {
-            this.setDefaultParams();
-            this.getAllowedContentTypes();
-        }
-    }
-
-    getAllowedContentTypes() {
-        this.$http.get('/api/claimDms/allowedContentTypes').then(res => {
-            const contentTypes = res.data.join(', ');
-            this.allowedContentTypes = contentTypes;
-        });
-    }
-
-    get contentTypesInfo() {
-        return this.$translate.instant('ContentTypesInfo', {
-            allowedContentTypes: this.allowedContentTypes
-        });
-    }
-
-    setDefaultParams() {
-        const path = `/api/Dms/${this.$stateParams.dmsId}`;
-        this.$http.get(path).then(res => {
-            const dms = res.data && res.data;
-            this.dms = {
-                reference: dms.reference,
-                warehouseId: dms.warehouseFk,
-                companyId: dms.companyFk,
-                dmsTypeId: dms.dmsTypeFk,
-                description: dms.description,
-                hasFile: dms.hasFile,
-                hasFileAttached: false,
-                files: []
-            };
-        });
-    }
-
-    onSubmit() {
-        const query = `/api/dms/${this.$stateParams.dmsId}/updateFile`;
-        const options = {
-            method: 'POST',
-            url: query,
-            params: this.dms,
-            headers: {
-                'Content-Type': undefined
-            },
-            transformRequest: files => {
-                const formData = new FormData();
-
-                for (let i = 0; i < files.length; i++)
-                    formData.append(files[i].name, files[i]);
-
-                return formData;
-            },
-            data: this.dms.files
-        };
-        this.$http(options).then(res => {
-            if (res) {
-                this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
-                this.$.watcher.updateOriginalData();
-                this.$state.go('claim.card.dms.index');
-            }
-        });
-    }
-
-    onFileChange(files) {
-        let hasFileAttached = false;
-        if (files.length > 0)
-            hasFileAttached = true;
-
-        this.$.$applyAsync(() => {
-            this.dms.hasFileAttached = hasFileAttached;
-        });
-    }
-}
-
-Controller.$inject = ['$scope', '$http', '$state', '$translate', 'vnApp'];
-
-ngModule.component('vnClaimDmsEdit', {
-    template: require('./index.html'),
-    controller: Controller,
-    bindings: {
-        claim: '<'
-    }
-});

modules/claim/front/dms/edit/index.spec.js

@@ -1,86 +0,0 @@
-import './index';
-
-describe('Claim', () => {
-    describe('Component vnClaimDmsEdit', () => {
-        let controller;
-        let $scope;
-        let $httpBackend;
-        let $state;
-
-        beforeEach(angular.mock.module('claim', $translateProvider => {
-            $translateProvider.translations('en', {});
-        }));
-
-        beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_) => {
-            $scope = $rootScope.$new();
-            $httpBackend = _$httpBackend_;
-            $state = {params: {dmsId: 1}};
-            controller = $componentController('vnClaimDmsEdit', {$scope, $state});
-            controller._claim = {id: 1, ticketFk: 16};
-        }));
-
-        describe('claim() setter', () => {
-            it('should set the claim data and then call setDefaultParams() and getAllowedContentTypes()', () => {
-                spyOn(controller, 'setDefaultParams');
-                spyOn(controller, 'getAllowedContentTypes');
-                controller._claim = undefined;
-                controller.claim = {
-                    id: 15,
-                    ticketFk: 16
-                };
-
-                expect(controller.setDefaultParams).toHaveBeenCalledWith();
-                expect(controller.claim).toBeDefined();
-                expect(controller.getAllowedContentTypes).toHaveBeenCalledWith();
-            });
-        });
-
-        describe('setDefaultParams()', () => {
-            it('should perform a GET query and define the dms property on controller', () => {
-                const dmsId = 1;
-                const expectedResponse = {
-                    reference: 101,
-                    warehouseFk: 1,
-                    companyFk: 442,
-                    dmsTypeFk: 20,
-                    description: 'Test',
-                    hasFile: false,
-                    hasFileAttached: false
-                };
-
-                $httpBackend.when('GET', `/api/Dms/${dmsId}`).respond(expectedResponse);
-                $httpBackend.expect('GET', `/api/Dms/${dmsId}`).respond(expectedResponse);
-                controller.setDefaultParams();
-                $httpBackend.flush();
-
-                expect(controller.dms).toBeDefined();
-                expect(controller.dms.reference).toEqual(101);
-                expect(controller.dms.dmsTypeId).toEqual(20);
-            });
-        });
-
-        describe('onFileChange()', () => {
-            it('should set dms hasFileAttached property to true if has any files', () => {
-                const files = [{id: 1, name: 'MyFile'}];
-                controller.dms = {hasFileAttached: false};
-                controller.onFileChange(files);
-                $scope.$apply();
-
-                expect(controller.dms.hasFileAttached).toBeTruthy();
-            });
-        });
-
-        describe('getAllowedContentTypes()', () => {
-            it('should make an HTTP GET request to get the allowed content types', () => {
-                const expectedResponse = ['image/png', 'image/jpg'];
-                $httpBackend.when('GET', `/api/claimDms/allowedContentTypes`).respond(expectedResponse);
-                $httpBackend.expect('GET', `/api/claimDms/allowedContentTypes`);
-                controller.getAllowedContentTypes();
-                $httpBackend.flush();
-
-                expect(controller.allowedContentTypes).toBeDefined();
-                expect(controller.allowedContentTypes).toEqual('image/png, image/jpg');
-            });
-        });
-    });
-});

modules/claim/front/dms/edit/style.scss

@@ -1,7 +0,0 @@
-vn-ticket-request {
-    vn-textfield {
-        margin: 0!important;
-        max-width: 100px;
-    }
-}
-

modules/claim/front/dms/index/index.html

@@ -1,113 +1,33 @@
-<vn-crud-model
+<vn-crud-model vn-id="model" auto-load="true"
-    vn-id="model"
     url="/api/ClaimDms"
     link="{claimFk: $ctrl.$stateParams.id}"
-    filter="::$ctrl.filter"
     limit="20"
-    data="$ctrl.claimDms">
+    data="$ctrl.photos">
 </vn-crud-model>
-<vn-vertical>
+<vn-horizontal class="photo-list" vn-droppable="true" on-drop="$ctrl.onDrop(event)">
-    <vn-card pad-large>
+    <section class="photo" ng-repeat="photo in $ctrl.photos">
-        <vn-vertical>
+        <section class="image">
-            <vn-table model="model">
+            <img alt="" on-error-src
-                <vn-thead>
+            ng-src="/api/dms/{{::photo.dmsFk}}/downloadFile?access_token={{::$ctrl.accessToken}}" 
-                    <vn-tr>
+            zoom-image="/api/dms/{{::photo.dmsFk}}/downloadFile?access_token={{::$ctrl.accessToken}}">
-                        <vn-th field="dmsFk" default-order="DESC" shrink>Id</vn-th>
+        </section>
-                        <vn-th shrink>Type</vn-th>
+        <section class="actions">
-                        <vn-th shrink number>Order</vn-th>
+            <button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-js-ripple-effect mdl-button--colored"
-                        <vn-th shrink>Reference</vn-th>
+                ng-click="$ctrl.showDeleteConfirm($index)"
-                        <vn-th expand>Description</vn-th>
+                title="{{'Remove file' | translate}}"
-                        <vn-th shrink>Original</vn-th>
+                tabindex="-1">
-                        <vn-th shrink>File</vn-th>
+                <vn-icon icon="delete"></vn-icon>
-                        <vn-th shrink>Employee</vn-th>
+            </button>
-                        <vn-th>Created</vn-th>
+        </section>
-                        <vn-th shrink></vn-th>
+    </section>
-                        <vn-th shrink></vn-th>
+    <vn-empty-rows ng-if="$ctrl.photos.length == 0">
-                        <vn-th shrink></vn-th>
+        <span translate>Drag & Drop files here...</span>
-                    </vn-tr>
+    </vn-empty-rows>
-                </vn-thead>
+</vn-horizontal>
-                <vn-tbody>
+<vn-pagination model="model"></vn-pagination>
-                    <vn-tr ng-repeat="document in $ctrl.claimDms">
-                        <vn-td number shrink>{{::document.dmsFk}}</vn-td>
-                        <vn-td shrink>
-                            <span title="{{::document.dms.dmsType.name}}">
-                                {{::document.dms.dmsType.name}}
-                            </span>
-                        </vn-td>
-                        <vn-td shrink number>
-                            <span class="chip" title="{{::document.dms.hardCopyNumber}}"
-                                ng-class="{'message': document.dms.hardCopyNumber}">
-                                {{::document.dms.hardCopyNumber}}
-                            </span>
-                        </vn-td>
-                        <vn-td shrink>
-                            <span title="{{::document.dms.reference}}">
-                                {{::document.dms.reference}}
-                            </span>
-                        </vn-td>
-                        <vn-td expand>
-                            <span title="{{::document.dms.description}}">
-                                {{::document.dms.description}}
-                            </span>
-                        </vn-td>
-                        <vn-td shrink>
-                            <vn-check disabled="true"
-                                field="document.dms.hasFile">
-                            </vn-check>
-                        </vn-td>
-                        <vn-td shrink>
-                            <a target="_blank"
-                                title="{{'Download file' | translate}}"
-                                href="api/dms/{{::document.dmsFk}}/downloadFile?access_token={{::$ctrl.accessToken}}">
-                                {{::document.dms.file}}
-                            </a>
-                        </vn-td>
-                        <vn-td shrink>
-                            <span class="link" 
-                                ng-click="$ctrl.showWorkerDescriptor($event, document.dms.workerFk)">
-                                {{::document.dms.worker.user.nickname | dashIfEmpty}}
-                            </span></vn-td>
-                        <vn-td>
-                            {{::document.dms.created | dateTime:'dd/MM/yyyy HH:mm'}}
-                        </vn-td>
-                        <vn-td shrink>
-                            <a target="_blank"
-                                href="api/dms/{{::document.dmsFk}}/downloadFile?access_token={{::$ctrl.accessToken}}">
-                                <vn-icon-button
-                                    icon="cloud_download"
-                                    title="{{'Download file' | translate}}">
-                                </vn-icon-button>
-                            </a>
-                        </vn-td>
-                        <vn-td shrink>
-                            <vn-icon-button icon="edit"
-                                ui-sref="claim.card.dms.edit({dmsId: {{::document.dmsFk}}})"
-                                title="{{'Edit file' | translate}}">
-                            </vn-icon-button>
-                        </vn-td>
-                        <vn-td shrink>
-                            <vn-icon-button icon="delete"
-                                ng-click="$ctrl.showDeleteConfirm($index)"
-                                title="{{'Remove file' | translate}}"
-                                tabindex="-1">
-                            </vn-icon-button>
-                        </vn-td>
-                    </vn-tr>
-                </vn-tbody>
-            </vn-table>
-        </vn-vertical>
-        <vn-pagination model="model"></vn-pagination>
-    </vn-card>
-</vn-vertical>
 <vn-worker-descriptor-popover 
     vn-id="workerDescriptor">
 </vn-worker-descriptor-popover>
-<a ui-sref="claim.card.dms.create"
-    vn-tooltip="Upload file"
-    vn-bind="+"
-    fixed-bottom-right>
-    <vn-float-button icon="add"></vn-float-button>
-</a>
 <vn-confirm 
     vn-id="confirm"
     message="This file will be deleted"

modules/claim/front/dms/index/index.js

@@ -9,41 +9,6 @@ class Controller {
         this.$translate = $translate;
         this.accessToken = vnToken.token;
         this.vnApp = vnApp;
-        this.filter = {
-            include: {
-                relation: 'dms',
-                scope: {
-                    fields: [
-                        'dmsTypeFk',
-                        'workerFk',
-                        'hardCopyNumber',
-                        'reference',
-                        'description',
-                        'hasFile',
-                        'file',
-                        'created',
-                    ],
-                    include: [{
-                        relation: 'dmsType',
-                        scope: {
-                            fields: ['name']
-                        }
-                    },
-                    {
-                        relation: 'worker',
-                        scope: {
-                            fields: ['userFk'],
-                            include: {
-                                relation: 'user',
-                                scope: {
-                                    fields: ['nickname']
-                                }
-                            },
-                        }
-                    }]
-                },
-            }
-        };
     }
 
     showWorkerDescriptor(event, workerFk) {
@@ -61,14 +26,70 @@ class Controller {
 
     deleteDms(response) {
         if (response === 'ACCEPT') {
-            const dmsFk = this.claimDms[this.dmsIndex].dmsFk;
+            const dmsFk = this.photos[this.dmsIndex].dmsFk;
             const query = `/api/claimDms/${dmsFk}/removeFile`;
             this.$http.post(query).then(() => {
                 this.$.model.remove(this.dmsIndex);
-                this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
+                this.vnApp.showSuccess(this.$translate.instant('Photo deleted'));
             });
         }
     }
+
+    onDrop(event) {
+        const files = event.dataTransfer.files;
+        this.setDefaultParams().then(() => {
+            this.dms.files = files;
+            this.create();
+        });
+    }
+
+    setDefaultParams() {
+        const params = {filter: {
+            where: {code: 'claim'}
+        }};
+        return this.$http.get('/api/DmsTypes/findOne', {params}).then(res => {
+            const dmsTypeId = res.data && res.data.id;
+            const companyId = window.localStorage.defaultCompanyFk;
+            const warehouseId = window.localStorage.defaultWarehouseFk;
+            this.dms = {
+                hasFile: false,
+                hasFileAttached: false,
+                reference: this.claim.id,
+                warehouseId: warehouseId,
+                companyId: companyId,
+                dmsTypeId: dmsTypeId,
+                description: this.$translate.instant('FileDescription', {
+                    claimId: this.claim.id,
+                    clientId: this.claim.client.id,
+                    clientName: this.claim.client.name
+                }).toUpperCase()
+            };
+        });
+    }
+
+
+    create() {
+        const query = `/api/claims/${this.claim.id}/uploadFile`;
+        const options = {
+            method: 'POST',
+            url: query,
+            params: this.dms,
+            headers: {'Content-Type': undefined},
+            transformRequest: files => {
+                const formData = new FormData();
+
+                for (let i = 0; i < files.length; i++)
+                    formData.append(files[i].name, files[i]);
+
+                return formData;
+            },
+            data: this.dms.files
+        };
+        this.$http(options).then(() => {
+            this.vnApp.showSuccess(this.$translate.instant('Photo uploaded!'));
+            this.$.model.refresh();
+        });
+    }
 }
 
 Controller.$inject = ['$stateParams', '$scope', '$http', '$translate', 'vnToken', 'vnApp'];
@@ -76,4 +97,7 @@ Controller.$inject = ['$stateParams', '$scope', '$http', '$translate', 'vnToken'
 ngModule.component('vnClaimDmsIndex', {
     template: require('./index.html'),
     controller: Controller,
+    bindings: {
+        claim: '<'
+    }
 });

modules/claim/front/dms/index/index.spec.js

@@ -7,17 +7,23 @@ describe('Claim', () => {
         let $scope;
         let $httpBackend;
         let controller;
+        let $httpParamSerializer;
 
         beforeEach(angular.mock.module('claim', $translateProvider => {
             $translateProvider.translations('en', {});
         }));
 
-        beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_) => {
+        beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_, _$httpParamSerializer_) => {
             $componentController = _$componentController_;
+            $httpParamSerializer = _$httpParamSerializer_;
             $httpBackend = _$httpBackend_;
             $scope = $rootScope.$new();
             controller = $componentController('vnClaimDmsIndex', {$: $scope});
             controller.$.model = crudModel;
+            controller.claim = {
+                id: 1,
+                client: {id: 101, name: 'Bruce Wayne'}
+            };
         }));
 
         describe('deleteDms()', () => {
@@ -26,7 +32,7 @@ describe('Claim', () => {
                 const dmsIndex = 0;
                 spyOn(controller.vnApp, 'showSuccess');
                 spyOn(controller.$.model, 'remove');
-                controller.claimDms = [{dmsFk: 1}];
+                controller.photos = [{dmsFk: 1}];
                 controller.dmsIndex = dmsIndex;
 
                 $httpBackend.when('POST', `/api/claimDms/${dmsId}/removeFile`).respond({});
@@ -35,7 +41,42 @@ describe('Claim', () => {
                 $httpBackend.flush();
 
                 expect(controller.$.model.remove).toHaveBeenCalledWith(dmsIndex);
-                expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
+                expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Photo deleted!');
+            });
+        });
+
+        describe('setDefaultParams()', () => {
+            it('should make an HTTP GET query, then set all dms properties', () => {
+                const params = {filter: {
+                    where: {code: 'claim'}
+                }};
+                let serializedParams = $httpParamSerializer(params);
+                $httpBackend.when('GET', `/api/DmsTypes/findOne?${serializedParams}`).respond({});
+                $httpBackend.expect('GET', `/api/DmsTypes/findOne?${serializedParams}`);
+                controller.setDefaultParams();
+                $httpBackend.flush();
+
+                expect(controller.dms).toBeDefined();
+            });
+        });
+
+        describe('create()', () => {
+            it('should make an HTTP Post query, then refresh the model data', () => {
+                const claimId = 1;
+                const dmsIndex = 0;
+                spyOn(controller.vnApp, 'showSuccess');
+                spyOn(controller.$.model, 'refresh');
+                controller.photos = [{dmsFk: 1}];
+                controller.dmsIndex = dmsIndex;
+                controller.dms = {files: []};
+
+                $httpBackend.when('POST', `/api/claims/${claimId}/uploadFile`).respond({});
+                $httpBackend.expect('POST', `/api/claims/${claimId}/uploadFile`);
+                controller.create();
+                $httpBackend.flush();
+
+                expect(controller.$.model.refresh).toHaveBeenCalledWith();
+                expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Photo uploaded!');
             });
         });
     });

modules/claim/front/dms/index/style.scss

@@ -1,6 +1,20 @@
-vn-client-risk-index {
+@import "./variables";
-    .totalBox {
+
-        display: table;
+vn-claim-dms-index {
-        float: right;
+    .photo-list {
+        border: 2px dashed $color-font-secondary;
+        box-sizing: border-box;
+        border-radius: 0.5em;
+        padding: $pad-medium;
+        min-height: 100%;
+
+        .photo {
+            width: 32em;
+        }
+    }
+
+    vn-empty-rows {
+        color: $color-font-secondary;
+        font-size: 2em
     }
 }

modules/claim/front/dms/locale/es.yml

@@ -1,8 +1,4 @@
-Upload file: Subir fichero
-Edit file: Editar fichero
-Upload: Subir
-File: Fichero
-FileDescription: Reclamación id {{claimId}} del cliente "{{clientName}}" id {{clientId}}
-Generate identifier for original file: Generar identificador para archivo original
-ContentTypesInfo: "Tipos de archivo permitidos: {{allowedContentTypes}}"
 Are you sure you want to continue?: ¿Seguro que quieres continuar?
+Drag & Drop files here...: Arrasta y suelta archivos aquí...
+Photo deleted: Foto eliminada
+Photo uploaded!: Foto subida!

modules/claim/front/routes.json

@@ -7,9 +7,9 @@
     "menu": [
         {"state": "claim.card.basicData", "icon": "settings"},
         {"state": "claim.card.detail", "icon": "icon-details"},
+        {"state": "claim.card.dms.index", "icon": "image"},
         {"state": "claim.card.development", "icon": "icon-traceability"},
-        {"state": "claim.card.action", "icon": "icon-actions"},
+        {"state": "claim.card.action", "icon": "icon-actions"}
-        {"state": "claim.card.dms.index", "icon": "image"}
     ],
     "keybindings": [
         {"key": "r", "state": "claim.index"}
@@ -88,22 +88,6 @@
             "params": {
                 "claim": "$ctrl.claim"
             }
-        }, {
-            "url" : "/create",
-            "state": "claim.card.dms.create",
-            "component": "vn-claim-dms-create",
-            "description": "Upload file",
-            "params": {
-                "claim": "$ctrl.claim"
-            }
-        }, {
-            "url": "/:dmsId/edit",
-            "state": "claim.card.dms.edit",
-            "component": "vn-claim-dms-edit",
-            "description": "Edit file",
-            "params": {
-                "claim": "$ctrl.claim"
-            }
         }
     ]
 }

modules/claim/front/summary/style.scss

@@ -1,22 +1,36 @@
 @import "./variables";
 
 .photo-list {
+    justify-content: center;
     align-items: flex-start;
+    align-content: flex-start;
     flex-wrap: wrap;
     
     .photo {
         box-sizing: border-box;
         padding: $pad-small;
-        width: 33%;
+        position: relative;
+        opacity: 0.7;
+        transition: all 0.5s;
+        width: 28em;
 
         .image {
-            border: 2px solid $color-main;
+            border: 2px solid $color-bg-dark;
-            border-radius: 0.5em;
+            border-radius: 0.2em;
             overflow: hidden;
 
-            img {
+            img, video {
                 max-width: 100%
             }
         }
+        .actions {
+            position: absolute;
+            right: 1em;
+            top: 1em
+        }
+    }
+
+    .photo:hover {
+        opacity: 1
     }
 }

package-lock.json

@@ -2166,7 +2166,7 @@
                 },
                 "util": {
                     "version": "0.10.3",
-                    "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
+                    "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
                     "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
                     "dev": true,
                     "requires": {
@@ -2960,7 +2960,7 @@
         "base": {
             "version": "0.11.2",
             "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-            "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+            "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
             "dev": true,
             "requires": {
                 "cache-base": "^1.0.1",
@@ -3293,7 +3293,7 @@
         },
         "browserify-rsa": {
             "version": "4.0.1",
-            "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+            "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
             "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
             "dev": true,
             "requires": {
@@ -3352,7 +3352,7 @@
         },
         "buffer": {
             "version": "4.9.1",
-            "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+            "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
             "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
             "requires": {
                 "base64-js": "^1.0.2",
@@ -3490,7 +3490,7 @@
         "cache-base": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-            "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+            "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
             "dev": true,
             "requires": {
                 "collection-visit": "^1.0.0",
@@ -3528,7 +3528,7 @@
         },
         "camelcase-keys": {
             "version": "2.1.0",
-            "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+            "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
             "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
             "dev": true,
             "requires": {
@@ -3667,7 +3667,7 @@
         "class-utils": {
             "version": "0.3.6",
             "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-            "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+            "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
             "dev": true,
             "requires": {
                 "arr-union": "^3.1.0",
@@ -4769,7 +4769,7 @@
         "dot-prop": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-            "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+            "integrity": "sha1-HxngwuGqDjJ5fEl5nyg3rGr2nFc=",
             "requires": {
                 "is-obj": "^1.0.0"
             }
@@ -4801,7 +4801,7 @@
                 },
                 "readable-stream": {
                     "version": "1.1.14",
-                    "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
                     "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
                     "dev": true,
                     "requires": {
@@ -4924,7 +4924,7 @@
             "dependencies": {
                 "fs-extra": {
                     "version": "0.30.0",
-                    "resolved": "http://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+                    "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
                     "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
                     "dev": true,
                     "requires": {
@@ -4937,7 +4937,7 @@
                 },
                 "jsonfile": {
                     "version": "2.4.0",
-                    "resolved": "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+                    "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
                     "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
                     "dev": true,
                     "requires": {
@@ -5840,7 +5840,7 @@
         },
         "file-loader": {
             "version": "1.1.11",
-            "resolved": "http://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
+            "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
             "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
             "dev": true,
             "requires": {
@@ -6204,8 +6204,7 @@
                 "ansi-regex": {
                     "version": "2.1.1",
                     "bundled": true,
-                    "dev": true,
+                    "dev": true
-                    "optional": true
                 },
                 "aproba": {
                     "version": "1.2.0",
@@ -6226,14 +6225,12 @@
                 "balanced-match": {
                     "version": "1.0.0",
                     "bundled": true,
-                    "dev": true,
+                    "dev": true
-                    "optional": true
                 },
                 "brace-expansion": {
                     "version": "1.1.11",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "balanced-match": "^1.0.0",
                         "concat-map": "0.0.1"
@@ -6248,20 +6245,17 @@
                 "code-point-at": {
                     "version": "1.1.0",
                     "bundled": true,
-                    "dev": true,
+                    "dev": true
-                    "optional": true
                 },
                 "concat-map": {
                     "version": "0.0.1",
                     "bundled": true,
-                    "dev": true,
+                    "dev": true
-                    "optional": true
                 },
                 "console-control-strings": {
                     "version": "1.1.0",
                     "bundled": true,
-                    "dev": true,
+                    "dev": true
-                    "optional": true
                 },
                 "core-util-is": {
                     "version": "1.0.2",
@@ -6378,8 +6372,7 @@
                 "inherits": {
                     "version": "2.0.3",
                     "bundled": true,
-                    "dev": true,
+                    "dev": true
-                    "optional": true
                 },
                 "ini": {
                     "version": "1.3.5",
@@ -6391,7 +6384,6 @@
                     "version": "1.0.0",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "number-is-nan": "^1.0.0"
                     }
@@ -6406,7 +6398,6 @@
                     "version": "3.0.4",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "brace-expansion": "^1.1.7"
                     }
@@ -6414,14 +6405,12 @@
                 "minimist": {
                     "version": "0.0.8",
                     "bundled": true,
-                    "dev": true,
+                    "dev": true
-                    "optional": true
                 },
                 "minipass": {
                     "version": "2.3.5",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "safe-buffer": "^5.1.2",
                         "yallist": "^3.0.0"
@@ -6440,7 +6429,6 @@
                     "version": "0.5.1",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "minimist": "0.0.8"
                     }
@@ -6521,8 +6509,7 @@
                 "number-is-nan": {
                     "version": "1.0.1",
                     "bundled": true,
-                    "dev": true,
+                    "dev": true
-                    "optional": true
                 },
                 "object-assign": {
                     "version": "4.1.1",
@@ -6534,7 +6521,6 @@
                     "version": "1.4.0",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "wrappy": "1"
                     }
@@ -6620,8 +6606,7 @@
                 "safe-buffer": {
                     "version": "5.1.2",
                     "bundled": true,
-                    "dev": true,
+                    "dev": true
-                    "optional": true
                 },
                 "safer-buffer": {
                     "version": "2.1.2",
@@ -6657,7 +6642,6 @@
                     "version": "1.0.2",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "code-point-at": "^1.0.0",
                         "is-fullwidth-code-point": "^1.0.0",
@@ -6677,7 +6661,6 @@
                     "version": "3.0.1",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "ansi-regex": "^2.0.0"
                     }
@@ -6721,14 +6704,12 @@
                 "wrappy": {
                     "version": "1.0.2",
                     "bundled": true,
-                    "dev": true,
+                    "dev": true
-                    "optional": true
                 },
                 "yallist": {
                     "version": "3.0.3",
                     "bundled": true,
-                    "dev": true,
+                    "dev": true
-                    "optional": true
                 }
             }
         },
@@ -7011,7 +6992,7 @@
         "global-modules": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-            "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+            "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
             "dev": true,
             "requires": {
                 "global-prefix": "^1.0.1",
@@ -7048,7 +7029,7 @@
         },
         "globby": {
             "version": "5.0.0",
-            "resolved": "http://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
             "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
             "dev": true,
             "requires": {
@@ -7152,7 +7133,7 @@
         },
         "got": {
             "version": "6.7.1",
-            "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz",
+            "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
             "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
             "dev": true,
             "requires": {
@@ -7485,7 +7466,7 @@
                 },
                 "kind-of": {
                     "version": "1.1.0",
-                    "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
                     "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
                     "dev": true
                 },
@@ -7705,7 +7686,7 @@
             "dependencies": {
                 "es6-promise": {
                     "version": "3.3.1",
-                    "resolved": "http://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
+                    "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
                     "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
                     "dev": true
                 },
@@ -8739,7 +8720,7 @@
         },
         "is-obj": {
             "version": "1.0.1",
-            "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+            "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
             "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
         },
         "is-path-cwd": {
@@ -8769,7 +8750,7 @@
         "is-plain-object": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+            "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
             "dev": true,
             "requires": {
                 "isobject": "^3.0.1"
@@ -9120,7 +9101,7 @@
         },
         "jasmine-core": {
             "version": "2.99.1",
-            "resolved": "http://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
+            "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
             "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=",
             "dev": true
         },
@@ -10243,7 +10224,7 @@
         },
         "load-json-file": {
             "version": "1.1.0",
-            "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+            "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
             "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
             "dev": true,
             "requires": {
@@ -11032,7 +11013,7 @@
         },
         "media-typer": {
             "version": "0.3.0",
-            "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+            "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
             "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
         },
         "mem": {
@@ -11057,7 +11038,7 @@
         },
         "meow": {
             "version": "3.7.0",
-            "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+            "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
             "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
             "dev": true,
             "requires": {
@@ -11180,7 +11161,7 @@
         },
         "minimist": {
             "version": "1.2.0",
-            "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
             "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         },
         "minstache": {
@@ -11292,7 +11273,7 @@
         },
         "mkdirp": {
             "version": "0.5.1",
-            "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
             "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
             "requires": {
                 "minimist": "0.0.8"
@@ -11300,7 +11281,7 @@
             "dependencies": {
                 "minimist": {
                     "version": "0.0.8",
-                    "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
                     "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
                 }
             }
@@ -11501,7 +11482,7 @@
         },
         "multipipe": {
             "version": "0.1.2",
-            "resolved": "http://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+            "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
             "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
             "dev": true,
             "requires": {
@@ -11707,7 +11688,7 @@
                 },
                 "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
                 },
@@ -12349,7 +12330,7 @@
             "dependencies": {
                 "minimist": {
                     "version": "0.0.10",
-                    "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
                     "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
                     "dev": true
                 },
@@ -12411,7 +12392,7 @@
         },
         "os-homedir": {
             "version": "1.0.2",
-            "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+            "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
             "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
             "dev": true
         },
@@ -12427,7 +12408,7 @@
         },
         "os-tmpdir": {
             "version": "1.0.2",
-            "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+            "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
             "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
             "dev": true
         },
@@ -12950,7 +12931,7 @@
         },
         "pretty-bytes": {
             "version": "1.0.4",
-            "resolved": "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
+            "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
             "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
             "dev": true,
             "requires": {
@@ -13041,7 +13022,7 @@
                 },
                 "readable-stream": {
                     "version": "1.1.14",
-                    "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
                     "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
                     "dev": true,
                     "requires": {
@@ -13059,7 +13040,7 @@
                 },
                 "through2": {
                     "version": "0.2.3",
-                    "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
+                    "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
                     "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
                     "dev": true,
                     "requires": {
@@ -13878,7 +13859,7 @@
         },
         "safe-regex": {
             "version": "1.1.0",
-            "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+            "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
             "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
             "dev": true,
             "requires": {
@@ -14003,7 +13984,7 @@
             "dependencies": {
                 "source-map": {
                     "version": "0.4.4",
-                    "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
                     "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
                     "dev": true,
                     "requires": {
@@ -14423,7 +14404,7 @@
         "snapdragon-node": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-            "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+            "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
             "dev": true,
             "requires": {
                 "define-property": "^1.0.0",
@@ -14474,7 +14455,7 @@
         "snapdragon-util": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-            "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+            "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
             "dev": true,
             "requires": {
                 "kind-of": "^3.2.0"
@@ -14755,7 +14736,7 @@
         "split-string": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-            "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+            "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
             "dev": true,
             "requires": {
                 "extend-shallow": "^3.0.0"
@@ -14764,7 +14745,7 @@
         "split2": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
-            "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
+            "integrity": "sha1-GGsldbz4PoW30YRldWI47k7kJJM=",
             "dev": true,
             "requires": {
                 "through2": "^2.0.2"
@@ -15690,7 +15671,7 @@
         },
         "through": {
             "version": "2.3.8",
-            "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
             "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
         },
         "through2": {
@@ -15885,7 +15866,7 @@
         "touch": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
-            "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
+            "integrity": "sha1-/jZfX3XsntTlaCXgu3bSSrdK+Ds=",
             "dev": true,
             "requires": {
                 "nopt": "~1.0.10"
@@ -15983,7 +15964,7 @@
         },
         "tty-browserify": {
             "version": "0.0.0",
-            "resolved": "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
             "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
             "dev": true
         },