754 Commits

Author	SHA1	Message	Date
Brenda Wallace	13e8d1f5a5	Merge remote-tracking branch 'upstream/dev' into api	2017-11-17 21:51:39 +13:00
Brenda Wallace	c1836cc78e	Removed un-used method, to reduce class size	2017-11-17 21:50:59 +13:00
Brenda Wallace	28fdb6e1ed	Reducing class line count	2017-11-17 21:50:59 +13:00
Brenda Wallace	86ea8eab39	Reducing crop class size	2017-11-17 21:50:59 +13:00
Brenda Wallace	8884056ff3	Run existing crop specs with annual crop	2017-11-17 21:50:59 +13:00
Brenda Wallace	d8f5876518	Added predictions to planting api, and added specs	2017-11-13 19:19:18 +13:00
Brenda Wallace	a2ae429f6b	If a harvest has a planting, it must have the same owner	2017-11-13 19:18:14 +13:00
Brenda Wallace	c6824b1262	Planting's owner must be the same as its garden's owner	2017-11-13 19:18:14 +13:00
Brenda Wallace	963a182981	simplified logic in planting's first/last harvest fetcher	2017-11-09 17:36:33 +13: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	bf6475da57	annual? perennial!=true	2017-11-06 23:15:08 +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	941dab7c4a	Crop.annual? method	2017-11-06 23:00:16 +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	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	4cc0f77bd0	Predicting first harvest - updating medians	2017-11-05 13:42:30 +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	71cb3f8c5f	Rubocop fixes	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	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	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	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	910a9673dc	Unsubscribes newsletter before member destroying	2017-06-09 22:39:07 +12:00
Brenda Wallace	bbc3ca749f	Removed author_exists scope. It is part of default	2017-06-02 22:43:25 +12:00
Brenda Wallace	20b980a162	Helpful comment explains why we use act_as_paranoid	2017-06-02 22:42:03 +12:00
Brenda Wallace	fb012c073e	leaves a record of orders and payments intact when members deleted	2017-06-02 22:34:19 +12:00
Brenda Wallace	c48e24845e	Remove owner_exists scope	2017-06-02 20:28:32 +12:00
Shiny	7621da7041	Merge branch 'dev' into issue-1044-account-deletion	2017-05-30 20:39:44 +12:00
Brenda Wallace	8bcc5104e5	Delegate planting predictions	2017-05-29 22:45:14 +12:00
Brenda Wallace	3c8b80574a	Small DRY of planting models -> predict added	2017-05-29 22:45:14 +12:00
Brenda Wallace	288ad782d2	Planted? = true when planted today	2017-05-29 22:45:14 +12:00
Brenda Wallace	ff1c835cda	Moving the planting predictions to own service	2017-05-29 22:45:14 +12:00
Shiny	fedc7a7fb6	Merge branch 'dev' into issue-1044-account-deletion	2017-05-29 16:17:59 +12:00