Commit Graph

1390 Commits

Author SHA1 Message Date
Michael Stenta 08921b9af6 Filter to pending activity logs in the query itself. 2020-07-24 10:57:26 -04:00
Paul Weidner efaaf4468c Add measure behavior to movement layer. 2020-07-24 10:57:26 -04:00
Paul Weidner 9996e83c13 Add hours and minutes to movement date field. 2020-07-24 10:57:26 -04:00
Paul Weidner 1d5df1ddc5 Save assets previous location geometry in post grazing logs. 2020-07-24 10:57:26 -04:00
Paul Weidner 2a6033cb65 Display assets current location geometry on map. 2020-07-24 10:57:26 -04:00
Paul Weidner 21818a6004 Create movement logs for multiple assets. 2020-07-24 10:57:26 -04:00
Paul Weidner b4f457cf15 Save custom geometry to pre-grazing logs. 2020-07-24 10:57:26 -04:00
Paul Weidner 96a9dd8231 Uncollapse the geometry fieldset default geometry is provided. 2020-07-24 10:57:26 -04:00
Paul Weidner 4d5041367e Update map layers when selecting a planned movement log. 2020-07-24 10:57:26 -04:00
Paul Weidner 71882433af Add helper functions to build ajax commands. 2020-07-24 10:57:26 -04:00
Paul Weidner 34b413f6d2 Edit planned movement logs. 2020-07-24 10:57:26 -04:00
Paul Weidner 425a7534da Only create observation logs if movement is marked as completed. 2020-07-24 10:57:26 -04:00
Paul Weidner 210268a74e Add checkbox to set the movement log status. 2020-07-24 10:57:26 -04:00
Paul Weidner f06cb357bc Save photos with pre and post grazing observation logs. 2020-07-24 10:57:26 -04:00
Michael Stenta ce457d88d0 Add fields for photo attachments (not processed yet). 2020-07-24 10:57:26 -04:00
Michael Stenta 9ca51f4c9a Serve client module JS files through Drupal. 2020-07-24 10:52:31 -04:00
paul121 5d17f01bca Rename hook_farm_client_modules() to hook_farm_client_module_info(). 2020-07-24 10:52:31 -04:00
Michael Stenta 1102f26ae9 Provide a hook that allows modules to declare Field Modules they provide. 2020-07-24 10:52:31 -04:00
Michael Stenta b8159138d9 If getallheaders() is not available, implement it ourselves. 2020-07-24 09:40:32 -04:00
Michael Stenta 7424cb9a54 Add Vary: Origin header when Access-Control-Allow-Origin is added. 2020-07-21 11:08:19 -04:00
Michael Stenta 282ac7fa71 Trim whitespace from allowed origins before checking them. 2020-07-21 11:08:03 -04:00
Michael Stenta 0b59497344 Allow multiple origins to be accepted for Access-Control-Allow-Origin header. 2020-07-21 11:07:38 -04:00
Michael Stenta 6289b37848 Fix "Done" filter in Calendar View only showing pending logs by default. 2020-07-21 07:54:43 -04:00
Michael Stenta e5423ac615 Add "Done" filter to Calendar View. 2020-07-20 08:21:47 -04:00
Michael Stenta 8a58fa7360 Allow OPTIONS requests to return 200 code on certain paths needed by Field Kit (right now just /farm/areas/geojson). 2020-07-20 08:21:47 -04:00
paul121 e40270ea48 Use isset to check for measurement values including 0. 2020-07-17 11:04:06 -04:00
Michael Stenta 34f569a8fb Fix birth quick form permissions. 2020-07-15 19:55:03 -04:00
Michael Stenta 7e930dd210 Make farm_map_combine_geoms() more resilient to empty geometries. 2020-07-15 13:45:19 -04:00
Paul Weidner 4b9df8fe63 Autocomplete multiple asset names separated by commas. 2020-07-15 13:33:36 -04:00
Paul Weidner 5f80906a23 Use correct order of parameters in implode function. 2020-07-15 11:56:18 -04:00
Michael Stenta fd867b6fbb Fix farm_map base_path JS setting to work without clean URLs. 2020-07-15 11:53:54 -04:00
Michael Stenta 3ef56dde35 Add description to animal weight action form. 2020-07-14 08:28:13 -04:00
Paul Weidner 2ea0c1f1f0 Link created logs to the quick form. 2020-07-07 14:24:45 -04:00
Michael Stenta faa9fdadba Use #default_value instead of #value and unset $form_state['input'] so that custom geometries are saved. 2020-07-03 08:48:18 -04:00
Michael Stenta ede70d0358 Pass geometry for farm_movement_create() instead of using farm_map_geofield_populate() because that doesn't populate movement geometries. 2020-07-03 08:48:18 -04:00
Michael Stenta 8bab415caa Allow a custom geometry to be provided with farm_movement_create(). 2020-07-03 08:48:18 -04:00
paul121 01c7147ddb Remove the current location layer if an asset has no location. 2020-07-03 08:48:18 -04:00
paul121 19db0bd560 Move next location ajax logic to form builder function. 2020-07-03 08:48:18 -04:00
paul121 948944e6bf Move current location ajax logic to form builder function. 2020-07-03 08:48:18 -04:00
paul121 64b4860a42 Rename ajax function to farm_livestock_move_form_current_location_ajax. 2020-07-03 08:48:18 -04:00
paul121 ec7aa6c19b Use log_save() method instead of $log->save(). 2020-07-03 08:48:18 -04:00
paul121 9b07b45d86 Call access callback with array of permissions as the first argument. 2020-07-03 08:48:18 -04:00
paul121 419d52cabd Display the movement geometry with orange color. 2020-07-03 08:48:18 -04:00
paul121 1bb243b576 Zoom to all vector layers when auto-updating the map. 2020-07-03 08:48:18 -04:00
paul121 6f231744f1 Create an editable Movement layer that updates with area geometry. 2020-07-03 08:48:18 -04:00
paul121 baa8fd5329 Display the assets current location on the map. 2020-07-03 08:48:18 -04:00
paul121 69ca698238 Link post grazing logs to area(s) animals are moving from. 2020-07-03 08:48:18 -04:00
paul121 f4d6aaabfb Create post grazing observation log before movement log. 2020-07-03 08:48:18 -04:00
paul121 f0dd507f80 Link pre grazing logs to the area animals are moving to. 2020-07-03 08:48:18 -04:00
paul121 544ef28f5a Create pre and post grazing observation logs. 2020-07-03 08:48:18 -04:00
paul121 b818781b5c Validate pasture height and forage quality are numbers. 2020-07-03 08:48:18 -04:00
paul121 75bb72069e Determine pasture height unit based on system of measurement. 2020-07-03 08:48:18 -04:00
paul121 208ffb4ed0 Create movement activity logs with optional precise geometry. 2020-07-03 08:48:18 -04:00
paul121 7fcc984e41 Validate animal or group asset. 2020-07-03 08:48:18 -04:00
paul121 5580aa9e85 Make the movement form a tree. 2020-07-03 08:48:18 -04:00
paul121 bfbed98499 Add movement date field. 2020-07-03 08:48:18 -04:00
Michael Stenta 292bc23b44 Initial sketch of post/pre-grazing observation fields. 2020-07-03 08:47:03 -04:00
Michael Stenta be0fa3b336 Add geometry field. 2020-07-03 08:45:28 -04:00
Michael Stenta 588796769b Initial animal move quick form sketch. 2020-07-03 08:43:14 -04:00
Michael Stenta be8fb3ef5e Require "create animal farm_asset entities" permission for the birth quick form. 2020-07-03 07:52:40 -04:00
Michael Stenta 4efe9c1488 Allow requiring multiple permissions for quick form access. 2020-07-03 07:52:40 -04:00
paul121 29665c3c0f Remove limit to display all active plans in block view. 2020-06-25 10:29:54 -04:00
paul121 046f3688bd Display active plans in a dashboard pane. 2020-06-25 10:29:54 -04:00
paul121 d041760e51 Add block_active_plans display to farm_plan view. 2020-06-25 10:29:54 -04:00
Michael Stenta 04b5c94766 Pass area descriptions through check_plain() when exporting KML to ensure that ampersands are escaped. See https://stackoverflow.com/questions/48207963/the-kml-file-contains-invalid-or-unsupported-data-or-the-file-is-too-large-to-p 2020-06-18 09:14:57 -04:00
Michael Stenta e65a47ffd9 Use default file scheme when saving KML export files (use private directory if that is the default). 2020-06-03 07:45:29 -04:00
Michael Stenta 05e10e67bc Issue #3142918: Show seedings/transplantings on area records 2020-06-02 08:46:32 -04:00
Michael Stenta 8158d9535e Use farm_term() in place of taxonomy_get_term_by_name(). 2020-06-02 08:43:25 -04:00
Michael Stenta be723c1149 Remove farm_map.js detach() method to fix map instances being destroyed before they should be. 2020-06-01 15:52:20 -04:00
Michael Stenta 785b296cbd Fix PHP Notice: Undefined variable: soil_names in farm_soil_nrcs_soil_name_lookup_submit() 2020-06-01 12:19:53 -04:00
paul121 4f5e1b655d Add spaces to table headers. 2020-06-01 10:02:27 -04:00
paul121 23be7573a0 Add archived label to archived animals in result table. 2020-06-01 10:02:27 -04:00
paul121 a94def9208 Add checkbox to include archived animals in weight report. 2020-06-01 10:02:27 -04:00
paul121 2c40b97b72 Display archived asset groups with archived label. 2020-06-01 10:02:27 -04:00
Michael Stenta 94395416c7 Fix asset cluster map showing all asset types when there are no assets. 2020-05-31 20:47:49 -04:00
Michael Stenta 0b33e9bcaf Only add fields that start with the "field_farm_" prefix to the field alias map. 2020-05-31 20:45:33 -04:00
Michael Stenta 8856a50d3d Movements that are changed in Field Kit do not show in Movement Logs in farmOS #303 2020-05-29 09:14:38 -04:00
Michael Stenta cbecbd4f0f Expand comments around the single vs multiple value term reference field name processing. 2020-05-27 09:18:21 -04:00
paul121 8419ec694a Check for name key to determine if a single value term reference field was supplied. 2020-05-27 09:17:53 -04:00
Michael Stenta e6ff32c146 Add a quick form for recording compost temperature observations. 2020-05-24 15:57:37 -04:00
Michael Stenta e22e419f2c Deprecate farm_area_parse_names() and use farm_term_parse_names() instead. 2020-05-24 15:56:42 -04:00
Michael Stenta 49612fd98b Use farm_term_parse_names instead of introducing new farm_season_parse_names() function. 2020-05-24 15:49:10 -04:00
Michael Stenta 9214d72a24 Add a general-purpose farm_term_parse_names() function that farm_area_parse_names() can delegate to. 2020-05-24 15:47:32 -04:00
Paul Weidner a40dc48661 Allow multiple seasons to be added in planting quick form. 2020-05-24 12:57:00 -04:00
Paul Weidner 5c4ca3f33f Add farm_season_parse_names helper function. 2020-05-24 12:57:00 -04:00
Paul Weidner 92d0bc8221 Add season to an array of seasons on the planting. 2020-05-24 12:57:00 -04:00
Michael Stenta de736afad1 Fix PHP Notice: Undefined offset: 0 in farm_api_restws_request_alter() 2020-05-19 15:53:06 -04:00
Michael Stenta d44bb13648 Issue #3136210: Add 'data_schema' to farm.json resource fields info 2020-05-16 10:55:50 -04:00
Michael Stenta c47fc86cf6 Add special logic for auto-creating terms by name in the "unit" field in "Quantity" field collections. 2020-05-16 10:55:50 -04:00
Michael Stenta 8c5d7c8ac3 Fix PHP Notice: Trying to get property 'name' of non-object 2020-05-13 12:31:38 -04:00
Michael Stenta 6b05852de1 Issue #3136150: Allow plantings to reference multiple seasons 2020-05-13 10:01:44 -04:00
Michael Stenta fcc1a2d708 Sort "Upcoming tasks" by timestamp ascending. 2020-05-13 10:00:29 -04:00
Michael Stenta 40f0eb51fc Add Mapbox watermark and attribution. 2020-05-12 09:38:30 -04:00
Michael Stenta 5819932dd0 Add a "Pressure" measure. 2020-05-12 06:45:57 -04:00
Michael Stenta 7a06a289be Fix API term creation for fields that only accept a single term (eg: field_farm_season). 2020-05-11 19:20:36 -04:00
Michael Stenta 8cf270502f Fix term filter for terms with numeric names (eg: Season term of "2020"). 2020-05-11 19:19:51 -04:00
Michael Stenta b861608820 Rename farmos_field_kit client to farm_client for consistency. 2020-05-11 12:03:21 -04:00
Paul Weidner 4285535fa8 Add OAuth client with client key 'farmos_field_kit'. 2020-05-11 12:03:17 -04:00
Michael Stenta 230d931944 Initial farm_client module for integrating farmOS server and client. 2020-05-11 11:56:39 -04:00
Michael Stenta db27caee38 Fix extra space between season and crop when location isn't specified. 2020-05-11 11:33:48 -04:00
Michael Stenta bb66528f29 Improve seeding/transplanting location description. 2020-05-11 11:33:30 -04:00
Paul Weidner bab224326a Update date_year_range to be -10:+3 to match other date selectors. 2020-05-11 11:05:34 -04:00
Paul Weidner d1363c4bc5 Add descriptions to Crops and Location fields. 2020-05-11 11:05:34 -04:00
Paul Weidner 91b3494fc3 Trim location to ensure asset name is less than 255 char. 2020-05-11 11:05:34 -04:00
Paul Weidner b3c712f1e2 Disable length limit on Log Location field. 2020-05-11 11:05:34 -04:00
Paul Weidner 66c80a28d1 Limit the planting asset name to 255 char. 2020-05-11 11:05:34 -04:00
Michael Stenta 451349ebda Enable default farmOS OAuth client on existing installs. 2020-05-11 10:48:40 -04:00
Paul Weidner 6a872fc88c Provide a farmOS Default OAuth client. 2020-05-11 10:48:40 -04:00
Paul Weidner 41283012d7 Allow OAuth clients to override some server-level settings. 2020-05-11 10:48:40 -04:00
Michael Stenta 274c1f6567 Bump the farmOS API version to 1.3. 2020-05-11 10:48:19 -04:00
Michael Stenta c6afabe9d4 Depend on the farm_term module. 2020-05-11 10:06:09 -04:00
pcambra 2d91f6287a Issue #3134067 by pcambra: Restws: POSTing a new log should autocreate the term by name 2020-05-11 09:45:22 -04:00
pcambra ffcf06f81c Issue #3134065 by pcambra: Restws: Taxonomy terms should have a name property besides the tid 2020-05-11 08:45:27 -04:00
Michael Stenta 580b3f3440 Limit the term lookup by vocabulary. 2020-05-11 08:21:12 -04:00
pcambra 529599244f Issue #3134066 by pcambra: Restws: Allow filtering by term name, not only term id 2020-05-11 08:21:05 -04:00
Michael Stenta 4fda841b34 Add 'collapsible' class so that the fieldset up/down icon is added by farm_theme. 2020-05-08 08:53:29 -04:00
Michael Stenta 9bea88bc74 Make all entity views groups collapsible. 2020-05-07 12:10:01 -04:00
Michael Stenta 974da4e5d9 Allow modules to define plan record tables that create relationships to multiple records. 2020-05-06 13:31:09 -04:00
Michael Stenta ce25c3c73f Allow record relationships to define a human-readable label. 2020-05-06 11:46:42 -04:00
Michael Stenta 0ff7aca7aa Allow modules to define their own plan record relationship tables with hook_farm_plan_record_relationships(). 2020-05-06 09:44:37 -04:00
Michael Stenta ca6fe1d7f8 Move "History of Assets" entity view to its own collapsed group, directly under the Assets group. 2020-04-24 10:53:03 -04:00
Michael Stenta 9cc6b1ca13 Document that entity view groups can be collapsed. 2020-04-24 10:52:43 -04:00
Michael Stenta 74515d8ca3 Spread out the weights of entity view groups provided by the Farm UI module, so that it's easier to put other groups in between them. 2020-04-24 10:52:07 -04:00
Michael Stenta 31fbaeb902 Fix Cannot filter the "History of Assets" in an Area #270 2020-04-24 10:29:26 -04:00
Michael Stenta 747153bf1a Add the ability to filter the Quantity Report results by the group that assets are in. 2020-04-24 09:52:33 -04:00
Michael Stenta 76341701e9 Add start and end date filters to Quantity Report. 2020-04-24 09:52:04 -04:00
Michael Stenta f3d0a9af40 Summarize results at the bottom of the Quantity Report. 2020-04-24 09:51:44 -04:00
Michael Stenta e48f178ede Remove l10n_update_download_store and language_negotiation_* variables from farm_l10n. 2020-04-24 09:23:22 -04:00
Michael Stenta 25520a794d Add translatable for Files field in soil tests View. 2020-04-23 14:59:43 -04:00
Michael Stenta 00b753a45b Move translatables code block in farm_sensor_data Views definition. 2020-04-23 14:59:43 -04:00
Michael Stenta 2e12d76553 Issue #3129409: Use click sorting instead of exposed sort in Views 2020-04-23 14:59:43 -04:00
Michael Stenta 8f01b05a58 Add note to farm_log_entity_label_summary() emphasizing that it is the responsibility of downstream code to sanitize entity labels. 2020-04-23 11:30:02 -04:00
Michael Stenta 6bd7c0aa84 Don't escape more variables that are being saved to log names. 2020-04-23 11:29:45 -04:00
Michael Stenta 327894095f Escape special characters in entity_label() usages. 2020-04-23 11:29:19 -04:00
Michael Stenta ba90a84c19 Don't escape measure and units before saving them. They will be sanitized by Drupal when they are loaded into the form #default_value. 2020-04-23 10:49:24 -04:00
Michael Stenta 9b1a87dcbe Translate untranslated drupal_set_message() function calls. 2020-04-23 10:46:19 -04:00
Michael Stenta 27f657d399 Escape characters in log names through quick forms #265 2020-04-23 10:21:10 -04:00
Michael Stenta 0944d92ad1 Fix preg_match() in birth and milk quick forms to work with archived assets. 2020-04-23 09:40:49 -04:00
Michael Stenta e485fc16bf Use htmlspecialchars() instead of check_plain() in asset and field autocompletes to preserve apostrophes. 2020-04-23 09:35:48 -04:00
Michael Stenta 7069c8eff9 Generalize "Archive assets" importer target and add to all log type importers. 2020-04-23 08:26:49 -04:00
Michael Stenta 247bc024ad Trim whitespace from Asset IDs in CSV imports. 2020-04-23 07:41:47 -04:00
Michael Stenta 8bbc67a784 Only archive assets that are not already archived. 2020-04-23 07:39:39 -04:00
pcambra 202a34f291 Issue #3128665 by pcambra: Archive assets via Harvest log CSV importer 2020-04-23 07:38:42 -04:00
Michael Stenta ff88327dac Issue #3092756: Add quantity fields to medical logs 2020-04-21 14:49:21 -04:00
Michael Stenta 81daf61664 Issue #2784911: Add quantity fields to water test logs 2020-04-21 14:49:21 -04:00
Michael Stenta 6cb3626faf Issue #2784911: Add quantity fields to soil test logs 2020-04-21 14:49:21 -04:00
Michael Stenta 75a4e8e491 Issue #3092757: Add Vet field to Medical log 2020-04-21 14:49:17 -04:00
Michael Stenta 5888a3410b Issue #3049153: Duplicate assets when filtering by multiple groups or location 2020-04-20 16:05:54 -04:00
Michael Stenta 5a8c774e39 Misc Livestock Features updates. 2020-04-20 15:23:09 -04:00
Michael Stenta cb1bc01cb2 Add translatables for equipment Views. 2020-04-20 15:22:33 -04:00