Styles fixed, change language moved to user config popover

2019-01-31 00:33:43 +01:00 · 2019-01-31 00:33:43 +01:00 · f643261a85
parent 1dc8cafc73
commit f643261a85
16 changed files with 120 additions and 126 deletions
--- a/e2e/helpers/extensions.js
+++ b/e2e/helpers/extensions.js
@ -73,17 +73,17 @@ let actions = {
    },

    changeLanguageToEnglish: function(done) {
-        this.wait('#lang')
-            .evaluate(selector => {
-                return document.querySelector(selector).title;
-            }, '#lang')
-            .then(title => {
-                if (title === 'Change language') {
+        let langSelector = 'vn-user-configuration-popover vn-autocomplete[field="$ctrl.lang"]';
+
+        this.waitToClick('#user')
+            .wait(langSelector)
+            .waitToGetProperty(`${langSelector} input`, 'value')
+            .then(lang => {
+                if (lang === 'English1') {
                    this.then(done)
                        .catch(done);
                } else {
-                    this.click('#lang')
-                        .click('vn-main-menu [vn-id="langs-menu"] ul > li[name="en"]')
+                    this.autocompleteSearch(langSelector, 'English')
                        .then(done)
                        .catch(done);
                }
--- a/front/core/components/searchbar/style.scss
+++ b/front/core/components/searchbar/style.scss
@ -1,3 +1,5 @@
+@import "padding";
+
 vn-searchbar {
    padding-top: 6px;
    display: block;
@ -6,3 +8,8 @@ vn-searchbar {
        color: black;
    }
 }
+
+.search-panel {
+    @extend .pad-large;
+    max-height: 44em;
+}
--- a/front/salix/components/main-menu/main-menu.html
+++ b/front/salix/components/main-menu/main-menu.html
@ -5,22 +5,6 @@
        class="unselectable">
        {{currentUserName}}
    </div>
-    <vn-icon
-        id="lang"
-        icon="language"
-        vn-popover="langs-menu"
-        translate-attr="{title: 'Change language'}">
-    </vn-icon>
-    <vn-menu vn-id="langs-menu">
-        <ul pad-small>
-            <li
-                ng-repeat="lang in ::$ctrl.langs"
-                name="{{::lang.code}}"
-                ng-click="$ctrl.onChangeLangClick(lang.code)">
-                <span>{{::lang.name}}</span>
-            </li>
-        </ul>
-    </vn-menu>
    <vn-icon
        id="apps"
        icon="apps"
--- a/front/salix/components/main-menu/main-menu.js
+++ b/front/salix/components/main-menu/main-menu.js
@ -1,16 +1,6 @@
 import ngModule from '../../module';
 import './style.scss';

-let languages = {
-    es: 'Español',
-    en: 'English',
-    ca: 'Català',
-    pt: 'Português',
-    fr: 'Français',
-    nl: 'Nederlands',
-    mn: 'Монгол хэл'
-};
-
 export default class MainMenu {
    constructor($translate, $scope, $http, $window, vnModules, vnAuth) {
        this.$ = $scope;
@ -18,15 +8,11 @@ export default class MainMenu {
        this.$translate = $translate;
        this.$window = $window;
        this.modules = vnModules.get();
-        this.langs = [];
        this.vnAuth = vnAuth;
-
-        for (let code of $translate.getAvailableLanguageKeys()) {
-            this.langs.push({
-                code: code,
-                name: languages[code] ? languages[code] : code
-            });
    }
+
+    $onInit() {
+        this.getCurrentUserName();
    }

    getCurrentUserName() {
@ -43,14 +29,6 @@ export default class MainMenu {
    onLogoutClick() {
        this.vnAuth.logout();
    }
-
-    onChangeLangClick(lang) {
-        this.$translate.use(lang);
-    }
-
-    $onInit() {
-        this.getCurrentUserName();
-    }
 }
 MainMenu.$inject = ['$translate', '$scope', '$http', '$window', 'vnModules', 'vnAuth'];

--- a/front/salix/components/main-menu/style.scss
+++ b/front/salix/components/main-menu/style.scss
@ -12,7 +12,7 @@ vn-main-menu {

        & > * {
            cursor: pointer;
-            padding-left: .1em;
+            padding-left: .3em;
    
            &:hover {
                color: $main-01;
@ -21,7 +21,7 @@ vn-main-menu {
        & > #user {
            vertical-align: middle;
            font-weight: bold;
-            padding-right: .6em;
+            padding-right: .4em;
        }
        & > vn-icon,
        & > a > vn-icon {
@ -41,6 +41,7 @@ vn-main-menu {
            padding: .8em;
            border-radius: .1em;
            min-width: 8em;
+            white-space: nowrap;
    
            &:last-child {
                margin-bottom: 0;
--- a/front/salix/components/user-configuration-popover/index.html
+++ b/front/salix/components/user-configuration-popover/index.html
@ -16,11 +16,8 @@
    data="companiesData"
    order="code">
 </vn-crud-model>
-
 <vn-popover vn-id="popover">
    <vn-vertical class="body">
-        <form name="form" ng-submit="$ctrl.onSubmit()">
-            <vn-horizontal>
        <vn-autocomplete
            vn-one
            label="Local warehouse"
@ -31,8 +28,6 @@
            show-field="name"
            value-field="id">
        </vn-autocomplete>
-            </vn-horizontal>
-            <vn-horizontal>
        <vn-autocomplete
            vn-one
            label="Local bank"
@ -45,8 +40,6 @@
            value-field="id">
            <tpl-item>{{id}}: {{bank}}</tpl-item>
        </vn-autocomplete>
-            </vn-horizontal>
-            <vn-horizontal>
        <vn-autocomplete
            vn-one
            label="Local company"
@ -57,8 +50,6 @@
            show-field="code"
            value-field="id">
        </vn-autocomplete>
-            </vn-horizontal>
-            <vn-horizontal>
        <vn-autocomplete
            vn-one
            label="User warehouse"
@ -69,8 +60,6 @@
            show-field="name"
            value-field="id">
        </vn-autocomplete>
-            </vn-horizontal>
-            <vn-horizontal>
        <vn-autocomplete
            vn-one
            label="User company"
@ -81,7 +70,13 @@
            show-field="code"
            value-field="id">
        </vn-autocomplete>
-            </vn-horizontal>
-        </form>
+        <vn-autocomplete
+            vn-one
+            label="Language"
+            field="$ctrl.lang"
+            data="$ctrl.langs"
+            show-field="name"
+            value-field="code">
+        </vn-autocomplete>
    </vn-vertical>
 </vn-popover>
--- a/front/salix/components/user-configuration-popover/index.js
+++ b/front/salix/components/user-configuration-popover/index.js
@ -1,6 +1,16 @@
 import ngModule from '../../module';
 import './style.scss';

+let languages = {
+    es: 'Español',
+    en: 'English',
+    ca: 'Català',
+    pt: 'Português',
+    fr: 'Français',
+    nl: 'Nederlands',
+    mn: 'Монгол хэл'
+};
+
 class Controller {
    constructor($scope, $http, $state, vnApp, $translate) {
        this.$scope = $scope;
@ -9,6 +19,25 @@ class Controller {
        this.vnApp = vnApp;
        this.$translate = $translate;
        this.getUserConfig();
+
+        this.lang = $translate.use();
+        this.langs = [];
+
+        for (let code of $translate.getAvailableLanguageKeys()) {
+            this.langs.push({
+                code: code,
+                name: languages[code] ? languages[code] : code
+            });
+        }
+    }
+
+    set lang(value) {
+        this._lang = value;
+        this.$translate.use(value);
+    }
+
+    get lang() {
+        return this._lang;
    }

    set localBankFk(value) {
--- a/modules/agency/front/location-search-panel/index.html
+++ b/modules/agency/front/location-search-panel/index.html
@ -1,4 +1,4 @@
-<div pad-large style="min-width: 30em">
+<div class="search-panel">
    <form ng-submit="$ctrl.onSearch()">
        <vn-horizontal>
            <vn-textfield
--- a/modules/agency/front/search-panel/index.html
+++ b/modules/agency/front/search-panel/index.html
@ -1,4 +1,4 @@
-<div pad-large style="min-width: 30em">
+<div class="search-panel">
    <form ng-submit="$ctrl.onSearch()">
        <vn-horizontal>
            <vn-textfield
--- a/modules/claim/front/search-panel/index.html
+++ b/modules/claim/front/search-panel/index.html
@ -1,4 +1,4 @@
-<div pad-large style="min-width: 30em">
+<div class="search-panel">
    <form ng-submit="$ctrl.onSearch()">
        <vn-horizontal>
            <vn-textfield
--- a/modules/client/front/search-panel/index.html
+++ b/modules/client/front/search-panel/index.html
@ -1,4 +1,4 @@
-<div pad-large style="min-width: 30em">
+<div class="search-panel">
    <form ng-submit="$ctrl.onSearch()">
        <vn-horizontal>
            <vn-textfield
--- a/modules/item/front/search-panel/index.html
+++ b/modules/item/front/search-panel/index.html
@ -1,6 +1,6 @@
 <mg-ajax path="/item/api/Tags" options="mgIndex as tags"></mg-ajax>
-<div style="min-width: 30em; max-height: 540px; overflow: auto;">
-    <form pad-large ng-submit="$ctrl.onSearch()">
+<div class="search-panel">
+    <form ng-submit="$ctrl.onSearch()">
        <vn-horizontal>
            <vn-textfield
                vn-one
--- a/modules/order/front/search-panel/index.html
+++ b/modules/order/front/search-panel/index.html
@ -1,4 +1,4 @@
-<div pad-large style="min-width: 30em">
+<div class="search-panel">
    <form ng-submit="$ctrl.onSearch()">
        <vn-horizontal>
            <vn-textfield
--- a/modules/ticket/front/search-panel/index.html
+++ b/modules/ticket/front/search-panel/index.html
@ -1,4 +1,4 @@
-<div pad-large style="min-width: 30em">
+<div class="search-panel">
    <form ng-submit="$ctrl.onSearch()">
        <vn-horizontal>
            <vn-textfield
--- a/modules/travel/front/search-panel/index.html
+++ b/modules/travel/front/search-panel/index.html
@ -1,4 +1,4 @@
-<div pad-large style="min-width: 30em">
+<div class="search-panel">
    <form ng-submit="$ctrl.onSearch()">
        <vn-horizontal>
            <vn-textfield
--- a/modules/worker/front/search-panel/index.html
+++ b/modules/worker/front/search-panel/index.html
@ -1,4 +1,4 @@
-<div pad-large style="min-width: 30em">
+<div class="search-panel">
    <form ng-submit="$ctrl.onSearch()">
        <vn-horizontal>
            <vn-textfield