Commit Graph

4195 Commits

Author SHA1 Message Date
Michael Stenta f4ecb23098 Add description to photo fields that explains how to attach multiple photos. 2020-07-24 10:57:26 -04:00
Michael Stenta 61d16ab2c9 Translate "Planned for" text. 2020-07-24 10:57:26 -04:00
Michael Stenta 6dcccac4f2 Use entity_label() and check_plain() with entity labels. 2020-07-24 10:57:26 -04:00
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 04d5280a14 Merge branch 'field_modules' into 7.x-1.x
See related discussion in the farmOS-client project: https://github.com/farmOS/farmOS-client/issues/217
2020-07-24 10:52:41 -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 a0ca94bd6e Allow multiple origins for Access-Control-Allow-Origin #271 2020-07-24 10:45:14 -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 ac5c3e026b Issue #3156713: Add a quick form for livestock grazing moves 2020-07-03 08:48:47 -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