{{::$ctrl.client.id}}
- {{$ctrl.client.name}}
- {{$ctrl.client.phone}}
- {{$ctrl.client.name}}
- Client id: {{$ctrl.client.id}}
- Phone: {{$ctrl.client.phone | phone}}
- Town/City: {{$ctrl.client.city}}
- Email: {{$ctrl.client.email}}
+
+ {{::$ctrl.client.name}}
+ Client id: {{::$ctrl.client.id}}
+ Phone: {{::$ctrl.client.phone | phone}}
+ Town/City: {{::$ctrl.client.city}}
+ Email: {{::$ctrl.client.email}}
diff --git a/client/client/src/index/locale/es.json b/client/client/src/index/locale/es.json
deleted file mode 100644
index 8b063f658..000000000
--- a/client/client/src/index/locale/es.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "Client id": "Id cliente",
- "Phone": "Teléfono",
- "Town/City": "Ciudad",
- "Email": "Correo electrónico",
- "Create client": "Crear cliente"
-}
\ No newline at end of file
diff --git a/client/client/src/index/locale/es.yml b/client/client/src/index/locale/es.yml
new file mode 100644
index 000000000..c221de7f6
--- /dev/null
+++ b/client/client/src/index/locale/es.yml
@@ -0,0 +1,5 @@
+Client id: Id cliente
+Phone: Teléfono
+Town/City: Ciudad
+Email: Correo electrónico
+Create client: Crear cliente
\ No newline at end of file
diff --git a/client/client/src/index/style.css b/client/client/src/index/style.css
index b30351f09..123a0bf97 100644
--- a/client/client/src/index/style.css
+++ b/client/client/src/index/style.css
@@ -12,5 +12,5 @@ vn-item-client a:hover {
}
.vn-item-client-name {
- font-family: raleway-bold;
+ font-family: vn-font-bold;
}
diff --git a/client/client/src/locale/en.json b/client/client/src/locale/en.json
deleted file mode 100644
index 78e01b929..000000000
--- a/client/client/src/locale/en.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "Client": "Client",
- "Clients": "Clients"
-}
\ No newline at end of file
diff --git a/client/client/src/locale/en.yml b/client/client/src/locale/en.yml
new file mode 100644
index 000000000..3dec4a7ed
--- /dev/null
+++ b/client/client/src/locale/en.yml
@@ -0,0 +1,2 @@
+Client: Client
+Clients: Clients
\ No newline at end of file
diff --git a/client/client/src/locale/es.json b/client/client/src/locale/es.json
deleted file mode 100644
index 20089e85c..000000000
--- a/client/client/src/locale/es.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "Client": "Cliente",
- "Clients": "Clientes",
- "Fiscal data": "Datos Fiscales",
- "Has to invoice": "Factura",
- "Invoice by mail": "Factura impresa",
- "Country": "País",
- "Street": "Domicilio fiscal",
- "City": "Municipio",
- "Postcode": "Código postal",
- "Province": "Provincia",
- "Save": "Guardar",
- "Pay method" : "Forma de pago"
-}
diff --git a/client/client/src/locale/es.yml b/client/client/src/locale/es.yml
new file mode 100644
index 000000000..bb2984d9b
--- /dev/null
+++ b/client/client/src/locale/es.yml
@@ -0,0 +1,23 @@
+Active: Activo
+Client: Cliente
+Clients: Clientes
+Basic data: Datos básicos
+Fiscal data: Datos Fiscales
+Addresses: Consignatarios
+Web access: Acceso web
+Notes: Notas
+Has to invoice: Factura
+Invoice by mail: Factura impresa
+Country: País
+Street: Domicilio fiscal
+City: Municipio
+Postcode: Código postal
+Province: Provincia
+Save: Guardar
+Pay method : Forma de pago
+Address: Consignatario
+Credit : Crédito
+Secured credit: Crédito asegurado
+Verified data: Datos comprobados
+Mandate: Mandato
+Amount: Importe
\ No newline at end of file
diff --git a/client/client/src/mandate/locale/es.yml b/client/client/src/mandate/locale/es.yml
new file mode 100644
index 000000000..545707023
--- /dev/null
+++ b/client/client/src/mandate/locale/es.yml
@@ -0,0 +1,3 @@
+Company: Empresa
+Register date: Fecha alta
+End date: Fecha baja
\ No newline at end of file
diff --git a/client/client/src/mandate/mandate.html b/client/client/src/mandate/mandate.html
new file mode 100644
index 000000000..f129da64b
--- /dev/null
+++ b/client/client/src/mandate/mandate.html
@@ -0,0 +1,31 @@
+{{::n.created | date:'dd/MM/yyyy HH:mm'}}
- {{::n.employee.name}}
- {{::n.text}}
-
-
-
- {{::$ctrl.text}}
+
+
+ {{::$ctrl.text}}
-
-
+
-
+
+
-
-
+
+
+
\ No newline at end of file
diff --git a/client/core/src/drop-down/drop-down.js b/client/core/src/drop-down/drop-down.js
index 90a02e857..5a3666651 100644
--- a/client/core/src/drop-down/drop-down.js
+++ b/client/core/src/drop-down/drop-down.js
@@ -1,5 +1,6 @@
import {module} from '../module';
import './style.scss';
+import validKey from '../lib/keyCodes';
export default class DropDown {
constructor($element, $filter, $timeout) {
@@ -7,26 +8,36 @@ export default class DropDown {
this.$filter = $filter;
this.$timeout = $timeout;
- this.parent = this.parent || $element[0].parentNode;
this._search = null;
this.itemsFiltered = [];
this._activeOption = -1;
this._focusingFilter = false;
+ this._tryToShow = 0;
}
+
+ get container() {
+ return this.$element[0].querySelector('ul.dropdown');
+ }
+
get show() {
return this._show;
}
set show(value) {
let oldValue = this.show;
- this._show = value;
- if (value && !this._focusingFilter && oldValue !== value && this.filter) {
- let inputFilterSearch = this.$element[0].querySelector('input');
- this._focusingFilter = true;
+ // It wait up to 1 second if the dropdown opens but there is no data to show
+ if (value && !oldValue && !this.itemsFiltered.length && this._tryToShow < 4) {
this.$timeout(() => {
- inputFilterSearch.focus();
- this._focusingFilter = false;
+ this._tryToShow++;
+ this.show = true;
+ if (this.activeOption === -1) {
+ this.activeOption = 0;
+ }
}, 250);
+ } else {
+ this._tryToShow = 0;
+ this._show = value;
+ this._toggleDropDown(value, oldValue);
}
}
@@ -51,18 +62,92 @@ export default class DropDown {
set activeOption(value) {
if (value < 0) {
value = 0;
- } else if (value >= this.items.length) {
- value = this.showLoadMore ? this.items.length : this.items.length - 1;
+ } else if (value >= this.itemsFiltered.length) {
+ value = this.showLoadMore ? this.itemsFiltered.length : this.itemsFiltered.length - 1;
}
this.$timeout(() => {
this._activeOption = value;
- // AutoLoad items with "scroll" (1st version):
- if (value && value >= this.items.length - 3 && !this.removeLoadMore) {
+ if (value && value >= this.itemsFiltered.length - 3 && !this.removeLoadMore) {
this.loadItems();
}
});
}
+ _toggleDropDown(value, oldValue) {
+ this.$timeout(() => {
+ this._eventScroll(value);
+ this._calculatePosition(value, oldValue);
+ });
+ }
+
+ _eventScroll(add, num) {
+ let count = num || 0;
+ if (add) {
+ if (this.container) {
+ this.container.addEventListener('scroll', e => this.loadFromScroll(e));
+ // this.$timeout(() => { // falla al entrar por primera vez xq pierde el foco y cierra el dropdown
+ // this._setFocusInFilterInput();
+ // });
+ } else if (count < 4) {
+ count++;
+ this.$timeout(() => { // wait angular ngIf
+ this._eventScroll(add, count);
+ }, 250);
+ }
+ } else if (this.container) {
+ this.container.removeEventListener('scroll', e => this.loadFromScroll(e));
+ }
+ }
+
+ _setFocusInFilterInput() {
+ let inputFilterSearch = this.$element[0].querySelector('input');
+ this._focusingFilter = true;
+ if (inputFilterSearch)
+ this.$timeout(() => {
+ inputFilterSearch.focus();
+ this._focusingFilter = false;
+ }, 250);
+ }
+
+ _background(create) {
+ let el = document.getElementById('ddBack');
+ if (el) {
+ el.parentNode.removeChild(el);
+ }
+
+ if (create) {
+ el = document.createElement('div');
+ el.id = 'ddBack';
+ document.body.appendChild(el);
+ }
+ }
+ _calculatePosition(value, oldValue) {
+ if (value && !oldValue) {
+ if (this.parent === undefined) {
+ this.parent = this.$element.parent().parent();
+ }
+
+ let parentRect = this.parent.getBoundingClientRect();
+ let elemetRect = this.$element[0].getBoundingClientRect();
+ let instOffset = parentRect.bottom + elemetRect.height;
+
+ if (instOffset >= window.innerHeight) {
+ this._background(true);
+ this.$element.addClass('fixed-dropDown');
+ this.$element.css('top', `${(parentRect.top - elemetRect.height)}px`);
+ this.$element.css('left', `${(parentRect.x)}px`);
+ this.$element.css('height', `${elemetRect.height}px`);
+ }
+ } else if (!value && oldValue) {
+ this.$element.removeAttr('style');
+ if (this.itemWidth) {
+ this.$element.css('width', this.itemWidth + 'px');
+ }
+ this.$element.removeClass('fixed-dropDown');
+ this._background();
+ }
+ }
+
filterItems() {
this.itemsFiltered = this.search ? this.$filter('filter')(this.items, this.search) : this.items;
}
@@ -73,18 +158,6 @@ export default class DropDown {
}
}
- $onChanges(changesObj) {
- if (changesObj.show && changesObj.top && changesObj.top.currentValue) {
- this.$element.css('top', changesObj.top.currentValue + 'px');
- }
- if (changesObj.show && changesObj.itemWidth && changesObj.itemWidth.currentValue) {
- this.$element.css('width', changesObj.itemWidth.currentValue + 'px');
- }
- if (changesObj.items) {
- this.filterItems();
- }
- }
-
clearSearch() {
this.search = null;
}
@@ -101,42 +174,55 @@ export default class DropDown {
onKeydown(event) {
if (this.show) {
- switch (event.keyCode) {
- case 13: // Enter
+ if (event.keyCode === 13) { // Enter
this.$timeout(() => {
this.selectOption();
});
event.preventDefault();
- break;
- case 27: // Escape
+ } else if (event.keyCode === 27) { // Escape
this.clearSearch();
- break;
- case 38: // Arrow up
+ } else if (event.keyCode === 38) { // Arrow up
this.activeOption--;
this.$timeout(() => {
this.setScrollPosition();
}, 100);
- break;
- case 40: // Arrow down
+ } else if (event.keyCode === 40) { // Arrow down
this.activeOption++;
this.$timeout(() => {
this.setScrollPosition();
}, 100);
- break;
- default:
- return;
+ } else if (event.keyCode === 35) { // End
+ this.activeOption = this.itemsFiltered.length - 1;
+ this.$timeout(() => {
+ this.setScrollPosition();
+ }, 100);
+ } else if (event.keyCode === 36) { // Start
+ this.activeOption = 0;
+ this.$timeout(() => {
+ this.setScrollPosition();
+ }, 100);
+ } else if (this.filter) {
+ let oldValue = this.search || '';
+ if (validKey(event)) {
+ this.search = oldValue + String.fromCharCode(event.keyCode);
+ } else if (event.keyCode === 8) { // backSpace
+ this.search = oldValue.slice(0, -1);
+ }
+ } /* else {
+ console.error(`Error: keyCode ${event.keyCode} not supported`);
+ } */
+ }
+ }
+ setScrollPosition() {
+ let child = this.$element[0].querySelector('ul.dropdown li.active');
+ if (child) {
+ let childRect = child.getBoundingClientRect();
+ let containerRect = this.container.getBoundingClientRect();
+ if (typeof child.scrollIntoView === 'function' && (childRect.top > containerRect.top + containerRect.height || childRect.top < containerRect.top)) {
+ child.scrollIntoView();
}
}
}
-
- setScrollPosition() {
- let dropdown = this.$element[0].querySelector('ul.dropdown');
- let child = dropdown ? dropdown.childNodes[this.activeOption] : null;
- if (child && typeof child.scrollIntoView === 'function') {
- child.scrollIntoView();
- }
- }
-
selectItem(item) {
this.selected = item;
if (this.multiple) {
@@ -146,14 +232,26 @@ export default class DropDown {
this.show = false;
}
}
-
loadItems() {
if (this.showLoadMore && this.loadMore) {
this.loadMore();
}
this.show = true;
}
-
+ loadFromScroll(e) {
+ let containerRect = e.target.getBoundingClientRect();
+ if (e.target.scrollHeight - e.target.scrollTop - containerRect.height <= 50) {
+ this.loadItems();
+ }
+ }
+ $onChanges(changesObj) {
+ if (changesObj.show && changesObj.itemWidth && changesObj.itemWidth.currentValue) {
+ this.$element.css('width', changesObj.itemWidth.currentValue + 'px');
+ }
+ if (changesObj.items) {
+ this.filterItems();
+ }
+ }
$onInit() {
if (this.parent)
this.parent.addEventListener('keydown', e => this.onKeydown(e));
@@ -179,7 +277,6 @@ module.component('vnDropDown', {
removeLoadMore: ' {
angular.mock.module('client');
});
- beforeEach(angular.mock.inject((_$componentController_, _$timeout_, _$filter_) => {
+ beforeEach(angular.mock.inject((_$componentController_, _$timeout_, _$filter_, _$httpBackend_) => {
+ _$httpBackend_.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({});
$componentController = _$componentController_;
$element = angular.element('');
$timeout = _$timeout_;
$filter = _$filter_;
controller = $componentController('vnDropDown', {$element, $timeout, $filter});
+ controller.parent = angular.element('
-
-
+
{
this.$timeout(() => {
- this.showDropDown = true;
+ this.mouseFocus = true;
+ this.showDropDown = this.focused;
});
});
this.$element.bind('mouseout', () => {
this.$timeout(() => {
- this.showDropDown = false;
+ this.mouseFocus = false;
+ this.showDropDown = this.focused;
});
});
this.$element.bind('focusin', e => {
this.$timeout(() => {
+ this.focused = true;
this.showDropDown = true;
});
});
this.$element.bind('focusout', e => {
this.$timeout(() => {
- this.showDropDown = false;
+ this.focused = false;
+ this.showDropDown = this.mouseFocus;
});
});
}
diff --git a/client/core/src/icon-menu/icon-menu.spec.js b/client/core/src/icon-menu/icon-menu.spec.js
index 548a1fca5..11be1ff62 100644
--- a/client/core/src/icon-menu/icon-menu.spec.js
+++ b/client/core/src/icon-menu/icon-menu.spec.js
@@ -15,6 +15,7 @@ describe('Component vnIconMenu', () => {
beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_, _$timeout_) => {
$componentController = _$componentController_;
$httpBackend = _$httpBackend_;
+ $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({});
$timeout = _$timeout_;
$scope = $rootScope.$new();
$element = angular.element('');
diff --git a/client/core/src/lib/app.js b/client/core/src/lib/app.js
index dd6ef1f09..c3676de77 100644
--- a/client/core/src/lib/app.js
+++ b/client/core/src/lib/app.js
@@ -7,8 +7,13 @@ import {module} from '../module';
* @property {Snackbar} snackbar The main object to show messages.
*/
export default class App {
+ constructor($rootScope) {
+ this.loaderStatus = 0;
+ this.$rootScope = $rootScope;
+ }
show(message) {
- if (this.snackbar) this.snackbar.show({message: message});
+ this.timeout = window.snackbarTimeout || 2000;
+ if (this.snackbar) this.snackbar.show({message: message, timeout: this.timeout});
}
showMessage(message) {
this.show(message);
@@ -16,5 +21,17 @@ export default class App {
showError(message) {
this.show(`Error: ${message}`);
}
+ pushLoader() {
+ this.loaderStatus++;
+ if (this.loaderStatus === 1)
+ this.$rootScope.loading = true;
+ }
+ popLoader() {
+ this.loaderStatus--;
+ if (this.loaderStatus === 0)
+ this.$rootScope.loading = false;
+ }
}
+App.$inject = ['$rootScope'];
+
module.service('vnApp', App);
diff --git a/client/core/src/lib/crud.js b/client/core/src/lib/crud.js
index df5c5d062..fe2c39af2 100644
--- a/client/core/src/lib/crud.js
+++ b/client/core/src/lib/crud.js
@@ -8,6 +8,14 @@ function index(mgIndex) {
}
module.factory('vnIndex', index);
+nonAuto.$inject = ['mgIndex'];
+function nonAuto(mgIndex) {
+ return Object.assign({}, mgIndex, {
+ auto: false
+ });
+}
+module.factory('vnIndexNonAuto', nonAuto);
+
successFactoryCreate.$inject = ['mgSuccessFactoryCreate'];
function successFactoryCreate(create) {
return Object.assign({}, create, {
diff --git a/client/core/src/lib/fullEmpty.js b/client/core/src/lib/fullEmpty.js
new file mode 100644
index 000000000..86c8e6bce
--- /dev/null
+++ b/client/core/src/lib/fullEmpty.js
@@ -0,0 +1,9 @@
+import {module} from '../module';
+
+const isFullEmpty = item => {
+ return (item === null || item === undefined) || (typeof item === 'object' && !Object.keys(item).length);
+};
+
+export default isFullEmpty;
+export const NAME = 'isFullEmpty';
+module.value(NAME, isFullEmpty);
diff --git a/client/core/src/lib/index.js b/client/core/src/lib/index.js
index a081b5f87..46c4e4882 100644
--- a/client/core/src/lib/index.js
+++ b/client/core/src/lib/index.js
@@ -14,3 +14,4 @@ export {NAME as INTERPOLATE, Interpolate} from './interpolate';
export {NAME as COPY_OBJECT} from './copy';
export {NAME as EQUALS_OBJECT} from './equals';
export {NAME as GET_DATA_MODIFIED, factory as Modified} from './modified';
+export {NAME as VALID_KEY} from './keyCodes';
diff --git a/client/core/src/lib/input.js b/client/core/src/lib/input.js
new file mode 100644
index 000000000..8db191c33
--- /dev/null
+++ b/client/core/src/lib/input.js
@@ -0,0 +1,13 @@
+import Component from './component';
+
+/**
+ * Component that host an input.
+ */
+export default class Input extends Component {
+ select() {
+ this.input.select();
+ }
+ focus() {
+ this.input.focus();
+ }
+}
diff --git a/client/core/src/lib/interceptor.js b/client/core/src/lib/interceptor.js
index 9cd97d78a..6d9266018 100644
--- a/client/core/src/lib/interceptor.js
+++ b/client/core/src/lib/interceptor.js
@@ -1,11 +1,10 @@
import {module} from '../module';
-interceptor.$inject = ['$q', '$rootScope', '$window', 'vnApp', '$translate', '$cookies'];
-function interceptor($q, $rootScope, $window, vnApp, $translate, $cookies) {
- $rootScope.loading = false;
+interceptor.$inject = ['$q', '$window', 'vnApp', '$translate', '$cookies'];
+function interceptor($q, $window, vnApp, $translate, $cookies) {
return {
request: function(config) {
- $rootScope.loading = true;
+ vnApp.pushLoader();
let token = $cookies.get('vnToken');
if (token)
@@ -23,11 +22,11 @@ function interceptor($q, $rootScope, $window, vnApp, $translate, $cookies) {
case 'PATCH':
vnApp.showMessage($translate.instant('Data saved!'));
}
- $rootScope.loading = false;
+ vnApp.popLoader();
return response;
},
responseError: function(rejection) {
- $rootScope.loading = false;
+ vnApp.popLoader();
let data = rejection.data;
let error;
diff --git a/client/core/src/lib/keyCodes.js b/client/core/src/lib/keyCodes.js
new file mode 100644
index 000000000..9586868ec
--- /dev/null
+++ b/client/core/src/lib/keyCodes.js
@@ -0,0 +1,19 @@
+import {module} from '../module';
+
+const validKey = key => {
+ let keycode = key.keyCode || key;
+
+ let valid =
+ (keycode > 47 && keycode < 58) || // number keys
+ (keycode > 64 && keycode < 91) || // letter keys
+ (keycode > 95 && keycode < 112) || // numpad keys
+ (keycode > 185 && keycode < 193) || // ;=,-./` (in order)
+ (keycode > 218 && keycode < 223); // [\]' (in order)
+
+ return valid;
+};
+
+export default validKey;
+
+export const NAME = 'validKey';
+module.value(NAME, validKey);
diff --git a/client/core/src/lib/modified.js b/client/core/src/lib/modified.js
index 79f725633..f62bc91ae 100644
--- a/client/core/src/lib/modified.js
+++ b/client/core/src/lib/modified.js
@@ -3,6 +3,9 @@ import isEqual from './equals';
export default function getModifiedData(object, objectOld) {
var newObject = {};
+ if (objectOld === null) {
+ return object;
+ }
for (var k in object) {
var val = object[k];
var valOld = objectOld[k] === undefined ? null : objectOld[k];
diff --git a/client/core/src/lib/moduleLoader.js b/client/core/src/lib/moduleLoader.js
index 3408afe31..82d671454 100644
--- a/client/core/src/lib/moduleLoader.js
+++ b/client/core/src/lib/moduleLoader.js
@@ -1,59 +1,59 @@
import {module} from '../module';
import splitingRegister from './splitingRegister';
-factory.$inject = ['$translatePartialLoader', '$http', '$window', '$ocLazyLoad', '$q', '$translate'];
-export function factory($translatePartialLoader, $http, $window, $ocLazyLoad, $q, $translate) {
+factory.$inject = ['$http', '$window', '$ocLazyLoad', '$translatePartialLoader', '$translate'];
+export function factory($http, $window, $ocLazyLoad, $translatePartialLoader, $translate) {
class ModuleLoader {
constructor() {
- this._loadedModules = {};
+ this._loaded = {};
}
load(moduleName, validations) {
- if (this._loadedModules[moduleName])
- return;
+ let loaded = this._loaded;
- this._loadedModules[moduleName] = true;
+ if (loaded[moduleName])
+ return loaded[moduleName];
+
+ loaded[moduleName] = Promise.resolve(true);
let deps = splitingRegister.getDependencies(moduleName);
- let modules = splitingRegister.modules;
- let promises = [];
+ let depPromises = [];
+
+ if (deps)
+ for (let dep of deps)
+ depPromises.push(this.load(dep, validations));
+
+ loaded[moduleName] = new Promise((resolve, reject) => {
+ Promise.all(depPromises)
+ .then(() => {
+ let promises = [];
+
+ // FIXME: https://github.com/angular-translate/angular-translate/pull/1674
+ $translatePartialLoader.addPart(moduleName);
+ promises.push($translate.refresh());
+
+ if (validations)
+ promises.push(new Promise(resolve => {
+ $http.get(`/${moduleName}/validations`).then(
+ json => this.onValidationsReady(json, resolve),
+ json => resolve()
+ );
+ }));
- for (let dep of deps) {
- this._loadedModules[dep] = true;
- promises.push(modules[dep]());
- if (validations)
promises.push(new Promise(resolve => {
- $http.get(`/${dep}/validations`).then(
- json => this.onValidationsReady(json, resolve),
- json => resolve()
- );
+ splitingRegister.modules[moduleName](resolve);
}));
- $translatePartialLoader.addPart(dep);
- // FIXME: https://github.com/angular-translate/angular-translate/pull/1674
- // promises.push($translate.refresh());
- setTimeout(() => $translate.refresh(), 500);
- }
-
- let ocDeps = deps.map(item => {
- return {name: item};
+ Promise.all(promises)
+ .then(() => {
+ this._loaded[moduleName] = true;
+ resolve($ocLazyLoad.load({name: moduleName}));
+ })
+ .catch(reject);
+ })
+ .catch(reject);
});
- return new Promise(resolve => {
- Promise.all(promises).then(
- () => resolve($ocLazyLoad.load(ocDeps))
- );
- });
- }
- parseValidation(val) {
- switch (val.validation) {
- case 'custom':
- // TODO: Reemplazar eval
- val.bindedFunction = eval(`(${val.bindedFunction})`);
- break;
- case 'format':
- val.with = new RegExp(val.with);
- break;
- }
+ return loaded[moduleName];
}
onValidationsReady(json, resolve) {
let entities = json.data;
@@ -69,6 +69,17 @@ export function factory($translatePartialLoader, $http, $window, $ocLazyLoad, $q
Object.assign($window.validations, json.data);
resolve();
}
+ parseValidation(val) {
+ switch (val.validation) {
+ case 'custom':
+ // TODO: Replace eval
+ val.bindedFunction = eval(`(${val.bindedFunction})`);
+ break;
+ case 'format':
+ val.with = new RegExp(val.with);
+ break;
+ }
+ }
}
return new ModuleLoader();
diff --git a/client/core/src/lib/specs/aclService.spec.js b/client/core/src/lib/specs/aclService.spec.js
new file mode 100644
index 000000000..45a820acc
--- /dev/null
+++ b/client/core/src/lib/specs/aclService.spec.js
@@ -0,0 +1,50 @@
+describe('Service acl', () => {
+ let aclService;
+
+ beforeEach(() => {
+ angular.mock.module('vnCore');
+ });
+
+ beforeEach(angular.mock.module($provide => {
+ $provide.value('aclConstant', {});
+ }));
+
+ beforeEach(inject((_aclService_, $httpBackend) => {
+ aclService = _aclService_;
+ }));
+
+ it("should return false as the service doesn't have roles", () => {
+ expect(aclService.routeHasPermission('http://www.verdnatura.es')).toBeFalsy();
+ });
+
+ it("should return true as the service has roles but the route has no acl", () => {
+ aclService.roles = {customer: true};
+
+ expect(aclService.routeHasPermission('http://www.verdnatura.es')).toBeTruthy();
+ });
+
+ it("should return false as the service roles have no length", () => {
+ aclService.roles = {};
+ let route = {url: 'http://www.verdnatura.es', acl: []};
+
+ expect(aclService.routeHasPermission(route)).toBeFalsy();
+ });
+
+ it("should call the service aclPermission() function and return false as the service has roles and the rote has acl without length", () => {
+ aclService.roles = {customer: true, employee: true};
+ let route = {url: 'http://www.verdnatura.es', acl: []};
+ spyOn(aclService, 'aclPermission').and.callThrough();
+
+ expect(aclService.routeHasPermission(route)).toBeFalsy();
+ expect(aclService.aclPermission).toHaveBeenCalledWith(route.acl);
+ });
+
+ it("should call the service aclPermission() function to return true as the service has roles matching with the ones in acl", () => {
+ aclService.roles = {customer: true, employee: true};
+ let route = {url: 'http://www.verdnatura.es', acl: ['customer']};
+ spyOn(aclService, 'aclPermission').and.callThrough();
+
+ expect(aclService.routeHasPermission(route)).toBeTruthy();
+ expect(aclService.aclPermission).toHaveBeenCalledWith(route.acl);
+ });
+});
diff --git a/client/core/src/lib/splitingRegister.js b/client/core/src/lib/splitingRegister.js
index 60c52f0bc..d6af3de64 100644
--- a/client/core/src/lib/splitingRegister.js
+++ b/client/core/src/lib/splitingRegister.js
@@ -1,29 +1,11 @@
class SplitingRegister {
constructor() {
- this._graph = null;
- this._modules = {};
+ this.graph = null;
+ this.modules = {};
}
- get modules() {
- return this._modules;
- }
- getDependencies(dependency) {
- var array = [];
- array.push(dependency);
- var first = this._graph[dependency];
-
- if (first)
- while (first.length > 0) {
- dependency = first.shift();
- array = array.concat(this.getDependencies(dependency));
- }
- return array;
- }
- registerGraph(graph) {
- this._graph = graph;
- }
- register(moduleName, loader) {
- this._modules[moduleName] = loader;
+ getDependencies(moduleName) {
+ return this.graph[moduleName];
}
}
diff --git a/client/core/src/lib/validator.js b/client/core/src/lib/validator.js
index d31fa9e36..9f8d6d53f 100644
--- a/client/core/src/lib/validator.js
+++ b/client/core/src/lib/validator.js
@@ -1,20 +1,21 @@
import {validator} from 'vendor';
export const validators = {
- presence: function(value, conf) {
- if (validator.isEmpty(value))
+ presence: value => {
+ if (validator.isEmpty(value ? String(value) : ''))
throw new Error(`Value can't be empty`);
},
- absence: function(value, conf) {
+ absence: value => {
if (!validator.isEmpty(value))
throw new Error(`Value should be empty`);
},
- length: function(value, conf) {
+ length: (value, conf) => {
let options = {
min: conf.min || conf.is,
max: conf.max || conf.is
};
- if (!validator.isLength(value, options)) {
+ let val = value ? String(value) : '';
+ if (!validator.isLength(val, options)) {
if (conf.is) {
throw new Error(`Value should be ${conf.is} characters long`);
} else if (conf.min && conf.max) {
@@ -26,26 +27,26 @@ export const validators = {
}
}
},
- numericality: function(value, conf) {
+ numericality: (value, conf) => {
if (conf.int) {
if (!validator.isInt(value))
throw new Error(`Value should be integer`);
} else if (!validator.isNumeric(value))
throw new Error(`Value should be a number`);
},
- inclusion: function(value, conf) {
+ inclusion: (value, conf) => {
if (!validator.isIn(value, conf.in))
throw new Error(`Invalid value`);
},
- exclusion: function(value, conf) {
+ exclusion: (value, conf) => {
if (validator.isIn(value, conf.in))
throw new Error(`Invalid value`);
},
- format: function(value, conf) {
+ format: (value, conf) => {
if (!validator.matches(value, conf.with))
throw new Error(`Invalid value`);
},
- custom: function(value, conf) {
+ custom: (value, conf) => {
if (!conf.bindedFunction(value))
throw new Error(`Invalid value`);
}
@@ -73,7 +74,7 @@ export function validate(value, conf) {
try {
checkNull(value, conf);
- if (validator && value != null)
+ if (validator) // && value != null ??
validator(value, conf);
} catch (e) {
let message = conf.message ? conf.message : e.message;
diff --git a/client/core/src/locale/en.json b/client/core/src/locale/en.json
deleted file mode 100644
index bcfbdd6d6..000000000
--- a/client/core/src/locale/en.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Accept": "Accept",
- "Cancel": "Cancel",
- "Close": "Close",
- "Clear": "Clear",
- "Save": "Save",
- "Add": "Add",
- "Search": "Search"
-}
\ No newline at end of file
diff --git a/client/core/src/locale/en.yml b/client/core/src/locale/en.yml
new file mode 100644
index 000000000..3fe077dcb
--- /dev/null
+++ b/client/core/src/locale/en.yml
@@ -0,0 +1,7 @@
+Accept: Accept
+Cancel: Cancel
+Close: Close
+Clear: Clear
+Save: Save
+Add: Add
+Search: Search
\ No newline at end of file
diff --git a/client/core/src/locale/es.json b/client/core/src/locale/es.json
deleted file mode 100644
index 8a44ead1c..000000000
--- a/client/core/src/locale/es.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "Accept": "Aceptar",
- "Cancel": "Cancelar",
- "Close": "Cerrar",
- "Clear": "Borrar",
- "Save": "Guardar",
- "Add": "Añadir",
- "Search": "Buscar",
- "Show More": "Ver más",
- "No more results" : "No hay más resultados"
-}
\ No newline at end of file
diff --git a/client/core/src/locale/es.yml b/client/core/src/locale/es.yml
new file mode 100644
index 000000000..bd2e3ee86
--- /dev/null
+++ b/client/core/src/locale/es.yml
@@ -0,0 +1,9 @@
+Accept: Aceptar
+Cancel: Cancelar
+Close: Cerrar
+Clear: Borrar
+Save: Guardar
+Add: Añadir
+Search: Buscar
+Show More: Ver más
+No more results : No hay más resultados
\ No newline at end of file
diff --git a/client/core/src/mdl-override.css b/client/core/src/mdl-override.css
index 83043a144..3a1f391a2 100644
--- a/client/core/src/mdl-override.css
+++ b/client/core/src/mdl-override.css
@@ -1,60 +1,60 @@
-/**
- * Rewrited CSS rules from Material Design Lite.
- * TODO: don't use !important
- */
-
-.mdl-textfield {
- width: 100%;
-}
-
-.mdl-button {
- font-weight: bolder;
- color: #ffa410;
-}
-.mdl-button--colored {
- color: white !important;
-}
-.mdl-button--colored,
-.mdl-button--colored:focus,
-.mdl-button--colored:active {
- background-color: #ffa410 !important;
-}
-.mdl-button--colored:hover,
-.mdl-button--raised:hover {
- background-color: #ffa410 !important;
-}
-.mdl-button--fab{
- color: white !important;
- background-color: #ff9400 !important;
-}
-
-.mdl-dialog__actions--full-width>*{
- text-align: center;
-}
-
-.mdl-dialog{
- width: 400px;
- font-family: raleway-regular;
- line-height:60px;
- text-align: center;
-}
-
-.mdl-textfield__error {
- visibility: visible;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- width: 100%;
-}
-.mdl-textfield.invalid .mdl-textfield__input {
- border-color: #d50000;
- box-shadow: none;
-}
-.mdl-textfield.invalid .mdl-textfield__label::after {
- background-color: #d50000;
-}
-.mdl-textfield--floating-label.invalid .mdl-textfield__label {
- color: #d50000;
- font-size: 12px;
- top: 4px;
-}
+/**
+ * Rewrited CSS rules from Material Design Lite.
+ * TODO: don't use !important
+ */
+
+.mdl-textfield {
+ width: 100%;
+}
+
+.mdl-button {
+ font-weight: bolder;
+ color: #ffa410;
+}
+.mdl-button--colored {
+ color: white !important;
+}
+.mdl-button--colored,
+.mdl-button--colored:focus,
+.mdl-button--colored:active {
+ background-color: #ffa410 !important;
+}
+.mdl-button--colored:hover,
+.mdl-button--raised:hover {
+ background-color: #ffa410 !important;
+}
+.mdl-button--fab{
+ color: white !important;
+ background-color: #ff9400 !important;
+}
+
+.mdl-dialog__actions--full-width>*{
+ text-align: center;
+}
+
+.mdl-dialog{
+ width: 400px;
+ font-family: vn-font;
+ line-height:60px;
+ text-align: center;
+}
+
+.mdl-textfield__error {
+ visibility: visible;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ width: 100%;
+}
+.mdl-textfield.invalid .mdl-textfield__input {
+ border-color: #d50000;
+ box-shadow: none;
+}
+.mdl-textfield.invalid .mdl-textfield__label::after {
+ background-color: #d50000;
+}
+.mdl-textfield--floating-label.invalid .mdl-textfield__label {
+ color: #d50000;
+ font-size: 12px;
+ top: 4px;
+}
diff --git a/client/core/src/textfield/style.scss b/client/core/src/textfield/style.scss
index aafeee204..0f9d95c8e 100644
--- a/client/core/src/textfield/style.scss
+++ b/client/core/src/textfield/style.scss
@@ -7,12 +7,18 @@ vn-textfield {
width: auto;
top: 0px;
right: -6px;
- margin: 22px 0px;
- background-color: white;
+ margin: 21px 0px;
+ background: white;
+ opacity: 1;
+ z-index: 9999;
+ color: #aaa;
}
.material-icons {
font-size: 18px;
float: right;
- margin-right: 5px;
+ margin-right: 5px;
+ }
+ .material-icons:hover {
+ color: rgba(0,0,0, .87);
}
}
\ No newline at end of file
diff --git a/client/core/src/textfield/textfield.html b/client/core/src/textfield/textfield.html
index 3b8f24e1e..e709c835d 100644
--- a/client/core/src/textfield/textfield.html
+++ b/client/core/src/textfield/textfield.html
@@ -1,11 +1,7 @@
+
+ Item barcode
+
+
\ No newline at end of file
diff --git a/client/item/src/barcode/item-barcode.js b/client/item/src/barcode/item-barcode.js
new file mode 100644
index 000000000..850c262b8
--- /dev/null
+++ b/client/item/src/barcode/item-barcode.js
@@ -0,0 +1,5 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemBarcode', {
+ template: require('./item-barcode.html')
+});
diff --git a/client/item/src/botanical/item-botanical.html b/client/item/src/botanical/item-botanical.html
new file mode 100644
index 000000000..36cd49f8f
--- /dev/null
+++ b/client/item/src/botanical/item-botanical.html
@@ -0,0 +1,5 @@
+
+
+ Botanical
+
+
\ No newline at end of file
diff --git a/client/item/src/botanical/item-botanical.js b/client/item/src/botanical/item-botanical.js
new file mode 100644
index 000000000..8bd744e53
--- /dev/null
+++ b/client/item/src/botanical/item-botanical.js
@@ -0,0 +1,5 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemBotanical', {
+ template: require('./item-botanical.html')
+});
diff --git a/client/item/src/card/item-card.html b/client/item/src/card/item-card.html
new file mode 100644
index 000000000..6696d07fd
--- /dev/null
+++ b/client/item/src/card/item-card.html
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
diff --git a/client/item/src/card/item-card.js b/client/item/src/card/item-card.js
new file mode 100644
index 000000000..aeb921651
--- /dev/null
+++ b/client/item/src/card/item-card.js
@@ -0,0 +1,35 @@
+import ngModule from '../module';
+
+class ItemCard {
+ constructor($http, $state) {
+ this.$http = $http;
+ this.$state = $state;
+ this.item = {};
+ }
+
+ $onInit() {
+ let filter = {
+ include: [
+ {relation: "itemType"},
+ {relation: "origin"},
+ {relation: "ink"},
+ {relation: "producer"},
+ {relation: "intrastat"},
+ {relation: "expence"},
+ {relation: "taxClass"},
+ {relation: "itemTag", scope: {order: "priority ASC", include: {relation: "tag"}}}
+ ]
+ };
+ this.$http.get(`/item/api/Items/${this.$state.params.id}?filter=${JSON.stringify(filter)}`).then(
+ res => {
+ this.item = res.data;
+ }
+ );
+ }
+}
+ItemCard.$inject = ['$http', '$state'];
+
+ngModule.component('vnItemCard', {
+ template: require('./item-card.html'),
+ controller: ItemCard
+});
diff --git a/client/item/src/card/item-card.spec.js b/client/item/src/card/item-card.spec.js
new file mode 100644
index 000000000..5447d007e
--- /dev/null
+++ b/client/item/src/card/item-card.spec.js
@@ -0,0 +1,33 @@
+import './item-card.js';
+
+describe('Item', () => {
+ describe('Component vnItemCard', () => {
+ let $componentController;
+ let $httpBackend;
+ let $state;
+ let controller;
+
+ beforeEach(() => {
+ angular.mock.module('item');
+ });
+
+ beforeEach(angular.mock.inject((_$componentController_, _$state_, _$httpBackend_) => {
+ $componentController = _$componentController_;
+ $httpBackend = _$httpBackend_;
+ $state = _$state_;
+ controller = $componentController('vnItemCard', {$state: $state});
+ }));
+
+ describe('$onInit()', () => {
+ it('should request to patch the propagation of tax status', () => {
+ controller.client = {id: 123, isEqualizated: false};
+ $httpBackend.whenGET('/item/api/Items/undefined?filter={"include":[{"relation":"itemType"},{"relation":"origin"},{"relation":"ink"},{"relation":"producer"},{"relation":"intrastat"},{"relation":"expence"},{"relation":"taxClass"},{"relation":"itemTag","scope":{"order":"priority ASC","include":{"relation":"tag"}}}]}').respond({data: 'item'});
+ $httpBackend.expectGET('/item/api/Items/undefined?filter={"include":[{"relation":"itemType"},{"relation":"origin"},{"relation":"ink"},{"relation":"producer"},{"relation":"intrastat"},{"relation":"expence"},{"relation":"taxClass"},{"relation":"itemTag","scope":{"order":"priority ASC","include":{"relation":"tag"}}}]}');
+ controller.$onInit();
+ $httpBackend.flush();
+
+ expect(controller.item).toEqual({data: 'item'});
+ });
+ });
+ });
+});
diff --git a/client/item/src/create/item-create.html b/client/item/src/create/item-create.html
new file mode 100644
index 000000000..d57806715
--- /dev/null
+++ b/client/item/src/create/item-create.html
@@ -0,0 +1,59 @@
+
+
+
diff --git a/client/item/src/create/item-create.js b/client/item/src/create/item-create.js
new file mode 100644
index 000000000..415e67c4f
--- /dev/null
+++ b/client/item/src/create/item-create.js
@@ -0,0 +1,23 @@
+import ngModule from '../module';
+
+class ItemCreate {
+ constructor($scope, $state) {
+ this.$ = $scope;
+ this.$state = $state;
+ this.item = {
+ relevancy: 0
+ };
+ }
+
+ onSubmit() {
+ this.$.watcher.submit().then(
+ json => this.$state.go('item.card.data', {id: json.data.id})
+ );
+ }
+}
+ItemCreate.$inject = ['$scope', '$state'];
+
+ngModule.component('vnItemCreate', {
+ template: require('./item-create.html'),
+ controller: ItemCreate
+});
diff --git a/client/item/src/create/item-create.spec.js b/client/item/src/create/item-create.spec.js
new file mode 100644
index 000000000..e63265ee7
--- /dev/null
+++ b/client/item/src/create/item-create.spec.js
@@ -0,0 +1,40 @@
+import './item-create.js';
+
+describe('Item', () => {
+ describe('Component vnItemCreate', () => {
+ let $componentController;
+ let $scope;
+ let $state;
+ let controller;
+
+ beforeEach(() => {
+ angular.mock.module('item');
+ });
+
+ beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$state_) => {
+ $componentController = _$componentController_;
+ $scope = $rootScope.$new();
+ $state = _$state_;
+ $scope.watcher = {
+ submit: () => {
+ return {
+ then: callback => {
+ callback({data: {id: 1}});
+ }
+ };
+ }
+ };
+ controller = $componentController('vnItemCreate', {$scope: $scope});
+ }));
+
+ describe('onSubmit()', () => {
+ it(`should call submit() on the watcher then expect a callback`, () => {
+ spyOn($state, 'go');
+ controller.onSubmit();
+
+ expect(controller.$state.go).toHaveBeenCalledWith('item.card.data', {id: 1});
+ });
+ });
+ });
+});
+
diff --git a/client/item/src/data/item-data.html b/client/item/src/data/item-data.html
new file mode 100644
index 000000000..16deded6c
--- /dev/null
+++ b/client/item/src/data/item-data.html
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
diff --git a/client/item/src/data/item-data.js b/client/item/src/data/item-data.js
new file mode 100644
index 000000000..6046e8dbc
--- /dev/null
+++ b/client/item/src/data/item-data.js
@@ -0,0 +1,8 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemData', {
+ template: require('./item-data.html'),
+ bindings: {
+ item: '<'
+ }
+});
diff --git a/client/item/src/descriptor/item-descriptor.html b/client/item/src/descriptor/item-descriptor.html
new file mode 100644
index 000000000..286e0c733
--- /dev/null
+++ b/client/item/src/descriptor/item-descriptor.html
@@ -0,0 +1,17 @@
+
+
+
+ ![]()
+
+
+ ![]()
+
+
+
+
+
diff --git a/client/item/src/descriptor/item-descriptor.js b/client/item/src/descriptor/item-descriptor.js
new file mode 100644
index 000000000..e2c93c484
--- /dev/null
+++ b/client/item/src/descriptor/item-descriptor.js
@@ -0,0 +1,8 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemDescriptor', {
+ template: require('./item-descriptor.html'),
+ bindings: {
+ item: '<'
+ }
+});
diff --git a/client/item/src/filter-panel/filter-panel.html b/client/item/src/filter-panel/filter-panel.html
new file mode 100644
index 000000000..607e7e7cc
--- /dev/null
+++ b/client/item/src/filter-panel/filter-panel.html
@@ -0,0 +1,58 @@
+
+
+ Item history
+
+
+
+
+ {{::itemLog.originFk}}
+ {{::itemLog.userFk}}
+ {{::itemLog.action}}
+ {{::itemLog.creationDate | date:'dd/MM/yyyy HH:mm'}}
+ {{::itemLog.description}}
+
+
+ No results
+
+
+
+
diff --git a/client/item/src/history/item-history.js b/client/item/src/history/item-history.js
new file mode 100644
index 000000000..a07503c81
--- /dev/null
+++ b/client/item/src/history/item-history.js
@@ -0,0 +1,5 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemHistory', {
+ template: require('./item-history.html')
+});
diff --git a/client/item/src/item.js b/client/item/src/item.js
new file mode 100644
index 000000000..ddfbb2d05
--- /dev/null
+++ b/client/item/src/item.js
@@ -0,0 +1,15 @@
+export * from './module';
+
+import './list/list';
+import './filter-panel/filter-panel';
+import './create/item-create';
+import './card/item-card';
+import './descriptor/item-descriptor';
+import './data/item-data';
+import './tags/item-tags';
+import './history/item-history';
+import './niche/item-niche';
+import './botanical/item-botanical';
+import './picture/item-picture';
+import './barcode/item-barcode';
+
diff --git a/client/item/src/list/item-product.html b/client/item/src/list/item-product.html
new file mode 100644
index 000000000..4fde108fd
--- /dev/null
+++ b/client/item/src/list/item-product.html
@@ -0,0 +1,14 @@
+
+
+
+ ![]()
+
+
+
+
+
diff --git a/client/item/src/list/item-product.js b/client/item/src/list/item-product.js
new file mode 100644
index 000000000..4f7c7b4e7
--- /dev/null
+++ b/client/item/src/list/item-product.js
@@ -0,0 +1,8 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemProduct', {
+ template: require('./item-product.html'),
+ bindings: {
+ item: '<'
+ }
+});
diff --git a/client/item/src/list/list.html b/client/item/src/list/list.html
new file mode 100644
index 000000000..00f498d4e
--- /dev/null
+++ b/client/item/src/list/list.html
@@ -0,0 +1,26 @@
+
+
+ Niche
+
+
\ No newline at end of file
diff --git a/client/item/src/niche/item-niche.js b/client/item/src/niche/item-niche.js
new file mode 100644
index 000000000..caa84c9ea
--- /dev/null
+++ b/client/item/src/niche/item-niche.js
@@ -0,0 +1,5 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemNiche', {
+ template: require('./item-niche.html')
+});
diff --git a/client/item/src/picture/item-picture.html b/client/item/src/picture/item-picture.html
new file mode 100644
index 000000000..93acec3c9
--- /dev/null
+++ b/client/item/src/picture/item-picture.html
@@ -0,0 +1,5 @@
+
+
+ Item pictures
+
+
\ No newline at end of file
diff --git a/client/item/src/picture/item-picture.js b/client/item/src/picture/item-picture.js
new file mode 100644
index 000000000..20fdd8499
--- /dev/null
+++ b/client/item/src/picture/item-picture.js
@@ -0,0 +1,5 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemPicture', {
+ template: require('./item-picture.html')
+});
diff --git a/client/item/src/tags/item-tags.html b/client/item/src/tags/item-tags.html
new file mode 100644
index 000000000..8f00b0b29
--- /dev/null
+++ b/client/item/src/tags/item-tags.html
@@ -0,0 +1,5 @@
+
+
+ Item tags
+
+
\ No newline at end of file
diff --git a/client/item/src/tags/item-tags.js b/client/item/src/tags/item-tags.js
new file mode 100644
index 000000000..a390820b7
--- /dev/null
+++ b/client/item/src/tags/item-tags.js
@@ -0,0 +1,5 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemTags', {
+ template: require('./item-tags.html')
+});
diff --git a/client/locator/routes.json b/client/locator/routes.json
index c76ec3365..b508fcc5f 100644
--- a/client/locator/routes.json
+++ b/client/locator/routes.json
@@ -8,7 +8,7 @@
"url": "/locator",
"state": "locator",
"component": "vn-locator-index",
- "acl": ["employee"]
+ "acl": ["developer"]
}
]
}
\ No newline at end of file
diff --git a/client/locator/src/locale/en.json b/client/locator/src/locale/en.json
deleted file mode 100644
index 9e26dfeeb..000000000
--- a/client/locator/src/locale/en.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/client/locator/src/locale/en.yml b/client/locator/src/locale/en.yml
new file mode 100644
index 000000000..8d3c81c58
--- /dev/null
+++ b/client/locator/src/locale/en.yml
@@ -0,0 +1,4 @@
+Routes locator: Routes locator
+Filter: Filter
+Store: Store
+Address: Address
\ No newline at end of file
diff --git a/client/locator/src/locale/es.json b/client/locator/src/locale/es.json
deleted file mode 100644
index e1ac63778..000000000
--- a/client/locator/src/locale/es.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "Routes locator": "Localizador de rutas",
- "Filter": "Filtro",
- "Store": "Almacén",
- "Address": "Dirección"
-}
\ No newline at end of file
diff --git a/client/locator/src/locale/es.yml b/client/locator/src/locale/es.yml
new file mode 100644
index 000000000..462c393bf
--- /dev/null
+++ b/client/locator/src/locale/es.yml
@@ -0,0 +1,4 @@
+Routes locator: Localizador de rutas
+Filter: Filtro
+Store: Almacén
+Address: Dirección
\ No newline at end of file
diff --git a/client/modules.json b/client/modules.json
deleted file mode 100644
index 62c5e11a1..000000000
--- a/client/modules.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "salix": [],
- "auth": [],
- "core": [],
- "client": [],
- "production": [],
- "route": [],
- "locator": []
-}
diff --git a/client/modules.yml b/client/modules.yml
new file mode 100644
index 000000000..0236ce1e3
--- /dev/null
+++ b/client/modules.yml
@@ -0,0 +1,8 @@
+salix: []
+auth: []
+core: []
+client: []
+production: []
+route: []
+locator: []
+item: []
diff --git a/client/production/routes.json b/client/production/routes.json
index f0348d7d7..1c3abd874 100644
--- a/client/production/routes.json
+++ b/client/production/routes.json
@@ -8,7 +8,7 @@
"url": "/production",
"state": "production",
"component": "vn-production-index",
- "acl": ["employee"]
+ "acl": ["developer"]
}
]
}
\ No newline at end of file
diff --git a/client/production/src/index/index.html b/client/production/src/index/index.html
index 5f215808d..63e899206 100644
--- a/client/production/src/index/index.html
+++ b/client/production/src/index/index.html
@@ -1,39 +1,37 @@
-
Finder
-
-
-
+
+
+
+
-
+ initial-value="$ctrl.filter.warehouseFk"
+ show-field="name"
+ value-field="id"
+ field="$ctrl.filter.warehouseFk"
+ url="/production/api/Warehouses/production"
+ on-change = "$ctrl.onChangeWareHouse(item)"
+ label="Store"
+ >
-
diff --git a/client/production/src/index/index.js b/client/production/src/index/index.js
index fff350580..bf111e9f0 100644
--- a/client/production/src/index/index.js
+++ b/client/production/src/index/index.js
@@ -2,14 +2,13 @@ import ngModule from '../module';
import './style.scss';
export default class ProductionIndex {
- constructor($element, $scope, $http, vnPopover, aclConstant) {
+ constructor($element, $scope, $http, aclConstant) {
this.$element = $element;
this.$ = $scope;
this.$http = $http;
- this.vnPopover = vnPopover;
this.filter = {};
this.tickets = [];
- this.states = [];
+
this.checkAll = 0;
this.footer = {
total: null,
@@ -17,23 +16,17 @@ export default class ProductionIndex {
meters: null
};
this._search = null;
- this.hourItems = [];
+
+ this.sharedData = {
+ states: [],
+ hourItems: []
+ };
+
this.child = undefined;
this.userProfile = aclConstant.userProfile;
this.filter.warehouseFk = this.userProfile.warehouseId;
}
- get search() {
- return this._search;
- }
- set search(value) {
- this._search = value;
- this.filter.q = value;
- if (!value) {
- this.searchTickets();
- }
- }
-
get checkAll() {
return this._checkAll;
}
@@ -42,92 +35,53 @@ export default class ProductionIndex {
}
// Actions Callbacks
- _changeState(ids, sateteId, stateName, index) {
- this.$http.put(`/production/api/TicketStates/${sateteId}/changeState`, {tickets: ids}).then(
- () => {
- index.forEach(
- val => {
- this.tickets[val].state = stateName;
- this.tickets[val].stateFk = sateteId;
- }
- );
- }
- );
- }
- _sendMessage(tickets) {
- this.$http.post(`/production/api/FakeProductions/messageSend`, {tickets: tickets}).then(
- () => {
- this.vnApp.showMessage(this.$translate.instant('Success: message send!'));
- }
- );
- }
- _changeTime(ids, time, index) {
- this.$http.put(`/production/api/Tickets/${time}/changeTime`, {tickets: ids}).then(
- () => {
- index.forEach(
- val => {
- this.tickets[val].hour = time;
- }
- );
- }
- );
+
+ _changeState(ids, stateId, stateName, index) {
+ this.$http.put(`/production/api/TicketStates/${stateId}/changeState`, {tickets: ids}).then(() => {
+ index.forEach(val => {
+ this.tickets[val].state = stateName;
+ this.tickets[val].stateFk = stateId;
+ });
+ });
}
- moreFilters(event) {
- this.child = this.vnPopover.showComponent('vn-production-filter-panel', this.$, this.$element[0].querySelector('.filterPanel'));
- var childCtrl = angular.element(this.child).isolateScope().$ctrl;
- childCtrl.filter = Object.assign({}, this.filter);
- childCtrl.data = Object.assign({}, {states: this.states}, {hourItems: this.hourItems});
- childCtrl.onSubmit = filter => this.onChildSubmit(filter);
- childCtrl.onCancel = () => this.onChildCancel();
- event.preventDefault();
- }
- onChildSubmit(filter) {
- let newFilter = {};
- Object.keys(filter).forEach(
- field => {
- if (filter[field] !== null) {
- newFilter[field] = filter[field];
- }
- }
- );
- this.searchTickets(newFilter);
- this.onChildCancel();
- }
- onChildCancel() {
- angular.element(this.child).scope().$destroy();
- angular.element(this.child).remove();
- delete this.child;
- }
- searchTickets(filter) {
- this.filter = Object.assign({}, this.filter, filter || {});
- let filters = Object.assign({}, {
- where: this.filter
- }, {
- page: 1,
- limit: 1000
+ _sendMessage(tickets) {
+ this.$http.post(`/production/api/FakeProductions/messageSend`, {tickets: tickets}).then(() => {
+ this.vnApp.showMessage(this.$translate.instant('Success: message send!'));
});
- this.checkAll = 0;
- this.$http.get('/production/api/FakeProductions/list?filter=' + JSON.stringify(filters)).then(
- json => {
- this.tickets = json.data.tickets;
- this.footer.lines = json.data.lines;
- this.footer.meters = json.data.m3;
- this.footer.total = json.data.total;
- }
- );
}
+
+ _changeTime(ids, time, index) {
+ this.$http.put(`/production/api/Tickets/${time}/changeTime`, {tickets: ids}).then(() => {
+ index.forEach(val => {
+ this.tickets[val].hour = time;
+ });
+ });
+ }
+
+ searchTickets(filter) {
+ this.$.index.filter.filter = Object.assign({}, this.filter, filter || {});
+ this.checkAll = 0;
+ this.$.index.accept().then(json => {
+ this.tickets = json.tickets;
+ this.footer.lines = json.lines;
+ this.footer.meters = json.m3;
+ this.footer.total = json.total;
+ });
+ }
+
refreshTickets() {
this.filter = {};
this.filter.warehouseFk = this.$.displayValue = this.userProfile.warehouseId;
- this.search = null;
}
+
onChangeWareHouse(warehouse) {
if (warehouse && warehouse != this.filter.warehouseFk) {
this.filter.warehouseFk = warehouse;
this.searchTickets(this.filter);
}
}
+
$onInit() {
for (let i = 1; i <= 24; i++) {
let hour = [i].join('');
@@ -135,13 +89,13 @@ export default class ProductionIndex {
hour = [0, i].join('');
}
hour += ':00';
- this.hourItems.push({id: i, name: hour});
+ this.sharedData.hourItems.push({id: i, name: hour});
}
this.filter.warehouseFk = this.$.displayValue = this.userProfile.warehouseId;
}
}
-ProductionIndex.$inject = ['$element', '$scope', '$http', 'vnPopover', 'aclConstant'];
+ProductionIndex.$inject = ['$element', '$scope', '$http', 'aclConstant'];
ngModule.component('vnProductionIndex', {
template: require('./index.html'),
diff --git a/client/production/src/index/index.spec.js b/client/production/src/index/index.spec.js
new file mode 100644
index 000000000..dc9f0d89b
--- /dev/null
+++ b/client/production/src/index/index.spec.js
@@ -0,0 +1,39 @@
+import './index.js';
+
+describe('Production', () => {
+ describe('Component vnProductionIndex', () => {
+ let $componentController;
+ let $httpBackend;
+ let $scope;
+ let controller;
+ let $element;
+ let aclConstant;
+
+ beforeEach(() => {
+ angular.mock.module('production');
+ });
+
+ beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_) => {
+ $element = angular.element('');
+ $componentController = _$componentController_;
+ $httpBackend = _$httpBackend_;
+ $scope = $rootScope.$new();
+ aclConstant = {userProfile: {warehouseId: 1}};
+ controller = $componentController('vnProductionIndex', {$scope: $scope, $element: $element, aclConstant: aclConstant});
+ }));
+
+ describe('_changeState()', () => {
+ it('should request to update the ticket state', () => {
+ let ids = [1, 2, 3, 4];
+ let stateId = 1;
+ let stateName = 'state';
+ let index = [];
+ controller.tickets = ['ticketVal'];
+ $httpBackend.whenPUT('/production/api/TicketStates/1/changeState', {tickets: ids}).respond({data: 'ticketVal'});
+ $httpBackend.expectPUT('/production/api/TicketStates/1/changeState', {tickets: ids});
+ controller._changeState(ids, stateId, stateName, index);
+ $httpBackend.flush();
+ });
+ });
+ });
+});
diff --git a/client/production/src/locale/en.json b/client/production/src/locale/en.json
deleted file mode 100644
index bb52c33b6..000000000
--- a/client/production/src/locale/en.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "Production" : "Production"
-}
\ No newline at end of file
diff --git a/client/production/src/locale/en.yml b/client/production/src/locale/en.yml
new file mode 100644
index 000000000..2577c6f43
--- /dev/null
+++ b/client/production/src/locale/en.yml
@@ -0,0 +1 @@
+Production: Production
\ No newline at end of file
diff --git a/client/production/src/locale/es.json b/client/production/src/locale/es.json
deleted file mode 100644
index 0cf5acba5..000000000
--- a/client/production/src/locale/es.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "Finder" : "Localizador",
- "Production" : "Producción",
- "Error: No tickets selected!" : "Error: ¡No hay tickets seleccionados!",
- "Error: Action not implemented!" : "Error: ¡Acción no implementada!",
- "State" : "Estado",
- "Alarm" : "Alarma",
- "Agencies": "Agencias",
- "Agency": "Agencia",
- "Store" : "Almacén",
- "Printed": "Impreso",
- "Commercial": "Comercial",
- "Hour" : "Hora",
- "Lines" : "Líneas",
- "Boxes" : "Cajas",
- "Comment" : "Comentario",
- "Message" : "Mensaje",
- "Send" : "Enviar",
- "Date" : "Fecha",
- "Ticket ID" : "ID Ticket",
- "Route ID": "ID Ruta",
- "Province" : "Provincia",
- "Filter" : "Filtrar",
- "Cancel" : "Cancelar",
- "Ticket with incidence" : "Ticket con incidencia"
-}
\ No newline at end of file
diff --git a/client/production/src/locale/es.yml b/client/production/src/locale/es.yml
new file mode 100644
index 000000000..7846f4b3d
--- /dev/null
+++ b/client/production/src/locale/es.yml
@@ -0,0 +1,27 @@
+Finder: Localizador
+Production: Producción
+'Error: No tickets selected!': 'Error: ¡No hay tickets seleccionados!'
+'Error: Action not implemented!': 'Error: ¡Acción no implementada!'
+State: Estado
+Alarm: Alarma
+Agencies: Agencias
+Agency: Agencia
+Store: Almacén
+Printed: Impreso
+Commercial: Comercial
+Hour: Hora
+Lines: Líneas
+Boxes: Cajas
+Comment: Comentario
+Message: Mensaje
+Send: Enviar
+Date: Fecha
+Ticket ID: ID Ticket
+Route ID: ID Ruta
+Province: Provincia
+Filter: Filtrar
+Cancel: Cancelar
+Worker: Trabajador
+Town: Población
+Client ID: ID Cliente
+Ticket with incidence: Ticket con incidencia
\ No newline at end of file
diff --git a/client/production/src/production-actions/production-actions.html b/client/production/src/production-actions/production-actions.html
index 4786d9136..0e79e3b4a 100644
--- a/client/production/src/production-actions/production-actions.html
+++ b/client/production/src/production-actions/production-actions.html
@@ -1,15 +1,15 @@
-
-
-
\ No newline at end of file
diff --git a/client/production/src/production-actions/production-actions.js b/client/production/src/production-actions/production-actions.js
index 0e5482f30..fee7b687b 100644
--- a/client/production/src/production-actions/production-actions.js
+++ b/client/production/src/production-actions/production-actions.js
@@ -35,45 +35,35 @@ export default class ProductionActions {
return this._actionWorker;
}
- _changeState(ids, sateteId, stateName, index) {
- this.$http.put(`/production/api/TicketStates/${sateteId}/changeState`, {tickets: ids}).then(
+ _changeState(ids, sateteId) {
+ this.$http.put(`/production/api/TicketStates/${sateteId}/changeState`, {tickets: ids})
+ .then(
() => {
- index.forEach(
- i => {
- this.tickets[i].state = stateName;
- this.tickets[i].stateFk = sateteId;
- }
- );
+ this.parent.searchTickets();
}
);
}
_sendMessage(tickets) {
- this.$http.post(`/production/api/FakeProductions/messageSend`, {tickets: tickets}).then(
- () => {
- this.vnApp.showMessage(this.$translate.instant('Success: message send!'));
- }
- );
+ this.$http.post(`/production/api/FakeProductions/messageSend`, {tickets: tickets})
+ .then(
+ () => {
+ this.vnApp.showMessage(this.$translate.instant('Success: message send!'));
+ }
+ );
}
_changeTime(ids, time, index) {
- this.$http.put(`/production/api/Tickets/${time}/changeTime`, {tickets: ids}).then(
+ this.$http.put(`/production/api/Tickets/${time}/changeTime`, {tickets: ids})
+ .then(
() => {
- index.forEach(
- i => {
- this.tickets[i].hour = time;
- }
- );
+ this.parent.searchTickets();
}
);
}
_changeWorker(ids, workerFk, index) {
- this.$http.put(`/production/api/Tickets/${workerFk}/changeWorker`, {tickets: ids}).then(
+ this.$http.put(`/production/api/Tickets/${workerFk}/changeWorker`, {tickets: ids})
+ .then(
() => {
- index.forEach(
- i => {
- this.tickets[i].workerFk = this.actionWorker.id;
- this.tickets[i].worker = this.actionWorker.name;
- }
- );
+ this.parent.searchTickets();
}
);
}
@@ -82,7 +72,7 @@ export default class ProductionActions {
let ids = [];
let index = [];
let tickets = [];
- this.tickets.forEach(
+ this.parent.tickets.forEach(
(val, i) => {
if (val.checked) {
ids.push(val.ticketFk);
@@ -94,13 +84,13 @@ export default class ProductionActions {
if (tickets.length) {
switch (actionName) {
case 'changeState' :
- this._changeState(ids, this.actionState.id, this.actionState.name, index);
+ this._changeState(ids, this.actionState.id);
break;
case 'addComment':
this._sendMessage(tickets);
break;
case 'markPrinted':
- this._changeState(ids, 4, 'Impreso', index);
+ this._changeState(ids, 4);
break;
case 'changeTime':
this._changeTime(ids, this.actionHours.name, index);
@@ -121,10 +111,8 @@ ProductionActions.$inject = ['$http', '$translate', 'vnApp'];
ngModule.component('vnProductionActions', {
template: require('./production-actions.html'),
- bindings: {
- tickets: '<',
- states: '<',
- hourItems: '<'
- },
- controller: ProductionActions
+ controller: ProductionActions,
+ require: {
+ parent: '^^vnProductionIndex'
+ }
});
diff --git a/client/production/src/production-table/production-table.html b/client/production/src/production-table/production-table.html
index 42a9e45ac..e87410722 100644
--- a/client/production/src/production-table/production-table.html
+++ b/client/production/src/production-table/production-table.html
@@ -8,6 +8,7 @@
-
+
@@ -27,8 +28,9 @@
{{::ticket.agency}}
{{::ticket.routeFk}}
{{::ticket.salesPerson | ucwords}}
- {{ticket.hour}}
- {{ticket.state}}
+ {{::ticket.worker | ucwords}}
+ {{::ticket.hour}}
+ {{::ticket.state}}
{{::ticket.lines}}
{{::ticket.m3}}
{{::ticket.boxes}}
@@ -44,10 +46,15 @@
:
{{$ctrl.footer.total}}
- {{$ctrl.footer.lines}}
{{$ctrl.footer.meters}}
-
diff --git a/client/production/src/production-table/production-table.js b/client/production/src/production-table/production-table.js
index 91c24314f..288118a0d 100644
--- a/client/production/src/production-table/production-table.js
+++ b/client/production/src/production-table/production-table.js
@@ -13,6 +13,8 @@ export class ProductionTable {
},
model: []
};
+ this.filteredField = null;
+ this.filteredReverse = null;
}
get checkAll() {
return this._checkAll;
@@ -21,7 +23,7 @@ export class ProductionTable {
this._checkAll = value;
}
set tickets(value) {
- this._tickets = value;
+ this._tickets = this.filteredField ? this.$filter('orderBy')(value, this.filteredField, this.filteredReverse) : value;
this.totalFilter = this._tickets.length;
this.pageTable.filter.page = 1;
this.pageTickets();
@@ -30,8 +32,9 @@ export class ProductionTable {
return this._tickets;
}
onOrder(field, order) {
- let reverse = order === 'DESC';
- this.tickets = this.$filter('orderBy')(this.tickets, field, reverse);
+ this.filteredField = field;
+ this.filteredReverse = order === 'DESC';
+ this.tickets = this.tickets; // call tickets setter
}
pageTickets() {
let init = (this.pageTable.filter.page - 1) * this.itemsDisplayedInList;
diff --git a/client/route/routes.json b/client/route/routes.json
index 38659dd17..9e7c48833 100644
--- a/client/route/routes.json
+++ b/client/route/routes.json
@@ -14,7 +14,7 @@
"url": "/list",
"state": "routes.index",
"component": "vn-route-index",
- "acl": ["employee"]
+ "acl": ["developer"]
},
{
"url": "/create",
diff --git a/client/route/src/card/card.html b/client/route/src/card/card.html
index c87155a74..b787b738f 100644
--- a/client/route/src/card/card.html
+++ b/client/route/src/card/card.html
@@ -4,7 +4,7 @@
actions="$ctrl.route = edit.model"
options="mgEdit">
-
+
@@ -19,7 +19,7 @@
+
diff --git a/client/route/src/locale/en.json b/client/route/src/locale/en.json
deleted file mode 100644
index ff0fd857e..000000000
--- a/client/route/src/locale/en.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "Routes" : "Routes"
-}
diff --git a/client/route/src/locale/en.yml b/client/route/src/locale/en.yml
new file mode 100644
index 000000000..6659ba5dc
--- /dev/null
+++ b/client/route/src/locale/en.yml
@@ -0,0 +1 @@
+Routes: Routes
\ No newline at end of file
diff --git a/client/route/src/locale/es.json b/client/route/src/locale/es.json
deleted file mode 100644
index 1c2b2f4c4..000000000
--- a/client/route/src/locale/es.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "Basic data": "Datos básicos",
- "Logistic data": "Datos logísticos",
- "Assigned tickets": "Tickets asignados",
- "Routes" : "Rutas",
- "Route" : "Ruta",
- "Date": "Fecha",
- "Agency": "Agencia",
- "Driver": "Conductor",
- "Vehicle": "Vehículo",
- "Start Hour" : "Hora Inicio",
- "End Hour": "Hora Fin",
- "Start Km": "Km Inicio",
- "End Km": "Km Fin",
- "Packages": "Bultos",
- "Route document": "Documento de Ruta"
-}
diff --git a/client/route/src/locale/es.yml b/client/route/src/locale/es.yml
new file mode 100644
index 000000000..4805a41e6
--- /dev/null
+++ b/client/route/src/locale/es.yml
@@ -0,0 +1,15 @@
+Basic data: Datos básicos
+Logistic data: Datos logísticos
+Assigned tickets: Tickets asignados
+Routes: Rutas
+Route: Ruta
+Date: Fecha
+Agency: Agencia
+Driver: Conductor
+Vehicle: Vehículo
+Start Hour: Hora Inicio
+End Hour: Hora Fin
+Start Km: Km Inicio
+End Km: Km Fin
+Packages: Bultos
+Route document: Documento de Ruta
diff --git a/client/route/src/logistic-data/logistic-data.html b/client/route/src/logistic-data/logistic-data.html
index 68bd3311d..9ea4c802b 100644
--- a/client/route/src/logistic-data/logistic-data.html
+++ b/client/route/src/logistic-data/logistic-data.html
@@ -1,24 +1,23 @@
+ form="form">
+ ng-mouseleave="$ctrl.hasMouseIn = false">
+ ng-focus="$ctrl.hasFocus = true"
+ ng-blur="$ctrl.hasFocus = false"
+ />
diff --git a/client/core/src/textfield/textfield.js b/client/core/src/textfield/textfield.js
index 09d65ab9d..b9262bc0e 100644
--- a/client/core/src/textfield/textfield.js
+++ b/client/core/src/textfield/textfield.js
@@ -1,9 +1,8 @@
import {module} from '../module';
-import Component from '../lib/component';
-import * as normalizerFactory from '../lib/inputAttrsNormalizer';
+import Input from '../lib/input';
import './style.scss';
-export default class TextfieldController extends Component {
+export default class Textfield extends Input {
constructor($element, $scope, $attrs, $timeout, normalizer) {
super($element);
@@ -15,45 +14,42 @@ export default class TextfieldController extends Component {
this.$timeout = $timeout;
this._value = null;
- this.type = this.$attrs.type || 'text';
+ this.type = $attrs.type || 'text';
this.showActions = false;
this.input = $element[0].querySelector('input');
- this.focus = false;
- this.hasInfo = Boolean(this.$attrs.info);
- this.info = this.$attrs.info || null;
+ this.hasInfo = Boolean($attrs.info);
+ this.info = $attrs.info || null;
this.hasFocus = false;
this.hasMouseIn = false;
componentHandler.upgradeElement($element[0].firstChild);
}
-
get value() {
return this._value;
}
-
set value(value) {
this._value = (value === undefined || value === '') ? null : value;
this.input.value = this._value;
this.hasValue = Boolean(this._value);
this.mdlUpdate();
}
-
+ set tabIndex(value) {
+ this.input.tabIndex = value;
+ }
mdlUpdate() {
let mdlField = this.$element[0].firstChild.MaterialTextfield;
if (mdlField)
mdlField.updateClasses_();
}
-
clear() {
this.value = null;
this.input.focus();
}
}
-
-TextfieldController.$inject = ['$element', '$scope', '$attrs', '$timeout', normalizerFactory.NAME];
+Textfield.$inject = ['$element', '$scope', '$attrs', '$timeout', 'vnInputAttrsNormalizer'];
module.component('vnTextfield', {
template: require('./textfield.html'),
- controller: TextfieldController,
+ controller: Textfield,
bindings: {
value: '=model',
label: '@?',
@@ -61,6 +57,7 @@ module.component('vnTextfield', {
disabled: ' this.$state.go(state)
+ () => this.$state.go(state, params || {})
);
}
/**
@@ -92,10 +94,10 @@ export default class Watcher extends Component {
(resolve, reject) => this.noChanges(reject)
);
}
- let changedData = getModifiedData(this.data, this.orgData);
+ let changedData = (this.$attrs.save && this.$attrs.save.toLowerCase() === 'post') ? this.copyInNewObject(this.data) : getModifiedData(this.data, this.orgData);
- if (this.save) {
- this.save.model = changedData;
+ if (this.save && this.save.accept) {
+ this.save.model = changedData; // this.copyInNewObject(changedData);
return new Promise((resolve, reject) => {
this.save.accept().then(
json => this.writeData({data: json}, resolve),
@@ -106,7 +108,7 @@ export default class Watcher extends Component {
// XXX: Alternative when mgCrud is not used
- let id = this.orgData[this.idField];
+ let id = this.idField ? this.orgData[this.idField] : null;
if (id) {
return new Promise((resolve, reject) => {
@@ -118,7 +120,7 @@ export default class Watcher extends Component {
}
return new Promise((resolve, reject) => {
- this.$http.post(this.url, this.data).then(
+ this.$http.post(this.url, changedData).then(
json => this.writeData(json, resolve),
json => reject(json)
);
@@ -147,6 +149,8 @@ export default class Watcher extends Component {
updateOriginalData() {
this.orgData = this.copyInNewObject(this.data);
+ if (this.form && this.form.$dirty)
+ this.form.$setPristine();
}
copyInNewObject(data) {
@@ -154,7 +158,7 @@ export default class Watcher extends Component {
if (data && typeof data === 'object') {
Object.keys(data).forEach(
val => {
- if (data[val] !== "" && data[val] !== undefined && data[val] !== null) {
+ if (!isFullEmpty(data[val])) {
if (typeof data[val] === 'object') {
newCopy[val] = this.copyInNewObject(data[val]);
} else {
@@ -179,6 +183,7 @@ export default class Watcher extends Component {
}
dataChanged() {
+ if (this.form && this.form.$dirty) return true;
let newData = this.copyInNewObject(this.data);
return !isEqual(newData, this.orgData);
}
@@ -193,7 +198,7 @@ export default class Watcher extends Component {
}
}
-Watcher.$inject = ['$element', '$scope', '$state', '$transitions', '$http', 'vnApp', '$translate'];
+Watcher.$inject = ['$element', '$scope', '$state', '$transitions', '$http', 'vnApp', '$translate', '$attrs'];
module.component('vnWatcher', {
template: require('./watcher.html'),
diff --git a/client/core/src/watcher/watcher.spec.js b/client/core/src/watcher/watcher.spec.js
index 0ed342e31..231680f28 100644
--- a/client/core/src/watcher/watcher.spec.js
+++ b/client/core/src/watcher/watcher.spec.js
@@ -11,6 +11,7 @@ describe('Component vnWatcher', () => {
let vnApp;
let $translate;
let controller;
+ let $attrs;
beforeEach(() => {
angular.mock.module('client');
@@ -24,8 +25,12 @@ describe('Component vnWatcher', () => {
vnApp = _vnApp_;
$transitions = _$transitions_;
$httpBackend = _$httpBackend_;
+ $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({});
$translate = _$translate_;
- controller = $componentController('vnWatcher', {$scope, $element, $state, vnApp, $transitions, $httpBackend, $translate});
+ $attrs = {
+ save: "patch"
+ };
+ controller = $componentController('vnWatcher', {$scope, $element, $state, vnApp, $transitions, $httpBackend, $translate, $attrs});
}));
describe('$onInit()', () => {
@@ -100,11 +105,11 @@ describe('Component vnWatcher', () => {
it(`should call controller.$state.go() function after calling controllers submit() function`, done => {
spyOn(controller, 'submit').and.returnValue(Promise.resolve());
spyOn(controller.$state, 'go');
- let state = 'the state';
+ let state = 'the.State';
controller.submitGo(state)
.then(() => {
expect(controller.submit).toHaveBeenCalledWith();
- expect(controller.$state.go).toHaveBeenCalledWith(state);
+ expect(controller.$state.go).toHaveBeenCalledWith(state, {});
done();
});
});
@@ -140,7 +145,7 @@ describe('Component vnWatcher', () => {
describe('when controller.save()', () => {
it(`should set controller.save.model property`, () => {
- controller.save = {};
+ controller.save = {accept: () => {}};
controller.data = {originalInfo: 'original data', info: 'new data'};
controller.orgData = {originalInfo: 'original data'};
controller.submit();
@@ -290,4 +295,3 @@ describe('Component vnWatcher', () => {
});
});
});
-// 309
\ No newline at end of file
diff --git a/client/item/index.js b/client/item/index.js
new file mode 100644
index 000000000..c94fde7de
--- /dev/null
+++ b/client/item/index.js
@@ -0,0 +1 @@
+export * from './src/item';
diff --git a/client/item/routes.json b/client/item/routes.json
new file mode 100644
index 000000000..74dbe6dad
--- /dev/null
+++ b/client/item/routes.json
@@ -0,0 +1,106 @@
+{
+ "module": "item",
+ "name": "Items",
+ "icon": "/static/images/icon_item.png",
+ "validations" : true,
+ "routes": [
+ {
+ "url": "/item",
+ "state": "item",
+ "abstract": true,
+ "component": "ui-view"
+ },
+ {
+ "url": "/list",
+ "state": "item.index",
+ "component": "vn-item-list",
+ "acl": ["developer"]
+ }, {
+ "url": "/create",
+ "state": "item.create",
+ "component": "vn-item-create"
+ }, {
+ "url": "/:id",
+ "state": "item.card",
+ "abstract": true,
+ "component": "vn-item-card"
+ }, {
+ "url" : "/data",
+ "state": "item.card.data",
+ "component": "vn-item-data",
+ "params": {
+ "item": "$ctrl.item"
+ },
+ "menu": {
+ "description": "Basic data",
+ "icon": "folder"
+ }
+ },{
+ "url" : "/tags",
+ "state": "item.card.tags",
+ "component": "vn-item-tags",
+ "params": {
+ "item": "$ctrl.item"
+ },
+ "menu": {
+ "description": "Tags",
+ "icon": "folder"
+ }
+ },{
+ "url" : "/history",
+ "state": "item.card.history",
+ "component": "vn-item-history",
+ "params": {
+ "item": "$ctrl.item"
+ },
+ "menu": {
+ "description": "History",
+ "icon": "folder"
+ }
+ },{
+ "url" : "/niche",
+ "state": "item.card.niche",
+ "component": "vn-item-niche",
+ "params": {
+ "item": "$ctrl.item"
+ },
+ "menu": {
+ "description": "Niche",
+ "icon": "folder"
+ }
+ },{
+ "url" : "/botanical",
+ "state": "item.card.botanical",
+ "component": "vn-item-botanical",
+ "params": {
+ "item": "$ctrl.item"
+ },
+ "menu": {
+ "description": "Botanical",
+ "icon": "folder"
+ }
+ },{
+ "url" : "/picture",
+ "state": "item.card.picture",
+ "component": "vn-item-picture",
+ "params": {
+ "item": "$ctrl.item"
+ },
+ "menu": {
+ "description": "Picture",
+ "icon": "folder"
+ }
+ }, {
+ "url" : "/barcode",
+ "state": "item.card.barcode",
+ "component": "vn-item-barcode",
+ "params": {
+ "item": "$ctrl.item"
+ },
+ "menu": {
+ "description": "Barcode",
+ "icon": "folder"
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/client/item/src/barcode/item-barcode.html b/client/item/src/barcode/item-barcode.html
new file mode 100644
index 000000000..549ac04d1
--- /dev/null
+++ b/client/item/src/barcode/item-barcode.html
@@ -0,0 +1,5 @@
+
- info_outline
- clear
+
+ info_outline
+
+
+ clear
+
Id: {{$ctrl.item.id}}
+ Name: {{$ctrl.item.name}}
+
+
+ {{itemTag.tag.name}}: {{itemTag.value}}
+
+
+
diff --git a/client/item/src/filter-panel/filter-panel.js b/client/item/src/filter-panel/filter-panel.js
new file mode 100644
index 000000000..608918b51
--- /dev/null
+++ b/client/item/src/filter-panel/filter-panel.js
@@ -0,0 +1,16 @@
+import ngModule from '../module';
+
+class ItemFilterPanel {
+ constructor() {
+ this.onSubmit = () => {};
+ }
+
+ onSearch() {
+ this.onSubmit(this.filter);
+ }
+}
+
+ngModule.component('vnItemFilterPanel', {
+ template: require('./filter-panel.html'),
+ controller: ItemFilterPanel
+});
diff --git a/client/item/src/filter-panel/locale/es.yml b/client/item/src/filter-panel/locale/es.yml
new file mode 100644
index 000000000..1411cc42d
--- /dev/null
+++ b/client/item/src/filter-panel/locale/es.yml
@@ -0,0 +1,3 @@
+Ink: Tinta
+Origin: Origen
+Producer: Productor
\ No newline at end of file
diff --git a/client/item/src/history/item-history.html b/client/item/src/history/item-history.html
new file mode 100644
index 000000000..1a5a65483
--- /dev/null
+++ b/client/item/src/history/item-history.html
@@ -0,0 +1,33 @@
+Id: {{$ctrl.item.id}}
+ Name: {{$ctrl.item.name}}
+ Description: {{$ctrl.item.description}}
+ Size: {{$ctrl.item.size}}
+ Type: {{$ctrl.item.itemType.name}}
+