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

Issue #2477643: Observations of areas

Browse source
This commit is contained in:
Michael Stenta 2015-05-27 16:31:33 -04:00
parent 3b43d0726a
commit de4d704856
4 changed files with 82 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
farm_log.features.field_instance.inc
View file

@ -327,6 +327,40 @@ function farm_log_field_default_field_instances() {
),
);
// Exported field_instance: 'log-farm_observation-field_farm_area'
$field_instances['log-farm_observation-field_farm_area'] = array(
'bundle' => 'farm_observation',
'default_value' => NULL,
'deleted' => 0,
'description' => 'What area did this observation take place in?',
'display' => array(
'default' => array(
'label' => 'inline',
'module' => 'taxonomy',
'settings' => array(),
'type' => 'taxonomy_term_reference_link',
'weight' => 3,
),
),
'entity_type' => 'log',
'field_name' => 'field_farm_area',
'label' => 'Area',
'required' => 0,
'settings' => array(
'user_register_form' => FALSE,
),
'widget' => array(
'active' => 0,
'module' => 'taxonomy',
'settings' => array(
'autocomplete_path' => 'taxonomy/autocomplete',
'size' => 60,
),
'type' => 'taxonomy_autocomplete',
'weight' => 5,
),
);
// Exported field_instance: 'log-farm_observation-field_farm_asset'
$field_instances['log-farm_observation-field_farm_asset'] = array(
'bundle' => 'farm_observation',
@ -384,7 +418,7 @@ function farm_log_field_default_field_instances() {
'colorbox_node_style_first' => 'large',
),
'type' => 'colorbox',
'weight' => 4,
'weight' => 5,
),
),
'entity_type' => 'log',
@ -429,7 +463,7 @@ function farm_log_field_default_field_instances() {
'progress_indicator' => 'bar',
),
'type' => 'image_image',
'weight' => 5,
'weight' => 6,
),
);
@ -515,7 +549,7 @@ function farm_log_field_default_field_instances() {
'view_mode' => 'full',
),
'type' => 'field_collection_fields',
'weight' => 3,
'weight' => 4,
),
),
'entity_type' => 'log',
@ -530,7 +564,7 @@ function farm_log_field_default_field_instances() {
'module' => 'field_collection',
'settings' => array(),
'type' => 'field_collection_embed',
'weight' => 6,
'weight' => 7,
),
);
@ -548,6 +582,7 @@ function farm_log_field_default_field_instances() {
t('Units');
t('Value');
t('What area did this activity take place in?');
t('What area did this observation take place in?');
t('What assets are being moved?');
t('What assets does this activity pertain to?');
t('What assets does this observation pertain to?');

1
farm_log.info
View file

@ -42,6 +42,7 @@ features[field_instance][] = log-farm_movement-field_farm_asset
features[field_instance][] = log-farm_movement-field_farm_move_from
features[field_instance][] = log-farm_movement-field_farm_move_to
features[field_instance][] = log-farm_movement-field_farm_notes
features[field_instance][] = log-farm_observation-field_farm_area
features[field_instance][] = log-farm_observation-field_farm_asset
features[field_instance][] = log-farm_observation-field_farm_images
features[field_instance][] = log-farm_observation-field_farm_notes

15
farm_log.module
View file

@ -62,6 +62,7 @@ function farm_log_farm_admin_actions() {
'paths' => array(
'farm',
'farm/plan',
'taxonomy/term/%',
),
),
);
@ -87,6 +88,12 @@ function farm_log_farm_taxonomy_term_view_views($term) {
'arg' => 2,
),
// Observations in this area.
array(
'name' => 'farm_log_observation',
'arg' => 2,
),
// Area asset history (at the bottom).
array(
'name' => 'farm_area_assets',
@ -108,6 +115,14 @@ function farm_log_farm_area_links($id) {
),
'weight' => -100,
),
array(
'title' => t('Observations'),
'href' => 'taxonomy/term/' . $id,
'options' => array(
'fragment' => 'Observations',
),
'weight' => -90,
),
);
}

27
farm_log.views_default.inc
View file

@ -866,6 +866,7 @@ if (!empty($farm_asset)) {
'id' => 'id',
'timestamp' => 'timestamp',
'name' => 'name',
'field_farm_area' => 'field_farm_area',
'field_farm_quantity' => 'field_farm_quantity',
'done' => 'done',
);
@ -897,6 +898,13 @@ if (!empty($farm_asset)) {
'separator' => '',
'empty_column' => 0,
),
'field_farm_area' => array(
'sortable' => 0,
'default_sort_order' => 'asc',
'align' => '',
'separator' => '',
'empty_column' => 0,
),
'field_farm_quantity' => array(
'sortable' => 0,
'default_sort_order' => 'asc',
@ -1050,6 +1058,10 @@ if (!empty($farm_asset)) {
$handler->display->display_options['fields']['field_farm_asset']['settings'] = array(
'link' => 1,
);
/* Field: Log: Area */
$handler->display->display_options['fields']['field_farm_area']['id'] = 'field_farm_area';
$handler->display->display_options['fields']['field_farm_area']['table'] = 'field_data_field_farm_area';
$handler->display->display_options['fields']['field_farm_area']['field'] = 'field_farm_area';
/* Field: Log: Quantity */
$handler->display->display_options['fields']['field_farm_quantity']['id'] = 'field_farm_quantity';
$handler->display->display_options['fields']['field_farm_quantity']['table'] = 'field_data_field_farm_quantity';
@ -1096,6 +1108,21 @@ if (!empty($farm_asset)) {
$handler->validated_title = entity_label(\'farm_asset\', $farm_asset);
return TRUE;
}';
/* Contextual filter: Log: Area (field_farm_area) */
$handler->display->display_options['arguments']['field_farm_area_tid']['id'] = 'field_farm_area_tid';
$handler->display->display_options['arguments']['field_farm_area_tid']['table'] = 'field_data_field_farm_area';
$handler->display->display_options['arguments']['field_farm_area_tid']['field'] = 'field_farm_area_tid';
$handler->display->display_options['arguments']['field_farm_area_tid']['title_enable'] = TRUE;
$handler->display->display_options['arguments']['field_farm_area_tid']['title'] = 'Observations in %2';
$handler->display->display_options['arguments']['field_farm_area_tid']['default_argument_type'] = 'fixed';
$handler->display->display_options['arguments']['field_farm_area_tid']['summary']['number_of_records'] = '0';
$handler->display->display_options['arguments']['field_farm_area_tid']['summary']['format'] = 'default_summary';
$handler->display->display_options['arguments']['field_farm_area_tid']['summary_options']['items_per_page'] = '25';
$handler->display->display_options['arguments']['field_farm_area_tid']['specify_validation'] = TRUE;
$handler->display->display_options['arguments']['field_farm_area_tid']['validate']['type'] = 'taxonomy_term';
$handler->display->display_options['arguments']['field_farm_area_tid']['validate_options']['vocabularies'] = array(
'farm_areas' => 'farm_areas',
);
/* Filter criterion: Log: Log type */
$handler->display->display_options['filters']['type']['id'] = 'type';
$handler->display->display_options['filters']['type']['table'] = 'log';