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

Include average text where originally intended.

This commit is contained in:
paul121 2020-07-31 14:10:10 -07:00 committed by Michael Stenta
parent c2169a9678
commit fa371df938
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/farm/farm_livestock/farm_livestock_weight/farm_livestock_weight.module
View File

@ -841,8 +841,15 @@ function farm_livestock_weight_entity_view_alter(&$build, $type) {
$value = !empty($weight['value']) ? $weight['value'] : '';
$units = !empty($weight['units']) ? $weight['units'] : '';
// If the animal has an inventory greater than 1, add "(average)".
$inventory = farm_inventory($asset);
$average_text = '';
if ($inventory > 1) {
$average_text .= ' (' . t('average') . ')';
}
// Build the weight display.
$output = '<strong>' . t('Weight') . ':</strong> ' . $value . ' ' . $units . '<a href="' . url($asset_uri['path'] . '/weight') . t('"> (weight report) </a>');
$output = '<strong>' . t('Weight') . ':</strong> ' . $value . ' ' . $units . $average_text . '<a href="' . url($asset_uri['path'] . '/weight') . t('"> (weight report) </a>');
// Load the daily live weight gain.
$dlwg = farm_livestock_weight_dlwg($asset);
@ -850,11 +857,6 @@ function farm_livestock_weight_entity_view_alter(&$build, $type) {
// Add the dlwg markup.
$output .= $dlwg['markup'];
}
// If the animal has an inventory greater than 1, add "(average)".
$inventory = farm_inventory($asset);
if ($inventory > 1) {
$output .= ' (' . t('average') . ')';
}
// Add it to the build array.
$build['weight'] = array(