4605 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brenda Wallace	4fe0dba28e	Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions	2017-11-09 18:30:18 +13:00
Shiny	328037b8c0	Merge branch 'master' into dev	2017-11-09 18:19:57 +13:00
Brenda Wallace	e4ab5114f7	Remove duplicate setting of medians in migration	2017-11-09 17:51:18 +13:00
Brenda Wallace	a5d43af899	Drop the plantings.days_before_maturity column ... it's not used anywhere	2017-11-09 17:43:00 +13:00
Brenda Wallace	2d384c9851	Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions	2017-11-09 17:36:50 +13:00
Brenda Wallace	205247b136	Shorter condition in haml view (progress)	2017-11-09 17:36:37 +13:00
Brenda Wallace	963a182981	simplified logic in planting's first/last harvest fetcher	2017-11-09 17:36:33 +13:00
Daniel O'Connor	1090db6d21	Merge pull request #1438 from Growstuff/bundle-update-2017-11-08-201231 ... Bundle Update on 2017-11-08	2017-11-09 09:27:31 +11:00
deppbot	f187b31653	Bundle Update on 2017-11-08	2017-11-08 20:12:32 +08:00
Brenda Wallace	809dd81378	"Changed last_harvest" to "days_to_last_harvest"	2017-11-08 17:17:58 +13:00
Brenda Wallace	62beec23a1	"Changed first_harvest" to "days_to_first_harvest"	2017-11-08 17:17:15 +13:00
Brenda Wallace	a60a5ce591	Added a space, to please hound	2017-11-07 09:46:19 +13:00
Brenda Wallace	7206f99510	Updated spec to match new crop detail page text	2017-11-07 08:39:45 +13:00
Brenda Wallace	bf6475da57	annual? perennial!=true	2017-11-06 23:15:08 +13:00
Brenda Wallace	c5971cd46b	A little bit of eager loading	2017-11-06 23:13:36 +13:00
Brenda Wallace	2f47eeb7b3	Bug fix. Can only predict if we have harvested_at and planted_at	2017-11-06 23:12:28 +13:00
Brenda Wallace	928749aaad	Changed a "Pictures" header to "Photos" to be consistent	2017-11-06 23:11:39 +13:00
Brenda Wallace	1d64d4d1d2	Clearer message that predctions are for days after planting	2017-11-06 23:10:55 +13:00
Brenda Wallace	1e86cf7662	Update planting medians after updating record ... So changes to the planted_at are re-calculated	2017-11-06 23:07:44 +13:00
Brenda Wallace	941dab7c4a	Crop.annual? method	2017-11-06 23:00:16 +13:00
Brenda Wallace	2696d12771	Removed duplicate display of last harvest	2017-11-06 22:59:04 +13:00
Brenda Wallace	6bf87c243c	Feature spec for crop predictions on crop#show	2017-11-06 22:38:48 +13:00
Brenda Wallace	ec63d8086f	Moved crop predictions to own haml file	2017-11-06 22:36:47 +13:00
Brenda Wallace	470aacd1c9	Fixed %w for an array of words	2017-11-06 09:11:27 +13:00
Brenda Wallace	9997c365d8	Update robocop todo - to reflect progress	2017-11-05 20:44:41 +13:00
Brenda Wallace	eaa65fda9e	update median_last_harvest too, with specs	2017-11-05 20:28:51 +13:00
Brenda Wallace	e844eade94	Changed model validators message to please Hound	2017-11-05 20:09:21 +13:00
Brenda Wallace	35e7b6a5b4	Removed an ignore from rubocop	2017-11-05 19:55:00 +13:00
Brenda Wallace	6c33c335d8	Default ordering for harvests are gone, so order it in spec	2017-11-05 19:26:50 +13:00
Brenda Wallace	26537943e3	Removed pending spec	2017-11-05 18:00:49 +13:00
Brenda Wallace	136c082003	Smaller photos on crop page. Fits in the predictions data	2017-11-05 17:47:19 +13:00
Brenda Wallace	b3fd8e32d0	Fixed ordering of Harvests - don't order in scope.	2017-11-05 17:42:59 +13:00
Brenda Wallace	9b1b22afa8	Bugfix and specs for first and last harvest	2017-11-05 17:33:58 +13:00
Brenda Wallace	996706ee78	Tests for planting lifespan predictions when there's no crop data	2017-11-05 17:29:42 +13:00
Brenda Wallace	9d11bcc039	Can't calculate first harvest if there are no harvests	2017-11-05 16:20:51 +13:00
Brenda Wallace	b1684b0156	Set prediction data for existing planting and crops	2017-11-05 14:16:00 +13:00
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