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

client/item/routes.json

@@ -46,14 +46,14 @@
                 "icon": "folder"
             }
         },{
-            "url" : "/historic",
-            "state": "item.card.historic",
-            "component": "vn-item-historic",
+            "url" : "/history",
+            "state": "item.card.history",
+            "component": "vn-item-history",
             "params": {
                 "item": "$ctrl.item"
             },
             "menu": {
-                "description": "Historic",
+                "description": "History",
                 "icon": "folder"
             }
         },{

client/item/src/barcode/item-barcode.html

@@ -0,0 +1,5 @@
+<vn-card>
+    <vn-vertical pad-large>
+        <vn-title>Item barcode</vn-title>
+    </vn-vertical>
+</vn-card>

client/item/src/barcode/item-barcode.js

@@ -0,0 +1,5 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemBarcode', {
+    template: require('./item-barcode.html')
+});

client/item/src/botanical/item-botanical.html

@@ -0,0 +1,5 @@
+<vn-card>
+    <vn-vertical pad-large>
+        <vn-title>Botanical</vn-title>
+    </vn-vertical>
+</vn-card>

client/item/src/botanical/item-botanical.js

@@ -0,0 +1,5 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemBotanical', {
+    template: require('./item-botanical.html')
+});

client/item/src/data/item-data.html

@@ -2,7 +2,7 @@
 <mg-ajax 
     path="/item/api/Items/{{patch.params.id}}" 
     options="vnPatch" 
-    override="{filter: {include: [{relation: 'itemType'}, {relation: 'origin'}, {relation: 'ink'}, {relation: 'producer'}]}}"
+    override="{filter: {include: [{relation: 'itemType'}, {relation: 'origin'}, {relation: 'ink'}, {relation: 'producer'}, {relation: 'expence'}]}}"
     >
 </mg-ajax>
 <vn-watcher

client/item/src/history/item-history.html

@@ -0,0 +1,5 @@
+<vn-card>
+    <vn-vertical pad-large>
+        <vn-title>Item history</vn-title>
+    </vn-vertical>
+</vn-card>

client/item/src/history/item-history.js

@@ -0,0 +1,5 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemHistory', {
+    template: require('./item-history.html')
+});

client/item/src/item.js

@@ -5,3 +5,10 @@ import './filter-panel/filter-panel';
 import './create/item-create';
 import './card/item-card';
 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';
+

client/item/src/locale/es.json

@@ -7,5 +7,14 @@
     "Type": "Tipo",
     "Name": "Nombre",
     "Relevancy": "Relevancia",
-    "New item": "Nuevo artículo"
+    "New item": "Nuevo artículo",
+    "Basic data": "Datos básicos",
+    "History" : "Historial",
+    "Item history" : "Historial del artículo",
+    "Item tags" : "Tags del artículo",
+    "Niche": "Nicho",
+    "Picture": "Foto",
+    "Item pictures": "Fotos del artículo",
+    "Barcode": "Código barras",
+    "Item barcode": "Código de barras del artículo"
 }

client/item/src/niche/item-niche.html

@@ -0,0 +1,5 @@
+<vn-card>
+    <vn-vertical pad-large>
+        <vn-title>Niche</vn-title>
+    </vn-vertical>
+</vn-card>

client/item/src/niche/item-niche.js

@@ -0,0 +1,5 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemNiche', {
+    template: require('./item-niche.html')
+});

client/item/src/picture/item-picture.html

@@ -0,0 +1,5 @@
+<vn-card>
+    <vn-vertical pad-large>
+        <vn-title>Item pictures</vn-title>
+    </vn-vertical>
+</vn-card>

client/item/src/picture/item-picture.js

@@ -0,0 +1,5 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemPicture', {
+    template: require('./item-picture.html')
+});

client/item/src/tags/item-tags.html

@@ -0,0 +1,5 @@
+<vn-card>
+    <vn-vertical pad-large>
+        <vn-title>Item tags</vn-title>
+    </vn-vertical>
+</vn-card>

client/item/src/tags/item-tags.js

@@ -0,0 +1,5 @@
+import ngModule from '../module';
+
+ngModule.component('vnItemTags', {
+    template: require('./item-tags.html')
+});