diff --git a/modules/farm/farm_crop/farm_crop.views_default.inc b/modules/farm/farm_crop/farm_crop.views_default.inc index 2af36ba3e..457dc9e12 100644 --- a/modules/farm/farm_crop/farm_crop.views_default.inc +++ b/modules/farm/farm_crop/farm_crop.views_default.inc @@ -225,6 +225,7 @@ function farm_crop_views_default_views() { 'field_farm_quantity_units' => 'field_farm_quantity_units', 'field_farm_move_to' => 'field_farm_move_to', 'field_farm_notes' => 'field_farm_notes', + 'field_farm_log_category' => 'field_farm_log_category', 'name' => 'name', ); $handler->display->display_options['style_options']['default'] = '-1'; @@ -293,6 +294,11 @@ function farm_crop_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_log_category' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'name' => array( 'sortable' => 0, 'default_sort_order' => 'asc', @@ -664,6 +670,7 @@ function farm_crop_views_default_views() { 'field_farm_quantity_units' => 'field_farm_quantity_units', 'field_farm_move_to' => 'field_farm_move_to', 'field_farm_notes' => 'field_farm_notes', + 'field_farm_log_category' => 'field_farm_log_category', 'name' => 'name', ); $handler->display->display_options['style_options']['default'] = '-1'; @@ -732,6 +739,11 @@ function farm_crop_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_log_category' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'name' => array( 'sortable' => 0, 'default_sort_order' => 'asc', @@ -1093,16 +1105,23 @@ function farm_crop_views_default_views() { $handler->display->display_options['pager']['options']['quantity'] = '9'; $handler->display->display_options['style_plugin'] = 'table'; $handler->display->display_options['style_options']['columns'] = array( + 'views_bulk_operations' => 'views_bulk_operations', 'id' => 'id', + 'field_farm_images' => 'field_farm_images', 'name' => 'name', 'field_farm_crop' => 'field_farm_crop', - 'field_farm_move_to' => 'field_farm_move_to', 'field_farm_season' => 'field_farm_season', 'field_farm_description' => 'field_farm_description', + 'field_farm_move_to' => 'field_farm_move_to', 'active' => 'active', ); $handler->display->display_options['style_options']['default'] = '-1'; $handler->display->display_options['style_options']['info'] = array( + 'views_bulk_operations' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'id' => array( 'sortable' => 0, 'default_sort_order' => 'asc', @@ -1110,6 +1129,11 @@ function farm_crop_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_images' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'name' => array( 'sortable' => 0, 'default_sort_order' => 'asc', @@ -1118,6 +1142,18 @@ function farm_crop_views_default_views() { 'empty_column' => 0, ), 'field_farm_crop' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'field_farm_season' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'field_farm_description' => array( 'sortable' => 0, 'default_sort_order' => 'asc', 'align' => '', @@ -1125,13 +1161,11 @@ function farm_crop_views_default_views() { 'empty_column' => 0, ), 'field_farm_move_to' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), - 'field_farm_season' => array( + 'active' => array( 'sortable' => 0, 'default_sort_order' => 'asc', 'align' => '', @@ -1196,6 +1230,12 @@ function farm_crop_views_default_views() { $handler->display->display_options['fields']['field_farm_crop']['id'] = 'field_farm_crop'; $handler->display->display_options['fields']['field_farm_crop']['table'] = 'field_data_field_farm_crop'; $handler->display->display_options['fields']['field_farm_crop']['field'] = 'field_farm_crop'; + $handler->display->display_options['fields']['field_farm_crop']['delta_offset'] = '0'; + /* Field: Farm asset: Season */ + $handler->display->display_options['fields']['field_farm_season']['id'] = 'field_farm_season'; + $handler->display->display_options['fields']['field_farm_season']['table'] = 'field_data_field_farm_season'; + $handler->display->display_options['fields']['field_farm_season']['field'] = 'field_farm_season'; + $handler->display->display_options['fields']['field_farm_season']['type'] = 'taxonomy_term_reference_plain'; /* Field: Farm asset: Description */ $handler->display->display_options['fields']['field_farm_description']['id'] = 'field_farm_description'; $handler->display->display_options['fields']['field_farm_description']['table'] = 'field_data_field_farm_description'; @@ -1210,11 +1250,6 @@ function farm_crop_views_default_views() { $handler->display->display_options['fields']['field_farm_move_to']['field'] = 'field_farm_move_to'; $handler->display->display_options['fields']['field_farm_move_to']['relationship'] = 'latest_movement'; $handler->display->display_options['fields']['field_farm_move_to']['label'] = 'Location'; - /* Field: Farm asset: Season */ - $handler->display->display_options['fields']['field_farm_season']['id'] = 'field_farm_season'; - $handler->display->display_options['fields']['field_farm_season']['table'] = 'field_data_field_farm_season'; - $handler->display->display_options['fields']['field_farm_season']['field'] = 'field_farm_season'; - $handler->display->display_options['fields']['field_farm_season']['type'] = 'taxonomy_term_reference_plain'; /* Field: Farm asset: Active */ $handler->display->display_options['fields']['active']['id'] = 'active'; $handler->display->display_options['fields']['active']['table'] = 'farm_asset'; @@ -1393,10 +1428,10 @@ function farm_crop_views_default_views() { t('Asset ID'), t('.'), t('Name'), - t('Location'), t('Crop/variety'), t('Season'), t('Description'), + t('Location'), t('Active'), t('All'), t('Plantings in %1'), diff --git a/modules/farm/farm_equipment/farm_equipment.views_default.inc b/modules/farm/farm_equipment/farm_equipment.views_default.inc index 3d656f6f6..ef0292156 100644 --- a/modules/farm/farm_equipment/farm_equipment.views_default.inc +++ b/modules/farm/farm_equipment/farm_equipment.views_default.inc @@ -39,6 +39,7 @@ function farm_equipment_views_default_views() { $handler->display->display_options['style_options']['columns'] = array( 'views_bulk_operations' => 'views_bulk_operations', 'id' => 'id', + 'field_farm_images' => 'field_farm_images', 'name' => 'name', 'field_farm_manufacturer' => 'field_farm_manufacturer', 'field_farm_model' => 'field_farm_model', @@ -61,6 +62,11 @@ function farm_equipment_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_images' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'name' => array( 'sortable' => 0, 'default_sort_order' => 'asc', @@ -364,6 +370,7 @@ function farm_equipment_views_default_views() { 'name' => 'name', 'field_farm_asset' => 'field_farm_asset', 'field_farm_notes' => 'field_farm_notes', + 'field_farm_log_category' => 'field_farm_log_category', 'name_1' => 'name_1', ); $handler->display->display_options['style_options']['default'] = '-1'; @@ -413,6 +420,11 @@ function farm_equipment_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_log_category' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'name_1' => array( 'sortable' => 0, 'default_sort_order' => 'asc', diff --git a/modules/farm/farm_livestock/farm_livestock.views_default.inc b/modules/farm/farm_livestock/farm_livestock.views_default.inc index 8b5fb0002..d35b48ae9 100644 --- a/modules/farm/farm_livestock/farm_livestock.views_default.inc +++ b/modules/farm/farm_livestock/farm_livestock.views_default.inc @@ -287,11 +287,16 @@ function farm_livestock_views_default_views() { $handler->display->display_options['style_options']['columns'] = array( 'views_bulk_operations' => 'views_bulk_operations', 'id' => 'id', + 'field_farm_images' => 'field_farm_images', 'name' => 'name', - 'field_farm_animal_sex' => 'field_farm_animal_sex', - 'field_farm_date' => 'field_farm_date', 'field_farm_animal_type' => 'field_farm_animal_type', 'field_farm_animal_group' => 'field_farm_animal_group', + 'field_farm_date' => 'field_farm_date', + 'field_farm_animal_sex' => 'field_farm_animal_sex', + 'field_farm_animal_castrated' => 'field_farm_animal_castrated', + 'field_farm_animal_tag_id' => 'field_farm_animal_tag_id', + 'field_farm_animal_tag_type' => 'field_farm_animal_tag_type', + 'field_farm_animal_tag_location' => 'field_farm_animal_tag_location', 'field_farm_description' => 'field_farm_description', 'field_farm_move_to' => 'field_farm_move_to', 'active' => 'active', @@ -310,6 +315,11 @@ function farm_livestock_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_images' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'name' => array( 'sortable' => 0, 'default_sort_order' => 'asc', @@ -317,20 +327,6 @@ function farm_livestock_views_default_views() { 'separator' => '', 'empty_column' => 0, ), - 'field_farm_animal_sex' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'field_farm_date' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), 'field_farm_animal_type' => array( 'sortable' => 0, 'default_sort_order' => 'asc', @@ -339,6 +335,52 @@ function farm_livestock_views_default_views() { 'empty_column' => 0, ), 'field_farm_animal_group' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'field_farm_date' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'field_farm_animal_sex' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'field_farm_animal_castrated' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'field_farm_animal_tag_id' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'field_farm_animal_tag_type' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'field_farm_animal_tag_location' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'field_farm_description' => array( 'sortable' => 0, 'default_sort_order' => 'asc', @@ -417,6 +459,27 @@ function farm_livestock_views_default_views() { $handler->display->display_options['fields']['name']['field'] = 'name'; $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE; $handler->display->display_options['fields']['name']['alter']['path'] = 'farm/asset/[id]'; + /* Field: Farm asset: Species/breed */ + $handler->display->display_options['fields']['field_farm_animal_type']['id'] = 'field_farm_animal_type'; + $handler->display->display_options['fields']['field_farm_animal_type']['table'] = 'field_data_field_farm_animal_type'; + $handler->display->display_options['fields']['field_farm_animal_type']['field'] = 'field_farm_animal_type'; + /* Field: Field: Group */ + $handler->display->display_options['fields']['field_farm_animal_group']['id'] = 'field_farm_animal_group'; + $handler->display->display_options['fields']['field_farm_animal_group']['table'] = 'field_data_field_farm_animal_group'; + $handler->display->display_options['fields']['field_farm_animal_group']['field'] = 'field_farm_animal_group'; + /* Field: Farm asset: Date of birth */ + $handler->display->display_options['fields']['field_farm_date']['id'] = 'field_farm_date'; + $handler->display->display_options['fields']['field_farm_date']['table'] = 'field_data_field_farm_date'; + $handler->display->display_options['fields']['field_farm_date']['field'] = 'field_farm_date'; + $handler->display->display_options['fields']['field_farm_date']['settings'] = array( + 'format_type' => 'short', + 'custom_date_format' => '', + 'fromto' => 'both', + 'multiple_number' => '', + 'multiple_from' => '', + 'multiple_to' => '', + 'show_remaining_days' => 0, + ); /* Field: Farm asset: Sex */ $handler->display->display_options['fields']['field_farm_animal_sex']['id'] = 'field_farm_animal_sex'; $handler->display->display_options['fields']['field_farm_animal_sex']['table'] = 'field_data_field_farm_animal_sex'; @@ -425,33 +488,12 @@ function farm_livestock_views_default_views() { $handler->display->display_options['fields']['field_farm_animal_castrated']['id'] = 'field_farm_animal_castrated'; $handler->display->display_options['fields']['field_farm_animal_castrated']['table'] = 'field_data_field_farm_animal_castrated'; $handler->display->display_options['fields']['field_farm_animal_castrated']['field'] = 'field_farm_animal_castrated'; - /* Field: Farm asset: Date of birth */ - $handler->display->display_options['fields']['field_farm_date']['id'] = 'field_farm_date'; - $handler->display->display_options['fields']['field_farm_date']['table'] = 'field_data_field_farm_date'; - $handler->display->display_options['fields']['field_farm_date']['field'] = 'field_farm_date'; - $handler->display->display_options['fields']['field_farm_date']['label'] = 'Birthdate'; - $handler->display->display_options['fields']['field_farm_date']['settings'] = array( - 'format_type' => 'long', - 'fromto' => 'both', - 'multiple_number' => '', - 'multiple_from' => '', - 'multiple_to' => '', - ); - /* Field: Farm asset: Species/breed */ - $handler->display->display_options['fields']['field_farm_animal_type']['id'] = 'field_farm_animal_type'; - $handler->display->display_options['fields']['field_farm_animal_type']['table'] = 'field_data_field_farm_animal_type'; - $handler->display->display_options['fields']['field_farm_animal_type']['field'] = 'field_farm_animal_type'; - $handler->display->display_options['fields']['field_farm_animal_type']['label'] = 'Species/Breed'; - /* Field: Field: Group */ - $handler->display->display_options['fields']['field_farm_animal_group']['id'] = 'field_farm_animal_group'; - $handler->display->display_options['fields']['field_farm_animal_group']['table'] = 'field_data_field_farm_animal_group'; - $handler->display->display_options['fields']['field_farm_animal_group']['field'] = 'field_farm_animal_group'; /* Field: Field collection item: ID */ $handler->display->display_options['fields']['field_farm_animal_tag_id']['id'] = 'field_farm_animal_tag_id'; $handler->display->display_options['fields']['field_farm_animal_tag_id']['table'] = 'field_data_field_farm_animal_tag_id'; $handler->display->display_options['fields']['field_farm_animal_tag_id']['field'] = 'field_farm_animal_tag_id'; $handler->display->display_options['fields']['field_farm_animal_tag_id']['relationship'] = 'field_farm_animal_tag_value'; - $handler->display->display_options['fields']['field_farm_animal_tag_id']['label'] = 'ID Tag'; + $handler->display->display_options['fields']['field_farm_animal_tag_id']['label'] = 'Tag ID'; /* Field: Field collection item: Tag Type */ $handler->display->display_options['fields']['field_farm_animal_tag_type']['id'] = 'field_farm_animal_tag_type'; $handler->display->display_options['fields']['field_farm_animal_tag_type']['table'] = 'field_data_field_farm_animal_tag_type'; @@ -470,7 +512,6 @@ function farm_livestock_views_default_views() { $handler->display->display_options['fields']['field_farm_description']['field'] = 'field_farm_description'; $handler->display->display_options['fields']['field_farm_description']['alter']['trim_whitespace'] = TRUE; $handler->display->display_options['fields']['field_farm_description']['alter']['max_length'] = '140'; - $handler->display->display_options['fields']['field_farm_description']['alter']['more_link'] = TRUE; $handler->display->display_options['fields']['field_farm_description']['alter']['strip_tags'] = TRUE; $handler->display->display_options['fields']['field_farm_description']['alter']['trim'] = TRUE; /* Field: Field collection item: Movement to */ @@ -725,17 +766,19 @@ function farm_livestock_views_default_views() { t('Asset ID'), t('.'), t('Name'), + t('Species/breed'), + t('Group'), + t('Date of birth'), t('Sex'), t('Castrated'), - t('Birthdate'), - t('Species/Breed'), - t('Group'), - t('ID Tag'), + t('Tag ID'), t('Tag type'), t('Tag location'), t('Description'), t('Location'), t('Active'), + t('Species/Breed'), + t('ID Tag'), t('All'), t('Animals in %1'), t('Animals in group %2'), @@ -781,6 +824,7 @@ function farm_livestock_views_default_views() { 'name' => 'name', 'field_farm_asset' => 'field_farm_asset', 'field_farm_notes' => 'field_farm_notes', + 'field_farm_log_category' => 'field_farm_log_category', 'name_1' => 'name_1', ); $handler->display->display_options['style_options']['default'] = '-1'; @@ -830,6 +874,11 @@ function farm_livestock_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_log_category' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'name_1' => array( 'sortable' => 0, 'default_sort_order' => 'asc', diff --git a/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.views_default.inc b/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.views_default.inc index 6e384da9f..f63ca2f6a 100644 --- a/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.views_default.inc +++ b/modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.views_default.inc @@ -41,10 +41,12 @@ function farm_livestock_eggs_views_default_views() { 'done' => 'done', 'id' => 'id', 'timestamp' => 'timestamp', + 'name_1' => 'name_1', 'field_farm_egg_qty' => 'field_farm_egg_qty', 'field_farm_animal_group' => 'field_farm_animal_group', - 'name' => 'name', 'field_farm_notes' => 'field_farm_notes', + 'field_farm_log_category' => 'field_farm_log_category', + 'name' => 'name', ); $handler->display->display_options['style_options']['default'] = '-1'; $handler->display->display_options['style_options']['info'] = array( @@ -74,6 +76,13 @@ function farm_livestock_eggs_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'name_1' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'field_farm_egg_qty' => array( 'sortable' => 0, 'default_sort_order' => 'asc', @@ -86,14 +95,19 @@ function farm_livestock_eggs_views_default_views() { 'separator' => '', 'empty_column' => 0, ), - 'name' => array( + 'field_farm_notes' => array( 'sortable' => 0, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), - 'field_farm_notes' => array( + 'field_farm_log_category' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'name' => array( 'sortable' => 0, 'default_sort_order' => 'asc', 'align' => '', @@ -174,6 +188,12 @@ function farm_livestock_eggs_views_default_views() { $handler->display->display_options['fields']['timestamp']['date_format'] = 'custom'; $handler->display->display_options['fields']['timestamp']['custom_date_format'] = 'M j Y'; $handler->display->display_options['fields']['timestamp']['second_date_format'] = 'long'; + /* Field: Log: Name */ + $handler->display->display_options['fields']['name_1']['id'] = 'name_1'; + $handler->display->display_options['fields']['name_1']['table'] = 'log'; + $handler->display->display_options['fields']['name_1']['field'] = 'name'; + $handler->display->display_options['fields']['name_1']['alter']['make_link'] = TRUE; + $handler->display->display_options['fields']['name_1']['alter']['path'] = 'log/[id]'; /* Field: Log: Quantity */ $handler->display->display_options['fields']['field_farm_egg_qty']['id'] = 'field_farm_egg_qty'; $handler->display->display_options['fields']['field_farm_egg_qty']['table'] = 'field_data_field_farm_egg_qty'; @@ -375,6 +395,7 @@ function farm_livestock_eggs_views_default_views() { t('Log ID'), t('.'), t('Date'), + t('Name'), t('Quantity'), t('Group'), t('Notes'), diff --git a/modules/farm/farm_log/farm_log.views_default.inc b/modules/farm/farm_log/farm_log.views_default.inc index 6362d39a6..534a2a7c5 100644 --- a/modules/farm/farm_log/farm_log.views_default.inc +++ b/modules/farm/farm_log/farm_log.views_default.inc @@ -267,7 +267,11 @@ function farm_log_views_default_views() { 'id' => 'id', 'timestamp' => 'timestamp', 'name' => 'name', + 'field_farm_asset' => 'field_farm_asset', + 'field_farm_area' => 'field_farm_area', 'type' => 'type', + 'field_farm_log_category' => 'field_farm_log_category', + 'name_1' => 'name_1', ); $handler->display->display_options['style_options']['default'] = '-1'; $handler->display->display_options['style_options']['info'] = array( @@ -304,6 +308,16 @@ function farm_log_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_asset' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'field_farm_area' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'type' => array( 'sortable' => 0, 'default_sort_order' => 'asc', @@ -311,6 +325,18 @@ function farm_log_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_log_category' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'name_1' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), ); $handler->display->display_options['style_options']['empty_table'] = TRUE; /* No results behavior: Global: Unfiltered text */ diff --git a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.views_default.inc b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.views_default.inc index 524a49f44..4faa2cdfa 100644 --- a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.views_default.inc +++ b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.views_default.inc @@ -45,6 +45,7 @@ function farm_log_harvest_views_default_views() { 'field_farm_quantity_value' => 'field_farm_quantity_value', 'field_farm_quantity_units' => 'field_farm_quantity_units', 'field_farm_asset' => 'field_farm_asset', + 'field_farm_area' => 'field_farm_area', 'field_farm_lot_number' => 'field_farm_lot_number', 'field_farm_notes' => 'field_farm_notes', 'field_farm_log_category' => 'field_farm_log_category', @@ -104,6 +105,11 @@ function farm_log_harvest_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_area' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'field_farm_lot_number' => array( 'sortable' => 0, 'default_sort_order' => 'asc', diff --git a/modules/farm/farm_log/farm_log_sale/farm_log_sale.views_default.inc b/modules/farm/farm_log/farm_log_sale/farm_log_sale.views_default.inc index 433105d12..c73d64e41 100644 --- a/modules/farm/farm_log/farm_log_sale/farm_log_sale.views_default.inc +++ b/modules/farm/farm_log/farm_log_sale/farm_log_sale.views_default.inc @@ -41,14 +41,16 @@ function farm_log_sale_views_default_views() { 'done' => 'done', 'id' => 'id', 'timestamp' => 'timestamp', + 'name' => 'name', 'field_farm_asset' => 'field_farm_asset', 'field_farm_customer' => 'field_farm_customer', 'field_farm_invoice_number' => 'field_farm_invoice_number', 'field_farm_lot_number' => 'field_farm_lot_number', - 'field_farm_unit_price' => 'field_farm_unit_price', - 'field_farm_total_price' => 'field_farm_total_price', 'field_farm_quantity_value' => 'field_farm_quantity_value', 'field_farm_quantity_units' => 'field_farm_quantity_units', + 'field_farm_unit_price' => 'field_farm_unit_price', + 'field_farm_total_price' => 'field_farm_total_price', + 'field_farm_notes' => 'field_farm_notes', 'field_farm_log_category' => 'field_farm_log_category', ); $handler->display->display_options['style_options']['default'] = '-1'; @@ -79,6 +81,13 @@ function farm_log_sale_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'name' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'field_farm_asset' => array( 'align' => '', 'separator' => '', @@ -105,6 +114,20 @@ function farm_log_sale_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_quantity_value' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'field_farm_quantity_units' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'field_farm_unit_price' => array( 'sortable' => 0, 'default_sort_order' => 'asc', @@ -119,14 +142,7 @@ function farm_log_sale_views_default_views() { 'separator' => '', 'empty_column' => 0, ), - 'field_farm_quantity_value' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), - 'field_farm_quantity_units' => array( + 'field_farm_notes' => array( 'sortable' => 0, 'default_sort_order' => 'asc', 'align' => '', @@ -215,6 +231,12 @@ function farm_log_sale_views_default_views() { $handler->display->display_options['fields']['timestamp']['date_format'] = 'custom'; $handler->display->display_options['fields']['timestamp']['custom_date_format'] = 'M j Y'; $handler->display->display_options['fields']['timestamp']['second_date_format'] = 'long'; + /* Field: Log: Name */ + $handler->display->display_options['fields']['name']['id'] = 'name'; + $handler->display->display_options['fields']['name']['table'] = 'log'; + $handler->display->display_options['fields']['name']['field'] = 'name'; + $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE; + $handler->display->display_options['fields']['name']['alter']['path'] = 'log/[id]'; /* Field: Log: Assets */ $handler->display->display_options['fields']['field_farm_asset']['id'] = 'field_farm_asset'; $handler->display->display_options['fields']['field_farm_asset']['table'] = 'field_data_field_farm_asset'; @@ -423,6 +445,7 @@ function farm_log_sale_views_default_views() { t('.'), t(','), t('Date'), + t('Name'), t('Assets'), t('Customer'), t('Invoice number'), diff --git a/modules/farm/farm_sensor/farm_sensor.views_default.inc b/modules/farm/farm_sensor/farm_sensor.views_default.inc index 9d75470f8..aa4918db5 100644 --- a/modules/farm/farm_sensor/farm_sensor.views_default.inc +++ b/modules/farm/farm_sensor/farm_sensor.views_default.inc @@ -118,7 +118,6 @@ function farm_sensor_views_default_views() { $handler->display->display_options['fields']['id']['table'] = 'farm_asset'; $handler->display->display_options['fields']['id']['field'] = 'id'; $handler->display->display_options['fields']['id']['label'] = 'Asset ID'; - $handler->display->display_options['fields']['id']['exclude'] = TRUE; $handler->display->display_options['fields']['id']['separator'] = ''; /* Field: Farm asset: Name */ $handler->display->display_options['fields']['name']['id'] = 'name'; diff --git a/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.views_default.inc b/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.views_default.inc index 190d3ea35..662106a04 100644 --- a/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.views_default.inc +++ b/modules/farm/farm_soil/farm_soil_compost/farm_soil_compost.views_default.inc @@ -37,16 +37,21 @@ function farm_soil_compost_views_default_views() { $handler->display->display_options['pager']['options']['quantity'] = '9'; $handler->display->display_options['style_plugin'] = 'table'; $handler->display->display_options['style_options']['columns'] = array( + 'views_bulk_operations' => 'views_bulk_operations', 'id' => 'id', + 'field_farm_images' => 'field_farm_images', 'name' => 'name', - 'field_farm_crop' => 'field_farm_crop', 'field_farm_description' => 'field_farm_description', 'field_farm_move_to' => 'field_farm_move_to', - 'field_farm_season' => 'field_farm_season', 'active' => 'active', ); $handler->display->display_options['style_options']['default'] = '-1'; $handler->display->display_options['style_options']['info'] = array( + 'views_bulk_operations' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'id' => array( 'sortable' => 0, 'default_sort_order' => 'asc', @@ -54,6 +59,11 @@ function farm_soil_compost_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_images' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'name' => array( 'sortable' => 0, 'default_sort_order' => 'asc', @@ -61,7 +71,7 @@ function farm_soil_compost_views_default_views() { 'separator' => '', 'empty_column' => 0, ), - 'field_farm_crop' => array( + 'field_farm_description' => array( 'sortable' => 0, 'default_sort_order' => 'asc', 'align' => '', @@ -69,13 +79,11 @@ function farm_soil_compost_views_default_views() { 'empty_column' => 0, ), 'field_farm_move_to' => array( - 'sortable' => 0, - 'default_sort_order' => 'asc', 'align' => '', 'separator' => '', 'empty_column' => 0, ), - 'field_farm_season' => array( + 'active' => array( 'sortable' => 0, 'default_sort_order' => 'asc', 'align' => '', diff --git a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.views_default.inc b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.views_default.inc index a8042e2cb..2be989758 100644 --- a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.views_default.inc +++ b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.views_default.inc @@ -45,6 +45,7 @@ function farm_soil_test_views_default_views() { 'field_farm_soil_lab' => 'field_farm_soil_lab', 'field_farm_area' => 'field_farm_area', 'field_farm_notes' => 'field_farm_notes', + 'field_farm_log_category' => 'field_farm_log_category', 'name_1' => 'name_1', ); $handler->display->display_options['style_options']['default'] = '-1'; @@ -101,6 +102,11 @@ function farm_soil_test_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_log_category' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'name_1' => array( 'sortable' => 0, 'default_sort_order' => 'asc', diff --git a/modules/farm/farm_water/farm_water_test/farm_water_test.views_default.inc b/modules/farm/farm_water/farm_water_test/farm_water_test.views_default.inc index 08fd26416..6aa5144eb 100644 --- a/modules/farm/farm_water/farm_water_test/farm_water_test.views_default.inc +++ b/modules/farm/farm_water/farm_water_test/farm_water_test.views_default.inc @@ -45,6 +45,7 @@ function farm_water_test_views_default_views() { 'field_farm_area' => 'field_farm_area', 'field_farm_water_lab' => 'field_farm_water_lab', 'field_farm_notes' => 'field_farm_notes', + 'field_farm_log_category' => 'field_farm_log_category', 'name_1' => 'name_1', ); $handler->display->display_options['style_options']['default'] = '-1'; @@ -101,6 +102,11 @@ function farm_water_test_views_default_views() { 'separator' => '', 'empty_column' => 0, ), + 'field_farm_log_category' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'name_1' => array( 'sortable' => 0, 'default_sort_order' => 'asc',