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

Return dlwg markup text with farm_livestock_weight_dlwg.

This commit is contained in:
paul121 2020-07-31 13:55:13 -07:00 committed by Michael Stenta
parent 4015d6c4ee
commit c1e38ab4c8
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,6 +95,7 @@ function farm_livestock_weight_all($asset) {
* "previous_log" - The weight log recorded before the latest.
* "value" - The daily liveweight gain value.
* "units" - The unit of measure (eg kg).
* "markup" - HTML markup of the dlwg.
*/
function farm_livestock_weight_dlwg($asset) {
@ -117,6 +118,9 @@ function farm_livestock_weight_dlwg($asset) {
$previous_weight = $weights[1];
$previous_log = $previous_weight['log'];
// Save units.
$units = $latest_weight['units'];
// Calculate weight difference.
$weight_difference = $latest_weight['value'] - $previous_weight['value'];
@ -127,7 +131,37 @@ function farm_livestock_weight_dlwg($asset) {
// Calculate dlwg.
$dlwg_value = round($weight_difference/$timediff_days,3);
$dlwg = array("latest_log" => $latest_log, "previous_log" => $previous_log, "value" => $dlwg_value, "units" => $latest_weight['units']);
// Generate markup commonly output by users of this function.
// Date format
$date_format = 'M j Y';
// Build links to weight logs.
// Latest log.
$latest_log_uri = entity_uri('log', $latest_log);
$latest_log_date = date($date_format, $latest_log->timestamp);
// Previous log.
$previous_log_uri = entity_uri('log', $previous_log);
$previous_log_date = date($date_format, $previous_log->timestamp);
// Build value + units text.
$dlwg_text = $dlwg_value . ' ' . $units . '/' . t('day');
// Build "observed between" text.
$observed_text = t(
'observed between <a href="@previous_log_link">@previous_log_date</a> and <a href="@latest_log_link">@latest_log_date</a>',
array(
'@previous_log_link' => url($previous_log_uri['path']),
'@previous_log_date' => $previous_log_date,
'@latest_log_link' => url($latest_log_uri['path']),
'@latest_log_date' => $latest_log_date)
);
// Assemble markup.
$markup = t('<p><strong>Daily Liveweight Gain: </strong>') . $dlwg_text . ' (' . $observed_text . ')';
// Build array to return.
$dlwg = array("latest_log" => $latest_log, "previous_log" => $previous_log, "value" => $dlwg_value, "units" => $units, 'markup' => $markup);
}
}
@ -813,11 +847,11 @@ function farm_livestock_weight_entity_view_alter(&$build, $type) {
// Build the weight display.
$output = '<strong>' . t('Weight') . ':</strong> ' . $value . ' ' . $units . '<a href="' . url($asset_uri['path'] . '/weight') . t('"> (weight report) </a>');
// Get the daily liveweight gains for the animal - if there is none - it will not put the title in.
// Load the daily live weight gain.
$dlwg = farm_livestock_weight_dlwg($asset);
if (!empty($dlwg)){
$output .= t('<p><strong>Daily Liveweight Gain since @date : </strong>', array('@date' => date('d/m/Y',$dlwg['previous_record']))) . $dlwg['value'] . ' ' .$dlwg['units'] . t('/day');
// Add the dlwg markup.
$output .= $dlwg['markup'];
}
// If the animal has an inventory greater than 1, add "(average)".
$inventory = farm_inventory($asset);

6
modules/farm/farm_livestock/farm_livestock_weight/farm_livestock_weight.report.inc
View File

@ -25,10 +25,12 @@ function farm_livestock_weight_individual_report(FarmAsset $farm_asset) {
$output .= t('<p>No weight recorded for asset</p>');
} else {
$output .= t('<p><strong>Current Weight:</strong> ') . $current_weight['value'] . ' ' . $current_weight['units'] . '</p>';
// Load the daily live weight gain.
$dlwg = farm_livestock_weight_dlwg($farm_asset);
if (!empty($dlwg)){
$output .= t('<p><strong>Daily Liveweight Gain since @date: </strong>',array( '@date' => date('d/m/Y',$dlwg['previous_record']))) . $dlwg['value'] ." ". $dlwg['units']. t("/day");
// Add the dlwg markup.
$output .= $dlwg['markup'];
}
};