github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-07 05:16:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add feature to always turn on the torch in camera scanner.

Browse Source
This commit is contained in:
Michael Neuendorf 2020-03-29 13:30:29 +02:00
parent 885c294443
commit 652ee3892e
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config-dist.php
View File

@ -154,3 +154,4 @@ Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true);
# Feature settings # Feature settings
Setting('FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT', true); // When set to false, opened products will not be considered for minimum stock amounts Setting('FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT', true); // When set to false, opened products will not be considered for minimum stock amounts
Setting('FEATURE_FLAG_AUTO_TORCH_ON_WITH_CAMERA', true); // Enables the torch automaticaly in every camera barcode scanner.

29
public/viewjs/components/barcodescanner.js
View File

@ -8,10 +8,16 @@ Grocy.Components.BarcodeScanner.CheckCapabilities = function()
capabilities = track.getCapabilities(); capabilities = track.getCapabilities();
} }
// Check if the camera is capable to turn on a torch.
var canTorch = typeof capabilities.torch === 'boolean' && capabilities.torch var canTorch = typeof capabilities.torch === 'boolean' && capabilities.torch
// Remove the torch button, if either the device can not torch or AutoTorchOn is set.
var node = document.querySelector('.torch'); var node = document.querySelector('.torch');
if (node) { if (node) {
node.style.display = canTorch ? 'inline-block' : 'none'; node.style.display = canTorch && !Grocy.FeatureFlags.FEATURE_FLAG_AUTO_TORCH_ON_WITH_CAMERA ? 'inline-block' : 'none';
}
// If AutoTorchOn is set, turn on the torch.
if (canTorch && Grocy.FeatureFlags.FEATURE_FLAG_AUTO_TORCH_ON_WITH_CAMERA) {
Grocy.Components.BarcodeScanner.TorchOn(track);
} }
// Reduce the height of the video, if it's heigher than then the viewport // Reduce the height of the video, if it's heigher than then the viewport
@ -116,6 +122,19 @@ Grocy.Components.BarcodeScanner.StopScanning = function()
bootbox.hideAll(); bootbox.hideAll();
} }
Grocy.Components.BarcodeScanner.TorchOn = function(track)
{
if (track) {
track.applyConstraints({
advanced: [
{
torch: true
}
]
});
}
}
Quagga.onDetected(function(result) Quagga.onDetected(function(result)
{ {
$.each(result.codeResult.decodedCodes, function(id, error) $.each(result.codeResult.decodedCodes, function(id, error)
@ -192,13 +211,7 @@ $(document).on("click", "#barcodescanner-start-button", function(e)
className: 'btn-warning responsive-button torch', className: 'btn-warning responsive-button torch',
callback: function() callback: function()
{ {
Quagga.CameraAccess.getActiveTrack().applyConstraints({ Grocy.Components.BarcodeScanner.TorchOn(Quagga.CameraAccess.getActiveTrack());
advanced: [
{
torch: true
}
]
});
return false; return false;
} }
}, },