Commit Graph
2804 Commits
Author SHA1 Message Date
Brenda Wallace 89599a665d Add crop_job_step association to Job model and migration
- Introduced a has_many association in CropJobStep for jobs with dependent nullify.
- Added crop_job_step reference to Job model with optional association.
- Created migration to add crop_job_step reference to jobs table with foreign key.
- Updated schema to reflect the new association.
- Added tests for crop_job_step association in Job model.
2026-10-23 21:04:21 +13:00
Brenda Wallace 6332f26c58 Merge pull request #4994 from Growstuff/crop-job-templates-admin
Admin for crop job templates, a tidier crop wrangling page, and crop and template seeds
2026-10-23 13:26:33 +10:30
Brenda Wallace e64e893b4f Merge pull request #5015 from Growstuff/job-photos
Photos on jobs, before and after
2026-10-23 13:20:46 +10:30
Brenda Wallace 0c1cc46e9f Merge remote-tracking branch 'origin/ui-niceness-for-jobs' into feat/tasks-for-garden 2026-10-23 12:39:15 +13:00
Brenda Wallace 95f36c80f3 Merge branch 'job-celebration' into ui-niceness-for-jobs 2026-10-23 12:31:01 +13:00
Brenda Wallace 9003ca3bef Enhance notepad accessibility and functionality
- Add reduced motion support for the notepad snail animation.
- Implement focused control tracking for job list interactions.
- Refactor job transmission logic to ensure sequential processing.
- Update notepad HTML structure for better screen reader compatibility.
- Introduce tests for notepad rendering and accessibility features.
2026-10-23 12:22:22 +13:00
Brenda Wallace d96594f812 Enhance job notepad and suggestions for garden context:
- Update styles for notepad title and job suggestions.
- Modify job suggestions controller to filter by garden plantings.
- Implement interactive suggestions in job notepad for crop linking.
- Add link to view all jobs in the garden's notepad.
- Extend tests for job suggestions in garden context.
2026-10-23 08:43:55 +13:00
Brenda Wallace 23a0e6ea1f Implement garden-specific job notepad: add JobsNotepad service, update controllers and views to support garden context, and enhance tests for new functionality. 2026-10-23 08:38:47 +13:00
Brenda Wallace 5a601d6dec Enhance job handling in neighbours and timeline services: add support for finished jobs, update queries, and improve localization for job-related events. 2026-10-23 08:31:29 +13:00
Brenda Wallace 0dfe944842 Add saving state indication for job notepad: implement spinner and status message during job addition 2026-10-23 08:22:15 +13:00
Brenda Wallace 7f0b6fb989 Enhance job notepad functionality: implement job crossing off with date tracking, update job grouping logic, and improve UI elements for better user experience. 2026-10-23 08:20:48 +13:00
Brenda Wallace 93c7ba08b7 Add overdue and done job groups to notepad and update styles 2026-10-23 08:18:00 +13:00
Brenda Wallace d6d56787ca Implement inline editing for job names in notepad with appropriate styles and hints 2026-10-23 08:13:16 +13:00
Brenda Wallace 5312090a67 Merge remote-tracking branch 'origin/job-links-from-typing' into job-celebration 2026-10-23 08:04:26 +13:00
Brenda Wallace 07a86dfd3b Merge remote-tracking branch 'origin/main' into job-links-from-typing 2026-10-23 08:03:09 +13:00
Brenda Wallace 5b7624814e Merge remote-tracking branch 'origin/main' into rename-activities-to-jobs 2026-10-23 07:49:43 +13:00
Brenda Wallace 7c299b0f50 Merge remote-tracking branch 'origin/main' into rename-activities-to-jobs 2026-10-23 07:26:02 +13:00
Brenda Wallace 2b542eadf2 Merge remote-tracking branch 'origin/main' into crop-job-templates 2026-10-23 07:17:28 +13:00
Brenda Wallace 66b70180cd Add external_uri attribute to CropJobStep with validations and tests 2026-10-23 07:16:43 +13:00
Daniel O'Connorandgoogle-labs-jules[bot] 744ec9b7ec Display layout preview and edit/view controls on garden show (#5003)
Add `Garden#has_layout?` method to detect whether a garden has an
existing layout. On `gardens#show`, if a garden has a layout, display
an SVG preview of the layout (placed plants and features) inside the
teaser bed frame, remove the "New" badge, update the title to
"Garden layout", and offer "Edit layout →" or "View layout →" controls.
If no layout exists, preserve the original "Map out this bed" teaser
and "New" badge.

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
2026-10-22 18:08:05 +00:00
51feec8de1 Add comment support for plantings (#4984)
* Add comment support for plantings

- Add polymorphic comments association, subject, and author methods to Planting.
- Add comments_count column migration for Planting counter cache.
- Update CommentsController and comments view templates to support Planting.
- Render comments list and form on Planting show view.
- Add specs for Planting comments in models, controllers, and requests.

Co-authored-by: CloCkWeRX <365751+CloCkWeRX@users.noreply.github.com>

* put 4.0.7 back

* Opt comments on posts into record-page styling temporarily

* Drop hr

* Flatten comments

* Update schema

---------

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: Brenda Wallace <brenda@wallace.net.nz>
2026-10-22 15:22:32 +00:00
Brenda Wallace e21c3ab1da Merge branch 'job-links-from-typing' into job-celebration 2026-10-22 20:21:44 +13:00
Brenda Wallace cef7322d7e Merge branch 'rename-activities-to-jobs' into job-links-from-typing 2026-10-22 20:18:29 +13:00
Brenda Wallace 29e9c71012 Refactor job handling: update due date logic, enhance notepad functionality, and adjust routing 2026-10-22 20:15:57 +13:00
Brenda Wallace f718f3e122 Refactor job handling and UI updates: streamline job path usage, enhance celebration text, and improve notepad interactions 2026-10-22 18:31:28 +13:00
Brenda Wallace be21f287a8 Merge branch 'job-links-from-typing' into job-celebration 2026-10-22 18:26:31 +13:00
Brenda Wallace 5588bd2eb1 Add crop icons to job suggestions and update notepad UI for improved visibility 2026-10-22 18:25:25 +13:00
Brenda Wallace afd053465d Enhance job creation and notepad functionality to handle empty jobbable links and ensure Add button remains enabled during submission 2026-10-22 18:18:56 +13:00
Brenda Wallace 1a1bd49265 Clarify planting trait association in job factory to ensure owner-specific planting 2026-10-22 18:18:38 +13:00
Brenda Wallace 37ea0436fc Refactor job ordering in load_notepad and add spec for job order retention when crossed off 2026-10-22 18:16:17 +13:00
Brenda Wallace 7b67fd3dd6 Add snail animation and job completion caption to notepad 2026-10-22 18:15:35 +13:00
Brenda Wallace 51923aadd8 Add job celebration features with animations and notifications for completed tasks 2026-10-22 18:11:35 +13:00
Brenda Wallace 871c7ff9ce Enhance job notepad and linking functionality with UI improvements and code refactoring 2026-10-22 18:02:21 +13:00
Brenda Wallace d7d14cf65e Implement job linking functionality with crop suggestions and UI enhancements 2026-10-22 17:59:27 +13:00
Brenda Wallace 47476324b3 Enhance job notepad functionality with drag-and-drop support and UI updates 2026-10-22 17:24:48 +13:00
Brenda Wallace 06138569c6 Implement job notepad functionality with AJAX support for adding jobs 2026-10-22 17:19:31 +13:00
Brenda Wallace a0b24381ac Refactor activities to jobs across the application
- Renamed all instances of 'Activity' to 'Job' in views, controllers, and models.
- Updated routes to reflect the change from activities to jobs.
- Modified database schema to rename the activities table to jobs and adjusted related columns.
- Updated locale files to change activity-related translations to jobs.
- Adjusted tests to ensure they reference jobs instead of activities.
- Removed the category field from jobs as they are now a plain list.
- Updated seed data and sample data generation to create jobs instead of activities.
2026-10-22 17:16:25 +13:00
Brenda Wallace 77bf9d5e92 Rename activities to jobs and update related files for consistency 2026-10-22 17:06:55 +13:00
Brenda Wallace ffacf8f236 Add crop job templates and steps models with associated migrations and tests 2026-10-22 16:56:47 +13:00
Brenda Wallace d1ea600117 Add additional mobile layout tests for crop and planting pages 2026-10-22 15:43:24 +13:00
Brenda Wallace 72bfc62d1d Add mobile layout tests and overflow helpers for better responsiveness 2026-10-22 15:43:24 +13:00
Brenda Wallace 977a984c24 Remove Elasticsearch integration and related code
- Deleted Elasticsearch gems from Gemfile and Gemfile.lock.
- Updated README and TECH documentation to reflect the removal of Elasticsearch.
- Removed Elasticsearch-related code from models, controllers, services, and factories.
- Adjusted tests to eliminate dependencies on Elasticsearch.
- Cleaned up Docker configuration and environment variables related to Elasticsearch.
- Added a TODO file for future gem reviews and potential removals.
2026-10-22 15:37:03 +13:00
Brenda Wallace ec8f32cc9a Fix flaky specs by adding DetachedNodeRetry module and disabling Rack::Attack during tests (#4983) 2026-10-21 13:01:35 +10:30
Brenda Wallace 229cd7e5e1 Implement normalized name handling and search improvements in Postgres 2026-10-21 12:58:48 +13:00
Brenda Wallace 8948d0386a Add icon helper method and corresponding tests for icon rendering 2026-10-20 23:55:33 +13:00
Brenda Wallace e68c98fd38 Add JavaScript functionality for planting alternate names and tab navigation
- Implemented `planting_alternate_name.js` to load alternate names for crops in the planting form based on user input.
- Added `tab_navigation.js` to manage tab navigation and update the URL hash accordingly.

Update map rendering in member and place views

- Modified `_map.html.haml` to include a custom marker icon for member maps.
- Updated `index.html.haml` and `show.html.haml` to pass `places_map_data` to the map sections.

Refactor asset management in Rails application

- Removed Sprockets from the application configuration and adjusted asset paths.
- Updated asset precompilation settings and removed deprecated asset configurations from environment files.
- Added new build scripts for CSS and updated package dependencies in `package.json` for Bootstrap, Chart.js, and others.

Ensure React and CSS bundles are built before running tests

- Updated `react_bundle.rb` to check for the existence of both JavaScript and CSS bundles and build them if missing.
2026-10-20 23:55:33 +13:00
Brenda Wallace 4d6b903f6d Add mock for GBIF suggestions in crop creation specs and update name field test for highlighted match 2026-10-20 17:06:34 +13:00
Brenda Wallace 5aa751f0f3 Refactor crop name fields: replace manual input handling with reusable components for scientific and alternate names, and integrate GBIF name suggestions. 2026-10-20 13:11:49 +13:00
Brenda Wallace 88624d2ac8 Implement alternate names functionality with React component and update related specs 2026-10-20 13:06:04 +13:00
Brenda Wallace 9d54380e22 Add feature specs for crop name rows and seed finishing functionality 2026-10-20 09:16:11 +13:00