Commit Graph

1390 Commits

Author SHA1 Message Date
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
Michael Stenta aae298097e Issue #3049153: Duplicate assets when filtering by multiple groups or location 2020-04-20 15:17:40 -04:00
Michael Stenta 31cfe1686e Fix Notice: Undefined variable: options in farm_livestock_weight_group_report_form() 2020-04-16 10:47:19 -04:00
pcambra 94e999d01d Issue #2957726 by pcambra: Collapsing areas in Farm Area overview 2020-04-16 08:38:44 -04:00
Michael Stenta 9c392b93e8 Convert sensor data denominator to a signed int because PostgreSQL does not support unsigned. #213 2020-04-09 10:59:59 -04:00
Paul Weidner 0bbec04d09 Check for optional client_secret before enabling oauth client. 2020-03-31 11:43:49 -04:00
Michael Stenta a491a84cd7 Issue #3122259: Remove Farm Tours and dependencies 2020-03-28 11:30:37 -04:00
Michael Stenta 7da2be9b82 Disable farmOS OAuth2 clients when modules that provide them are disabled. 2020-03-25 11:28:45 -04:00
Michael Stenta 2fe098445d Refactor to remove the 'farm_api_enabled_clients' variable. 2020-03-25 11:23:51 -04:00
Michael Stenta 3826a57959 Automatically enable farmOS OAuth2 clients when the module that provides them is enabled. 2020-03-25 11:23:50 -04:00
Michael Stenta 77f0257157 Create a farm_api_enable_oauth_client() helper function. 2020-03-25 09:46:19 -04:00
Michael Stenta 16ba371638 Re-export farm_api Feature. 2020-03-25 09:15:46 -04:00
Michael Stenta 556e2283cf Fix comment. 2020-03-24 11:56:54 -04:00
Michael Stenta a44290677d Document farm_api_check_scope() return value. 2020-03-24 11:56:54 -04:00
Michael Stenta e5ef44f2fc Specify that admin/config/farm/oauth is farmOS-specific in the title and description. 2020-03-24 11:56:54 -04:00
Michael Stenta 6043edaf07 Remove unnecessary 'file path' from hook_menu(). 2020-03-24 11:56:54 -04:00
Michael Stenta aa4192c28e Rename 'administer oauth clients' permission to 'administer farm api oauth clients'. 2020-03-24 11:56:54 -04:00
Michael Stenta 00d4b789b2 Delete the farm_api_enabled_clients when farm_api is uninstalled. 2020-03-24 11:56:54 -04:00
Michael Stenta 3d62e83f0e Install oauth2_server and restws_oauth2_server in farm_api_update_7001(). 2020-03-24 11:56:54 -04:00
Michael Stenta bb2767fe5a Do not call farm_api_install() from update hook, in case it changes in the future. 2020-03-24 11:56:54 -04:00
Michael Stenta 44aa8eeed6 Move hook_install() and hook_uninstall() to top. 2020-03-24 11:56:54 -04:00
Michael Stenta a13c25ec36 Capitalize "URI". 2020-03-24 11:56:54 -04:00
Michael Stenta 54317e2743 Whitespace. 2020-03-24 11:56:54 -04:00
paul121 b93247f4c8 Refactor authorized_callback.js to Drupal JS conventions. 2020-03-24 11:56:39 -04:00
paul121 37ebfcad3a Create separate farm_api_development module for development with OAuth. 2020-03-24 11:56:39 -04:00
paul121 6637611bf2 Enable the farmOS OAuth2 server on existing sites. 2020-03-24 11:56:39 -04:00
paul121 999d26b4ed Refactor to use hook_install and hook_uninstall not disable and enable. 2020-03-24 11:56:39 -04:00
paul121 e8455708f0 Remove unnecessary variable. 2020-03-24 11:56:39 -04:00
paul121 8a097a0e32 Remove redundant variable defining oauth2_server_name. 2020-03-24 11:56:39 -04:00
paul121 c2a6d1f537 Document hook_farm_api_oauth2_client. 2020-03-24 11:56:39 -04:00
paul121 332b576fa6 Allow modules to provide an option oauth2 client_secret. 2020-03-24 11:56:39 -04:00
paul121 be4d7a53c5 Rename hook_farm_oauth_client to hook_farm_api_oauth2_client. 2020-03-24 11:56:39 -04:00
paul121 a64de67dda Merge farm_api_oauth into farm_api. 2020-03-24 11:56:39 -04:00
paul121 1ed4e32f52 Remove default OAuth client. 2020-03-24 11:56:39 -04:00
paul121 5210948c64 Refactor to allow modules to add oauth clients via hook_api 2020-03-24 10:02:19 -04:00
paul121 8ecda18c34 Refactor to allow adding oauth clients via hook_farm_oauth_client, and enable via system settings form. 2020-03-24 10:02:19 -04:00
paul121 89ae497fe0 Disable the implicit OAuth flow by default. OAuth standards no longer recommend the implicit flow. 2020-03-24 07:21:08 -04:00
paul121 7a9535c74e Do not enable the client_credentials grant, client secret by default. This value cannot be made public. 2020-03-24 07:21:08 -04:00
paul121 d3f622af55 Fix deletion of oauth2_server_client and oauth2_server_scope entities. 2020-03-24 07:21:08 -04:00
Paul Weidner 986d87d33f Update farm_api_farm_info to require the farm_info scope for basic info. 2020-03-24 07:21:08 -04:00
Paul Weidner 532c5cfddf Update hook_farm_info api example. 2020-03-24 07:21:08 -04:00
Paul Weidner ae37a1a71c Update the farm.json endpoint to check for OAuth Scopes. 2020-03-24 07:21:08 -04:00
Paul Weidner 08bfb23fd4 Add farm_api_oauth as a submodule of farm_api. 2020-03-24 07:21:08 -04:00
Michael Stenta 09411cbb31 Remove old zoom_levels property from bed area type. 2020-03-18 13:15:29 -04:00
Michael Stenta fde4542b9a Put the farm_l10n module in the farmOS (beta) package. 2020-03-18 10:18:11 -04:00
Michael Stenta 19cab336a8 Export default localization config to new farm_l10n module. 2020-03-18 10:17:47 -04:00
botlfarm ec128c1c28 Changed default configuration from force single to allow multiple. 2020-03-14 20:41:14 -04:00
Michael Stenta a3b7600047 Fix Error: call to undefined function bcscale() #258 2020-02-28 14:20:20 -05:00
Michael Stenta 11dc980beb Move metrics into farm.json. Remove farm_metrics.json. 2020-02-26 11:17:59 -05:00
Michael Stenta 6b20ba1a04 Create a farm_metrics() helper function for loading metrics. 2020-02-26 11:10:44 -05:00
Michael Stenta 209cb5e48a Only show metrics dashboard pane if the user has access to metrics. 2020-02-26 10:40:27 -05:00
Michael Stenta 14b72d7930 Remove unused variable. 2020-02-26 10:40:27 -05:00
Michael Stenta 41758a29d2 Allow all farm roles to access metrics. 2020-02-26 10:40:27 -05:00
Michael Stenta 1db1671256 Move hook_farm_access_perms() to module file for consistency. 2020-02-26 10:40:27 -05:00
Paul Weidner b7cb769191 Refactor hook_farm_metrics to use a 'key' to identify arrays of metrics.
Without this, the 'farm_metrics.json' endpoint returns an array indexed by element ID, which would be more difficult for consumers of the 'farm_metrics.json' API to parse.
2020-02-26 10:40:27 -05:00
Paul Weidner ec82d5d9d6 Create farm_metrics.json endpoint to expose metrics over API. 2020-02-26 10:40:27 -05:00
Paul Weidner 6a114b7fc8 Refactor farm_ui.farm_dashboard.inc to farm_ui.farm_metrics.inc. 2020-02-26 10:40:27 -05:00
Paul Weidner 0833072bf5 Refactor farm_area.farm_dashboard.inc to farm_area.farm_metrics.inc. 2020-02-26 10:40:27 -05:00
Paul Weidner de788dfd89 Remove 'farm_dashboard_metrics' from farm_dashboard hook_hook_info. 2020-02-26 10:39:40 -05:00
Paul Weidner 7ee3c604a4 Init farm_metrics modules from existing farm_dashboard code. 2020-02-26 10:39:40 -05:00
Michael Stenta 27c83e92d5 Make sure farmOS.map.behaviors.geofield runs after farmOS.map.behaviors.wkt. 2020-02-20 23:30:56 -05:00
Michael Stenta 0656c75550 Fix PHP Notice: Undefined index: default_value in farm_ui_farm_info() 2020-02-20 14:25:18 -05:00
Michael Stenta 76bedcb779 Make the Mapbox Satellite layer visible by default. 2020-02-17 13:41:22 -05:00
Michael Stenta 19579e91df When the map popup is closed, return focus to the map. 2020-02-17 12:50:24 -05:00
Michael Stenta 797a8c4428 Swap the Mapbox layers so that Satellite appears on top. 2020-02-17 12:50:24 -05:00
Michael Stenta 7fe30ec0ab Fix Movement Geometry field settings on existing sites. 2020-02-10 14:53:28 -05:00
Michael Stenta c2da059acf Remove "Calculated area" from area details. 2020-02-10 14:27:50 -05:00
Michael Stenta cd87da08f4 Display polygon/linestring measurement in map popups. 2020-02-10 14:27:50 -05:00
Michael Stenta 388ce9faa8 Remove "Calculated area" from area term page. It is shown in the map now. 2020-02-10 14:27:50 -05:00
Michael Stenta b1a961ae86 Remove Openlayers modules, patches, dependencies, configuration, and related code. 2020-02-10 14:27:50 -05:00
Michael Stenta 9f6bbb8253 Update farmOS-map library to v0.9.1 and add weights to behaviors. 2020-02-10 14:27:50 -05:00
Michael Stenta dd717a1f5c Fix zoom to all areas when WKT is empty. 2020-02-10 14:27:50 -05:00
Michael Stenta 6d8d070198 Fix duplicate measure behavior on editable maps. 2020-02-10 14:27:50 -05:00
Michael Stenta 3984b8d8dd When AJAX reloads a geofield map, look for new WKT in $form_state['input']. 2020-02-10 14:27:50 -05:00
Michael Stenta c3ca0cc041 Destroy farmOS-map instances when Drupal behaviors are detached. 2020-02-10 14:27:50 -05:00
Michael Stenta 18e86f9550 Refactor Drupal.behaviors.farm_map so that Drupal.settings.farm_map.maps is not needed. 2020-02-10 14:27:50 -05:00
Michael Stenta 7034539eed Update Tours. 2020-02-10 14:27:49 -05:00
Michael Stenta 9b5eb5a1d9 Remove old farm_map_show variable. 2020-02-10 14:27:49 -05:00
Michael Stenta ae60c5f9c2 Display asset cluster maps in the farm map header block. 2020-02-10 14:27:49 -05:00
Michael Stenta d792512680 Add behaviors for asset cluster maps. 2020-02-10 14:27:49 -05:00
Michael Stenta 164709c169 Add cluster support to the popup behavior. 2020-02-10 14:27:49 -05:00
Michael Stenta 59abbb1304 Remove dashboard map pane. 2020-02-10 14:27:49 -05:00
Michael Stenta 0f121776f6 Provide a Farm Map block. 2020-02-10 14:27:49 -05:00
Michael Stenta e9e48590b5 Mapbox module: add Mapbox API key to farm map settings form and add the Mapbox Satellite layer to maps. 2020-02-10 14:27:49 -05:00
Michael Stenta 0d3a71e7f9 Refactor Google Maps integration to use a farmOS-map behavior. 2020-02-10 14:27:49 -05:00
Michael Stenta 4f30833bed Use farm_map_geofield widget in all geofields. 2020-02-10 14:27:49 -05:00
Michael Stenta 2ea421a4a6 Add Geocoder integration. 2020-02-10 14:27:49 -05:00
Michael Stenta e93040e9ab Provide a farm_map_geofield field widget that uses farmOS-map. 2020-02-10 14:27:49 -05:00
Michael Stenta 7d3ad27ae9 Show a combined "All areas" layer in geofields. 2020-02-10 14:27:49 -05:00
Michael Stenta 42ef0068a4 Use farm_map_geofield formatter in all geofield displays. 2020-02-10 14:27:49 -05:00
Michael Stenta bfe8f9114e Provide a farm_map_geofield field formatter that uses farmOS-map. 2020-02-10 14:27:49 -05:00
Michael Stenta a51da53fce Initial commit of Farm Map Geofield module. 2020-02-10 14:27:49 -05:00
Michael Stenta a9a712952b Add the measure behavior to WKT layers. 2020-02-10 14:27:49 -05:00
Michael Stenta 8baceff31f If #edit is TRUE on a map element, enable the edit behavior. 2020-02-10 14:27:49 -05:00
Michael Stenta cd800b73f4 If WKT was provided in the element, show it in the map. 2020-02-10 14:27:49 -05:00
Michael Stenta c8c89d195e Set onFocusOnly: true when initializing maps, so that the user must click on the map before scroll zoom works. 2020-02-10 14:27:49 -05:00
Michael Stenta cc5664473c Pass system of measurement into farmOS-map. 2020-02-10 14:27:49 -05:00
Michael Stenta 942993d0d5 Remove default base layer setting (defer to farmOS-map layer memory). 2020-02-10 14:27:49 -05:00
Michael Stenta d67fb1c796 Refactor MapKnitter module to use a farmOS-map behavior. 2020-02-10 14:27:49 -05:00
Michael Stenta d7fd542069 Refactor farm_plan_map to use a farmOS-map behavior. 2020-02-10 14:27:49 -05:00
Michael Stenta 0eea90dec0 Refactor NRCS Soil Survey to use a farmOS-map behavior. 2020-02-10 14:27:49 -05:00
Michael Stenta 608eb047cf @todo This assumes that there is only one map on the page. 2020-02-10 14:27:49 -05:00
Michael Stenta c1ac402087 Refactor farm area generator to use a farmOS-map behavior. 2020-02-10 14:27:49 -05:00
Michael Stenta 2fb2adeb42 Display a popup when area features are clicked, and load area details via AJAX. 2020-02-10 14:27:49 -05:00
Michael Stenta 9f09c050e3 Add a JS setting that defines the base path of the site. 2020-02-10 14:27:49 -05:00
Michael Stenta 2fbd605693 Put all area layers in an "Areas" layer group. 2020-02-10 14:27:49 -05:00
Michael Stenta d7c67a130c Add all area type layers to farmOS-map. 2020-02-10 14:27:49 -05:00
Michael Stenta 1178d1fbb2 Change all area type styles to match those provided by farmOS-map. 2020-02-10 14:27:49 -05:00
Michael Stenta 30ce3a796f Update farmOS-map.js to v0.2.0. 2020-02-10 14:27:49 -05:00
Michael Stenta 18ec6180f9 Add new hooks for defining farmOS map behaviors in Drupal, and a farm_map_add_behavior() function for adding them. 2020-02-10 14:27:49 -05:00
Michael Stenta 7361a17490 Allow other modules to perform logic when a map is rendered via hook_farm_map_view(). 2020-02-10 14:27:49 -05:00
Michael Stenta c0fa34f1ae Set the height of farmOS maps to 400px. 2020-02-10 14:27:49 -05:00
Michael Stenta fbda7e5d97 Render new farmOS-map element in farm_map_build(). 2020-02-10 14:27:49 -05:00
Michael Stenta 6bc7e9f22e Add new farm_map element type with theme function that renders a farmOS-map. 2020-02-10 14:27:49 -05:00
Michael Stenta 2bce9efc87 Implement hook_libraries_info() in farm_map.module to integrate farmOS-map library. 2020-02-10 14:27:49 -05:00
Michael Stenta c64a669525 Empty text in metrics pane: "No metrics available." 2020-02-08 10:26:12 -05:00
Michael Stenta 97c872cdc0 Allow decimal values in the milk quick form. 2020-02-07 14:10:03 -05:00
Michael Stenta 89a71ae937 Explicitly set BCMath scale to 24 in farm_area.module and farm_area_generate.module functions. 2020-01-30 13:48:45 -05:00
Michael Stenta ed5b5fa368 Make farm_map_set_bcscale() capable of maintaining scale even when it is used in nested functions without resetting prematurely. 2020-01-30 13:48:44 -05:00
Michael Stenta 9f86cb0099 Increment the farmOS API version to 1.2, now that entity field info is available in /farm.json. 2020-01-22 14:49:58 -05:00
Michael Stenta b9e64b2592 Provide field requirements/restrictions/defaults for log types at /farm.json 2020-01-22 14:15:40 -05:00
Michael Stenta 6dd973d765 Install the Quantity Report module with the default set of modules. 2020-01-20 15:35:03 -05:00
Symbioquine 55a1e390a4 Fix idempotency issue with deletion
https://github.com/farmOS/farmOS/issues/232
2020-01-20 15:28:21 -05:00
Michael Stenta 41f1b5a552 Wrap farm metrics links in url() so they work without clean URLs. 2020-01-15 08:49:28 -05:00
Michael Stenta ff8871ed45 Fix Error: Call to a member function geometryType() on boolean in farm_area_calculate_area() 2020-01-09 13:47:38 -05:00
Michael Stenta 58734b0f23 Explicitly set BCMath scale to 24 when performing geometry calculations, and reset afterwards. 2019-12-31 11:40:38 -05:00
Michael Stenta 2bd13f2e0e Rename farm_map_geofield_geometry_combine() to farm_map_combine_geoms(). 2019-12-31 11:40:38 -05:00
Michael Stenta 11c02e2ab8 Move farm_map geometry functions to an include file. 2019-12-31 11:40:38 -05:00
Michael Stenta 443535e710 Load GeoPHP in farm_map_polygon_area(). 2019-12-31 11:40:38 -05:00
Jamie Gaehring b27b0400c3 Use farm_access_allow_origin variable to set headers.
Delete var's inside uninstall hook.
2019-11-21 18:26:41 -05:00
Jamie Gaehring e224670296 Add permissions and form for admin'ing the access module.
Remove mention of quantity in comments.
2019-11-21 18:26:32 -05:00
Michael Stenta 3e5a8e777d Only clean up numeric entity IDs in farm_plan_entity_delete(). 2019-10-15 15:43:12 -04:00
Michael Stenta 79f0a84d91 Only clean up numeric entity IDs in farm_quick_entity_delete(). 2019-10-15 15:35:31 -04:00
Michael Stenta 296bad2c4b Remove wildcard from NRCS STIR autocomplete path so that it can be used in anonymous forms. 2019-10-14 14:02:36 -04:00
Michael Stenta f731b378da Only include observation logs in livestock weight reports. #208 2019-10-10 12:40:21 -04:00
Michael Stenta d47db78086 Trim whitespace from CSV fields: Asset names, Parent names, Areas, Categories, Crop/variety, Nicknames, Material. 2019-10-09 12:38:25 -04:00
Michael Stenta 148eda32b0 Issue #3086611: Allow CSV imports to reference assets by name 2019-10-09 12:38:25 -04:00
Michael Stenta 700786444a Sort asset entity reference selection by asset ID descending. 2019-10-09 12:38:25 -04:00
Michael Stenta 74e2e091ed Support importing multiple Materials with input log CSVs. 2019-10-09 12:38:25 -04:00
Michael Stenta 2818877ea1 Autocreate Materials when importing input logs. 2019-10-09 12:38:25 -04:00
Michael Stenta 6c6ada79ce Fix birth log importer's mother reference target. 2019-10-09 12:38:25 -04:00
Paul Weidner 66f08494e2 Use the average weight calculated on the server in graphs. 2019-09-25 11:05:05 -04:00
Paul Weidner 61df12ed89 Add the average animal gain per day to group report 2019-09-25 11:05:05 -04:00
Paul Weidner f17c1c448a Rename Average Weight graph 2019-09-25 11:05:05 -04:00
Paul Weidner ced00f371f Display graphs of average animal weights in group reports 2019-09-25 11:05:05 -04:00
Paul Weidner 875c46bbc6 Update group report, display HTML table and CSV Export 2019-09-25 11:05:05 -04:00
Paul Weidner 8bc35866bb Update name of individual report method. 2019-09-25 11:05:05 -04:00
Michael Stenta e99011881c Move individual weight report access callback to main module file. 2019-09-25 11:05:05 -04:00
Paul Weidner 76ace07782 Improve header formatting of CSV 2019-09-25 11:05:05 -04:00
Paul Weidner 229630bf5a Change to use a while loop to walk through columns + logs 2019-09-25 11:05:05 -04:00
Paul Weidner 655daacec1 Collect log dates unique to each animal 2019-09-25 11:05:05 -04:00
Paul Weidner a49c727a56 Unset the default start date, change the date_year_range to -10:+1 2019-09-25 11:05:05 -04:00
Paul Weidner 37dacdb43e Change CSV format to one animal per line, columns specific to date 2019-09-25 11:05:05 -04:00
Michael Stenta ee480ec590 Generalize farm_report.info description - not just for assets. 2019-09-25 11:05:05 -04:00
Michael Stenta d453bad45f Remove asset ID and make "Current weight" bold. 2019-09-25 11:05:05 -04:00
Michael Stenta 6ad3ac254d Float graph to the right of the weights table. 2019-09-25 11:05:05 -04:00
Michael Stenta 1f1f8105a4 Allow creating a report of groups that contain other asset types in addition to animals (but skip them). 2019-09-25 11:05:05 -04:00
Michael Stenta 5e0c4e7507 Fix farm_livestock_weight_report_access(). 2019-09-25 11:05:05 -04:00
Michael Stenta 62d5da2774 Move Quantity report to /farm/report/quantity, depend on farm_report, install farm_report on existing sites. 2019-09-25 11:05:05 -04:00
Michael Stenta c44662ed6c Install the Farm Report module (dependency of Livestock Weight Report). 2019-09-25 11:05:05 -04:00
Michael Stenta c9a21f92e2 Add a default "Info" tab to /farm/reports. Make weight report a local task. 2019-09-25 11:05:05 -04:00
Michael Stenta cddb77a4d6 Remove unnecessary dependencies from farm_report. 2019-09-25 11:05:05 -04:00
Michael Stenta a731896a5e Pass $end_date into farm_quantity_log_asset() as the timestamp upper bound. 2019-09-25 11:05:05 -04:00
Michael Stenta a1e802b8f8 Do not include parameter variables in function call. 2019-09-25 11:05:05 -04:00
Michael Stenta 0a34e87a6d Simplify start/end date default value code. 2019-09-25 11:05:05 -04:00
Michael Stenta f629d8d9fd Misc whitespace, comments, Drupal coding standards fixes. 2019-09-25 11:05:05 -04:00
Michael Stenta 518a2db188 Update farm_quantity_log_asset() docblock. 2019-09-25 11:05:05 -04:00
Paul Weidner f29b18742e Save weights for graph 2019-09-25 11:05:05 -04:00
Paul Weidner d7c5c9fe33 Prevent Weight tab from appearing on non-animal assets 2019-09-25 11:05:05 -04:00
Paul Weidner e64090e04f Change the name of animal weight graph page from 'report' to 'weight' 2019-09-25 11:05:05 -04:00
Michael Stenta 215db36ea2 Update farm_quantity_log_asset_query() docblock. 2019-09-25 11:05:05 -04:00
Paul Weidner 8e72ca9d45 Update the name of the JS graph behavior 2019-09-25 11:05:05 -04:00
Paul Weidner ed7d893842 Use the drupal theme function to render table of recorded weights 2019-09-25 11:05:05 -04:00
Paul Weidner 473af40b07 Clean code. Use else statement and load multiple logs at once 2019-09-25 11:05:05 -04:00
Paul Weidner ae7f8df22c Add start and end date filter to CSV export 2019-09-25 11:05:05 -04:00
Paul Weidner d4276befcf Export CSV file of weights from all animals of selected group(s) 2019-09-25 11:05:05 -04:00
Paul Weidner f2fc551b54 Remove the group ID from Select list 2019-09-25 11:05:05 -04:00
Paul Weidner 366332c4ba Add a form for selecting groups of animal assets 2019-09-25 11:05:05 -04:00
Paul Weidner 0403bf6980 Move Reports to a tab, out of the Farm menu 2019-09-25 11:05:05 -04:00
Paul Weidner e8319fae70 Add farm_report permissions 2019-09-25 11:05:05 -04:00
Paul Weidner 565008af75 Add farm_report module, /farm/report path and menu item 2019-09-25 11:05:05 -04:00
Paul Weidner 6b32df38a6 Add a Weight graph to the Livestock Report tab 2019-09-25 11:05:05 -04:00
Paul Weidner 9ade46dc83 Only display the table of weights if weights have been logged 2019-09-25 11:05:05 -04:00
Paul Weidner 4df8640b60 Move the report view to farm_livestock_report.inc 2019-09-25 11:05:05 -04:00
Paul Weidner 3d0789c0df Display all recorded weights in the Animal Reports tab 2019-09-25 11:05:05 -04:00
Paul Weidner ceaa03912b Update farm_quantity_log_asset_query to accept Type and Single arguments 2019-09-25 11:05:05 -04:00
Paul Weidner 04dca2cf53 Update farm_quantity_log_asset to search for multiple records. 2019-09-25 11:05:05 -04:00
Paul Weidner 91f938e106 Add simple animal report view, show ID and current weight 2019-09-25 11:05:05 -04:00
Paul Weidner bbf9a7776f Add link to animal report 2019-09-25 11:05:05 -04:00
Michael Stenta 8ffb86c3dc Change "Length" measure label to "Length/depth". 2019-09-17 14:04:02 -04:00
Michael Stenta da91c3d18f Add Feeds importer mapping for extra fields on Purchase logs. 2019-09-09 13:10:22 -04:00
Michael Stenta 1d4d513c3c Fix Notice: Undefined variable: entity_ids in farm_fields_autocomplete(). 2019-09-02 11:11:56 -04:00
Michael Stenta e7c924307a Add a helper function for deleting a quantity measurement from a log, based on its label. 2019-08-27 14:22:20 -04:00
Michael Stenta c4a67637e5 Make farm_quantity_log_update_measurement_by_label() more specific. 2019-08-27 14:21:35 -04:00
Michael Stenta 12c63b1c45 Create the base breadcrumb from the frontpage menu item, so "Farm" can be overridden. 2019-08-26 16:05:20 -04:00
Michael Stenta b0d011bd7f Fix Views implicit relationship overwriting. 2019-08-23 16:56:39 -04:00
Michael Stenta 1db9cebd02 Describe the plan record relationship entity ID column to Views. 2019-08-23 14:06:14 -04:00
Michael Stenta fd82b12a9f Create an implicit Views relationship between plan record relationship tables and the {farm_plan} table. 2019-08-23 14:06:00 -04:00
Michael Stenta 729e996261 Add a computed geometry property to assets that shows the geometry of their most recent completed movement log. 2019-08-23 11:32:09 -04:00
Michael Stenta fa35ac74e8 Allow API access from https://farmOS.app. 2019-08-21 10:32:06 -04:00
Michael Stenta acfa67867e Fix farm_plan_logs View not appearing on all plan types. 2019-08-14 09:42:05 -04:00