Brenda Wallace
ec00baef0d
Updated feature spec to look for new annual/perennial text
2017-11-05 14:07:33 +13:00
Brenda Wallace
eb585611fe
Fixed spec to call update_lifespan_medians
2017-11-05 14:05:54 +13:00
Brenda Wallace
9280049a84
Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions
2017-11-05 13:45:08 +13:00
Brenda Wallace
53d7fd1479
Displaying predicted first harvest on plantings and crops
2017-11-05 13:43:00 +13:00
Brenda Wallace
4cc0f77bd0
Predicting first harvest - updating medians
2017-11-05 13:42:30 +13:00
Brenda Wallace
5e5773aa59
feature spec for displaying annual/perennial on crops#show
2017-11-05 12:52:02 +13:00
deppbot
2422939b4f
Bundle Update on 2017-11-04
2017-11-04 20:10:52 +13:00
Brenda Wallace
d5a1a683f1
Rubocop fix
2017-11-04 15:44:56 +13:00
Brenda Wallace
f5bb47e4ca
DRY plantings controller a bit more - update crop means in one place
2017-11-04 15:36:51 +13:00
Brenda Wallace
8359218294
Update crop medians after deletion of planting (not before)
2017-11-04 11:53:40 +13:00
Brenda Wallace
285e6edc61
crop -> sci_names needs dependent:destroy so we don't get orphans
2017-11-04 11:51:19 +13:00
Brenda Wallace
f2fac9db1b
Time.zone.local
2017-11-04 11:39:53 +13:00
Brenda Wallace
cabc4fd030
%i-literals should be delimited by ( and )
2017-11-04 10:29:31 +13:00
Brenda Wallace
20fe9e4cc5
Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions
2017-11-04 10:09:53 +13:00
Logan Gingerich
fa600bea9e
changed spec to reflect factorybot change
2017-11-03 14:53:20 +13:00
Logan Gingerich
99e7fb1f7d
Name added to contributors and spec added
2017-11-03 14:53:20 +13:00
Logan Gingerich
81e22d6fb2
fixes #1419 - Allows brackets in garden names
2017-11-03 14:53:20 +13:00
Logan Gingerich
10a8df47a9
Factorygirl to factorybot - fixes #1413 ( #1425 )
...
* FactoryGirl Changed to FactoryBot
file fix
changes based on comments received
Bundle Update on 2017-10-29
style update to align hash literal
added package-lock
* indentation fixes with rubocop
* name added to contributors
2017-11-01 15:03:31 +00:00
pozorvlak
b0a4df629c
Merge pull request #1429 from Br3nda/delimiters
...
Stop hound and codeclimate fighing over delimiter styles
2017-11-01 10:00:44 +00:00
Brenda Wallace
0b8357a261
Merge branch 'delimiters' into feature/harvest-predictions
2017-11-01 15:14:06 +13:00
Brenda Wallace
7104781d1b
Rubocop array fix ups
2017-11-01 15:13:32 +13:00
Brenda Wallace
267f27b3f8
rubocop fix up
2017-11-01 14:48:42 +13:00
Brenda Wallace
31a37bf6dc
No progress bar for perennials
2017-11-01 14:27:03 +13:00
Brenda Wallace
d1951b8b65
Edit and show perennial plants
2017-11-01 14:22:39 +13:00
Brenda Wallace
cd99769311
Wrapped a long line
2017-11-01 14:02:56 +13:00
Brenda Wallace
71cb3f8c5f
Rubocop fixes
2017-11-01 13:57:49 +13:00
Brenda Wallace
d540342acb
removed the days_before_maturity specs because function no longer exists
2017-11-01 13:57:49 +13:00
Brenda Wallace
f66b0768e2
Changed how db schema is loaded in travis
2017-11-01 13:57:49 +13:00
Brenda Wallace
251f44b0c7
Updated tests of progress bar
2017-11-01 13:57:49 +13:00
Brenda Wallace
adf07ce5ef
Planting feature specs passing
2017-11-01 13:57:49 +13:00
Brenda Wallace
54b204c636
fixed typo
2017-11-01 13:57:49 +13:00
Brenda Wallace
ff446c2139
Updated spec, new message when not enough data to predict progress
2017-11-01 13:57:49 +13:00
Brenda Wallace
62d84d7af4
planting progress is 100% if finished
2017-11-01 13:57:49 +13:00
Brenda Wallace
92fa09a1d3
Mark harvest predictions as pending
2017-11-01 13:57:49 +13:00
Brenda Wallace
b09c4aa7a1
Update display, to show predicted finish date
2017-11-01 13:57:49 +13:00
Brenda Wallace
692ab59285
Display expected finished date
2017-11-01 13:57:49 +13:00
Brenda Wallace
302bdba150
fixes search
2017-11-01 13:57:49 +13:00
Brenda Wallace
aa3057056f
rubocop fix up
2017-11-01 13:57:49 +13:00
Brenda Wallace
9ef40532ad
removed old percentage grow specs
2017-11-01 13:57:49 +13:00
Brenda Wallace
70ba8c8421
Updating planting model specs, for predictions
2017-11-01 13:57:49 +13:00
Brenda Wallace
3b81affbe5
include child records when reading plantings from db
2017-11-01 13:57:49 +13:00
Brenda Wallace
9703d4e983
Remove harvest preductions for now
2017-11-01 13:57:49 +13:00
Brenda Wallace
22e1718ce6
Rubocop fix ups
2017-11-01 13:57:49 +13:00
Brenda Wallace
b90b4e42fb
Updated progress bar to use new predictions
2017-11-01 13:57:49 +13:00
Brenda Wallace
202f557e32
Delete the old predictions code
2017-11-01 13:57:49 +13:00
Brenda Wallace
8364c8c688
updated schema
2017-11-01 13:57:49 +13:00
Brenda Wallace
3a286cd240
Show median lifespan of a crop
2017-11-01 13:57:49 +13:00
Brenda Wallace
41dbf6fb1b
Moved crop search out of crop model file
2017-11-01 13:57:49 +13:00
Brenda Wallace
47ecbe3f94
Call the predictions update on planting modifications from controller
2017-11-01 13:57:49 +13:00
Brenda Wallace
0f066ab302
Cleaning up models as adding predictions
2017-11-01 13:57:49 +13:00
Brenda Wallace