Commit Graph

4172 Commits

Author SHA1 Message Date
Michael Stenta e007fecc61 If only a single log was returned, wrap it in an array. 2020-11-26 06:23:54 -05:00
Michael Stenta 6631de0530 Remove $single= parameter name from function call. 2020-11-26 06:23:54 -05:00
Michael Stenta 06735fc3ce Improve "Daily liveweight gain" translation. Separate markup from string. Close P tag. 2020-11-26 06:23:54 -05:00
Michael Stenta 00695591d8 Do not sanitize log paths generated by url(). 2020-11-26 06:23:54 -05:00
paul121 2b8bdb8bd0 Whitespace and comments. 2020-11-26 06:23:54 -05:00
paul121 649d3bd847 Format animal name with htmlspecialchars(entity_label()). 2020-11-26 06:23:54 -05:00
paul121 fa371df938 Include average text where originally intended. 2020-11-26 06:23:54 -05:00
paul121 c2169a9678 Initialize log_weights array before checking logs. 2020-11-26 06:23:54 -05:00
paul121 c1e38ab4c8 Return dlwg markup text with farm_livestock_weight_dlwg. 2020-11-26 06:23:54 -05:00
paul121 4015d6c4ee Return logs with farm_livestock_weight_all and farm_livestock_weight_dlwg. 2020-11-26 06:23:54 -05:00
Skipper 47cbbde867 Added daily liveweight gain
Added function to calculate daily liveweight gain, and to get all weight records.
Added translation
Added farm_livestock_weight_all() function
2020-11-26 06:23:54 -05:00
Michael Stenta 02705d5029 Update Drupal core to 7.75. 2020-11-26 06:21:34 -05:00
Michael Stenta 0a94059b00 Add a link to the chat room when creating a GitHub issue. 2020-11-25 11:25:27 -05:00
Michael Stenta f0639ae7d6 Add a link to the forum when creating a GitHub issue. 2020-11-25 11:18:55 -05:00
Michael Stenta 5b6086d753 Provide a GitHub issue template for bug reports. 2020-11-25 09:02:05 -05:00
Michael Stenta 4f9797e7e4 Initial commit of CONTRIBUTING.md. This is mostly moved from https://farmOS.org/community/contribute. 2020-11-25 09:02:05 -05:00
paul121 e19abae842 Add farm_livestock_asset_inventory function to help calculate animal inventories over time. 2020-11-22 12:35:03 -08:00
Michael Stenta fa86dce518 Update Geocoder to 7.x-1.7 and remove committed patch. 2020-11-22 11:19:49 -05:00
Michael Stenta 323da428ab Patch Geocoder module to fix Issue #3181471: No geocoding with empty cache 2020-11-21 17:08:40 -05:00
Michael Stenta c986c2578f Update Features module to 7.x-2.13. 2020-11-20 10:29:24 -05:00
Michael Stenta dc3d0d5371 Fix deprecated set-env in test-build.yml GitHub action. 2020-11-18 15:10:54 -05:00
Michael Stenta dc8908e79a Update Drupal core to 7.74. 2020-11-18 15:04:58 -05:00
Michael Stenta 80b4105fb9 Fixes for livestock quick movement form #361 2020-11-11 07:54:17 -05:00
paul121 50494b16da Only save logs that have duplicate areas. 2020-11-11 07:53:58 -05:00
paul121 25ecd4faf1 Get the assets current location relative to the movement time. 2020-11-11 07:53:58 -05:00
paul121 241781b13a Fix existing post-grazing observation logs that have duplicate area references. 2020-11-11 07:53:58 -05:00
paul121 3a2c2f9043 Only reference unique areas in post-grazing observation logs. 2020-11-11 07:53:58 -05:00
Michael Stenta 46a791f163 farm_map_set_bcscale() prevents the bcscale from being set multiple times. #368 #369 2020-11-11 07:52:28 -05:00
Michael Stenta f83e56cc44 Reset the static scale variable with drupal_static_reset() so that successive calls to farm_map_set_bcscale() work. 2020-11-11 07:51:55 -05:00
Michael Stenta 54cfbf5296 Use drupal_static() instead of static variables in farm_map_set_bcscale(). 2020-11-11 07:51:55 -05:00
Michael Stenta af0b25147e Decrement $depth every time farm_map_reset_bcscale() is run. 2020-11-11 07:51:51 -05:00
Michael Stenta 8fc2a36b4e Ensure that farm_map_set_bcscale() will always be followed by farm_map_reset_bcscale() (without a returning prematurely). 2020-11-10 20:56:21 -05:00
Michael Stenta d6ed1f0e3e Revert "Unset the static $scale variable so a new scale can later be set."
This reverts commit 7aa49b68a4.

See https://github.com/farmOS/farmOS/issues/367
2020-11-10 11:44:22 -05:00
Michael Stenta b194775f35 Update Geocoder module to 7.x-1.6. 2020-11-10 06:38:22 -05:00
Michael Stenta e991879eda Update Features module to 7.x-2.12. 2020-11-10 06:38:10 -05:00
Michael Stenta 1bfdd47772 Update Ctools to 7.x-1.17. 2020-11-10 06:33:31 -05:00
Michael Stenta d41e726552 Update Calendar module to 7.x-3.6 and remove committed patch. 2020-11-10 06:33:14 -05:00
Michael Stenta f9dea9a248 Expand bcscale() comment in farm_map_set_bcscale(). 2020-10-30 19:10:42 -04:00
paul121 7aa49b68a4 Unset the static $scale variable so a new scale can later be set. 2020-10-30 18:51:14 -04:00
paul121 87fa04da99 Use db_like to escape quantity labels that might include spaces. 2020-10-29 13:38:46 -07:00
Michael Stenta 92f854b9be Update Date module to 7.x-2.11-rc1. 2020-10-02 12:54:31 -04:00
paul121 a38c1133df Add farm_crop_family_crops function to help load Farm Crop terms
associated with specific crop families.
2020-09-29 20:26:46 -04:00
paul121 7cfb2ae78c Add farm_crop_families function to help load Crop Family terms. 2020-09-29 20:26:46 -04:00
paul121 4840b0a088 Issue #3172818: Alias oauth2/* endpoints to oauth/*. 2020-09-29 20:23:47 -04:00
Michael Stenta 39ff4d1529 Combine some of the Dockerfile RUN tasks to reduce build steps. 2020-09-17 06:32:38 -04:00
Michael Stenta 86dde3f829 Fix Uploadprogress is breaking farmos/farmos:7.x-1.x Docker image build #350 2020-09-17 06:31:41 -04:00
Michael Stenta 99ae3a621e Remove a2enmod rewrite from Dockerfile. It is already enabled in drupal:7 image. 2020-09-17 06:22:37 -04:00
Michael Stenta 6f85c888a9 Update Drupal core to 7.73. 2020-09-16 15:21:04 -04:00
Michael Stenta 6439b89979 Update GeoPHP module to 7.x-1.8. 2020-09-16 08:10:16 -04:00
Michael Stenta 49f937eaae Update Log module to 7.x-1.14. 2020-09-16 08:04:13 -04:00