OpenEcoLab-LasAlpujarras
/
farmOS
mirror of https://github.com/farmOS/farmOS.git
3
0
Fork 0
Code Wiki

Get the assets current location relative to the movement time.

This commit is contained in:
paul121 2020-10-27 15:58:03 -07:00 committed by Michael Stenta
parent 241781b13a
commit 25ecd4faf1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/farm/farm_livestock/farm_livestock.farm_quick.move.inc
View File

@ -222,7 +222,8 @@ function farm_livestock_move_form($form, &$form_state) {
// Load current location geometry of all assets. // Load current location geometry of all assets.
$geoms = array(); $geoms = array();
foreach ($assets as $asset) { foreach ($assets as $asset) {
$geoms[] = farm_movement_asset_geometry($asset); $timestamp = strtotime($form_state['values']['move']['date'] ?: $defaults['date']);
$geoms[] = farm_movement_asset_geometry($asset, $timestamp);
} }
// Combine geometries. // Combine geometries.
@ -628,7 +629,7 @@ function farm_livestock_move_form_submit($form, &$form_state) {
// Load current locations of all assets. // Load current locations of all assets.
$previous_areas = array(); $previous_areas = array();
foreach ($assets as $asset) { foreach ($assets as $asset) {
$previous_areas = array_merge($previous_areas, farm_movement_asset_location($asset)); $previous_areas = array_merge($previous_areas, farm_movement_asset_location($asset, $timestamp));
} }
// Remove any duplicate areas. // Remove any duplicate areas.
@ -646,7 +647,7 @@ function farm_livestock_move_form_submit($form, &$form_state) {
// Load current location geometry of all assets. // Load current location geometry of all assets.
$geoms = array(); $geoms = array();
foreach ($assets as $asset) { foreach ($assets as $asset) {
$geoms[] = farm_movement_asset_geometry($asset); $geoms[] = farm_movement_asset_geometry($asset, $timestamp);
} }
// Combine geometries. // Combine geometries.