Commit Graph

57 Commits

Author SHA1 Message Date
google-labs-jules[bot]
30e7c5d01c Merge pull request #4352 from Growstuff/add-public-food-key
feat: Add Public Food Key to Crop model
2025-12-01 18:02:33 +10:30
google-labs-jules[bot]
63477ee59d feat: Add contribution links and conditional edit form
This commit introduces a series of changes to encourage user contributions for missing crop data.

On the crop show page, it adds links for logged-in users to:
- Add a description if one is not present.
- Add a YouTube video if one is not present.
- Add more attributes in the predictions section if any are missing.

On the crop edit page, the form now conditionally displays fields. For standard users, it only shows fields for attributes that are currently empty. For privileged users (wranglers), it displays all fields, allowing them to edit existing data.
2025-11-30 02:38:05 +00:00
Daniel O'Connor
208720c46c Show parent crop details if known 2025-11-29 05:49:28 +00:00
Daniel O'Connor
0a89ac7e28 Merge pull request #4331 from Growstuff/feature/migrate-crop-description
feat: Migrate crop description to a dedicated column
2025-11-29 14:49:24 +10:30
google-labs-jules[bot]
8f6738eefa feat: Migrate crop description to a dedicated column
This change migrates the crop description from the `openfarm_data` JSONB field to a new, dedicated `description` text column in the `crops` table.

A data migration is included to move the existing description data to the new column. The `OpenFarmData` concern is updated to remove the now-redundant `description` method.
2025-11-29 04:07:25 +00:00
google-labs-jules[bot]
73c7158454 feat: Add YouTube video to crop page
This commit introduces the following changes:

- Adds an `en_youtube_url` attribute to the `Crop` model to store a URL for an English language YouTube video.
- The `en_youtube_url` is now an editable field in the crop form.
- If a `en_youtube_url` is present for a crop, the video is embedded on the crop's show page.
- A link is added to the "Learn more" section of the crop's show page to search YouTube for "growing [crop name]".
- A helper method is added to extract the video ID from various YouTube URL formats.
- A validation is added to the `Crop` model to ensure that the `en_youtube_url` is a valid YouTube URL.
2025-11-29 03:45:23 +00:00
google-labs-jules[bot]
bc11a1b8db Merge pull request #4209 from Growstuff/extend-crop-model
Extend Crop Model and Migrate Data from OpenFarm
2025-09-07 20:03:18 +09:30
Daniel O'Connor
83f2cf4a3c Require name, handle errors on crop create (#3799)
* Fix #3278 by ensuring we rebuild names on error

* Require a URL

* Require a name

* 'Only required for wrangers, and only when approving

* Re-add expectation
2024-07-23 19:44:21 +09:30
Daniel O'Connor
1f0cfa9b6c Add GBIF to our scientific names, so that our crops can associate creative commons photos (#3559)
* Add GBIF cient

* Add lookup

* Add autocomplete for GBIF lookup

* Add extra detail to scientific names

* Autocomplete

* Add routes

* Rmeove mapping

* Add autocomplete

* Update GBIF data on save

* db/schema

* Style

* Extract service

* Add concern

* Add concern

* Save photos

* Initial coverage

* Coverage

* Add coverage

* Shut up, codeclimate

* Shut up, codeclimate

* Unused

* Shut up, codeclimate

* Apply suggestions from code review

* Remove localhost

* Fix rubocop

* Fix rubocop

* Add UI links

* Add rake

* Indent

* Update Gemfile.lock

* Update lib/tasks/gbif.rake

* Update app/views/crops/_scientific_names.html.haml

* Rubocop

* Expand edit photo form

* Fix error

* Add model validations

* Skip photos without backlinks

* Fix tests

* Add photo words

* Allow blank

* Rubocop and handle invalid legacy data

* Apply suggestions from code review

* Update lib/tasks/gbif.rake
2024-01-21 13:22:25 +10:30
Daniel O'Connor
9f6fe4d7d8 Fix #3247 broken links 2023-03-13 02:00:46 +00:00
Brenda Wallace
b0c8b11246 📝 Inline editing and display tidy ups (#2200)
* Inline editing and display tidy ups
2019-10-08 11:06:53 +13:00
Brenda Wallace
7b5698f977 👩‍🌾 Import openfarm data (#2177)
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
2019-09-28 17:23:25 +12:00
Brenda Wallace
2c75f62caf Avoid using id selectors 2019-09-01 20:23:59 +12:00
Brenda Wallace
017a942a41 Rename classes to name codeclimate happy 2019-09-01 19:58:47 +12:00
Brenda Wallace
465c7c7b6d Move crop form error messages to alert 2019-06-14 15:54:04 +12:00
Brenda Wallace
6c23302435 Fix duplicate labels on crop form 2019-06-14 15:52:05 +12:00
Brenda Wallace
8d6e48ad3d tidy up crops form 2019-05-27 09:27:43 +12:00
Brenda Wallace
334037ed1e form tidy 2019-05-24 20:43:00 +12:00
Brenda Wallace
ca17e6a258 Starting to tidy the crops form 2019-05-24 20:37:56 +12:00
Brenda Wallace
9ecf210ffb More form tidy up 2019-04-27 19:19:42 +12:00
Brenda Wallace
eabf1fc659 Tidy up (most) forms 2019-04-27 19:11:30 +12:00
Brenda Wallace
308e834713 Wrap long line 2018-01-23 09:00:34 +13:00
Brenda Wallace
121deb4f48 Fix ordering of crops' parent on form 2018-01-23 09:00:34 +13:00
Brenda Wallace
d1951b8b65 Edit and show perennial plants 2017-11-01 14:22:39 +13:00
Brenda Wallace
8267b7d16d Removing references to Discource (talk.growstuff.org)
and adding one link to github issues.
2017-03-12 10:51:25 +13:00
Brenda Wallace
6478d9cb1b Haml clean up for crops views 2017-02-06 10:31:45 +13:00
Brenda Wallace
8ddf36fed9 Haml clean up for (some of) crops views 2017-02-04 15:04:07 +13:00
Mackenzie Morgan
e1a2b168c9 rename scientific_names.scientific_name to scientific_names.name
this mirrors alternate_names.name and allows making code more DRY
2016-11-28 21:57:51 -05:00
Brenda Wallace
bdb057ca0f Removed all trailing white space 2016-11-14 15:05:32 +13:00
AELOGICA
a581b759a3 Added tests for creating crops with multiple scientific and alternate names 2015-07-17 07:31:53 +08:00
AELOGICA
12d151b68c Added multiple forms for scientific and alternate names on crop creation 2015-07-17 07:31:51 +08:00
AELOGICA
472acd0e81 Polished UI of added forms for alternate names 2015-07-17 07:31:51 +08:00
AELOGICA
7f88b167b4 Added dynamic adding and removing additional scientific names 2015-07-17 07:31:51 +08:00
Cjay Billones
bb88041fef [Refactoring] Replace .count and .length with .size for collections
Improved program efficiency (in querying in particular) by replacing .count and .length with .size for collections.

Fix error in refactoring

Reverted some .size into .count
2015-06-25 12:09:03 +08:00
Skud
1dfac3fb2f Improving crop request form 2015-02-17 20:44:24 +11:00
Taylor Griffin
2697fea249 tests back to green 2015-02-09 22:41:35 +11:00
Taylor Griffin
cbb4f9d7ac add rejection notes 2015-02-09 22:17:32 +11:00
Taylor Griffin
1099e4c9fe update copy for new / edit crop form 2015-02-06 07:34:01 +11:00
Taylor Griffin
abece6473b make rejected and pending crops viewable on wrangle crops page 2015-02-04 14:18:10 +11:00
Taylor Griffin
ff1b941690 validate that a crop hasn't already been rejected or approved 2015-02-04 06:56:51 +11:00
Taylor Griffin
0993917dc6 define approval status options in model 2015-02-03 13:28:44 +11:00
Taylor Griffin
d6cb20e2c4 make reasons for rejection a select input 2015-02-03 13:27:41 +11:00
Taylor Griffin
4211ebec76 add request notes to crop request 2015-02-01 17:56:51 +11:00
Taylor Griffin
d02edc3dd1 don't show sci name fields to regular users in crop form 2015-02-01 17:42:21 +11:00
Taylor Griffin
e86200b942 requester receives a message when crop request is rejected 2015-02-01 17:32:49 +11:00
Taylor Griffin
c80b42d9bc change from approved boolean to approval_status string 2015-02-01 16:52:31 +11:00
Skud
501fda3fc9 b3ified a few of the lesser-used forms 2014-08-27 19:02:06 +10:00
Skud
bb0f88bc0b Small amount of b3ification when merging dev into b3 branch 2014-07-22 14:26:22 +10:00
Skud
250a2b7d02 Merge branch 'bootstrap3' into dev
Conflicts:
	app/assets/stylesheets/overrides.css.less
2014-07-22 14:24:07 +10:00
Amy Hendrix
b7fbe60b83 Bootstrap3: form control groups 2014-07-13 18:45:56 -04:00