OpenEcoLab-LasAlpujarras/farmOS
3
0
Fork 0
mirror of https://github.com/farmOS/farmOS.git synced 2024-02-23 11:37:38 +01:00
Code Wiki Activity

Move current location ajax logic to form builder function.

Browse source
This commit is contained in:
paul121 2020-07-02 09:44:58 -07:00 committed by Michael Stenta
parent 64b4860a42
commit 948944e6bf
1 changed files with 35 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
modules/farm/farm_livestock/farm_livestock.farm_quick.move.inc
View file

@ -45,6 +45,25 @@ function farm_livestock_move_form($form, &$form_state) {
'#required' => TRUE,
);
// Load the animal or group asset
// if an asset name has been entered.
if (!empty($form_state['values']['move']['asset'])) {
// Extract an ID from the text field.
$asset_id = 0;
$matches = array();
$result = preg_match('/\\[id: ([0-9]+)\\]/', $form_state['values']['move']['asset'], $matches);
if (!empty($matches[$result])) {
$asset_id = $matches[$result];
}
}
// If an asset ID was found, load the asset.
$asset = NULL;
if (!empty($asset_id)) {
$asset = farm_asset_load($asset_id);
}
$form['move']['current_location'] = array(
'#type' => 'hidden',
'#value' => '',
@ -52,6 +71,22 @@ function farm_livestock_move_form($form, &$form_state) {
'#suffix' => '</div>',
);
// If a valid asset was supplied load its
// current location and save WKT to hidden field.
if (!empty($asset)) {
$areas = farm_movement_asset_location($asset);
// Get WKT geometry.
$area_ids = array();
foreach($areas as $area) {
$area_ids[] = $area->tid;
}
$geom = farm_area_extract_geoms($area_ids);
// Update current location field with WKT.
$form['move']['current_location']['#value'] = $geom;
}
// Area reference.
$form['move']['area']['name'] = array(
'#type' => 'textfield',
@ -205,37 +240,10 @@ function farm_livestock_move_form_validate($form, &$form_state) {
*/
function farm_livestock_move_form_current_location_ajax($form, $form_state) {
// Validate animal or group asset.
// Extract asset ID.
$id = 0;
$matches = array();
$result = preg_match('/\\[id: ([0-9]+)\\]/', $form_state['values']['move']['asset'], $matches);
if (!empty($matches[$result])) {
$id = $matches[$result];
}
// If an ID couldn't be extracted, throw an error.
if (empty($id)) {
return array();
}
// Load the asset.
$asset = farm_asset_load($id);
$areas = farm_movement_asset_location($asset);
// Get the "wkt" form element and CSS selector.
$element = $form['move']['current_location'];
$selector = '#current-location';
// Update hidden wkt.
$area_ids = array();
foreach($areas as $area) {
$area_ids[] = $area->tid;
}
$geom = farm_area_extract_geoms($area_ids);
$element['#value'] = $geom;
// Assemble commands...
$commands = array();