diff --git a/front/core/components/check/style.scss b/front/core/components/check/style.scss
index 5ddd56fa3..ade79c4c5 100644
--- a/front/core/components/check/style.scss
+++ b/front/core/components/check/style.scss
@@ -16,10 +16,6 @@ vn-check {
}
md-checkbox {
- margin-bottom: 0
- }
-
- md-checkbox .md-label {
- margin-bottom: .5em;
+ margin-bottom: 0.8em
}
}
diff --git a/front/core/components/table/style.scss b/front/core/components/table/style.scss
index 54b40db6d..33e2ee06a 100644
--- a/front/core/components/table/style.scss
+++ b/front/core/components/table/style.scss
@@ -174,4 +174,7 @@ vn-table {
float: right;
margin: 0!important;
}
+ md-checkbox {
+ margin: 0;
+ }
}
\ No newline at end of file
diff --git a/front/core/directives/uvc.html b/front/core/directives/uvc.html
index f7b559cd9..0248aefc1 100644
--- a/front/core/directives/uvc.html
+++ b/front/core/directives/uvc.html
@@ -2,7 +2,6 @@
{
+ it('should return the same number if there is a barcode and a item with the same ID', async() => {
+ let barcode = 3;
+ let result = await app.models.ItemBarcode.toItem(barcode);
+
+ expect(result).toBe(3);
+ });
+});
diff --git a/modules/item/back/methods/item-barcode/toItem.js b/modules/item/back/methods/item-barcode/toItem.js
new file mode 100644
index 000000000..0fbbf4508
--- /dev/null
+++ b/modules/item/back/methods/item-barcode/toItem.js
@@ -0,0 +1,28 @@
+module.exports = Self => {
+ Self.remoteMethod('toItem', {
+ description: 'Returns last entries',
+ accessType: 'READ',
+ accepts: [{
+ arg: 'barcode',
+ type: 'Number',
+ required: true,
+ description: 'barcode'
+ }],
+ returns: {
+ type: 'Number',
+ root: true
+ },
+ http: {
+ path: `/:barcode/toItem`,
+ verb: 'GET'
+ }
+ });
+
+ Self.toItem = async barcode => {
+ let query = `SELECT vn.barcodeToItem(?)`;
+ let [item] = await Self.rawSql(query, [barcode]);
+ if (item)
+ item = Object.values(item);
+ return item[0];
+ };
+};
diff --git a/modules/item/back/models/item-barcode.js b/modules/item/back/models/item-barcode.js
index 094701113..b608a7fe9 100644
--- a/modules/item/back/models/item-barcode.js
+++ b/modules/item/back/models/item-barcode.js
@@ -1,4 +1,6 @@
module.exports = Self => {
+ require('../methods/item-barcode/toItem')(Self);
+
Self.validatesUniquenessOf('code', {
message: `Barcode must be unique`
});
diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html
index a0d6404f5..d0c89e9e1 100644
--- a/modules/item/front/descriptor/index.html
+++ b/modules/item/front/descriptor/index.html
@@ -95,7 +95,7 @@
Regularize stock
-
+