From 7dd82cac19361c98955d2dc709788959acb5906c Mon Sep 17 00:00:00 2001 From: nelo Date: Tue, 17 Jan 2017 11:26:59 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Boton=20redondo=20Arreglado=20detalles=20de?= =?UTF-8?q?=20dise=C3=B1o=20en=20consignatarios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/left-menu/menu-item.html | 10 ++-- @salix/core/src/card/card.js | 2 +- @salix/core/src/core.js | 2 + @salix/core/src/floatbutton/floatbutton.js | 19 +++++++ .../core/src/floatbutton/floatbutton.mdl.html | 3 + .../core/src/floatbutton/floatbutton.mdl.js | 20 +++++++ .../client/addresses-data-create/index.html | 54 +++++++++--------- .../src/client/addresses-data-edit/index.html | 56 +++++++++---------- @salix/crud/src/client/addresses/index.html | 46 ++++++++------- @salix/crud/src/client/basic-data/index.html | 5 +- @salix/crud/src/client/card/card.html | 21 ++++--- .../src/client/descriptor/descriptor.html | 2 +- @salix/crud/src/client/fiscal-data/index.html | 14 ++--- services/client/common/models/Client.json | 3 + 14 files changed, 150 insertions(+), 107 deletions(-) create mode 100644 @salix/core/src/floatbutton/floatbutton.js create mode 100644 @salix/core/src/floatbutton/floatbutton.mdl.html create mode 100644 @salix/core/src/floatbutton/floatbutton.mdl.js diff --git a/@salix/app/src/components/left-menu/menu-item.html b/@salix/app/src/components/left-menu/menu-item.html index 3f38ba07e..5bffa626d 100644 --- a/@salix/app/src/components/left-menu/menu-item.html +++ b/@salix/app/src/components/left-menu/menu-item.html @@ -1,7 +1,7 @@
  • - - keyboard_arrow_right - {{menu.item.icon}} - {{menu.item.description}} - + + keyboard_arrow_right + {{menu.item.icon}} + {{menu.item.description}} +
    • \ No newline at end of file diff --git a/@salix/core/src/card/card.js b/@salix/core/src/card/card.js index 1dfe2ccc6..01f3118be 100644 --- a/@salix/core/src/card/card.js +++ b/@salix/core/src/card/card.js @@ -9,7 +9,7 @@ export const NAME = util.getName(_NAME); directive.$inject = [resolveFactory.NAME]; export function directive(resolve) { return { - require: 'E', + restrict: 'E', transclude: true, template: function(_, attr) { return resolve.getTemplate(_NAME, attr); diff --git a/@salix/core/src/core.js b/@salix/core/src/core.js index 5c2e9a2da..3c98db40b 100644 --- a/@salix/core/src/core.js +++ b/@salix/core/src/core.js @@ -46,6 +46,8 @@ export {NAME as CARD, directive as CardDirective} from './card/card'; export {NAME as CARD_MDL, factory as cardMdl} from './card/card.mdl'; export {NAME as SWITCH, directive as SwitchDirective} from './switch/switch'; export {NAME as SWITCH_MDL, factory as switchdMdl} from './switch/switch.mdl'; +export {NAME as FLOATBUTTON, directive as FloatButtonDirective} from './floatbutton/floatbutton'; +export {NAME as FLOATBUTTON_MDL, factory as floatButtondMdl} from './floatbutton/floatbutton.mdl'; export {directive as Icon} from './icon/icon'; export {factory as IconMdl} from './icon/icon.mdl'; diff --git a/@salix/core/src/floatbutton/floatbutton.js b/@salix/core/src/floatbutton/floatbutton.js new file mode 100644 index 000000000..276ae4618 --- /dev/null +++ b/@salix/core/src/floatbutton/floatbutton.js @@ -0,0 +1,19 @@ +import {module as _module} from '../module'; +import * as resolveFactory from '../resolveDefaultComponents'; +import * as util from '../util'; + +const _NAME = 'floatButton'; +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); + diff --git a/@salix/core/src/floatbutton/floatbutton.mdl.html b/@salix/core/src/floatbutton/floatbutton.mdl.html new file mode 100644 index 000000000..14618c3d2 --- /dev/null +++ b/@salix/core/src/floatbutton/floatbutton.mdl.html @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/@salix/core/src/floatbutton/floatbutton.mdl.js b/@salix/core/src/floatbutton/floatbutton.mdl.js new file mode 100644 index 000000000..3a7c5a3d3 --- /dev/null +++ b/@salix/core/src/floatbutton/floatbutton.mdl.js @@ -0,0 +1,20 @@ +import {module as _module} from '../module'; +import * as util from '../util'; +import * as constant from '../constants'; +import template from './floatbutton.mdl.html'; + +const _NAME = 'floatButton'; +const DEFAULT_CLASS = 'mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored'; + +export const NAME = util.getFactoryName(_NAME + constant.MATERIAL_DESIGN_FRAMEWORK); + +export function factory() { + return { + template: template, + default: { + className: DEFAULT_CLASS + } + }; +} + +_module.factory(NAME, factory); diff --git a/@salix/crud/src/client/addresses-data-create/index.html b/@salix/crud/src/client/addresses-data-create/index.html index fb97f1a08..a962380f8 100644 --- a/@salix/crud/src/client/addresses-data-create/index.html +++ b/@salix/crud/src/client/addresses-data-create/index.html @@ -1,31 +1,31 @@
    - - - Consignatario - - - - - - - - - - - - - - - - - - - - + + + Consignatario + + + + + + + + + + + + + + + + + + + + + + - -
    \ No newline at end of file diff --git a/@salix/crud/src/client/addresses-data-edit/index.html b/@salix/crud/src/client/addresses-data-edit/index.html index 2fbdc24a2..4578044ee 100644 --- a/@salix/crud/src/client/addresses-data-edit/index.html +++ b/@salix/crud/src/client/addresses-data-edit/index.html @@ -1,32 +1,32 @@
    - - - Consignatario - - - - - - - - - - - - - - - - - - - - - + + + Consignatario + + + + + + + + + + + + + + + + + + + + + + + - -
    \ No newline at end of file diff --git a/@salix/crud/src/client/addresses/index.html b/@salix/crud/src/client/addresses/index.html index f563071b9..4160250d3 100644 --- a/@salix/crud/src/client/addresses/index.html +++ b/@salix/crud/src/client/addresses/index.html @@ -1,27 +1,25 @@ - - - - Consignatario - - - - - -
    {{i.consignee}}
    -
    {{i.street}}
    -
    {{i.city}}, {{i.province}}
    -
    {{i.phone}}, {{i.mobile}}
    -     - + + + + Consignatario -     -     - - - - - -     -     + + + + +
    {{i.consignee}}
    +
    {{i.street}}
    +
    {{i.city}}, {{i.province}}
    +
    {{i.phone}}, {{i.mobile}}
    +     + +     +     +     +     + + + + diff --git a/@salix/crud/src/client/basic-data/index.html b/@salix/crud/src/client/basic-data/index.html index b9105cfdf..77302f8a8 100644 --- a/@salix/crud/src/client/basic-data/index.html +++ b/@salix/crud/src/client/basic-data/index.html @@ -9,15 +9,16 @@ + - + - + diff --git a/@salix/crud/src/client/card/card.html b/@salix/crud/src/client/card/card.html index 029eaf353..124f988fd 100644 --- a/@salix/crud/src/client/card/card.html +++ b/@salix/crud/src/client/card/card.html @@ -1,11 +1,14 @@ - - - - - - - - - + + + + + + + + + + + + diff --git a/@salix/crud/src/client/descriptor/descriptor.html b/@salix/crud/src/client/descriptor/descriptor.html index 74cef41dd..c6a198de2 100644 --- a/@salix/crud/src/client/descriptor/descriptor.html +++ b/@salix/crud/src/client/descriptor/descriptor.html @@ -5,7 +5,7 @@ person -
    {{descriptor.client.clientId}}
    +
    {{descriptor.client.id}}
    {{descriptor.client.name}}
    {{descriptor.client.phone}}
     diff --git a/@salix/crud/src/client/fiscal-data/index.html b/@salix/crud/src/client/fiscal-data/index.html index 11b7f3949..ffa74f5fc 100644 --- a/@salix/crud/src/client/fiscal-data/index.html +++ b/@salix/crud/src/client/fiscal-data/index.html @@ -4,7 +4,6 @@ Datos fiscales y de facturación - @@ -21,12 +20,7 @@     - - - - - -     + @@ -56,8 +50,8 @@ + + + - - - diff --git a/services/client/common/models/Client.json b/services/client/common/models/Client.json index c96001996..6114b676f 100644 --- a/services/client/common/models/Client.json +++ b/services/client/common/models/Client.json @@ -43,6 +43,9 @@ "phone": { "type": "string" }, + "mobile": { + "type": "string" + }, "fax": { "type": "string" }, From 8f372a7331ca8409e1df4390f9db950cb5a80009 Mon Sep 17 00:00:00 2001 From: nelo Date: Tue, 17 Jan 2017 12:24:32 +0100 Subject: [PATCH 2/3] =?UTF-8?q?modificaci=C3=B3n=20estilos=20css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- @salix/core/src/floatbutton/floatbutton.mdl.html | 2 +- @salix/core/src/icon-button/icon-button.mdl.html | 4 ++-- @salix/core/src/icon/icon.mdl.html | 2 +- @salix/core/src/mdl-override.css | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/@salix/core/src/floatbutton/floatbutton.mdl.html b/@salix/core/src/floatbutton/floatbutton.mdl.html index 14618c3d2..d9467b5ce 100644 --- a/@salix/core/src/floatbutton/floatbutton.mdl.html +++ b/@salix/core/src/floatbutton/floatbutton.mdl.html @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/@salix/core/src/icon-button/icon-button.mdl.html b/@salix/core/src/icon-button/icon-button.mdl.html index 52b459664..39a1d1520 100644 --- a/@salix/core/src/icon-button/icon-button.mdl.html +++ b/@salix/core/src/icon-button/icon-button.mdl.html @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/@salix/core/src/icon/icon.mdl.html b/@salix/core/src/icon/icon.mdl.html index 865296d9b..f4b1888dd 100644 --- a/@salix/core/src/icon/icon.mdl.html +++ b/@salix/core/src/icon/icon.mdl.html @@ -1 +1 @@ -*[icon]* +*[icon]* diff --git a/@salix/core/src/mdl-override.css b/@salix/core/src/mdl-override.css index 99a592d97..ce2515291 100644 --- a/@salix/core/src/mdl-override.css +++ b/@salix/core/src/mdl-override.css @@ -27,4 +27,9 @@ .mdl-button--raised:hover { background-color: #ffa410; +} + +.mdl-button--fab{ + color: white !important; + background-color: #ff9400 !important; } \ No newline at end of file From ec5c70ed94f4633a4f90c77b80fb285c02c415cd Mon Sep 17 00:00:00 2001 From: nelo Date: Tue, 17 Jan 2017 13:03:04 +0100 Subject: [PATCH 3/3] modificaciones estilos --- .../crud/src/client/addresses-data-create/index.js | 12 +++++++----- @salix/crud/src/client/index/style.css | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/@salix/crud/src/client/addresses-data-create/index.js b/@salix/crud/src/client/addresses-data-create/index.js index b202e2dfd..b426bddb4 100644 --- a/@salix/crud/src/client/addresses-data-create/index.js +++ b/@salix/crud/src/client/addresses-data-create/index.js @@ -5,7 +5,7 @@ export const NAME = 'vnClientAddressesDataCreate'; export const COMPONENT = { template: template, controllerAs: 'addressData', - controller: function($http) + controller: function($http, $state) { this.address = {}; $http.get('/client/api/Agencies').then( @@ -16,10 +16,12 @@ export const COMPONENT = { ); this.submit = function(){ - $http.post('/client/api/Addresses', this.address); - } - } + $http.post('/client/api/Addresses', this.address).then( + json => $state.go('clientCard.addresses') + ); + }; + } } -COMPONENT.controller.$inject = ['$http']; +COMPONENT.controller.$inject = ['$http', '$state']; module.component(NAME, COMPONENT); diff --git a/@salix/crud/src/client/index/style.css b/@salix/crud/src/client/index/style.css index 5329ae742..7e56420c4 100644 --- a/@salix/crud/src/client/index/style.css +++ b/@salix/crud/src/client/index/style.css @@ -7,7 +7,8 @@ vn-item-client a { color: inherit; } vn-item-client a:hover { - background-color: rgba(0, 0, 0, .1); + color: white; + background-color: #424242; } .vn-item-client-name{