1
0

116 Commits

Author SHA1 Message Date
cryptogopher
3ce5d5c940 Fix migration of default quantities
Allow Quantity formula to be nil but not blank
Add computed energy quantity
Reverse default quantities deletion order
2019-11-15 00:04:34 +01:00
cryptogopher
0e5a53b4b9 Moved defaults into separate migration 2019-11-14 22:21:40 +01:00
cryptogopher
dc9ebb36f6 Simplified Formula.valid? 2019-11-11 15:46:57 +01:00
cryptogopher
fd11198446 Fixed fieldset toggling 2019-11-11 15:21:05 +01:00
cryptogopher
2e477921e9 Updated Formula get_quantities/calculate for new parsing algo 2019-11-11 15:10:02 +01:00
cryptogopher
613c26728c Removed old (Ripper.lex based) formula validation code
Muted multiple 'disallowed' messages for keywords
Removed unnecessary .to_d call in formula computation
2019-11-11 00:01:31 +01:00
cryptogopher
d768adb86b Formula parsing extensions 2019-11-10 23:37:11 +01:00
cryptogopher
7032bd4fb0 Moved filters ouside of ingredient table, so they are always visible 2019-11-10 23:26:32 +01:00
cryptogopher
13703dc8ed Fixed filtering 2019-11-10 23:23:59 +01:00
cryptogopher
60cfd17c0f WIP on alternative (sexp) formula parsing 2019-11-10 23:14:36 +01:00
cryptogopher
841fcb2807 Working on formula validation to accomodate functions, WIP 2019-11-10 00:48:54 +01:00
cryptogopher
eba2aaa8aa Unknown formula values default to nil 2019-11-09 22:35:29 +01:00
cryptogopher
67b0cd9b66 Unevaluable formulas return nil (instead of throwing error)
Filter formula errors are shown in filter view
2019-11-09 20:36:10 +01:00
cryptogopher
70b6e97b87 Filtering ingredients by formula working 2019-11-08 23:42:41 +01:00
cryptogopher
4ab24aa223 Nutrient filter input resized to remaining width 2019-11-08 16:36:34 +01:00
cryptogopher
78cf471ecd Preliminary support for comparison formula 2019-11-07 19:55:16 +01:00
cryptogopher
2a3e7e8d00 Moved remaining formula code to Formula module 2019-11-07 19:30:02 +01:00
cryptogopher
19e2a45ba8 Moved formula code/validation to separate module 2019-11-07 19:19:31 +01:00
cryptogopher
884f7b2366 Added ingredient filter by nutrients field 2019-11-07 16:25:42 +01:00
cryptogopher
b6c453c37c Further optimized nutrient calculation defaults 2019-11-07 16:10:15 +01:00
cryptogopher
c1771d44d7 Commented nutrient computation algo 2019-11-07 00:43:30 +01:00
cryptogopher
8bad0b0b0f Fixed nutrients listing for absent quantity 2019-11-07 00:03:33 +01:00
cryptogopher
88e5cb430a Quantity computation from formula 2019-11-06 23:11:58 +01:00
cryptogopher
304c8c788d Aggregated quantity calculation for all ingredients 2019-11-06 22:58:07 +01:00
cryptogopher
ce4d839a10 Simplified returning result 2019-11-06 22:45:09 +01:00
cryptogopher
5c8b7e0def Displaying computed nutrients 2019-11-06 21:26:33 +01:00
cryptogopher
eff672318b Quantity computing from formula looks done, savepoint 2019-11-06 15:59:39 +01:00
cryptogopher
d70a17f58b Preliminary nutrient computation from formulas 2019-11-05 16:02:53 +01:00
cryptogopher
dd6b21d834 Simplified ingredient list preparation 2019-11-04 20:48:12 +01:00
cryptogopher
fce6ee57b0 Quantity formula assignment and validation 2019-11-03 18:35:22 +01:00
cryptogopher
fd24bced60 Changed action column width 2019-11-02 23:59:19 +01:00
cryptogopher
020c4e30ea Changed showAndScrollTo -> show + focus 2019-11-02 23:53:36 +01:00
cryptogopher
12015f6083 Added Quantity.formula
Added timestamps to all models
2019-11-02 23:35:08 +01:00
cryptogopher
31518660c8 Added auto submit on name filter focus lost 2019-11-02 19:39:47 +01:00
cryptogopher
3294689cb4 Added Ingredient visibility filter
Fixed index display (many? -> any? persisted)
2019-11-02 19:30:52 +01:00
cryptogopher
05c79782f5 Ingredient create/import redirect to proper page 2019-11-02 18:53:46 +01:00
cryptogopher
3689abb1dc Changed Ingredient#destroy to ajax 2019-11-02 18:50:14 +01:00
cryptogopher
c7c39be017 Filter form resetting 2019-11-02 16:52:35 +01:00
cryptogopher
1acb72f33d Filtering ingredients by name
Nutrients link in sidebar
2019-11-02 15:32:21 +01:00
cryptogopher
cf9c913897 Toggling quantity primariness from nutrients view 2019-11-01 21:43:56 +01:00
cryptogopher
09c441f662 Moved expand action from icon to TD 2019-10-31 23:42:48 +01:00
cryptogopher
611b2b799d Removed rowspans 2019-10-31 23:08:04 +01:00
cryptogopher
526a4b1fe6 Better expanding of extra nutrients 2019-10-31 23:00:40 +01:00
cryptogopher
fcec8364bc Extra quantities styling in Nutrients listing
Fixed decimal precision/scale
2019-10-31 22:13:39 +01:00
cryptogopher
2f0b34d3fe Extra nutrients are displayed in table cells
Fixed column widths with content ellipsizing
2019-10-31 15:28:32 +01:00
cryptogopher
6f9e8926d7 Nutrients list expandable, displays description 2019-10-28 22:08:05 +01:00
cryptogopher
c4e89def0a Created common contextual menu for ingredient/nutrients views
Restored sidebar for nutrients view
2019-10-28 19:51:46 +01:00
cryptogopher
67efb6c6bc Added Ingredient#toggle and dimming hidden items 2019-10-27 22:18:00 +01:00
cryptogopher
3cec0847df Quantity#destroy changed to AJAX 2019-10-27 20:05:57 +01:00
cryptogopher
daf0bd421e Running Quantity#toggle/up/down/left/right through AJAX 2019-10-27 19:29:12 +01:00