+ on-close-start="$ctrl.focus()">
\ No newline at end of file
diff --git a/front/core/components/autocomplete/index.js b/front/core/components/autocomplete/index.js
index 69114d028..49dd14b07 100755
--- a/front/core/components/autocomplete/index.js
+++ b/front/core/components/autocomplete/index.js
@@ -228,7 +228,7 @@ export default class Autocomplete extends Field {
event.preventDefault();
}
- onContainerMouseDown(event) {
+ onContainerClick(event) {
if (event.defaultPrevented) return;
event.preventDefault();
this.showDropDown();
@@ -260,6 +260,7 @@ export default class Autocomplete extends Field {
}
showDropDown(search) {
+ if (this.readonly) return;
this.assignDropdownProps();
this.$.dropDown.show(this.container, search);
}
diff --git a/front/core/components/autocomplete/style.scss b/front/core/components/autocomplete/style.scss
index af45902cc..6be42c3bc 100755
--- a/front/core/components/autocomplete/style.scss
+++ b/front/core/components/autocomplete/style.scss
@@ -20,4 +20,7 @@ vn-autocomplete.vn-field {
}
}
}
+ &.readonly > .container > .icons.post {
+ display: none;
+ }
}
diff --git a/front/core/components/button-menu/button-menu.html b/front/core/components/button-menu/button-menu.html
deleted file mode 100644
index 5beeb12fb..000000000
--- a/front/core/components/button-menu/button-menu.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
\ No newline at end of file
diff --git a/front/core/components/button-menu/index.html b/front/core/components/button-menu/index.html
new file mode 100644
index 000000000..b0977bb93
--- /dev/null
+++ b/front/core/components/button-menu/index.html
@@ -0,0 +1,20 @@
+
+
+
\ No newline at end of file
diff --git a/front/core/components/button-menu/button-menu.js b/front/core/components/button-menu/index.js
similarity index 83%
rename from front/core/components/button-menu/button-menu.js
rename to front/core/components/button-menu/index.js
index 99f3879ee..d31094d36 100644
--- a/front/core/components/button-menu/button-menu.js
+++ b/front/core/components/button-menu/index.js
@@ -1,17 +1,13 @@
import ngModule from '../../module';
-import Input from '../../lib/input';
+import Button from '../button';
import assignProps from '../../lib/assign-props';
import './style.scss';
-export default class ButtonMenu extends Input {
+export default class ButtonMenu extends Button {
constructor($element, $scope, $transclude) {
super($element, $scope);
this.$transclude = $transclude;
- this.input = this.element.querySelector('.mdl-button');
- $element.on('click', e => {
- if (!this.disabled)
- this.onClick(e);
- });
+ $element.on('click', e => this.onClick(e));
}
get model() {
@@ -46,6 +42,7 @@ export default class ButtonMenu extends Input {
}
onClick(event) {
+ if (this.disabled) return;
if (event.defaultPrevented) return;
event.preventDefault();
this.emit('open');
@@ -85,15 +82,14 @@ export default class ButtonMenu extends Input {
}
ButtonMenu.$inject = ['$element', '$scope', '$transclude'];
-ngModule.component('vnButtonMenu', {
- template: require('./button-menu.html'),
+ngModule.vnComponent('vnButtonMenu', {
+ template: require('./index.html'),
+ controller: ButtonMenu,
bindings: {
- label: '@',
showField: '@?',
selection: '
- {{$ctrl.label}}
-
-
-
\ No newline at end of file
diff --git a/front/core/components/button/button.js b/front/core/components/button/button.js
deleted file mode 100644
index 4e5cf50a2..000000000
--- a/front/core/components/button/button.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import ngModule from '../../module';
-import Input from '../../lib/input';
-import './style.scss';
-
-export default class Button extends Input {
- constructor($element) {
- super($element);
- this.$element = $element;
- this.input = this.element.querySelector('.mdl-button');
-
- $element[0].addEventListener('click', event => {
- if (this.disabled)
- event.stopImmediatePropagation();
- });
- }
-
- $onInit() {
- if (!this.type)
- this.type = 'button';
- }
-}
-Button.$inject = ['$element'];
-
-ngModule.component('vnButton', {
- controller: Button,
- template: require('./button.html'),
- bindings: {
- label: '@?',
- disabled: '
+
+ {{::$ctrl.label}}
+
+
+
+
\ No newline at end of file
diff --git a/front/core/components/button/index.js b/front/core/components/button/index.js
new file mode 100644
index 000000000..e1a86eb5d
--- /dev/null
+++ b/front/core/components/button/index.js
@@ -0,0 +1,46 @@
+import ngModule from '../../module';
+import FormInput from '../form-input';
+import './style.scss';
+
+export default class Button extends FormInput {
+ constructor($element, $scope) {
+ super($element, $scope);
+ this.design = 'colored';
+ this.input = this.element.querySelector('button');
+
+ let element = this.element;
+ element.tabIndex = 0;
+ element.classList.add('vn-button');
+ this.element.addEventListener('keyup', e => this.onKeyup(e));
+ this.element.addEventListener('click', e => this.onClick(e));
+ }
+
+ $onInit() {
+ this.element.classList.add(this.design);
+ if (!this.type) this.type = 'button';
+ }
+
+ onKeyup(event) {
+ if (event.code == 'Space')
+ this.onClick(event);
+ }
+
+ onClick(event) {
+ if (event.defaultPrevented) return;
+ // event.preventDefault();
+
+ // FIXME: Don't stop event propagation
+ if (this.disabled) event.stopImmediatePropagation();
+ }
+}
+Button.$inject = ['$element', '$scope'];
+
+ngModule.vnComponent('vnButton', {
+ controller: Button,
+ template: require('./index.html'),
+ bindings: {
+ icon: '@?',
+ type: '@?'
+ }
+});
+
diff --git a/front/core/components/button/style.scss b/front/core/components/button/style.scss
index 84bd8659a..74dcbcf9b 100644
--- a/front/core/components/button/style.scss
+++ b/front/core/components/button/style.scss
@@ -1,5 +1,83 @@
-vn-button {
- & > button > vn-icon {
- vertical-align: middle;
+@import "variables";
+
+.vn-button {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ height: 36px;
+ border: none;
+ border-radius: .1em;
+ font-family: vn-font-bold;
+ text-transform: uppercase;
+ font-size: 14px;
+ cursor: pointer;
+ box-sizing: border-box;
+ outline: none;
+
+ & > button {
+ width: 100%;
+ padding: 0 12px;
+ box-sizing: border-box;
+ background-color: transparent;
+ border: none;
+ height: inherit;
+ color: inherit;
+ font: inherit;
+ display: block;
+ text-transform: inherit;
+ cursor: inherit;
+ outline: none;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ & > vn-icon {
+ vertical-align: middle;
+ color: inherit;
+ font-size: 1.7em;
+ }
}
-}
\ No newline at end of file
+ &.colored {
+ color: white;
+ background-color: $color-main;
+ box-shadow: 0 .15em .15em 0 rgba(0, 0, 0, .3);
+ transition: background 200ms ease-in-out;
+
+ &:not(.disabled) {
+ &:hover,
+ &:focus {
+ background-color: lighten($color-main, 10%);
+ }
+ }
+ }
+ &.flat {
+ color: $color-main;
+ background-color: transparent;
+ box-shadow: none;
+ transition: background 200ms ease-in-out;
+
+ &:not(.disabled) {
+ &:hover,
+ &:focus {
+ background-color: $color-hover-cd;
+ }
+ }
+ }
+ &:hover,
+ &:focus {
+ outline: none;
+ }
+ &.round {
+ border-radius: 50%;
+ height: 3.8em;
+ width: 3.8em;
+
+ & > button > span {
+ display: none;
+ }
+ }
+ &.disabled {
+ opacity: .7;
+ cursor: initial;
+ }
+}
diff --git a/front/core/components/card/card.js b/front/core/components/card/card.js
index b812ccf61..a37835995 100644
--- a/front/core/components/card/card.js
+++ b/front/core/components/card/card.js
@@ -7,7 +7,7 @@ export default function directive() {
transclude: true,
template: require('./card.html'),
link: function($scope, $element, $attrs, $ctrl, $transclude) {
- $element.addClass('demo-card-wide mdl-shadow--2dp bg-panel');
+ $element.addClass('demo-card-wide vn-shadow bg-panel');
$transclude($scope, function(clone) {
angular.element($element[0].querySelector('div')).append(clone);
diff --git a/front/core/components/card/style.scss b/front/core/components/card/style.scss
index c2fe4e1ea..a459879df 100644
--- a/front/core/components/card/style.scss
+++ b/front/core/components/card/style.scss
@@ -1,3 +1,4 @@
vn-card {
display: block;
+ box-sizing: border-box;
}
\ No newline at end of file
diff --git a/front/core/components/chip/index.html b/front/core/components/chip/index.html
index 8696fd8bb..38a56923d 100644
--- a/front/core/components/chip/index.html
+++ b/front/core/components/chip/index.html
@@ -1,8 +1,7 @@
-
-
-
-
-
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/front/core/components/chip/index.js b/front/core/components/chip/index.js
index b35c00cbf..6a945559b 100644
--- a/front/core/components/chip/index.js
+++ b/front/core/components/chip/index.js
@@ -1,17 +1,12 @@
import ngModule from '../../module';
+import Component from '../../lib/component';
import './style.scss';
-export default class Chip {
-
-/**
- * Remove chip event
- */
- remove() {
- if (this.onRemove)
- this.onRemove();
+export default class Chip extends Component {
+ onRemove() {
+ if (!this.disabled) this.emit('remove');
}
}
-
Chip.$inject = ['$element', '$scope', '$transclude'];
ngModule.component('vnChip', {
@@ -20,6 +15,6 @@ ngModule.component('vnChip', {
transclude: true,
bindings: {
disabled: ' {
controller = $componentController('vnChip', {$element, $scope, $transclude: () => {}});
}));
- describe('remove()', () => {
- it(`should call onRemove()`, () => {
- controller.onRemove = () => {};
- spyOn(controller, 'onRemove');
- controller.remove();
+ describe('onRemove()', () => {
+ it(`should emit remove event`, () => {
+ controller.emit = () => {};
+ spyOn(controller, 'emit');
+ controller.onRemove();
- expect(controller.onRemove).toHaveBeenCalledWith();
+ expect(controller.emit).toHaveBeenCalledWith('remove');
});
});
});
diff --git a/front/core/components/chip/style.scss b/front/core/components/chip/style.scss
index 81e81589c..ee7f46848 100644
--- a/front/core/components/chip/style.scss
+++ b/front/core/components/chip/style.scss
@@ -1,18 +1,53 @@
@import "variables";
vn-chip {
+ border-radius: 16px;
+ background-color: $color-bg;
margin: 0 0.5em 0.5em 0;
+ color: $color-font;
+ font-size: 14px;
+ margin: .25em;
+ display: inline-flex;
+ align-items: center;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ height: 28px;
+ padding: 0 .7em;
+ overflow: hidden;
- .mdl-chip {
- background-color: rgba($color-main, 0.9);
- color: #FFF
+ &.colored {
+ background-color: $color-main;
+ color: $color-font-dark;
}
-
- .mdl-chip:active {
- background-color: $color-main
- }
-
- & > vn-one > span > span {
+ & > div {
+ display: flex;
+ align-items: center;
max-width: 100%;
+ height: 100%;
+
+ & > vn-avatar {
+ margin-left: -0.7em;
+ margin-right: .4em;
+ }
}
+ & > vn-icon {
+ margin-left: .2em;
+ margin-right: -0.3em;
+ vertical-align: middle;
+ opacity: .6;
+ cursor: pointer;
+ transition: opacity 250ms ease-out;
+
+ &:hover,
+ &:focus {
+ opacity: 1;
+ }
+ }
+}
+
+vn-avatar {
+ display: inline-block;
+ height: 28px;
+ width: 28px;
+ border-radius: 50%;
}
\ No newline at end of file
diff --git a/front/core/components/color-legend/index.html b/front/core/components/color-legend/index.html
deleted file mode 100644
index 613fb2347..000000000
--- a/front/core/components/color-legend/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- {{legend.name}}
-
\ No newline at end of file
diff --git a/front/core/components/color-legend/index.js b/front/core/components/color-legend/index.js
deleted file mode 100644
index f72a501a7..000000000
--- a/front/core/components/color-legend/index.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import ngModule from '../../module';
-import Component from '../../lib/component';
-import './style.scss';
-
-export default class Controller extends Component {
- constructor($element, $scope, $attrs) {
- super($element, $scope);
- this.$attrs = $attrs;
- }
-
- onClick(legend) {
- this.emit('click', {legend});
- }
-}
-
-Controller.$inject = ['$element', '$scope', '$attrs'];
-
-ngModule.component('vnColorLegend', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- data: '`)($scope)[0];
- this.initPicker();
+ this.input = $compile(``)($scope)[0];
+ this.input.addEventListener('change', () => this.onValueUpdate());
+ }
+
+ onValueUpdate() {
+ let date = null;
+ let value = this.input.value;
+
+ if (value) {
+ date = new Date(value);
+
+ if (this.field) {
+ let orgDate = this.field instanceof Date
+ ? this.field
+ : new Date(this.field);
+
+ date.setHours(
+ orgDate.getHours(),
+ orgDate.getMinutes(),
+ orgDate.getSeconds(),
+ orgDate.getMilliseconds()
+ );
+ }
+ }
+
+ super.field = date;
+ this.$.$applyAsync();
}
get field() {
@@ -18,69 +43,10 @@ class DatePicker extends Field {
set field(value) {
super.field = value;
-
- let date = value;
- if (date && !(date instanceof Date))
- date = new Date(date);
-
- this.picker.setDate(fixDate(date));
- }
-
- set options(value) {
- let selectedDates = this.picker.selectedDates || [];
- this._options = value;
- this.initPicker();
- this.picker.setDate(selectedDates[0]);
- }
-
- get options() {
- return this._options;
- }
-
- initPicker() {
- let locale = this.$translate.use();
- let format = locale == 'es' ? 'd-m-Y' : 'Y-m-d';
-
- let options = this.options || {};
- let defaultOptions = {
- locale: locale,
- dateFormat: format,
- enableTime: false,
- disableMobile: true,
- onValueUpdate: () => this.onValueUpdate()
- };
-
- if (options.enableTime) {
- Object.assign(defaultOptions, {
- dateFormat: `${format} h:i`,
- time_24hr: true
- });
- }
-
- let mergedOptions = Object.assign({},
- defaultOptions,
- options
- );
-
- if (this.picker) this.picker.destroy();
- this.picker = new Flatpickr(this.input, mergedOptions);
- }
-
- onValueUpdate() {
- let date = null;
-
- if (this.picker.selectedDates.length)
- date = this.picker.selectedDates[0];
-
- super.field = fixDate(date, -1);
- this.$.$applyAsync();
- }
-
- $onDestroy() {
- this.picker.destroy();
+ this.input.value = this.$filter('date')(value, 'yyyy-MM-dd');
}
}
-DatePicker.$inject = ['$element', '$scope', '$compile', '$translate'];
+DatePicker.$inject = ['$element', '$scope', '$compile', '$translate', '$filter'];
ngModule.vnComponent('vnDatePicker', {
controller: DatePicker,
@@ -88,12 +54,3 @@ ngModule.vnComponent('vnDatePicker', {
options: ' {
let $filter;
let $element;
let $ctrl;
- let today;
beforeEach(angular.mock.module('vnCore', $translateProvider => {
$translateProvider.translations('en', {});
@@ -13,9 +12,6 @@ describe('Component vnDatePicker', () => {
$element = $compile(`
+ on-close="$ctrl.onClose()"
+ on-close-start="$ctrl.emit('closeStart')">
this.$.input.focus());
this.emit('open');
}
diff --git a/front/core/components/field/index.js b/front/core/components/field/index.js
index bc60af0d3..ed99d1f5c 100644
--- a/front/core/components/field/index.js
+++ b/front/core/components/field/index.js
@@ -11,7 +11,6 @@ export default class Field extends FormInput {
this.suffix = null;
this.control = this.element.querySelector('.control');
- this.classList = this.element.classList;
this.classList.add('vn-field');
this.element.addEventListener('click', e => this.onClick(e));
@@ -43,9 +42,11 @@ export default class Field extends FormInput {
}
set input(value) {
- if (this.input) this.control.removeChild(this.input);
+ if (this.input)
+ this.control.removeChild(this.input);
this._input = value;
- this.control.appendChild(value);
+ if (value)
+ this.control.appendChild(value);
}
get input() {
@@ -84,36 +85,8 @@ export default class Field extends FormInput {
return this.input.placeholder;
}
- set tabIndex(value) {
- this.input.tabIndex = value;
- }
-
- get tabIndex() {
- return this.input.tabIndex;
- }
-
- set disabled(value) {
- this._disabled = boolTag(value);
- this.input.disabled = this._disabled;
- this.classList.toggle('disabled', this._disabled);
- }
-
- get disabled() {
- return this._disabled;
- }
-
- set readonly(value) {
- this._readonly = boolTag(value);
- this.input.readOnly = this._readonly;
- this.classList.toggle('readonly', this._readonly);
- }
-
- get readonly() {
- return this._readonly;
- }
-
set required(value) {
- this._required = boolTag(value);
+ this._required = value;
let required = this.element.querySelector('.required');
display(required, this._required);
}
@@ -180,9 +153,13 @@ export default class Field extends FormInput {
fix.innerText = text || '';
}
+ refreshTabIndex() {
+ this.input.tabIndex = this.disabled ? -1 : this.tabIndex;
+ }
+
onClick() {
- if (event.defaultPrevented) return;
- event.preventDefault();
+ // if (event.defaultPrevented) return;
+ // event.preventDefault();
if (this.input !== document.activeElement)
this.focus();
@@ -250,15 +227,10 @@ ngModule.vnComponent('vnField', {
suffix: '@?',
hint: '@?',
error: ' .fix {
padding-top: 24px;
line-height: 24px;
- font-size: $input-font-size;
+ font-size: $font-size;
opacity: 0;
transition: opacity 200ms ease-in-out;
@@ -58,18 +58,39 @@
border: none;
font-family: Arial, sans-serif;
display: block;
- font-size: $input-font-size;
+ font-size: $font-size;
width: 100%;
background: 0;
color: inherit;
box-sizing: border-box;
min-height: 56px;
-
+ }
+ & > input {
+ position: relative;
+
+ &[type=time],
+ &[type=date],
+ &[type=password] {
+ opacity: 0;
+ transition: opacity 200ms ease-in-out;
+ cursor: pointer;
+ }
&[type=time],
&[type=date] {
clip-path: inset(0 20px 0 0);
- opacity: 0;
- transition: opacity 200ms ease-in-out;
+
+ &::-webkit-inner-spin-button,
+ &::-webkit-clear-button {
+ display: none;
+ -webkit-appearance: none;
+ }
+ &::-webkit-calendar-picker-indicator {
+ position: absolute;
+ height: 100%;
+ width: 100%;
+ opacity: 0;
+ cursor: pointer;
+ }
}
&[type=number] {
-moz-appearance: textfield;
@@ -83,6 +104,15 @@
&:invalid {
box-shadow: none;
}
+ &:-internal-autofill-selected {
+ &,
+ &:hover,
+ &:focus,
+ &:active,
+ &:valid {
+ box-shadow: 0 0 0 40px $color-bg-panel inset;
+ }
+ }
}
}
}
@@ -172,7 +202,8 @@
}
& > .control > * {
&[type=time],
- &[type=date] {
+ &[type=date],
+ &[type=password] {
opacity: 1;
}
}
@@ -214,7 +245,6 @@
}
}
& > .hint {
- z-index: -1;
padding: 4px 0;
height: 12px;
color: rgba(0, 0, 0, .4);
@@ -224,11 +254,12 @@
transition-duration: 200ms;
transition-timing-function: ease-in-out;
opacity: 0;
+ visibility: hidden;
&.filled {
- z-index: 0;
opacity: 1;
transform: translateY(0);
+ visibility: visible;
}
}
&.invalid {
diff --git a/front/core/components/float-button/float-button.html b/front/core/components/float-button/float-button.html
deleted file mode 100644
index e74a1fce7..000000000
--- a/front/core/components/float-button/float-button.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/front/core/components/float-button/float-button.js b/front/core/components/float-button/float-button.js
deleted file mode 100644
index beb3dd13b..000000000
--- a/front/core/components/float-button/float-button.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import ngModule from '../../module';
-
-ngModule.component('vnFloatButton', {
- template: require('./float-button.html'),
- bindings: {
- icon: '@'
- }
-});
diff --git a/front/core/components/float-button/index.js b/front/core/components/float-button/index.js
new file mode 100644
index 000000000..32ada7437
--- /dev/null
+++ b/front/core/components/float-button/index.js
@@ -0,0 +1,13 @@
+import ngModule from '../../module';
+import Button from '../button';
+
+export default class FloatButton extends Button {
+ constructor($element, $scope) {
+ super($element, $scope);
+ this.element.classList.add('round');
+ }
+}
+
+ngModule.vnComponent('vnFloatButton', {
+ controller: FloatButton
+});
diff --git a/front/core/components/form-input/index.js b/front/core/components/form-input/index.js
index 74d98079c..0a1297788 100644
--- a/front/core/components/form-input/index.js
+++ b/front/core/components/form-input/index.js
@@ -9,6 +9,11 @@ import Component from '../../lib/component';
* @property {Boolean} disabled Put component in disabled mode
*/
export default class FormInput extends Component {
+ constructor($element, $scope) {
+ super($element, $scope);
+ this.classList = this.element.classList;
+ }
+
$onInit() {
// XXX: Compatibility with old inputs
let attrs = this.$element[0].attributes;
@@ -41,6 +46,48 @@ export default class FormInput extends Component {
get name() {
return this.element.getAttribute('name');
}
+
+ set disabled(value) {
+ this._disabled = boolTag(value);
+ this.input.disabled = this._disabled;
+ this.classList.toggle('disabled', this._disabled);
+ this.refreshTabIndex();
+ }
+
+ get disabled() {
+ return this._disabled;
+ }
+
+ set readonly(value) {
+ this._readonly = boolTag(value);
+ this.input.readOnly = this._readonly;
+ this.classList.toggle('readonly', this._readonly);
+ }
+
+ get readonly() {
+ return this._readonly;
+ }
+
+ set tabIndex(value) {
+ this._tabIndex = value;
+ this.refreshTabIndex();
+ }
+
+ get tabIndex() {
+ return this._tabIndex;
+ }
+
+ select() {
+ this.input.select();
+ }
+
+ focus() {
+ this.input.focus();
+ }
+
+ refreshTabIndex() {
+ this.element.tabIndex = this.disabled ? -1 : this.tabIndex;
+ }
}
ngModule.vnComponent('vnFormInput', {
@@ -50,9 +97,14 @@ ngModule.vnComponent('vnFormInput', {
field: '=?',
name: '@?',
disabled: '
-
-
\ No newline at end of file
diff --git a/front/core/components/icon-button/icon-button.js b/front/core/components/icon-button/icon-button.js
deleted file mode 100644
index ba3ccae3e..000000000
--- a/front/core/components/icon-button/icon-button.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import ngModule from '../../module';
-import './style.scss';
-
-export default class IconButton {
- constructor($element) {
- this.element = $element[0];
-
- if (this.element.getAttribute('tabindex') == null)
- this.element.tabIndex = 0;
-
- this.element.addEventListener('keyup', e => this.onKeyup(e));
- this.element.addEventListener('click', e => this.onClick(e));
- }
-
- onKeyup(event) {
- if (event.code == 'Space')
- this.onClick(event);
- }
-
- onClick(event) {
- if (event.defaultPrevented) return;
- event.preventDefault();
-
- // FIXME: Don't use Event.stopPropagation()
- let button = this.element.querySelector('button');
- if (this.disabled || button.disabled)
- event.stopImmediatePropagation();
- }
-}
-
-IconButton.$inject = ['$element'];
-ngModule.component('vnIconButton', {
- controller: IconButton,
- template: require('./icon-button.html'),
- bindings: {
- icon: '@',
- disabled: ' button {
- background-color: transparent;
- display: block;
- color: inherit;
- border: 0;
- padding: 0;
- font-size: inherit;
- &:hover {
- background-color: initial;
- }
- & > vn-icon {
- display: block;
- font-size: inherit;
- }
+ & > button {
+ padding: .2em !important;
+ }
+ &:focus {
+ opacity: .6;
}
}
diff --git a/front/core/components/icon-focusable/icon-focusable.html b/front/core/components/icon-focusable/icon-focusable.html
deleted file mode 100644
index 4bd8ad78a..000000000
--- a/front/core/components/icon-focusable/icon-focusable.html
+++ /dev/null
@@ -1 +0,0 @@
-
+
+
+
+
\ No newline at end of file
diff --git a/front/core/components/icon-menu/index.js b/front/core/components/icon-menu/index.js
new file mode 100644
index 000000000..0549149a8
--- /dev/null
+++ b/front/core/components/icon-menu/index.js
@@ -0,0 +1,14 @@
+import ngModule from '../../module';
+import ButtonMenu from '../button-menu';
+
+export default class IconMenu extends ButtonMenu {
+ constructor($element, $scope) {
+ super($element, $scope);
+ this.element.classList.add('flat');
+ }
+}
+
+ngModule.vnComponent('vnIconMenu', {
+ template: require('./index.html'),
+ controller: IconMenu
+});
diff --git a/front/core/components/icon-menu/style.scss b/front/core/components/icon-menu/style.scss
deleted file mode 100644
index df7a5e331..000000000
--- a/front/core/components/icon-menu/style.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-vn-icon-menu {
- cursor: pointer;
-
- vn-drop-down {
- font-family: 'vn-font';
- outline: 0
- }
-}
\ No newline at end of file
diff --git a/front/core/components/index.js b/front/core/components/index.js
index 0433744f6..50c1a1bf8 100644
--- a/front/core/components/index.js
+++ b/front/core/components/index.js
@@ -10,36 +10,35 @@ import './subtitle/subtitle';
import './spinner/spinner';
import './snackbar/snackbar';
import './tooltip/tooltip';
-import './icon-menu/icon-menu';
-import './button-menu/button-menu';
import './popover/popover';
import './drop-down/drop-down';
import './menu/menu';
import './multi-check/multi-check';
-import './button/button';
-import './icon-button/icon-button';
-import './submit/submit';
import './card/card';
-import './float-button/float-button';
import './step-control/step-control';
import './label-value/label-value';
import './pagination/pagination';
import './searchbar/searchbar';
import './scroll-up/scroll-up';
import './autocomplete';
+import './button';
+import './button-menu';
import './calendar';
import './check';
import './chip';
-import './color-legend';
import './data-viewer';
import './date-picker';
import './field';
+import './float-button';
+import './icon-menu';
+import './icon-button';
import './input-number';
-import './input-range';
+import './range';
import './input-time';
import './input-file';
import './list';
import './radio';
+import './submit';
import './table';
import './td-editable';
import './textarea';
diff --git a/front/core/components/input-file/index.html b/front/core/components/input-file/index.html
index 4e9c48631..58a2bea0c 100644
--- a/front/core/components/input-file/index.html
+++ b/front/core/components/input-file/index.html
@@ -1,42 +1,53 @@
-
-
+
+
-
- {{::document.dms.created | dateTime:'dd/MM/yyyy HH:mm'}}
+ {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}}
-
+ label="Country"
+ rule>
-
+ label="Province"
+ rule>
diff --git a/modules/client/front/greuge/index/index.html b/modules/client/front/greuge/index/index.html
index 5932a66a9..51f31338f 100644
--- a/modules/client/front/greuge/index/index.html
+++ b/modules/client/front/greuge/index/index.html
@@ -36,7 +36,7 @@
- {{::greuge.shipped | dateTime:'dd/MM/yyyy HH:mm' }}
+ {{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }}
{{::greuge.description}}
{{::greuge.greugeType.name}}
{{::greuge.amount | currency: 'EUR': 2}}
diff --git a/modules/client/front/index/index.html b/modules/client/front/index/index.html
index 602ef8600..64be81a29 100644
--- a/modules/client/front/index/index.html
+++ b/modules/client/front/index/index.html
@@ -6,7 +6,7 @@
data="clients">
-
-
\ No newline at end of file
diff --git a/modules/client/front/descriptor/index.js b/modules/client/front/descriptor/index.js
index 1eecdc15a..04d619f50 100644
--- a/modules/client/front/descriptor/index.js
+++ b/modules/client/front/descriptor/index.js
@@ -13,6 +13,10 @@ class Controller {
callback.call(this);
}
+ get client() {
+ return this._client;
+ }
+
set client(value) {
this._client = value;
@@ -32,10 +36,6 @@ class Controller {
};
}
- get client() {
- return this._client;
- }
-
set quicklinks(value = {}) {
this._quicklinks = Object.assign(value, this._quicklinks);
}
diff --git a/modules/client/front/dms/index/index.html b/modules/client/front/dms/index/index.html
index 0c936234c..1f306dc88 100644
--- a/modules/client/front/dms/index/index.html
+++ b/modules/client/front/dms/index/index.html
@@ -70,7 +70,7 @@
{{::document.dms.worker.user.nickname | dashIfEmpty}}
-
+
+
+
diff --git a/front/core/components/input-file/index.js b/front/core/components/input-file/index.js
index d0f93e4f8..3a0066e75 100644
--- a/front/core/components/input-file/index.js
+++ b/front/core/components/input-file/index.js
@@ -1,15 +1,13 @@
import ngModule from '../../module';
-import Input from '../../lib/input';
+import FormInput from '../form-input';
import './style.scss';
-export default class InputFile extends Input {
+export default class InputFile extends FormInput {
constructor($element, $scope) {
super($element, $scope);
- this.element = $element[0];
- this.hasFocus = false;
this._multiple = false;
this._value = 'Select a file';
-
+ this.input = this.element.querySelector('input');
this.registerEvents();
}
@@ -106,26 +104,12 @@ export default class InputFile extends Input {
}
}
-InputFile.$inject = ['$element', '$scope'];
-
-ngModule.component('vnInputFile', {
+ngModule.vnComponent('vnInputFile', {
template: require('./index.html'),
controller: InputFile,
- transclude: {
- leftIcons: '?tLeftIcons',
- rightIcons: '?tRightIcons'
- },
bindings: {
- label: '@?',
- name: '@?',
- disabled: ' .container {
- width: 100%;
- position: relative;
- padding-bottom: 2px;
- display: flex;
-
- & > .textField {
- width: 100%;
- display: flex;
- align-items: center;
- position: relative;
- padding-top: 4px;
- }
- }
-
- .leftIcons, .rightIcons, .suffix {
- display: flex;
- color: $color-font-secondary;
-
- .material-icons {
- font-size: 20px !important
- }
- }
-
- .suffix vn-icon-button {
- padding: 0
- }
-
- t-left-icons {
- padding-right: 0.5em
- }
-
- t-right-icons {
- padding-left: 0.5em
- }
-
- .infix {
- position: relative;
- display: block;
- flex: auto;
- width: 100%;
- min-width: 0;
- }
- i.clear {
- visibility: hidden;
- cursor: pointer;
- outline: 0;
-
- &:hover {
- color: #222;
- }
- }
- &:hover i.clear {
- visibility: visible;
- }
- i.visible {
- visibility: visible;
- }
- label {
- position: absolute;
- bottom: 0;
- left: 0;
- padding: 4px 0!important;
- pointer-events: none;
- color: $color-font-secondary;
- transition-duration: .2s;
- transition-timing-function: cubic-bezier(.4,0,.2,1);
- }
- &.not-empty label{
- bottom: 24px;
- color: $color-main;
- padding: 0;
- font-size: 12px;
- }
- input {
- outline: none;
- border: none;
- font-family: "Helvetica", "Arial", sans-serif;
- display: block;
- font-size: 16px;
- width: 100%;
- background: 0 0;
- color: inherit;
- padding: 4px;
- box-sizing: border-box;
- border-bottom: 0!important;
-
- &[type=number] {
- -moz-appearance: textfield;
- &::-webkit-outer-spin-button,
- &::-webkit-inner-spin-button {
- -webkit-appearance: none;
- margin: 0;
- }
- }
- &:invalid {
- box-shadow: none;
- }
- }
- .underline {
- position: absolute;
- bottom: 0;
- height: 1px;
- content: ' ';
- pointer-events: none;
- width: 100%;
- background-color: $color-input-underline;
- }
- .selected.underline {
- background-color: $color-main;
- height: 2px;
- left: 50%;
- width: 0px !important;
- transition-duration: 0.2s;
- transition-timing-function: cubic-bezier(.4,0,.2,1);
- }
-
- div.selected {
- &.container{
- border-bottom: 0px;
- }
- label {
- bottom: 24px;
- color: $color-main;
- font-size: 12px;
- }
- .selected.underline{
- left: 0;
- width: 100%!important;
- }
- }
- & > div.container > div.textField > div.infix.invalid {
- @extend div.selected;
-
- & > span.mdl-textfield__error {
- visibility: visible;
- }
- & > label {
- color: #d50000;
- }
- }
- .infix.invalid + .underline {
- background-color: #d50000;
- }
-
- label span:nth-child(2) {
- color: $color-alert
+ input[type=file] {
+ display: none;
}
}
\ No newline at end of file
diff --git a/front/core/components/input-range/index.html b/front/core/components/input-range/index.html
deleted file mode 100644
index 649e4de9f..000000000
--- a/front/core/components/input-range/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
+
+
+
+
+
+
{{$ctrl.value}}
-
+ type="file"
+ ng-model="$ctrl.files"
+ accept="{{$ctrl.accept}}">
+
-
-
-
-
- info_outline
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
\ No newline at end of file
diff --git a/front/core/components/input-range/index.js b/front/core/components/input-range/index.js
deleted file mode 100644
index 8cfd898c7..000000000
--- a/front/core/components/input-range/index.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import ngModule from '../../module';
-import Input from '../../lib/input';
-import './style.scss';
-
-export default class inputRange extends Input {
- constructor($element, $scope) {
- super($element, $scope);
- this.mdlElement = this.element.querySelector('.mdl-slider');
- componentHandler.upgradeElement(this.mdlElement);
- this.mdlElement.addEventListener('change', () => {
- this._value = this.input.value;
- this.$.$applyAsync();
- if (this._value && this.onChange)
- this.emit('change', {value: this._value});
- });
- }
-
- get value() {
- return this._value;
- }
-
- set value(value) {
- this._value = value;
- this.mdlElement.MaterialSlider.change(value);
- }
-
- get max() {
- return this.input.max;
- }
-
- set max(value) {
- this.input.max = value;
- }
-
- get min() {
- return this.input.min;
- }
-
- set min(value) {
- this.input.min = value;
- }
-
- get step() {
- return this.input.step;
- }
-
- set step(value) {
- this.input.step = value;
- }
-
- get() {
- return this._model;
- }
-
- set model(value) {
- this._model = value;
- }
-
- set disabled(value) {
- this.input.disabled = value;
- }
-}
-
-inputRange.$inject = ['$element', '$scope'];
-
-ngModule.component('vnInputRange', {
- template: require('./index.html'),
- controller: inputRange,
- bindings: {
- label: '@?',
- disabled: ' parseInt(i) || null);
- date = new Date(this.field || null);
+
+ date = this.field instanceof Date
+ ? this.field
+ : new Date(this.field || null);
date.setHours(split[0], split[1], 0, 0);
}
diff --git a/front/core/components/input-time/index.spec.js b/front/core/components/input-time/index.spec.js
index f1ab14b50..0ab0fc762 100644
--- a/front/core/components/input-time/index.spec.js
+++ b/front/core/components/input-time/index.spec.js
@@ -24,7 +24,7 @@ describe('Component vnInputTime', () => {
it(`should display the formated the date`, () => {
let date = new Date();
$ctrl.field = date;
- let displayed = $filter('dateTime')(date, 'HH:mm');
+ let displayed = $filter('date')(date, 'HH:mm');
expect($ctrl.value).toEqual(displayed);
});
diff --git a/front/core/components/list/style.scss b/front/core/components/list/style.scss
index 7560d3288..0786cacf8 100644
--- a/front/core/components/list/style.scss
+++ b/front/core/components/list/style.scss
@@ -24,11 +24,10 @@
vn-icon-button {
opacity: .4;
- color: $color-main;
margin-left: .5em;
transition: opacity 250ms ease-out;
padding: 0;
- font-size: 2em;
+ font-size: 1.2em;
&:hover {
opacity: 1;
diff --git a/front/core/components/multi-check/multi-check.js b/front/core/components/multi-check/multi-check.js
index 63f89f84e..d354c9eef 100644
--- a/front/core/components/multi-check/multi-check.js
+++ b/front/core/components/multi-check/multi-check.js
@@ -1,5 +1,5 @@
import ngModule from '../../module';
-import Input from '../../lib/input';
+import FormInput from '../form-input';
import './style.scss';
/**
@@ -8,7 +8,7 @@ import './style.scss';
* @param {Array} data List of options shown in drop-down
* @param {Array} models Elements to check / unCheck
*/
-export default class MultiCheck extends Input {
+export default class MultiCheck extends FormInput {
constructor($element, $scope) {
super($element, $scope);
this._checked = false;
diff --git a/front/core/components/popover/popover.js b/front/core/components/popover/popover.js
index af6edb79a..39b44e206 100644
--- a/front/core/components/popover/popover.js
+++ b/front/core/components/popover/popover.js
@@ -109,6 +109,7 @@ export default class Popover extends Component {
this.showTimeout = null;
this.element.style.display = 'none';
this.document.body.removeChild(this.element);
+ this.emit('close');
}, 250);
this.document.removeEventListener('keydown', this.docKeyDownHandler);
@@ -118,7 +119,7 @@ export default class Popover extends Component {
this.bgMouseDownHandler = null;
if (this.deregisterCallback) this.deregisterCallback();
- this.emit('close');
+ this.emit('closeStart');
}
/**
diff --git a/front/core/components/range/index.html b/front/core/components/range/index.html
new file mode 100644
index 000000000..ea35db58a
--- /dev/null
+++ b/front/core/components/range/index.html
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/front/core/components/range/index.js b/front/core/components/range/index.js
new file mode 100644
index 000000000..80410875a
--- /dev/null
+++ b/front/core/components/range/index.js
@@ -0,0 +1,50 @@
+import ngModule from '../../module';
+import FormInput from '../form-input';
+import './style.scss';
+
+export default class Range extends FormInput {
+ constructor($element, $scope) {
+ super($element, $scope);
+ this.input = this.element.querySelector('input');
+ }
+
+ get max() {
+ return this.input.max;
+ }
+
+ set max(value) {
+ this.input.max = value;
+ }
+
+ get min() {
+ return this.input.min;
+ }
+
+ set min(value) {
+ this.input.min = value;
+ }
+
+ get step() {
+ return this.input.step;
+ }
+
+ set step(value) {
+ this.input.step = value;
+ }
+
+ refreshTabIndex() {
+ this.input.tabIndex = this.disabled ? -1 : this.tabIndex;
+ }
+}
+
+ngModule.vnComponent('vnRange', {
+ template: require('./index.html'),
+ controller: Range,
+ bindings: {
+ min: ' label {
+ font-size: 12px;
+
+ &.main {
+ color: $color-main;
+ }
+ &.min-label {
+ float: left;
+ }
+ &.max-label {
+ float: right;
+ }
+ }
+ & > input {
+ cursor: pointer;
+ height: 30px;
+ display: block;
+ width: 100%;
+ background: transparent;
+ border-color: transparent;
+ -webkit-appearance: none;
+ margin: .2em 0;
+
+ &:focus {
+ outline: none;
+ }
+ &::-moz-focus-outer {
+ border: 0;
+ }
+ @include range(
+ "-moz-range-thumb",
+ "-moz-range-track"
+ );
+ @include range(
+ "-webkit-slider-thumb",
+ "-webkit-slider-runnable-track"
+ );
+ @include range(
+ "-ms-thumb",
+ "-ms-track"
+ );
+ &:disabled {
+ cursor: initial;
+ }
+ }
+}
diff --git a/front/core/components/scroll-up/scroll-up.html b/front/core/components/scroll-up/scroll-up.html
index 3f3b309d5..a3748acc6 100644
--- a/front/core/components/scroll-up/scroll-up.html
+++ b/front/core/components/scroll-up/scroll-up.html
@@ -1,5 +1,6 @@
-
\ No newline at end of file
+ vn-tooltip="Go up"
+ class="round">
+
\ No newline at end of file
diff --git a/front/core/components/scroll-up/style.scss b/front/core/components/scroll-up/style.scss
index 0d5cd6c58..1bf7ea982 100644
--- a/front/core/components/scroll-up/style.scss
+++ b/front/core/components/scroll-up/style.scss
@@ -1,6 +1,6 @@
vn-scroll-up {
- top: 5em;
- right: 2.5em;
+ top: 5.5em;
+ right: 2em;
display: none;
position: fixed;
}
\ No newline at end of file
diff --git a/front/core/components/searchbar/searchbar.html b/front/core/components/searchbar/searchbar.html
index c231b9752..069a9411c 100644
--- a/front/core/components/searchbar/searchbar.html
+++ b/front/core/components/searchbar/searchbar.html
@@ -1,6 +1,6 @@
-
+
{{::mandate.id}}
{{::mandate.company.code}}
{{::mandate.mandateType.name}}
- {{::mandate.created | dateTime:'dd/MM/yyyy HH:mm' }}
- {{::mandate.finished | dateTime:'dd/MM/yyyy HH:mm' || '-'}}
+ {{::mandate.created | date:'dd/MM/yyyy HH:mm' }}
+ {{::mandate.finished | date:'dd/MM/yyyy HH:mm' || '-'}}
diff --git a/modules/client/front/note/index/index.html b/modules/client/front/note/index/index.html
index db9ba0818..04bd7d28e 100644
--- a/modules/client/front/note/index/index.html
+++ b/modules/client/front/note/index/index.html
@@ -15,7 +15,7 @@
class="note vn-pa-sm border-solid border-radius vn-mb-md">
{{::note.worker.user.nickname}}
- {{::note.created | dateTime:'dd/MM/yyyy HH:mm'}}
+ {{::note.created | date:'dd/MM/yyyy HH:mm'}}
{{::note.text}}
diff --git a/modules/client/front/recovery/index/index.html b/modules/client/front/recovery/index/index.html
index 9e4345025..755556f37 100644
--- a/modules/client/front/recovery/index/index.html
+++ b/modules/client/front/recovery/index/index.html
@@ -33,8 +33,8 @@
ng-click="$ctrl.setFinished(recovery)">
- {{::recovery.started | dateTime:'dd/MM/yyyy' }}
- {{recovery.finished | dateTime:'dd/MM/yyyy' }}
+ {{::recovery.started | date:'dd/MM/yyyy' }}
+ {{recovery.finished | date:'dd/MM/yyyy' }}
{{::recovery.amount | currency: 'EUR': 0}}
{{::recovery.period}}
diff --git a/modules/client/front/sample/index/index.html b/modules/client/front/sample/index/index.html
index 2d7f63ba7..49be184f3 100644
--- a/modules/client/front/sample/index/index.html
+++ b/modules/client/front/sample/index/index.html
@@ -23,7 +23,7 @@
- {{::sample.created | dateTime:'dd/MM/yyyy HH:mm' }}
+ {{::sample.created | date:'dd/MM/yyyy HH:mm' }}
{{::sample.type.description}}
diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html
index 2fae69572..eccf45873 100644
--- a/modules/client/front/summary/index.html
+++ b/modules/client/front/summary/index.html
@@ -192,7 +192,7 @@
+ value="{{$ctrl.summary.recovery.started | date:'dd/MM/yyyy'}}">
diff --git a/modules/client/front/web-payment/index.html b/modules/client/front/web-payment/index.html
index 326945c21..7f6042759 100644
--- a/modules/client/front/web-payment/index.html
+++ b/modules/client/front/web-payment/index.html
@@ -36,7 +36,7 @@
{{::transaction.id}}
- {{::transaction.created | dateTime:'dd/MM/yyyy HH:mm'}}
+ {{::transaction.created | date:'dd/MM/yyyy HH:mm'}}
{{::transaction.amount | currency: 'EUR':2}}
{
case 'companyFk':
case 'issued':
case 'dued':
+ param = `i.${param}`;
return {[param]: value};
}
});
diff --git a/modules/invoiceOut/front/descriptor/index.html b/modules/invoiceOut/front/descriptor/index.html
index 211560d28..f84b90d41 100644
--- a/modules/invoiceOut/front/descriptor/index.html
+++ b/modules/invoiceOut/front/descriptor/index.html
@@ -21,7 +21,7 @@
+ value="{{$ctrl.invoiceOut.issued | date: 'dd/MM/yyyy'}}">
@@ -33,24 +33,9 @@
value="{{$ctrl.invoiceOut.company.code}}">
-
+
+
{{$ctrl.invoiceOut.ref}}
-
+
+
+
@@ -39,7 +37,7 @@
class="clickable vn-tr searchResult"
ui-sref="invoiceOut.card.summary({id: {{::invoiceOut.id}}})">
{{::invoiceOut.ref | dashIfEmpty}}
- {{::invoiceOut.issued | dateTime:'dd/MM/yyyy' | dashIfEmpty}}
+ {{::invoiceOut.issued | date:'dd/MM/yyyy' | dashIfEmpty}}
{{::invoiceOut.amount | currency: 'EUR': 2 | dashIfEmpty}}
- {{::invoiceOut.created | dateTime:'dd/MM/yyyy' | dashIfEmpty}}
+ {{::invoiceOut.created | date:'dd/MM/yyyy' | dashIfEmpty}}
{{::invoiceOut.companyCode | dashIfEmpty}}
- {{::invoiceOut.dued | dateTime:'dd/MM/yyyy' | dashIfEmpty}}
+ {{::invoiceOut.dued | date:'dd/MM/yyyy' | dashIfEmpty}}
+ value="{{$ctrl.summary.invoiceOut.issued | date: 'dd/MM/yyyy'}}">
+ value="{{$ctrl.summary.invoiceOut.dued | date: 'dd/MM/yyyy'}}">
+ value="{{$ctrl.summary.invoiceOut.created | date: 'dd/MM/yyyy'}}">
+ value="{{$ctrl.summary.invoiceOut.booked | date: 'dd/MM/yyyy'}}">
@@ -66,7 +66,7 @@
{{ticket.nickname}}
- {{ticket.shipped | dateTime: 'dd/MM/yyyy'}}
+ {{ticket.shipped | date: 'dd/MM/yyyy'}}
{{ticket.total | currency: 'EUR': 2}}
diff --git a/modules/item/back/methods/item/regularize.js b/modules/item/back/methods/item/regularize.js
index 17f1dbe1e..b9aa0d85f 100644
--- a/modules/item/back/methods/item/regularize.js
+++ b/modules/item/back/methods/item/regularize.js
@@ -105,15 +105,18 @@ module.exports = Self => {
async function getTicketId(params, options) {
- const currentDate = new Date();
- currentDate.setHours(null, null, null);
+ const minDate = new Date();
+ minDate.setHours(0, 0, 0, 0);
+
+ const maxDate = new Date();
+ maxDate.setHours(23, 59, 59, 59);
let ticket = await Self.app.models.Ticket.findOne({
where: {
addressFk: params.addressFk,
warehouseFk: params.warehouseFk,
- shipped: currentDate,
- landed: currentDate
+ shipped: {between: [minDate, maxDate]},
+ landed: {between: [minDate, maxDate]}
}
}, options);
diff --git a/modules/item/front/create/index.html b/modules/item/front/create/index.html
index d852faab7..557ccdf77 100644
--- a/modules/item/front/create/index.html
+++ b/modules/item/front/create/index.html
@@ -53,13 +53,13 @@
-
+
+
+
diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html
index cd12c253f..e273b02e4 100644
--- a/modules/item/front/descriptor/index.html
+++ b/modules/item/front/descriptor/index.html
@@ -64,32 +64,9 @@
ng-class="{bright: $ctrl.item.isActive == false}">
-
-
-
-
-
+
-
-
-
+
+
+ suggested-filter="{isActive: true}">
{{entry.warehouse| dashIfEmpty}}
- {{entry.landed | dateTime:'dd/MM/yyyy HH:mm'}}
+ {{entry.landed | date:'dd/MM/yyyy HH:mm'}}
{{entry.entryFk | dashIfEmpty}}
{{entry.price2 | dashIfEmpty}}
{{entry.price3 | dashIfEmpty}}
diff --git a/modules/item/front/last-entries/style.scss b/modules/item/front/last-entries/style.scss
index 63ffcb35b..6188daabc 100644
--- a/modules/item/front/last-entries/style.scss
+++ b/modules/item/front/last-entries/style.scss
@@ -15,10 +15,6 @@ vn-item-last-entries {
}
vn-date-picker {
flex: none !important;
-
- .mdl-textfield{
- width: 400px !important;
- }
}
@media screen and (max-width: 1440px) {
.expendable {
diff --git a/modules/item/front/request-search-panel/index.html b/modules/item/front/request-search-panel/index.html
index 8e15be8fb..999bfd500 100644
--- a/modules/item/front/request-search-panel/index.html
+++ b/modules/item/front/request-search-panel/index.html
@@ -16,7 +16,7 @@
+ order="shipped DESC, isOk ASC">
+ on-response="$ctrl.denyRequest(response)">
-
-
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/request/index.js b/modules/item/front/request/index.js
index f887be9a8..c18800001 100644
--- a/modules/item/front/request/index.js
+++ b/modules/item/front/request/index.js
@@ -9,8 +9,23 @@ export default class Controller {
this.$ = $;
this.vnApp = vnApp;
this._ = $translate;
- if (!$stateParams.q)
- this.filter = {isOk: false, mine: true};
+ if (!$stateParams.q) {
+ const today = new Date();
+ today.setHours(23, 59, 59, 59);
+
+ const lastWeek = new Date();
+ lastWeek.setHours(0, 0, 0, 0);
+ lastWeek.setDate(lastWeek.getDate() - 7);
+
+ this.filter = {
+ where: {
+ isOk: false,
+ mine: true,
+ from: lastWeek,
+ to: today
+ }
+ };
+ }
}
$postLink() {
@@ -21,7 +36,7 @@ export default class Controller {
getState(isOk) {
if (isOk === null)
return 'Nueva';
- else if (isOk === -1 || isOk === 1)
+ else if (isOk === -1 || isOk)
return 'Aceptada';
else
return 'Denegada';
@@ -34,14 +49,12 @@ export default class Controller {
quantity: request.saleQuantity
};
- let endpoint = `/api/TicketRequests/${request.id}/confirm`;
+ let query = `/api/TicketRequests/${request.id}/confirm`;
+ this.$http.post(query, params).then(res => {
+ request.itemDescription = res.data.concept;
+ request.isOk = true;
- this.$http.post(endpoint, params).then(() => {
this.vnApp.showSuccess(this._.instant('Data saved!'));
- this.$.model.refresh();
- }).catch( e => {
- this.$.model.refresh();
- throw e;
});
}
}
@@ -56,10 +69,7 @@ export default class Controller {
this.$http.patch(endpoint, params).then(() => {
this.vnApp.showSuccess(this._.instant('Data saved!'));
- }).catch( e => {
- this.$.model.refresh();
- throw e;
- });
+ }).then(() => this.confirmRequest(request));
} else
this.confirmRequest(request);
}
@@ -86,7 +96,7 @@ export default class Controller {
}
showDenyReason(event, requestId) {
- this.denyRequestId = requestId;
+ this.selectedRequest = requestId;
this.$.denyReason.parent = event.target;
this.$.denyReason.show();
document.querySelector('vn-item-request vn-textarea textArea').focus();
@@ -96,17 +106,21 @@ export default class Controller {
delete this.denyRequestId;
}
- denyRequest() {
+ denyRequest(response) {
+ if (response !== 'ACCEPT') return;
+
let params = {
observation: this.denyObservation
};
- let endpoint = `/api/TicketRequests/${this.denyRequestId}/deny`;
+ let query = `/api/TicketRequests/${this.selectedRequest.id}/deny`;
+ this.$http.post(query, params).then(res => {
+ const request = res.data;
+ this.selectedRequest.isOk = request.isOk;
+ this.selectedRequest.attenderFk = request.attenderFk;
+ this.selectedRequest.response = request.response;
- this.$http.post(endpoint, params).then(() => {
this.vnApp.showSuccess(this._.instant('Data saved!'));
- this.$.model.refresh();
- this.$.denyReason.hide();
this.denyObservation = null;
});
}
diff --git a/modules/item/front/request/index.spec.js b/modules/item/front/request/index.spec.js
index e27bc3879..1704c61a1 100644
--- a/modules/item/front/request/index.spec.js
+++ b/modules/item/front/request/index.spec.js
@@ -53,15 +53,15 @@ describe('Item', () => {
let model = controller.$.model;
spyOn(model, 'refresh');
+ const expectedResult = {concept: 'Melee Weapon'};
let request = {itemFk: 1, saleQuantity: 1, id: 1};
- $httpBackend.when('POST', `/api/TicketRequests/${request.id}/confirm`).respond();
- $httpBackend.expect('POST', `/api/TicketRequests/${request.id}/confirm`).respond();
+ $httpBackend.when('POST', `/api/TicketRequests/${request.id}/confirm`).respond(expectedResult);
+ $httpBackend.expect('POST', `/api/TicketRequests/${request.id}/confirm`).respond(expectedResult);
controller.confirmRequest(request);
$httpBackend.flush();
expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
- expect($scope.model.refresh).toHaveBeenCalledWith();
});
});
@@ -110,20 +110,17 @@ describe('Item', () => {
describe('denyRequest()', () => {
it(`should perform a query and call vnApp.showSuccess(), refresh(), hide() and set denyObservation to null in the controller`, () => {
spyOn(controller.vnApp, 'showSuccess');
- let model = controller.$.model;
- spyOn(model, 'refresh');
- spyOn(controller.$.denyReason, 'hide');
- controller.denyRequestId = 1;
+ const request = {id: 1};
+ const expectedResult = {isOk: false, attenderFk: 106, response: 'Denied!'};
+ controller.selectedRequest = request;
- $httpBackend.when('POST', `/api/TicketRequests/${controller.denyRequestId}/deny`).respond();
- $httpBackend.expect('POST', `/api/TicketRequests/${controller.denyRequestId}/deny`).respond();
- controller.denyRequest();
+ $httpBackend.when('POST', `/api/TicketRequests/${request.id}/deny`).respond(expectedResult);
+ $httpBackend.expect('POST', `/api/TicketRequests/${request.id}/deny`).respond(expectedResult);
+ controller.denyRequest('ACCEPT');
$httpBackend.flush();
expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
- expect($scope.model.refresh).toHaveBeenCalledWith();
- expect($scope.denyReason.hide).toHaveBeenCalledWith();
});
});
});
diff --git a/modules/item/front/request/locale/es.yml b/modules/item/front/request/locale/es.yml
index 760f30bd3..33710a327 100644
--- a/modules/item/front/request/locale/es.yml
+++ b/modules/item/front/request/locale/es.yml
@@ -1,5 +1,6 @@
Discard: Descartar
-Indicate the reasons to deny this request: Indique las razones para descartar esta peticion
+Specify the reasons to deny this request: Especifica las razones para descartar la petición
Buy requests: Peticiones de compra
Search request by id or alias: Buscar peticiones por identificador o alias
-Sale quantity: C. conseguida
\ No newline at end of file
+Requested: Solicitado
+Achieved: Conseguido
\ No newline at end of file
diff --git a/modules/item/front/search-panel/index.js b/modules/item/front/search-panel/index.js
index 458382a99..a722fb1fc 100644
--- a/modules/item/front/search-panel/index.js
+++ b/modules/item/front/search-panel/index.js
@@ -2,8 +2,8 @@ import ngModule from '../module';
import SearchPanel from 'core/components/searchbar/search-panel';
class Controller extends SearchPanel {
- constructor($scope) {
- super();
+ constructor($scope, $element) {
+ super($scope, $element);
this.$ = $scope;
this.moreFields = [
{field: 'id'},
@@ -58,8 +58,6 @@ class Controller extends SearchPanel {
}
}
-Controller.$inject = ['$scope'];
-
ngModule.component('vnItemSearchPanel', {
template: require('./index.html'),
controller: Controller
diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html
index 4a1e4fb56..a3ab3d8ae 100644
--- a/modules/item/front/summary/index.html
+++ b/modules/item/front/summary/index.html
@@ -2,11 +2,9 @@
-
- ![]()
-
+ ![]()
+ value="{{$ctrl.order.landed | date: 'dd/MM/yyyy' }}">
@@ -46,32 +46,9 @@
value="{{$ctrl.order.total | currency: 'EUR': 2}}">
-
+ Indicate the reasons to deny this request
-Specify the reasons to deny this request
{{$ctrl.item.id}} - {{$ctrl.summary.item.name}}
Visible
diff --git a/modules/item/front/tags/index.js b/modules/item/front/tags/index.js index b187e5baf..c5e120d82 100644 --- a/modules/item/front/tags/index.js +++ b/modules/item/front/tags/index.js @@ -66,7 +66,7 @@ class Controller { this.$scope.watcher.check(); this.$scope.model.save().then(() => { this.$scope.watcher.notifySaved(); - this.$scope.model.refresh(); + this.$scope.watcher.updateOriginalData(); this.card.reload(); }); } diff --git a/modules/order/front/descriptor/index.html b/modules/order/front/descriptor/index.html index dcc9b16de..fd83d5c71 100644 --- a/modules/order/front/descriptor/index.html +++ b/modules/order/front/descriptor/index.html @@ -31,7 +31,7 @@ value="{{$ctrl.order.client.salesPerson.user.nickname}}">