From 5f2aa345ba9bfa7970d83198074497e0b9bb26fb Mon Sep 17 00:00:00 2001
From: Dani Herrero <dherrero@alfatecsistemas.es>
Date: Thu, 15 Jun 2017 11:22:47 +0200
Subject: [PATCH] iconMenu arreglo de posicion del DropDown interno

---
 client/core/src/autocomplete/autocomplete.js  |  9 ++-
 client/core/src/components.js                 |  2 +-
 client/core/src/icon-button/icon-button.html  |  4 +-
 client/core/src/icon-button/icon-button.js    | 21 +------
 .../core/src/icon-button/icon-button.mdl.html |  3 -
 .../core/src/icon-button/icon-button.mdl.js   | 15 -----
 client/core/src/icon-menu/icon-menu.js        | 11 +---
 client/core/src/icon-menu/style.scss          |  3 +
 client/core/src/icon/icon.js                  | 19 +------
 client/core/src/icon/icon.mdl.html            |  1 -
 client/core/src/icon/icon.mdl.js              | 12 ----
 .../src/filter-panel/filter-panel.html        | 54 ++++++++----------
 client/production/src/index/index.html        | 57 +++++++++++++------
 client/production/src/index/index.js          |  1 +
 client/production/src/index/style.scss        | 14 +++++
 15 files changed, 95 insertions(+), 131 deletions(-)
 delete mode 100644 client/core/src/icon-button/icon-button.mdl.html
 delete mode 100644 client/core/src/icon-button/icon-button.mdl.js
 create mode 100644 client/core/src/icon-menu/style.scss
 delete mode 100644 client/core/src/icon/icon.mdl.html
 delete mode 100644 client/core/src/icon/icon.mdl.js

diff --git a/client/core/src/autocomplete/autocomplete.js b/client/core/src/autocomplete/autocomplete.js
index c46fcebf7..81e320676 100644
--- a/client/core/src/autocomplete/autocomplete.js
+++ b/client/core/src/autocomplete/autocomplete.js
@@ -10,7 +10,7 @@ export default class Autocomplete extends Component {
         super($element);
         this.input = $element[0].querySelector('input');
         this.item = null;
-        this.data = null;
+       // this.data = null;
         this.popover = null;
         this.displayData = null;
         this.timeoutId = null;
@@ -83,8 +83,10 @@ export default class Autocomplete extends Component {
 
         if (requestWillSame)
             this.localFilter(textFilter);
-        else
+        else if (this.url)
             this.requestData(textFilter, false);
+        else
+            this.setDisplayData(this.data);
     }
     getRequestFields() {
         let fields = {};
@@ -402,11 +404,12 @@ Autocomplete.$inject = ['$element', '$scope', '$http', 'vnPopover', '$transclude
 module.component('vnAutocomplete', {
     template: require('./autocomplete.html'),
     bindings: {
-        url: '@',
+        url: '@?',
         showField: '@?',
         valueField: '@?',
         selectFields: '@?',
         initialData: '<?',
+        data: '<?',
         itemAs: '@?',
         field: '=',
         label: '@'
diff --git a/client/core/src/components.js b/client/core/src/components.js
index f0303ebe2..2427a223d 100644
--- a/client/core/src/components.js
+++ b/client/core/src/components.js
@@ -29,7 +29,7 @@ export {NAME as TEXTAREA_MDL, factory as textareaMdl} from './textarea/textarea.
 export {NAME as LABEL, directive as LabelDirective} from './label/label';
 export {NAME as LABEL_MDL, factory as labelMdl} from './label/label.mdl';
 export {NAME as ICON_BUTTON, directive as IconButtonDirective} from './icon-button/icon-button';
-export {NAME as ICON_BUTTON_MDL, factory as iconButtonMdl} from './icon-button/icon-button.mdl';
+
 export {NAME as SUBMIT, directive as SubmitDirective} from './submit/submit';
 export {NAME as SUBMIT_MDL, factory as submitMdl} from './submit/submit.mdl';
 export {NAME as COMBO, directive as ComboDirective} from './combo/combo';
diff --git a/client/core/src/icon-button/icon-button.html b/client/core/src/icon-button/icon-button.html
index 4f80d96b5..9c5f9c5fe 100644
--- a/client/core/src/icon-button/icon-button.html
+++ b/client/core/src/icon-button/icon-button.html
@@ -1,3 +1,3 @@
-<button class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored icon-square {{ib.className}}" {{ib.enabled}}>
-    <vn-icon icon="{{ib.icon}}"></vn-icon>{{ib.label}}
+<button class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored icon-square {{$ctrl.className}}" {{$ctrl.enabled}}>
+    <vn-icon icon="{{$ctrl.icon}}"></vn-icon>{{$ctrl.label}}
 </button>
\ No newline at end of file
diff --git a/client/core/src/icon-button/icon-button.js b/client/core/src/icon-button/icon-button.js
index 806b86d83..55d4b1070 100644
--- a/client/core/src/icon-button/icon-button.js
+++ b/client/core/src/icon-button/icon-button.js
@@ -1,29 +1,12 @@
 import {module as _module} from '../module';
-// import * as resolveFactory from '../lib/resolveDefaultComponents';
-import * as util from '../lib/util';
 
-const _NAME = 'iconButton';
-export const NAME = util.getName(_NAME);
-/*
-directive.$inject = [resolveFactory.NAME];
-export function directive(resolve) {
-    return {
-        restrict: 'E',
-        template: function(_, attr) {
-            return resolve.getTemplate(_NAME, attr);
-        }
-    };
-}
-_module.directive(NAME, directive); */
-
-_module.component(NAME, {
+_module.component('vnIconButton', {
     template: require('./icon-button.html'),
     bindings: {
         icon: '@',
         className: '<?',
         enabled: '<?',
         label: '@?'
-    },
-    controllerAs: 'ib'
+    }
 });
 
diff --git a/client/core/src/icon-button/icon-button.mdl.html b/client/core/src/icon-button/icon-button.mdl.html
deleted file mode 100644
index 3b8763a59..000000000
--- a/client/core/src/icon-button/icon-button.mdl.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<button class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored icon-square *[className]*" *[enabled]*>
-    <vn-icon icon="*[icon]*"></vn-icon>*[label]*
-</button>
\ No newline at end of file
diff --git a/client/core/src/icon-button/icon-button.mdl.js b/client/core/src/icon-button/icon-button.mdl.js
deleted file mode 100644
index 14c9fa2a3..000000000
--- a/client/core/src/icon-button/icon-button.mdl.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import {module} from '../module';
-import template from './icon-button.mdl.html';
-
-export const NAME = 'vnIconButtonMdlFactory';
-export function factory() {
-    return {
-        template: template,
-        default: {
-            enabled: 'enabled',
-            icon: '',
-            label: ''
-        }
-    };
-}
-module.factory(NAME, factory);
diff --git a/client/core/src/icon-menu/icon-menu.js b/client/core/src/icon-menu/icon-menu.js
index 9e5e52794..23d84b041 100644
--- a/client/core/src/icon-menu/icon-menu.js
+++ b/client/core/src/icon-menu/icon-menu.js
@@ -1,4 +1,5 @@
 import {module} from '../module';
+import './style.scss';
 
 export default class IconMenu {
     constructor($element, $http, $timeout) {
@@ -6,7 +7,6 @@ export default class IconMenu {
         this.$http = $http;
         this.$timeout = $timeout;
         this._showDropDown = false;
-        this._pos = undefined;
     }
     get showDropDown() {
         return this._showDropDown;
@@ -15,13 +15,6 @@ export default class IconMenu {
         this._showDropDown = value;
     }
 
-    get pos() {
-        return this._pos;
-    }
-    set pos(value) {
-        this._pos = value;
-    }
-
     getItems() {
         this.$http.get(this.url).then(
             json => {
@@ -37,8 +30,6 @@ export default class IconMenu {
         this.$element.bind('mouseover', e => {
             this.$timeout(() => {
                 this.showDropDown = true;
-                if (e.target.nodeName === 'BUTTON')
-                    this.pos = e.target.getBoundingClientRect();
             });
         });
 
diff --git a/client/core/src/icon-menu/style.scss b/client/core/src/icon-menu/style.scss
new file mode 100644
index 000000000..e4e6b4104
--- /dev/null
+++ b/client/core/src/icon-menu/style.scss
@@ -0,0 +1,3 @@
+vn-icon-menu{
+    position: relative;
+}
\ No newline at end of file
diff --git a/client/core/src/icon/icon.js b/client/core/src/icon/icon.js
index 29f3d0747..c979f86f9 100644
--- a/client/core/src/icon/icon.js
+++ b/client/core/src/icon/icon.js
@@ -1,24 +1,7 @@
 import {module} from '../module';
-import './icon.mdl';
 import './style.css';
-// import * as resolveFactory from '../lib/resolveDefaultComponents';
 
-// const _NAME = 'icon';
-export const NAME = 'vnIcon';
-
-/* export function directive(resolver) {
-    return {
-        restrict: 'E',
-        template: function(_, attrs) {
-            return resolver.getTemplate(_NAME, attrs);
-        }
-    };
-}
-directive.$inject = [resolveFactory.NAME];
-
-module.directive(NAME, directive);*/
-
-module.component(NAME, {
+module.component('vnIcon', {
     template: '<i class="material-icons">{{i.icon}}</i>',
     bindings: {
         icon: '@'
diff --git a/client/core/src/icon/icon.mdl.html b/client/core/src/icon/icon.mdl.html
deleted file mode 100644
index 865296d9b..000000000
--- a/client/core/src/icon/icon.mdl.html
+++ /dev/null
@@ -1 +0,0 @@
-<i class="material-icons">*[icon]*</i>
diff --git a/client/core/src/icon/icon.mdl.js b/client/core/src/icon/icon.mdl.js
deleted file mode 100644
index 6a558285c..000000000
--- a/client/core/src/icon/icon.mdl.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import {module} from '../module';
-import template from './icon.mdl.html';
-
-export const NAME = 'vnIconMdlFactory';
-export function factory() {
-    return {
-        template: template,
-        default: {}
-    };
-}
-
-module.factory(NAME, factory);
diff --git a/client/production/src/filter-panel/filter-panel.html b/client/production/src/filter-panel/filter-panel.html
index 8ee87823c..5ef3ecdda 100644
--- a/client/production/src/filter-panel/filter-panel.html
+++ b/client/production/src/filter-panel/filter-panel.html
@@ -1,31 +1,23 @@
-<div pad-large>
-    <form ng-submit="$ctrl.onSearch()">
-        <vn-horizontal>
-            <vn-textfield vn-one label="ID Ruta" model="$ctrl.filter.ruteId"></vn-textfield>
-            <vn-date-picker vn-one label="Fecha" model="$ctrl.filter.date"></vn-date-picker>
-        </vn-horizontal>
-        <vn-horizontal>
-             <vn-autocomplete vn-one
-                    initial-value="$ctrl.filter.province"
-                    field="$ctrl.filter.provinceFk"
-                    url="/client/api/Provinces"
-                    show-field="name"
-                    value-field="id"
-                    label="Provincia">
-                </vn-autocomplete>
-            <vn-date-picker vn-one label="Hora" ini-opts="{enableTime:true,noCalendar:true,dateFormat:'H:i',time_24hr:true,static:true,minuteIncrement:30}" model="$ctrl.filter.hour"></n-date-picker>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-check vn-one pad-medium-top label="Ticket con incidencia" field="$ctrl.filter.withIncidence"></vn-check>
-            <vn-textfield vn-one label="Agencia" model="$ctrl.filter.agency"></vn-textfield>
-        </vn-horizontal>
-        <vn-horizontal margin-medium-top>
-            <vn-one>
-                <vn-submit label="Filtrar"></vn-submit>
-            </vn-one>
-            <vn-one>
-                <vn-button vn-right label="Cancelar"></vn-button>
-            </vn-one>
-        </vn-horizontal>
-    </form>
-</div>
\ No newline at end of file
+
+<form ng-submit="$ctrl.onSearch()">
+    <vn-horizontal>
+        <vn-textfield vn-one label="ID Ruta" model="$ctrl.filter.ruteId"></vn-textfield>
+        <vn-date-picker vn-one label="Fecha" model="$ctrl.filter.date"></vn-date-picker>
+    </vn-horizontal>
+    <vn-horizontal>
+            <vn-autocomplete vn-one
+                initial-value="$ctrl.filter.province"
+                field="$ctrl.filter.provinceFk"
+                url="/client/api/Provinces"
+                show-field="name"
+                value-field="id"
+                label="Provincia">
+            </vn-autocomplete>
+        <vn-date-picker vn-one label="Hora" ini-opts="{enableTime:true,noCalendar:true,dateFormat:'H:i',time_24hr:true,static:true,minuteIncrement:30}" model="$ctrl.filter.hour"></n-date-picker>
+    </vn-horizontal>
+    <vn-horizontal>
+        <vn-check vn-one pad-medium-top label="Ticket con incidencia" field="$ctrl.filter.withIncidence"></vn-check>
+        <vn-textfield vn-one label="Agencia" model="$ctrl.filter.agency"></vn-textfield>
+    </vn-horizontal>
+    
+</form>
diff --git a/client/production/src/index/index.html b/client/production/src/index/index.html
index f9188889c..8eed566b2 100644
--- a/client/production/src/index/index.html
+++ b/client/production/src/index/index.html
@@ -1,29 +1,54 @@
 <mg-ajax path="/production/api/Tickets/list" options="vnIndex" actions="$ctrl.tickets = index.model.tickets;$ctrl.sumTickets()"></mg-ajax>
+<mg-ajax path="/production/api/States/productionStates" options="vnIndex as states" actions="$ctrl.states = states.model.states;"></mg-ajax>
+
 <vn-card margin-large>
    <vn-vertical pad-medium>
-       <vn-horizontal vn-one>
+       <vn-horizontal vn-one margin-large-bottom class="locator-header">
             <vn-title vn-one><span translate>Localizador</span></vn-title>           
-           <vn-one vn-horizontal>
-               
-           </vn-one>
-           <vn-one vn-horizontal>
-                <vn-one></vn-one>
-                <vn-autocomplete vn-one
-                    initial-value="$ctrl.warehouse"
-                    field="$ctrl.warehouseFk"
-                    url="/client/api/ContactChannels"
-                    label="Almacen">
-                </vn-autocomplete>
-                <vn-icon-button vn-none pad-ten-top icon="refresh"></vn-icon-button>
-           </vn-one>
+            <vn-two vn-horizontal ng-init="moreFilters = false">
+                <vn-vertical vn-one>
+                    <vn-horizontal vn-one>
+                        <vn-autocomplete vn-one margin-medium-right
+                            field="$ctrl.filter.stateFk"
+                            data = "$ctrl.states"
+                            label="Estado">
+                        </vn-autocomplete>
+                        <vn-autocomplete vn-one margin-medium-right
+                            field="$ctrl.filter.alarmFk"
+                            data = "$ctrl.states"
+                            label="Alarma">
+                        </vn-autocomplete>
+                        <vn-autocomplete vn-one margin-medium-right
+                            field="$ctrl.filter.agencyFk"
+                            data = "$ctrl.states"
+                            label="Agencias">
+                        </vn-autocomplete>
+                        <vn-icon vn-none margin-medium-right pad-medium-top icon="{{!moreFilters ? 'keyboard_arrow_down' : 'keyboard_arrow_up'}}" ng-click="moreFilters = !moreFilters"></vn-icon>
+                        <vn-button vn-none pad-small-top label="Filtrar"></vn-button>
+                        </vn-none>
+                    </vn-horizontal>
+                     <vn-horizontal vn-one ng-show="moreFilters" class="moreFilters">
+                        <vn-production-filter-panel vn-one></vn-production-filter-panel>
+                    </vn-horizontal>
+                </vn-vertical>
+            </vn-two>
+            <vn-one vn-horizontal>
+                    <vn-one></vn-one>
+                    <vn-autocomplete vn-two
+                        initial-value="$ctrl.warehouse"
+                        field="$ctrl.warehouseFk"
+                        url="/production/api/Warehouses/list"
+                        label="Almacen">
+                    </vn-autocomplete>
+                    <vn-icon-button vn-none pad-ten-top icon="refresh"></vn-icon-button>
+            </vn-one>
        </vn-horizontal>
        <vn-horizontal vn-one margin-large-bottom>
            <vn-one>
                <vn-horizontal>
                     <vn-button vn-none margin-medium-right label="Impreso"></vn-button>
                     <vn-none margin-medium-right>
-                        <mg-ajax path="/production/api/States/productionStates" options="vnIndex as states"></mg-ajax>
-                        <vn-icon-menu icon="assignment" items="states.model.states" selected="$ctrl.actions.state"></vn-icon-menu> 
+                        <vn-icon-menu icon="assignment" items="$ctrl.states" selected="$ctrl.actions.state"></vn-icon-menu> 
                     </vn-none>
                     <vn-none margin-medium-right>
                         <vn-icon-menu icon="textsms" items="[{id:1,name:'prueba 01'},{id:2,name:'prueba 02'},{id:3,name:'prueba 03'}]" selected="$ctrl.actions.textsm"></vn-icon-menu> 
diff --git a/client/production/src/index/index.js b/client/production/src/index/index.js
index c2d811af3..105f0d757 100644
--- a/client/production/src/index/index.js
+++ b/client/production/src/index/index.js
@@ -8,6 +8,7 @@ export default class ProductionIndex {
         this.filter = {};
         this._checkAll = false;
         this.tickets = [];
+        this.states = [];
         this.lines = 0;
         this.meters = 0;
         this.actions = {
diff --git a/client/production/src/index/style.scss b/client/production/src/index/style.scss
index 63d0cd9a7..292a6fbb7 100644
--- a/client/production/src/index/style.scss
+++ b/client/production/src/index/style.scss
@@ -17,4 +17,18 @@ vn-production-index {
     .icon-square{
         height: 36px;
     }
+    .locator-header{
+        i{
+            cursor: pointer;
+        }
+        .moreFilters{
+            position: absolute;
+            z-index: 99;
+            background-color: white;
+            padding: 15px;
+            border: 1px solid #9D9D9D;
+            margin-top: 60px;
+            width: 600px;
+        }
+    }
 }
\ No newline at end of file