2395 Commits

Author	SHA1	Message	Date
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
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	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	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
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	71cb3f8c5f	Rubocop fixes	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	62d84d7af4	planting progress is 100% if finished	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	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	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	7d6c49d8c3	Set harvest preductions on plantings	2017-11-01 13:57:49 +13:00
Brenda Wallace	82a37d69bc	Ensure harvests are same crop, and after the planting was planted	2017-11-01 13:57:49 +13:00
Brenda Wallace	f3d03c00b2	Merge remote-tracking branch 'upstream/dev' into feature/more-crop-photos	2017-10-26 20:31:23 +13:00
Brenda Wallace	a3a88c48de	Randomise the crops on the homepage	2017-10-23 22:09:34 +01:00
Brenda Wallace	f3e88f5aae	Include harvest photos on crop page	2017-10-24 09:34:10 +13:00
Brenda Wallace	1e81dac699	All crop photos; crops-> photos route	2017-10-24 09:34:03 +13:00
Brenda Wallace	705240014a	Link harvest thumbnails to harvests ... to be consistent with the rest of the site	2017-10-23 11:07:27 +01:00
Brenda Wallace	b356d86931	Allow inline style on the progress bar width	2017-10-21 22:48:37 +01:00
Brenda Wallace	34f91c2189	Wrap garden overview buttons to right of photo on small screens	2017-10-21 22:48:37 +01:00
Brenda Wallace	faf3f60e78	small screen gardens overview	2017-10-21 22:48:37 +01:00
Brenda Wallace	e3113fd53d	Re-work gardens#index to show planting progress	2017-10-21 22:48:37 +01:00
Brenda Wallace	68768c4d6a	Fixed redirection after planting is deleted	2017-10-21 22:48:37 +01:00
Brenda Wallace	191c8e4e9d	Display messages even when member is deleted	2017-10-20 23:44:51 +13:00
Brenda Wallace	8d681dd90a	Another code style fixup	2017-10-17 17:29:48 +13:00
Brenda Wallace	e21b95a353	Use floats, so the percentage calc works	2017-09-13 22:21:15 +12:00
Brenda Wallace	01333bf965	Use string.start_with? instead of a regexp	2017-09-01 12:11:57 +12:00
Brenda Wallace	a145abff56	Changed regex to matches? to appease rubocop	2017-08-31 21:27:22 +12:00