Bernd Bestel
e897570968
Only adjust the camera barcode scanning live stream picture size once ( fixes #734 )
2020-04-13 22:34:52 +02:00
Bernd Bestel
2e625f330d
Little style changes and changelog for #733
2020-04-13 22:30:35 +02:00
Michael Frikke Madsen
a6030798c7
Add camera picker button ( #733 )
...
* Add camera picker button
* Remove button and nested dialog - make it a select
- Also make Cancel button gray again
2020-04-13 22:07:38 +02:00
Bernd Bestel
6f4769a7b3
Make product groups on the shopping list collapsible ( closes #604 )
2020-04-13 19:11:13 +02:00
Bernd Bestel
1390c65864
Show optionally an icon on the stock overview page if the product is already on the shopping list ( closes #708 )
2020-04-13 18:47:41 +02:00
Bernd Bestel
840b35b30d
Add tooltips to shopping list item buttons ( closes #572 )
2020-04-13 18:26:53 +02:00
Bernd Bestel
886721e972
Fixed consuming tare weight handling enabled products from the stock overview page ( fixes #731 )
2020-04-13 17:29:00 +02:00
Bernd Bestel
f36d9c46ed
Make Quagga2 setting "numOfWorkers" adjustable ( closes #713 )
2020-04-13 16:14:43 +02:00
Bernd Bestel
10f890ef89
Added a camera-barcode-scanner-button to the barcodes field on the product edit page ( closes #723 )
2020-04-13 15:55:27 +02:00
Bernd Bestel
9a93c32d3c
Fix total price amount relation on purchase ( fixes #722 )
2020-04-13 14:52:13 +02:00
Bernd Bestel
855b24c515
Fix consume page form validation limits for the amount input when tare weight handling is enabled ( fixes #727 )
2020-04-12 21:41:04 +02:00
Bernd Bestel
0327188125
Optimize datetimepicker form validation events ( fixes #726 )
2020-04-12 18:41:23 +02:00
Bernd Bestel
8cfd3e19ba
Typo...
2020-04-12 15:34:27 +02:00
Bernd Bestel
81e6530ddc
Always set number inputs in browser locale format ( fixes #610 )
2020-04-12 15:33:36 +02:00
Bernd Bestel
4e5e191b22
Fixed the conversion factor hint on the purchase page ( fixes #625 )
2020-04-12 14:09:38 +02:00
Bernd Bestel
9dbd6a68c4
Don't change the displayed QU to the products stock QU when "Only check if a single unit is in stock" is set when editing a recipe ingredient ( fixes #606 )
2020-04-12 13:55:26 +02:00
Mik-
a6dd794ce8
Add missing form validation on presetting QU id stock ( #704 )
2020-04-07 16:37:30 +02:00
Mik-
1aa788b6c2
Preset the stock qu with the purchase qu on new products. ( #688 )
2020-04-02 08:36:20 +02:00
Mik-
7200f2c17f
Fix errors with disabled feature flag STOCK_PRICE_TRACKING ( #687 )
...
fixes #685
2020-04-02 08:34:43 +02:00
Mik-
f66a4c9631
Camera barcode scanner enhancements ( #675 )
...
* Disable torch button, if not supported
* Allow toggling torch
* Don't exceed the screen width with camera window
* Disable torch button, if not supported
* Allow toggling torch
* Don't exceed the screen width with camera window
* Allow toggling torch
* Disable torch button, if not supported
* Allow toggling torch
* Don't exceed the screen width with camera window
* Allow toggling torch
* Allow toggling torch
* Don't exceed the screen width with camera window
* Remove toggling of torch, as it's not working
and add resize of video to fit in viewport hieght
* Add feature to always turn on the torch in camera scanner.
* Fix feature flag name
Co-authored-by: Michael Neuendorf <neuendorf@gonicus.de>
2020-03-29 14:25:04 +02:00
kriddles
2fee4b45ff
set default store for product, purchase set last store purchased if available or use product default ( #672 )
2020-03-27 19:27:40 +01:00
Bernd Bestel
305f5b67e4
Name shopping locations "Stores" on the frontend (references #658 )
2020-03-25 20:09:28 +01:00
Bernd Bestel
2d00f6f84a
Immediately show the changed shopping location after edit on the stock entries page (references #658 )
2020-03-25 20:00:52 +01:00
Bernd Bestel
c3d4be352d
Fix product card chart rendering error when there is no shopping location (references #658 )
2020-03-25 19:49:10 +01:00
Immae
a45317aea1
Add shopping location for price tracking ( #658 )
2020-03-25 19:34:56 +01:00
Bernd Bestel
48dc8e45ba
Fixed localization string (references #588 )
2020-03-06 20:58:01 +01:00
Bernd Bestel
5cfe7cf34d
Fixed that the recipe page was reloaded when expanding a collapsed row on mobile ( fixes #589 )
2020-03-06 20:51:09 +01:00
Bernd Bestel
fc131f5598
Little changes and changelog for #574
2020-03-01 17:58:10 +01:00
Radim Kabeláč
51cd81422e
Button to Flashlight ON in Barcodescanner ( #574 )
...
* Button to Flash lights ON in barcodereader
Only to ON, not OFF (you can Cancel)
* First documentation files for ReadThedoc
* Delete index.md
* Delete mkdocs.yml
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-03-01 17:53:28 +01:00
Bernd Bestel
3c4264c3a0
Reload the meal plan after consuming a recipe
2020-02-11 19:24:34 +01:00
Bernd Bestel
aa787e765e
Changelog, small changes and added missing localization strings for #556
2020-02-10 18:24:15 +01:00
kriddles
c5f38689fa
Include product_group in recipe ingredient list ( #556 )
...
* Include product_group in recipe ingredient list
* Delete 0098.sql
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-02-10 18:04:57 +01:00
Bernd Bestel
49edd011b4
Changelog and small fixes for #545
2020-02-09 21:50:56 +01:00
kriddles
7638254f14
Mealplan - use mealplan recipe_servings when consuming and adding missing recipe ingredients ( #545 )
2020-02-09 21:43:31 +01:00
Bernd Bestel
5a65f37f4a
Little wording change/fix
2020-02-09 21:03:11 +01:00
Bernd Bestel
540ae2627a
Changelog & small changes for #554
2020-02-09 21:01:29 +01:00
kriddles
2c0f7f0883
Default initial recipe add for mealplan to use recipe's base_servings ( #554 )
2020-02-09 20:57:25 +01:00
Bernd Bestel
62dae64a88
Make meal plan entries editable (references #545 )
2020-02-09 17:15:13 +01:00
Bernd Bestel
0359003e09
Little changes for #551
2020-02-09 15:36:03 +01:00
Marc Ole Bulling
a0ab5c5e94
Add option to disable automatic switching to compact shoppinglist view on mobile devices ( #551 )
2020-02-09 15:25:54 +01:00
Bernd Bestel
e9f55de987
Fixed FullCalendar height was not calculated dynamically ( fixes #549 )
2020-02-09 15:24:05 +01:00
Bernd Bestel
3af5bd8e29
Scoll to the recipe card after selecting a recipe on mobile devices ( closes #547 )
2020-02-09 15:11:38 +01:00
Bernd Bestel
06fe308f31
Fixed recipeposform initial product quantity unit was not set
2020-02-04 20:04:48 +01:00
Bernd Bestel
171d6af5e1
We don't need that switch-button, a native Boostrap button is enough and less disturbing
2020-02-03 21:21:42 +01:00
Bernd Bestel
58cff18b03
Improved the meal plan add-dialogs ( closes #540 )
2020-02-03 20:04:22 +01:00
Leroy Förster
b4a759c0fc
Use full width for compact shopping list ( #541 )
...
I had luck with not enforcing any width, not even 100% and removed the
padding an margin overrides from the shoppinglist.js
I also tested it on a real Android device to be really sure.
2020-02-03 08:48:37 +01:00
Bernd Bestel
b9e32a9795
Fixed contextual time ago display was missing (references #513 )
2020-02-02 17:55:35 +01:00
Bernd Bestel
890663bf63
Fixed the "Shopping list to stock workflow" with disabled FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING ( fixes #537 )
2020-02-02 13:01:31 +01:00
Bernd Bestel
5effa0c103
Fixed recipeposform edit when "Only check if a single unit is in stock" is set (again closes #535 )
2020-02-02 12:33:48 +01:00
Bernd Bestel
7235d9c0c9
Next try to fix scrolling issues on shopping list compact view (again closes #453 )
2020-02-02 12:01:47 +01:00
Bernd Bestel
ad9f336035
Fix new recipe creation when reloading the /recipes/new page ( fixes #536 )
2020-02-01 18:16:44 +01:00
Bernd Bestel
23efe0c87a
Added an option to hide the calendar on the shopping list ( closes #531 )
2020-02-01 12:55:12 +01:00
Bernd Bestel
683ea0984c
Further optimized shopping list compact view (references #453 )
2020-02-01 12:35:06 +01:00
Bernd Bestel
debb29ddaa
Fixed recipeposform edit when "Only check if a single unit is in stock" is set ( fixes #535 )
2020-02-01 09:03:30 +01:00
Bernd Bestel
b8c6ac6905
Fixed location_id handling when FEATURE_FLAG_STOCK_LOCATION_TRACKING is disabled ( fixes #532 )
2020-01-31 21:27:51 +01:00
Bernd Bestel
da92ac40c4
Always save the recipe before leaving/reloading the page (this now closes #520 )
2020-01-28 21:04:59 +01:00
Bernd Bestel
8d490351d0
Replaced jQuery UI by Animate.css (better, faster, lighter)
2020-01-28 19:27:18 +01:00
Bernd Bestel
4c1c971f6d
Rename /stockedit and /stockdetail to match the "naming conventions" (references #421 )
2020-01-27 19:19:09 +01:00
Bernd Bestel
05aceb72ae
Squashed commit
...
- Only refresh contextual number/datetime info/formatting where needed (closes #513 )
- Also refresh correlated stock journal entries on undo (closes #471 )
- Prefill "New amount" with the current stock amount on the inventory page (closes #434 )
- Ensure that the location_id of the stock and stock_log tables is never empty after migration 95 (references #421 )
- Load initial values of the /stockedit form server side to improve loading performance (references #421 )
- Use more or less the same input ordering as on the purchase page for the /stockedit page (references #421 )
- Also display the "Compact view" button on the shopping list page when FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS is disabled (references #453 )
- Ensure that the currently active sidebar menu item is visible
- Optimized sidebar menu item grouping/spacing
- Properly order the API documentation route groups and put the "by-barcode" routes into a separate group
- Updated dependencies
- Pulled translations from Transifex
- Prepared changelog for next release
2020-01-27 19:00:49 +01:00
Bernd Bestel
9221d787a5
How many units are in stock doesn't really mean anything...
2020-01-26 21:18:09 +01:00
Bernd Bestel
71a57c9dcb
Implement "Free products" ( closes #426 )
2020-01-26 20:01:30 +01:00
Bernd Bestel
f09ba08549
Typo... (references #517 )
2020-01-26 18:02:12 +01:00
Bernd Bestel
430cd05278
Break long mealplan notes ( fixes #517 )
2020-01-26 18:00:29 +01:00
Bernd Bestel
c7bcb9984a
Implemented "Scan mode"
2020-01-26 15:35:01 +01:00
Bernd Bestel
7a048136c6
Added missing localization strings
2020-01-26 13:40:26 +01:00
kriddles
ac1be1e90f
450 updates ( #518 )
...
* prevent seeing undefinde if no recipes
* disable weekRecipeConsume if weekCosts are zero
* reword title
* Add meal plan notes and products to Calendar
2020-01-26 08:50:44 +01:00
Bernd Bestel
0ef9b2fdb7
Added a new setting to be able to start the meal plan on a different weekday ( closes #429 )
2020-01-25 20:01:40 +01:00
Bernd Bestel
d64a1a546c
Finalize products on meal plan feature (references #450 )
2020-01-25 19:42:46 +01:00
Bernd Bestel
98f70d1525
Finalize products on meal plan feature (references #450 )
2020-01-25 18:36:54 +01:00
Bernd Bestel
aa97a8c301
Finalize products on meal plan feature (references #450 )
2020-01-25 18:34:03 +01:00
kriddles
3762c1f799
450 consume meal plan product ( #514 )
...
* typo
* mealplan product consume
2020-01-25 18:02:50 +01:00
Bernd Bestel
e111d07f4e
Added the ability to directly add products to the meal plan ( closes #450 )
2020-01-25 11:51:00 +01:00
Bernd Bestel
061f4da041
Don't try to switch twice to shopping list compact mode on mobile (references #453 )
2020-01-25 08:49:17 +01:00
Bernd Bestel
3cbeea7d95
Added an option to filter for only undone items on the shopping list ( closes #452 )
2020-01-24 22:26:36 +01:00
Bernd Bestel
ad54253d72
Added a compact view for shopping list (for mobile shopping) ( closes #453 )
2020-01-24 22:05:08 +01:00
Bernd Bestel
fd5a72264d
Meal plan recipe and notes also fit into one table (references #477 )
2020-01-23 21:57:47 +01:00
Bernd Bestel
8d7f985b59
Make it possible to add notes to meal plan (days) ( closes #477 )
2020-01-23 20:59:19 +01:00
Bernd Bestel
b4997abf75
Reload the page if a stock row cannot be found by id (references #506 )
2020-01-23 19:13:35 +01:00
Bernd Bestel
99d4b05a3c
Make purchased date on /stockedit editable / Dirty workaround for 2 datetimepickers on the same page (references #506 )
2020-01-23 18:58:05 +01:00
Bernd Bestel
ec2551d263
Little refinements for #507
2020-01-22 21:17:04 +01:00
kriddles
ef9f28d154
421 ( #507 )
...
* refactor to be stock/entry/{entryId}
* Allow recipeform add productworkflow
* on document ready stockdetail filter based on ProductPicker
* openDate fixes for undo
* RefreshStockDetailRow refresh location-id
2020-01-22 21:08:49 +01:00
Bernd Bestel
101355cae2
Added day summary (costs and calories) to the meal plan ( closes #502 )
2020-01-21 22:44:04 +01:00
Bernd Bestel
ca6c2b0af8
Also show calories per serving on the meal plan (references #502 )
2020-01-21 22:02:53 +01:00
Bernd Bestel
5793f6b041
Fixed that meal plan week costs were missing for weeks 1 - 9
2020-01-21 21:54:22 +01:00
Bernd Bestel
22c978c8dc
Preselect the default serving size when adding a nested recipe ( closes #500 )
2020-01-21 21:42:52 +01:00
Bernd Bestel
0816359867
Some refinements for #501
2020-01-21 20:45:34 +01:00
kriddles
3a36bdaf45
recipes can create products ( #501 )
2020-01-21 20:20:26 +01:00
Bernd Bestel
c22496ca7c
Fixed /stockedit opened checkbox (references #506 )
2020-01-21 20:04:33 +01:00
Bernd Bestel
f543a3a472
Fixed and optimized some things related to #421 (& some more cleanup)
2020-01-21 17:30:09 +01:00
kriddles
7c2320e978
refresh productcard on save ( #495 )
2020-01-17 18:13:43 +01:00
kriddles
cdbfc3c3db
productcard.js check null location ( #494 )
2020-01-17 18:06:33 +01:00
kriddles
2a608c41e9
Stock detail updates ( #493 )
...
* Fix spelling
* stockdetail refresh with location name
* Stock updates
* change stock_row_id to id
* fix stockdetail refresh rows after clicking undo
* fix stockdetail consume spoiled
2020-01-17 17:54:34 +01:00
Bernd Bestel
485eb262f9
Show some more info when camera access is not possible ( closes #437 )
2020-01-05 09:20:58 +01:00
Bernd Bestel
e515f21d3b
Fixed DataTables earch / don't search the first column with buttons/menus ( fixes #440 )
2020-01-03 14:18:56 +01:00
Bernd Bestel
6345e69922
Fixed tare weight handling min. amount on purchase was not calculated based on the products qu_factor_purchase_to_stock ( fixes #457 )
2020-01-03 14:10:43 +01:00
Bernd Bestel
675bf25927
Allow empty date(time) inputs when the field is not required (fixes #462(
2020-01-03 13:50:10 +01:00
kriddles
36e8484046
Recipe form updates ( #476 )
...
* recipePosForm - hide when embeded productcard
* recipeposform: remove prefillByName for productPicker
* recipeform add data-product-id
* recipeposform cleanup extra clicks
* recipeform: bootbox the recipe pos edit button
* recipeform: bootbox the recipe pos add button
* recipeposform postMessage back
* recipeform reload if IngredientsChanged
* Fix page reload for new recipes (URL = /recipe/new)
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2019-12-21 12:36:02 +01:00
kriddles
e89832c3aa
Check for Price Tracking in mealplan.js ( #469 )
2019-12-19 20:07:13 +01:00
kriddles
6c7420ea08
Stock Service Updates ( #421 )
...
* viewjs consume: implement location and update stock specific
* Transfer Products
* services StockService#GetProductStockEntriesByLocation: add method
* services StockService#AddProduct: check for stock and locations
* services StockService: include location_id
* services StockService#LocationExists: add method
* services StockService#UndoBooking: fix based on stockRow
* Reimplement StockServer->TransferProduct (one loop for the whole action to preserve stock_id)
* Ensure that the location_id is never NULL in the stock and stock_log table (checked by an INSERT trigger, sets the products default location if empty)
* Only consider stock amount at the given location on consume, if supplied
* Restore more/old display text for "specific stock entry"
* Don't allow transfering tare weight enabled products
* Various small changes (code style, missing OpenAPI endpoint, remove location_id null checking)
* Updated translations strings
* Added transaction_id and correlation_id to stock_log entries to group them together
* ProductCard - location to default location label change
* Also undo correlated bookings on undo
* Added API endpoints for listing and undoing transactions and use them on purchase/consume/inventory/stockoverview
* Initial Stock detail page
* Allow Undo for Tranfers
* Price step to .01
* Some localization string changes & fixes
2019-12-19 19:48:36 +01:00
Bernd Bestel
da2c8d48ac
Changelog and code optimizations for pull request #420
2019-10-19 10:33:46 +02:00
