github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-01 18:39:25 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
594 Commits 2 Branches 81 Tags 29 MiB
b4d2e2a20a
Commit Graph

257 Commits

Author SHA1 Message Date
Bernd Bestel
fa6f09679f
Made "Disable stock fulfillment checking for this ingredient" a default option per product (closes #182) 2019-04-06 15:42:40 +02:00
Bernd Bestel
25c257bb2c
Allow partial minimum stock amount when enabled (closes #203) 2019-04-06 15:27:00 +02:00
Bernd Bestel
45ae386005
Fixed context menu is not visible when the table height is smaller than the menu height (fixes #195) 2019-04-06 14:41:43 +02:00
Bernd Bestel
b6e80580ed
Make it possible to provide a different location for added product during inventory (closes #183) 2019-04-05 21:26:44 +02:00
Bernd Bestel
886e272c03
Show product count per group on the product groups page and added a link to the products page filtered by the current product group (closes #174) 2019-04-05 21:08:30 +02:00
Bernd Bestel
40cc0ff280
Revert changes in file public/js/grocy.js of commit "Fixed differences in highlighting for expiring/expired items in header vs table on stock overview page (fixes #198)" 
This reverts changes in file public/js/grocy.js of commit 12082b52ab.
 2019-04-05 18:59:58 +02:00
Bernd Bestel
3a0bb913d5
Improved form input padding (fixes #180) 2019-04-05 18:50:46 +02:00
Bernd Bestel
12082b52ab
Fixed differences in highlighting for expiring/expired items in header vs table on stock overview page (fixes #198) 2019-04-05 18:41:21 +02:00
Bernd Bestel
353a65d41c
Tried to fix inventory form validation again (closes #167) 2019-03-10 16:08:15 +01:00
Bernd Bestel
bfcd05473a
Allow best before date on purchase/inventory to be today or in the past, but display a hint when so (closes #172) 2019-03-10 16:02:13 +01:00
Bernd Bestel
27ba2bfd55
Fixed display errors when consuming partial amounts from stock overview page (fixes #170) 2019-03-10 14:10:25 +01:00
Bernd Bestel
47a6260d27
Show the plural form of stock QU unit when showing purchase to stock conversion factor on purchase page when QU units are different (references #169) 2019-03-09 17:04:34 +01:00
Bernd Bestel
bfd29def8d
Show purchase to stock conversion factor on purchase page when QU units are different (closes #169) 2019-03-09 17:00:57 +01:00
Bernd Bestel
659d60b235
Make it possible to show the changelog directly via /about?tab=changelog 2019-03-09 16:25:23 +01:00
Bernd Bestel
6de4b120b3
Include changelog as markdown files and show it in the about dialog 2019-03-09 15:54:16 +01:00
Bernd Bestel
bd483ec8b0
Added a context menu to all stock overview page items 2019-03-09 13:11:50 +01:00
Bernd Bestel
4d215edbd0
Clear displayed quantity unit after purchase/consume/inventory bookings 2019-03-09 12:31:45 +01:00
Bernd Bestel
2d0c0bf34f
Fixed cancel button color in unknown product resolve dialog 2019-03-09 10:41:03 +01:00
Bernd Bestel
cad5e9ef79
Tried to fix inventory form validation (references #167) 2019-03-08 22:03:59 +01:00
Bernd Bestel
9f36a599a4
Changed the about dialog slightly 2019-03-06 19:23:53 +01:00
Bernd Bestel
ff15e81abe
Fixed a rounding regarding stock amount comparison when a (scaled) recipe needs a decimal amount (closes #164) 2019-03-06 19:05:32 +01:00
Bernd Bestel
2d8ad24887
Implemented that included recipes can have a serving amount (closes #163 and references #127) 2019-03-05 23:45:04 +01:00
Bernd Bestel
1077149784
Hide the form validation feedback icons introduced in Bootstrap 4.2.0 - a colored border is enough 2019-03-05 20:15:29 +01:00
Bernd Bestel
fcdeda91d9
Show the iCal sharing link instead of directly open it (references #141) 2019-03-05 19:36:14 +01:00
Bernd Bestel
7f2942d414
Also filter gallery items when searching for recipes (references #147) 2019-03-05 19:17:10 +01:00
Bernd Bestel
3a1c5efcfd Fix gallery tab was not selected by query parameter (references #147) 2019-03-05 18:04:16 +01:00
Bernd Bestel
816eb03147 Added a "recipe gallery" view (closes #147) 2019-03-05 17:59:33 +01:00
Bernd Bestel
8504429f5f Implemented tare weight handling (closes #132) 2019-03-05 17:51:50 +01:00
Bernd Bestel
90291fdbca Added possibility to export the calendar in iCal format (closes #141) 2019-03-04 17:44:48 +01:00
Bernd Bestel
77b0bc675c Varios small UI changes / improve UI consistency 2019-03-04 17:43:12 +01:00
Bernd Bestel
8020f92d6b
Track on consume for which recipe it was (closes #64 and references #64) 2019-03-03 18:20:06 +01:00
Bernd Bestel
38825c70da
Added missing translations strings & pulled translations from Transifex 2019-03-03 17:01:35 +01:00
Bernd Bestel
bb5daa5f8b
Display total cost of recipes based on last purchase prices (closes #128) 2019-03-03 16:33:48 +01:00
Bernd Bestel
e9ef7ea6d8
Allow recipe ingredients to be ignored when putting them on the shopping list (closes #125) 2019-03-03 14:49:46 +01:00
Bernd Bestel
89ad25c904
Implemented scalable recipes (closes #127) 2019-03-03 13:27:10 +01:00
Bernd Bestel
ee38d626aa
Added all application icon variants (closes #159) 2019-03-02 08:56:53 +01:00
Bernd Bestel
b89643ddb1
Allow different locations per product in stock (closes #124) 
Kind of basic for now, a different location can be set on purchase, the filters on the stock overview page handles different locations
 2019-03-01 20:25:01 +01:00
Bernd Bestel
9974305ad4
Hide relative date when clearing the datetimepicker (this now closes #143) 2019-02-09 14:48:13 +01:00
Bernd Bestel
01e9e3f5ce
Move about dialog into separate view and add API endpoint for system info 2019-02-09 13:41:40 +01:00
Bernd Bestel
ad09630dbe
Make it possible to add pictures to recipes (closes #136) 2019-01-26 20:06:01 +01:00
Bernd Bestel
03720940d4
Resize embedded iframes to content height (this should fix #130) 2019-01-26 19:31:41 +01:00
Bernd Bestel
dfc05e0bec
Allow optional partial units of products in stock (closes #123) 2019-01-26 14:17:02 +01:00
Bernd Bestel
5c622b9512
Fix product form was not validated when changing location (fixes #144) 2019-01-26 13:13:38 +01:00
Bernd Bestel
276bc94cc6
More improvements on the REST API (references #139) 2019-01-21 22:13:42 +01:00
Bernd Bestel
bfa59dd29c
Rework API to be more RESTful (references #139) 2019-01-19 14:51:51 +01:00
Chris Forkner
0ce8d706a6 API - A bit more RESTful (#140) 
* Restful routes

* Change public/viewjs to match API routes

* Move the GET and POST together. Fixed Typos. PUT for object/user edits.

* Verb-less Generic Entity Interactions

* Create Grocy.Api.Put

* Create Grocy.Api.Delete

* Fix Volatile Slim Error order in routes and adjust to english noun
 2019-01-19 08:37:21 +01:00
Bernd Bestel
c042657dd8
Fix location edit form (edit did not work) 2019-01-05 20:38:27 +01:00
Bernd Bestel
f6649d51bd
Finalize loading speed improvements for all data tables (this now closes #120) 
This is a workaround for now. The tables are still DOM sourced because of too big dependencies between server side rendering and frontend JS code. The tables are initially load while tbody is hidden, this results in a speedup by around 65 %.
 2019-01-05 20:06:35 +01:00
Bernd Bestel
2e265ac70a
Again some changes for stock overview table loading speed workaround (references #120) 2019-01-05 16:27:26 +01:00
Bernd Bestel
30e54997b2
Workaround to improve stock overview table loading time (references #120) 2019-01-05 14:27:40 +01:00
Bernd Bestel
5c25e91984
Add possibility to skip items in "all shopping list items to stock workflow" (closes #116) 2018-11-26 20:02:01 +01:00
Bernd Bestel
02163c4305
Properly refresh opened product amount after consume on stock overview page (fixes #114) 2018-11-26 19:47:07 +01:00
Bernd Bestel
5cdf2c14d3
Fix shopping list edit form - product was not prefilled (fixes #115) 2018-11-26 19:37:17 +01:00
Bernd Bestel
61fc6e05f4
Add an agenda view to calendar 2018-11-24 20:18:13 +01:00
Bernd Bestel
367a3e52de
Properly sort recipes fulfillment column (closes #113) 2018-11-24 19:59:24 +01:00
Bernd Bestel
a3617cffb8
Small different UI improvements 
Show the cursor as pointer on stock overview page while hovering the product name cell to highlight that the productcard can be opened
Show a waiting cursor and disable all form inputs while doing background XHR calls to highlight that the user should wait
Place the search field (to search a table) on all pages to the left most place
 2018-11-24 19:40:50 +01:00
Bernd Bestel
ca5df3b217
Hopefully finally fix the navbar scrollbar problems now 2018-11-21 21:36:22 +01:00
Bernd Bestel
dd48be595c
Remove "debug" JS output 2018-11-21 19:16:06 +01:00
Bernd Bestel
306d0f7da6
Add "one click shopping list to stock workflow" (closes #110) 2018-11-21 19:08:36 +01:00
Bernd Bestel
c61c37e67a
Properly initialize show_clock_in_header user setting control after page reload 2018-11-20 19:34:06 +01:00
Bernd Bestel
f7f90238f2
Show optionally a clock in the header (closes #109) 2018-11-20 19:23:48 +01:00
Bernd Bestel
5da24d2d4f
Added first version of calendar (closes #42) 2018-11-18 15:39:43 +01:00
Bernd Bestel
f7f2bf3fc0
Various small UI improvements for the shopping list 2018-11-18 14:19:50 +01:00
Bernd Bestel
e021c93d22
Make clear than picking a specific stock item on consume always means an amount of 1 2018-11-18 13:46:23 +01:00
Bernd Bestel
2ff5faacc0
Prevent opening more products than are unopened in stock 2018-11-18 13:35:21 +01:00
Bernd Bestel
a403bb687a
Show amount of opened products on stock overview page and in product card 2018-11-18 13:17:36 +01:00
Bernd Bestel
5966a3d678
Improve journal UI when undoing a transaction 2018-11-18 12:58:15 +01:00
Bernd Bestel
10ea9c44fd
Make it possible to mark a product as opened (closes #86) 2018-11-17 19:39:37 +01:00
Bernd Bestel
816ca6460f
Make it possible to pick a specific stock item on consume (closes #62) 2018-11-17 17:51:35 +01:00
Bernd Bestel
b6d60c4e34
Fix datetimepicker did not trigger a change event (fixes #108) 2018-11-17 15:00:51 +01:00
Bernd Bestel
6f67619784
Finish "shopping list to stock workflow" (closes #98) 2018-11-17 14:50:52 +01:00
Bernd Bestel
973f07b360
Add embedded mode (hides menu and so on), maybe need for #98 2018-11-17 12:57:35 +01:00
Bernd Bestel
0f73d849eb
Fixed equipment edit button always pointed to the first equipment item (fixes #107) 2018-11-17 08:26:31 +01:00
Bernd Bestel
8f31f891fd
Add a "shopping list item to stock flow" (references #98) 2018-11-14 21:40:17 +01:00
Bernd Bestel
04e9ba8e34
Allow fraction numbers for recipe ingredients when not checked against stock and add option to not check stock for a recipe position (closes #105) 2018-11-02 19:53:01 +01:00
Bernd Bestel
89553b7fa0
Workaround for datepicker problem (fixes #100) 2018-10-27 17:56:53 +02:00
Bernd Bestel
364f6b2051
Add journal and undo UI for stock bookings, chore executions and battery charge cycles (closes #63, closes #97) 2018-10-27 17:26:00 +02:00
Bernd Bestel
da98efa833
Finalize nested recipes / group recipe positions feature (closes #77) 2018-10-27 10:37:31 +02:00
Bernd Bestel
fc3a4c6899
Finish first version of nested recipes feature (references #77) 2018-10-25 20:36:29 +02:00
Bernd Bestel
12a2cb0bdf
Created basis edit UI for nested recipes (references #77) 2018-10-23 19:36:39 +02:00
Bernd Bestel
57a0864465
Show productcard as a popup on stockoverview page instead of only the product picture (closes #93) 2018-10-22 19:28:59 +02:00
Bernd Bestel
b3da837ede
Added link to item edit page for all item cards (product/chore/battery) (references #93) 2018-10-22 19:13:08 +02:00
Bernd Bestel
04c93d937e
Make presets for new products configurable (closes #92) 2018-10-20 14:55:49 +02:00
Bernd Bestel
5318e79f55
Properly pluralize quantity unit in success message on purchase/consume/inventory page 2018-10-20 14:09:19 +02:00
Bernd Bestel
366152c049
Next attempt to fix the scroll issue of navigation section (references #90) 2018-10-20 11:25:22 +02:00
Bernd Bestel
4a35477c35
Don't auto reload when database has changed in "fullscreen-card-mode" (fixes #88) 2018-10-13 09:18:16 +02:00
Bernd Bestel
03eaa6c79f
Add possibility to filter by product group on stock overview page 2018-10-06 18:19:31 +02:00
Bernd Bestel
9984e8f218
Small visual/space improvements/changes on recipes and equipment page 2018-10-06 11:43:46 +02:00
Marius Boro
b0c91f6ad1 added missing and updated for new features. (#83) 2018-10-06 09:15:54 +02:00
Bernd Bestel
7ba6fc875b
Improve responsive embeds (references #25) 2018-10-03 19:05:00 +02:00
Bernd Bestel
ebd24bf30e
Use new editor also for recipes 2018-10-03 16:41:21 +02:00
Bernd Bestel
ebd9b1b851
Add possibility to show equipment notes/instruction manuals also in fullscreen mode (references #25) 2018-10-03 16:40:40 +02:00
Bernd Bestel
b242a5de52
Finish equipment / instruction manuals feature (references #25) 2018-10-03 16:11:39 +02:00
Bernd Bestel
81ec011095
Product edit page: Slightly improved styling of barcodes 2018-10-03 13:34:38 +02:00
Bernd Bestel
2a371cc081
Product edit page: Enforce a quantity unit conversion factor > 1 when quantity unit purchase != quantity unit stock 2018-10-03 13:27:36 +02:00
Bernd Bestel
edb986ce24
Added a quick mockup for equipment / instruction manuals (references #25) 2018-10-02 20:03:08 +02:00
Bernd Bestel
6090ac621e
Prevent deletion of products with current stock (closes #81) 2018-10-02 18:17:26 +02:00
Bernd Bestel
ae58606d04
Center title in product picture dialog 2018-10-02 18:00:52 +02:00
Bernd Bestel
9dd57decdf
Finish "pictures for products" features (now closes #58) 2018-10-02 16:48:39 +02:00
Bernd Bestel
f1fc0ee549
Finished first version of "pictures for products" (references #58) 2018-10-01 20:20:50 +02:00