Merge branch 'dev' of http://git.verdnatura.es/salix into dev

client/client/src/greuge-create/greuge-create.html

@@ -11,7 +11,12 @@
             <vn-title vn-one margin-large-bottom>Add Greuge</vn-title>
             <vn-horizontal>
                 <vn-textfield vn-one margin-medium-right label="Amount" field="$ctrl.greuge.amount" type="number" vn-focus></vn-textfield>
-                <vn-date-picker vn-one label="Date" model="$ctrl.greuge.shipped"></vn-date-picker>
+                <vn-date-picker vn-one 
+                    label="Date" 
+                    model="$ctrl.greuge.shipped"
+                    ini-options="{enableTime: true, dateFormat: 'd-m-Y h:i', time_24hr: true}"
+                    >
+                </vn-date-picker>
             </vn-horizontal>
             <vn-horizontal>
                 <vn-textfield vn-one margin-medium-right label="Comment" field="$ctrl.greuge.description"></vn-textfield>

client/client/src/greuge-create/greuge-create.js

@@ -5,7 +5,7 @@ class ClientGreugeCreate {
         this.$ = $scope;
         this.$state = $state;
         this.greuge = {
-            shipped: $filter('date')(new Date(), 'yyyy-MM-dd')
+            shipped: $filter('date')(new Date(), 'yyyy-MM-dd HH:mm')
         };
     }
     onSubmit() {

client/core/src/datePicker/datePicker.js

@@ -30,6 +30,7 @@ class DatePicker extends Component {
         this._modelView = null;
         this._model = undefined;
         this._optionsChecked = false;
+        this._waitingInit = 0;
         this.hasFocus = false;
         this.hasMouseIn = false;
         componentHandler.upgradeElement($element[0].firstChild);
@@ -39,12 +40,27 @@ class DatePicker extends Component {
         return this._model;
     }
     set model(value) {
-        this._model = value;
-        if (value && !this.modelView) {
-            let options = this._getOptions();
-            let initialDateFormat = (options && options.dateFormat) ? options.dateFormat : 'Y-m-d';
-            let format = this._formatFlat2Angular(initialDateFormat);
-            this.modelView = this.$filter('date')(value, format);
+        if (this._optionsChecked) {
+            this._waitingInit = 0;
+            this._model = value;
+            if (value && !this.modelView) {
+                let initialDateFormat = this.$translate.use() === 'es' ? 'd-m-Y' : 'Y-m-d';
+                if (this.iniOptions.enableTime) {
+                    initialDateFormat += ' H:i:s';
+                }
+                let format = this._formatFlat2Angular(initialDateFormat);
+                this._modelView = this.$filter('date')(new Date(value), format);
+                this.mdlUpdate();
+            }
+        } else if (this._waitingInit < 4) {
+            this._waitingInit++;
+            this.$timeout(() => {
+                this.model = value;
+            }, 250);
+        } else {
+            this.model = null;
+            this.modelView = '';
+            this._waitingInit = 0;
         }
     }
     get modelView() {
@@ -54,10 +70,9 @@ class DatePicker extends Component {
         this._modelView = value;
         this.input.value = value;
         this._setModel(value);
-        this.$timeout(() => {
-            this.mdlUpdate();
-        }, 500);
+        this.mdlUpdate();
     }
+
     onClear() {
         this.modelView = null;
     }
@@ -67,9 +82,11 @@ class DatePicker extends Component {
         }
     }
     mdlUpdate() {
-        let mdlField = this.element.firstChild.MaterialTextfield;
-        if (mdlField)
-            mdlField.updateClasses_();
+        this.$timeout(() => {
+            let mdlField = this.element.firstChild.MaterialTextfield;
+            if (mdlField)
+                mdlField.updateClasses_();
+        }, 500);
     }
 
     _formatFlat2Angular(string) { // change string Flatpickr format to angular format (d-m-Y  -> dd-MM-yyyy)
@@ -193,6 +210,12 @@ class DatePicker extends Component {
         this.vp = undefined;
     }
 
+    $onChanges(objChange) {
+        if (objChange.iniOptions && objChange.iniOptions.currentValue) {
+            this.iniOptions = Object.assign(this.iniOptions, objChange.iniOptions.currentValue);
+        }
+    }
+
     $onInit() {
         this.initPicker();
     }

client/item/src/create/item-create.html

@@ -9,16 +9,9 @@
     <div style="max-width: 70em; margin: 0 auto;">
         <vn-card>
             <vn-vertical pad-large>
-                <vn-title>Create item</vn-title>
-                <vn-horizontal>
-                    <vn-textfield vn-one label="Size" field="$ctrl.item.size" vn-focus></vn-textfield>
-                    <vn-textfield vn-five label="Category" field="$ctrl.item.category"></vn-textfield>
-                </vn-horizontal>
-                <vn-horizontal>
-                    <vn-textfield vn-one label="Stems" field="$ctrl.item.stems"></vn-textfield>
-                    <vn-textfield vn-five label="Description" field="$ctrl.item.description"></vn-textfield>
-                </vn-horizontal>
+                <vn-title>New item</vn-title>
                 <vn-horizontal>
+                    <vn-textfield vn-one label="Name" field="$ctrl.item.name" vn-focus></vn-textfield>
                     <vn-autocomplete vn-one
                         url="/item/api/ItemTypes"
                         label="Type"
@@ -27,17 +20,23 @@
                         field="$ctrl.item.typeFk"
                     >
                     </vn-autocomplete>
-        
-                    <vn-autocomplete vn-one
-                        url="/item/api/Inks"
-                        label="Ink"
-                        show-field="name"
-                        value-field="id"
-                        field="$ctrl.item.inkFk"
-                    >
-                    </vn-autocomplete>
                 </vn-horizontal>
-        
+                <vn-horizontal>
+                    <vn-autocomplete vn-one
+                        url="/item/api/Intrastats"
+                        label="Intrastat"
+                        show-field="description"
+                        value-field="id"
+                        field="$ctrl.item.intrastatFk"
+                        order="description ASC"
+                        filter-search="{where: {description: {regexp: 'search'}} }"
+                    >
+                        <tpl-item>{{$parent.$parent.item.description}}</tpl-item>
+                    </vn-autocomplete>
+                    <vn-textfield vn-one label="Relevancy" field="$ctrl.item.relevancy" type="number"></vn-textfield>
+
+                </vn-horizontal>
+                
                 <vn-horizontal>
                     <vn-autocomplete vn-one
                         url="/item/api/Origins"
@@ -45,18 +44,10 @@
                         show-field="name"
                         value-field="id"
                         field="$ctrl.item.originFk"
-                    >
-                    </vn-autocomplete>
-        
-                    <vn-autocomplete vn-one
-                        url="/item/api/Producers"
-                        label="Producer"
-                        show-field="name"
-                        value-field="id"
-                        field="$ctrl.item.producerFk"
-                    >
-                    </vn-autocomplete>
+                    ></vn-autocomplete>
+                    <vn-one></vn-one>
                 </vn-horizontal>
+              
             </vn-vertical>
         </vn-card>
         <vn-button-bar>

client/item/src/create/item-create.js

@@ -1,16 +1,21 @@
 import ngModule from '../module';
 
 class ItemCreate {
-    constructor() {
-        this.item = {};
+    constructor($scope, $state) {
+        this.$ = $scope;
+        this.$state = $state;
+        this.item = {
+            relevancy: 0
+        };
     }
 
     onSubmit() {
         this.$.watcher.submit().then(
-            json => this.$state.go('item.card.basic', {id: json.data.id})
+            json => this.$state.go('item.card.data', {id: json.data.id})
         );
     }
 }
+ItemCreate.$inject = ['$scope', '$state'];
 
 ngModule.component('vnItemCreate', {
     template: require('./item-create.html'),

client/item/src/locale/es.json

@@ -4,5 +4,8 @@
     "Category": "Categoría",
     "Description": "Descripción",
     "Size": "Tamaño",
-    "Type": "Tipo"
+    "Type": "Tipo",
+    "Name": "Nombre",
+    "Relevancy": "Relevancia",
+    "New item": "Nuevo artículo"
 }

services/item/common/models/intrastat.json

@@ -18,9 +18,9 @@
         }
     },
     "relations": {
-        "taxGroup": {
+        "taxClass": {
             "type": "belongsTo",
-            "model": "TaxGroup",
+            "model": "TaxClass",
             "foreignKey": "taxClassFk"
         },
         "taxCode": {

services/item/common/models/item.js

@@ -1,3 +1,6 @@
 module.exports = function(Self) {
     require('../methods/item/filter.js')(Self);
+
+    Self.validatesPresenceOf('name', {message: 'Cannot be blank'});
+    Self.validatesPresenceOf('originFk', {message: 'Cannot be blank'});
 };