Add Category field to all logs that don't already have it.

modules/farm/farm_crop/farm_crop.features.field_instance.inc

@@ -365,6 +365,37 @@ function farm_crop_field_default_field_instances() {
     ),
   );
 
+  // Exported field_instance: 'log-farm_seeding-field_farm_log_category'.
+  $field_instances['log-farm_seeding-field_farm_log_category'] = array(
+    'bundle' => 'farm_seeding',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => 'Use this to organize your logs into categories for easier searching and filtering later.',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'taxonomy',
+        'settings' => array(),
+        'type' => 'taxonomy_term_reference_link',
+        'weight' => 8,
+      ),
+    ),
+    'entity_type' => 'log',
+    'field_name' => 'field_farm_log_category',
+    'label' => 'Log category',
+    'required' => 0,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'options',
+      'settings' => array(),
+      'type' => 'options_select',
+      'weight' => 10,
+    ),
+  );
+
   // Exported field_instance: 'log-farm_seeding-field_farm_log_owner'.
   $field_instances['log-farm_seeding-field_farm_log_owner'] = array(
     'bundle' => 'farm_seeding',
@@ -660,6 +691,37 @@ function farm_crop_field_default_field_instances() {
     ),
   );
 
+  // Exported field_instance: 'log-farm_transplanting-field_farm_log_category'.
+  $field_instances['log-farm_transplanting-field_farm_log_category'] = array(
+    'bundle' => 'farm_transplanting',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => 'Use this to organize your logs into categories for easier searching and filtering later.',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'taxonomy',
+        'settings' => array(),
+        'type' => 'taxonomy_term_reference_link',
+        'weight' => 7,
+      ),
+    ),
+    'entity_type' => 'log',
+    'field_name' => 'field_farm_log_category',
+    'label' => 'Log category',
+    'required' => 0,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'options',
+      'settings' => array(),
+      'type' => 'options_select',
+      'weight' => 10,
+    ),
+  );
+
   // Exported field_instance: 'log-farm_transplanting-field_farm_log_owner'.
   $field_instances['log-farm_transplanting-field_farm_log_owner'] = array(
     'bundle' => 'farm_transplanting',
@@ -1010,6 +1072,7 @@ function farm_crop_field_default_field_instances() {
   t('Description');
   t('Enter the crop/variety that this is a planting of. As you type, you will have the option of selecting from crops/varieties that you\'ve entered in the past.');
   t('Files');
+  t('Log category');
   t('Movement');
   t('Notes');
   t('Optionally assign this task to one or more people.');
@@ -1022,6 +1085,7 @@ function farm_crop_field_default_field_instances() {
   t('Source/Supplier');
   t('Specify the parent(s) of this planting.');
   t('Use these fields to record a movement with this log entry. This will be used to define the location of any referenced assets. The current location of any asset is determined by the most recently completed movement log. Only the "to" field is required.');
+  t('Use this to organize your logs into categories for easier searching and filtering later.');
   t('What planting does this seeding log pertain to?');
   t('What planting does this transplanting log pertain to?');
   t('Where were the seeds obtained?');

modules/farm/farm_crop/farm_crop.field_group.inc

@@ -21,7 +21,7 @@ function farm_crop_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'Assignment',
-    'weight' => '4',
+    'weight' => '5',
     'children' => array(
       0 => 'field_farm_log_owner',
     ),
@@ -50,7 +50,7 @@ function farm_crop_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'Assignment',
-    'weight' => '4',
+    'weight' => '5',
     'children' => array(
       0 => 'field_farm_log_owner',
     ),
@@ -68,6 +68,64 @@ function farm_crop_field_group_info() {
   );
   $field_groups['group_farm_assignment|log|farm_transplanting|form'] = $field_group;
 
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_farm_category|log|farm_seeding|form';
+  $field_group->group_name = 'group_farm_category';
+  $field_group->entity_type = 'log';
+  $field_group->bundle = 'farm_seeding';
+  $field_group->mode = 'form';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'Category',
+    'weight' => '4',
+    'children' => array(
+      0 => 'field_farm_log_category',
+    ),
+    'format_type' => 'fieldset',
+    'format_settings' => array(
+      'label' => 'Category',
+      'instance_settings' => array(
+        'required_fields' => 1,
+        'id' => '',
+        'classes' => 'group-farm-category field-group-fieldset',
+        'description' => '',
+      ),
+      'formatter' => 'collapsed',
+    ),
+  );
+  $field_groups['group_farm_category|log|farm_seeding|form'] = $field_group;
+
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_farm_category|log|farm_transplanting|form';
+  $field_group->group_name = 'group_farm_category';
+  $field_group->entity_type = 'log';
+  $field_group->bundle = 'farm_transplanting';
+  $field_group->mode = 'form';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'Category',
+    'weight' => '4',
+    'children' => array(
+      0 => 'field_farm_log_category',
+    ),
+    'format_type' => 'fieldset',
+    'format_settings' => array(
+      'label' => 'Category',
+      'instance_settings' => array(
+        'required_fields' => 1,
+        'id' => '',
+        'classes' => 'group-farm-category field-group-fieldset',
+        'description' => '',
+      ),
+      'formatter' => 'collapsed',
+    ),
+  );
+  $field_groups['group_farm_category|log|farm_transplanting|form'] = $field_group;
+
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -138,7 +196,7 @@ function farm_crop_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'File attachments',
-    'weight' => '5',
+    'weight' => '6',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -168,7 +226,7 @@ function farm_crop_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'File attachments',
-    'weight' => '5',
+    'weight' => '6',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -367,6 +425,7 @@ function farm_crop_field_group_info() {
   // Translatables
   // Included for use with string extractors like potx.
   t('Assignment');
+  t('Category');
   t('Description');
   t('File attachments');
   t('General information');

modules/farm/farm_crop/farm_crop.info

@@ -52,6 +52,8 @@ features[field_base][] = field_farm_seed_source
 features[field_base][] = field_farm_transplant_days
 features[field_group][] = group_farm_assignment|log|farm_seeding|form
 features[field_group][] = group_farm_assignment|log|farm_transplanting|form
+features[field_group][] = group_farm_category|log|farm_seeding|form
+features[field_group][] = group_farm_category|log|farm_transplanting|form
 features[field_group][] = group_farm_description|farm_asset|planting|form
 features[field_group][] = group_farm_files|farm_asset|planting|form
 features[field_group][] = group_farm_files|log|farm_seeding|form
@@ -71,6 +73,7 @@ features[field_instance][] = farm_asset-planting-field_farm_season
 features[field_instance][] = log-farm_seeding-field_farm_asset
 features[field_instance][] = log-farm_seeding-field_farm_files
 features[field_instance][] = log-farm_seeding-field_farm_images
+features[field_instance][] = log-farm_seeding-field_farm_log_category
 features[field_instance][] = log-farm_seeding-field_farm_log_owner
 features[field_instance][] = log-farm_seeding-field_farm_movement
 features[field_instance][] = log-farm_seeding-field_farm_notes
@@ -79,6 +82,7 @@ features[field_instance][] = log-farm_seeding-field_farm_seed_source
 features[field_instance][] = log-farm_transplanting-field_farm_asset
 features[field_instance][] = log-farm_transplanting-field_farm_files
 features[field_instance][] = log-farm_transplanting-field_farm_images
+features[field_instance][] = log-farm_transplanting-field_farm_log_category
 features[field_instance][] = log-farm_transplanting-field_farm_log_owner
 features[field_instance][] = log-farm_transplanting-field_farm_movement
 features[field_instance][] = log-farm_transplanting-field_farm_notes

modules/farm/farm_crop/farm_crop.views_default.inc

@@ -400,6 +400,13 @@ 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'] = 'field_farm_movement_value';
   $handler->display->display_options['fields']['field_farm_move_to']['delta_offset'] = '0';
+  /* Field: Log: Log category */
+  $handler->display->display_options['fields']['field_farm_log_category']['id'] = 'field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['table'] = 'field_data_field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['field'] = 'field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Category';
+  $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
+  $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
   /* Field: User: Name */
   $handler->display->display_options['fields']['name']['id'] = 'name';
   $handler->display->display_options['fields']['name']['table'] = 'users';
@@ -461,6 +468,20 @@ function farm_crop_views_default_views() {
   $handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner';
   $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
   $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
+  /* Filter criterion: Log: Log category (field_farm_log_category) */
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['id'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['table'] = 'field_data_field_farm_log_category';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['field'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['group'] = 1;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['operator_id'] = 'field_farm_log_category_tid_op';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['label'] = 'Category';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['operator'] = 'field_farm_log_category_tid_op';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['identifier'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['multiple'] = TRUE;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['type'] = 'select';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['vocabulary'] = 'farm_log_categories';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['hierarchy'] = 1;
   /* Filter criterion: Date: Date (log) */
   $handler->display->display_options['filters']['date_filter']['id'] = 'date_filter';
   $handler->display->display_options['filters']['date_filter']['table'] = 'log';
@@ -564,6 +585,7 @@ function farm_crop_views_default_views() {
     t('Quantity'),
     t('Units'),
     t('Movement to'),
+    t('Category'),
     t('All'),
     t('Seedings of %1'),
     t('Start date'),
@@ -785,6 +807,13 @@ 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'] = 'field_farm_movement_value';
   $handler->display->display_options['fields']['field_farm_move_to']['delta_offset'] = '0';
+  /* Field: Log: Log category */
+  $handler->display->display_options['fields']['field_farm_log_category']['id'] = 'field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['table'] = 'field_data_field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['field'] = 'field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Category';
+  $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
+  $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
   /* Field: User: Name */
   $handler->display->display_options['fields']['name']['id'] = 'name';
   $handler->display->display_options['fields']['name']['table'] = 'users';
@@ -846,6 +875,20 @@ function farm_crop_views_default_views() {
   $handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner';
   $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
   $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
+  /* Filter criterion: Log: Log category (field_farm_log_category) */
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['id'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['table'] = 'field_data_field_farm_log_category';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['field'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['group'] = 1;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['operator_id'] = 'field_farm_log_category_tid_op';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['label'] = 'Category';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['operator'] = 'field_farm_log_category_tid_op';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['identifier'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['multiple'] = TRUE;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['type'] = 'select';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['vocabulary'] = 'farm_log_categories';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['hierarchy'] = 1;
   /* Filter criterion: Date: Date (log) */
   $handler->display->display_options['filters']['date_filter']['id'] = 'date_filter';
   $handler->display->display_options['filters']['date_filter']['table'] = 'log';
@@ -949,6 +992,7 @@ function farm_crop_views_default_views() {
     t('Quantity'),
     t('Units'),
     t('Movement to'),
+    t('Category'),
     t('All'),
     t('Transplantings of %1'),
     t('Start date'),

modules/farm/farm_equipment/farm_equipment.features.field_instance.inc

@@ -363,6 +363,37 @@ function farm_equipment_field_default_field_instances() {
     ),
   );
 
+  // Exported field_instance: 'log-farm_maintenance-field_farm_log_category'.
+  $field_instances['log-farm_maintenance-field_farm_log_category'] = array(
+    'bundle' => 'farm_maintenance',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => 'Use this to organize your logs into categories for easier searching and filtering later.',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'taxonomy',
+        'settings' => array(),
+        'type' => 'taxonomy_term_reference_link',
+        'weight' => 6,
+      ),
+    ),
+    'entity_type' => 'log',
+    'field_name' => 'field_farm_log_category',
+    'label' => 'Log category',
+    'required' => 0,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'options',
+      'settings' => array(),
+      'type' => 'options_select',
+      'weight' => 10,
+    ),
+  );
+
   // Exported field_instance: 'log-farm_maintenance-field_farm_log_owner'.
   $field_instances['log-farm_maintenance-field_farm_log_owner'] = array(
     'bundle' => 'farm_maintenance',
@@ -469,6 +500,7 @@ function farm_equipment_field_default_field_instances() {
   t('Assets');
   t('Description');
   t('Files');
+  t('Log category');
   t('Manufacturer');
   t('Model');
   t('Movement');
@@ -478,6 +510,7 @@ function farm_equipment_field_default_field_instances() {
   t('Photos');
   t('Serial Number');
   t('Use these fields to record a movement with this log entry. This will be used to define the location of any referenced assets. The current location of any asset is determined by the most recently completed movement log. Only the "to" field is required.');
+  t('Use this to organize your logs into categories for easier searching and filtering later.');
   t('What assets do this maintenance log pertain to?');
 
   return $field_instances;

modules/farm/farm_equipment/farm_equipment.field_group.inc

@@ -50,7 +50,7 @@ function farm_equipment_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'Assignment',
-    'weight' => '4',
+    'weight' => '5',
     'children' => array(
       0 => 'field_farm_log_owner',
     ),
@@ -68,6 +68,35 @@ function farm_equipment_field_group_info() {
   );
   $field_groups['group_farm_assignment|log|farm_maintenance|form'] = $field_group;
 
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_farm_category|log|farm_maintenance|form';
+  $field_group->group_name = 'group_farm_category';
+  $field_group->entity_type = 'log';
+  $field_group->bundle = 'farm_maintenance';
+  $field_group->mode = 'form';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'Category',
+    'weight' => '4',
+    'children' => array(
+      0 => 'field_farm_log_category',
+    ),
+    'format_type' => 'fieldset',
+    'format_settings' => array(
+      'label' => 'Category',
+      'instance_settings' => array(
+        'required_fields' => 1,
+        'id' => '',
+        'classes' => 'group-farm-category field-group-fieldset',
+        'description' => '',
+      ),
+      'formatter' => 'collapsed',
+    ),
+  );
+  $field_groups['group_farm_category|log|farm_maintenance|form'] = $field_group;
+
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -138,7 +167,7 @@ function farm_equipment_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'File attachments',
-    'weight' => '5',
+    'weight' => '6',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -250,6 +279,7 @@ function farm_equipment_field_group_info() {
   // Included for use with string extractors like potx.
   t('Assets');
   t('Assignment');
+  t('Category');
   t('Description');
   t('File attachments');
   t('General information');

modules/farm/farm_equipment/farm_equipment.info

@@ -22,6 +22,7 @@ dependencies[] = multiupload_imagefield_widget
 dependencies[] = options
 dependencies[] = pathauto
 dependencies[] = strongarm
+dependencies[] = taxonomy
 dependencies[] = text
 dependencies[] = views
 dependencies[] = views_bulk_operations
@@ -36,6 +37,7 @@ features[field_base][] = field_farm_model
 features[field_base][] = field_farm_serial_number
 features[field_group][] = group_farm_assets|log|farm_maintenance|form
 features[field_group][] = group_farm_assignment|log|farm_maintenance|form
+features[field_group][] = group_farm_category|log|farm_maintenance|form
 features[field_group][] = group_farm_description|farm_asset|equipment|form
 features[field_group][] = group_farm_files|farm_asset|equipment|form
 features[field_group][] = group_farm_files|log|farm_maintenance|form
@@ -51,6 +53,7 @@ features[field_instance][] = farm_asset-equipment-field_farm_serial_number
 features[field_instance][] = log-farm_maintenance-field_farm_asset
 features[field_instance][] = log-farm_maintenance-field_farm_files
 features[field_instance][] = log-farm_maintenance-field_farm_images
+features[field_instance][] = log-farm_maintenance-field_farm_log_category
 features[field_instance][] = log-farm_maintenance-field_farm_log_owner
 features[field_instance][] = log-farm_maintenance-field_farm_movement
 features[field_instance][] = log-farm_maintenance-field_farm_notes

modules/farm/farm_equipment/farm_equipment.views_default.inc

@@ -434,6 +434,13 @@ function farm_equipment_views_default_views() {
     'link' => 1,
   );
   $handler->display->display_options['fields']['field_farm_asset']['delta_offset'] = '0';
+  /* Field: Log: Log category */
+  $handler->display->display_options['fields']['field_farm_log_category']['id'] = 'field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['table'] = 'field_data_field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['field'] = 'field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Category';
+  $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
+  $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
   /* Field: User: Name */
   $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
   $handler->display->display_options['fields']['name_1']['table'] = 'users';
@@ -492,6 +499,20 @@ function farm_equipment_views_default_views() {
   $handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner';
   $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
   $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
+  /* Filter criterion: Log: Log category (field_farm_log_category) */
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['id'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['table'] = 'field_data_field_farm_log_category';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['field'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['group'] = 1;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['operator_id'] = 'field_farm_log_category_tid_op';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['label'] = 'Category';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['operator'] = 'field_farm_log_category_tid_op';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['identifier'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['multiple'] = TRUE;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['type'] = 'select';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['vocabulary'] = 'farm_log_categories';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['hierarchy'] = 1;
   /* Filter criterion: Date: Date (log) */
   $handler->display->display_options['filters']['date_filter']['id'] = 'date_filter';
   $handler->display->display_options['filters']['date_filter']['table'] = 'log';
@@ -590,6 +611,7 @@ function farm_equipment_views_default_views() {
     t('.'),
     t('Date'),
     t('Assets'),
+    t('Category'),
     t('All'),
     t('Maintenance of %1'),
     t('Start date'),

modules/farm/farm_livestock/farm_livestock.features.field_instance.inc

@@ -657,6 +657,37 @@ function farm_livestock_field_default_field_instances() {
     ),
   );
 
+  // Exported field_instance: 'log-farm_medical-field_farm_log_category'.
+  $field_instances['log-farm_medical-field_farm_log_category'] = array(
+    'bundle' => 'farm_medical',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => 'Use this to organize your logs into categories for easier searching and filtering later.',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'taxonomy',
+        'settings' => array(),
+        'type' => 'taxonomy_term_reference_link',
+        'weight' => 6,
+      ),
+    ),
+    'entity_type' => 'log',
+    'field_name' => 'field_farm_log_category',
+    'label' => 'Log category',
+    'required' => 0,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'options',
+      'settings' => array(),
+      'type' => 'options_select',
+      'weight' => 10,
+    ),
+  );
+
   // Exported field_instance: 'log-farm_medical-field_farm_log_owner'.
   $field_instances['log-farm_medical-field_farm_log_owner'] = array(
     'bundle' => 'farm_medical',
@@ -773,6 +804,7 @@ function farm_livestock_field_default_field_instances() {
   t('ID Tag(s)');
   t('List any identification tags that this animal has. These can be ear tags, tattoos, leg bands, etc. Use the fields below to describe the type, location, and ID of each.');
   t('List any nickname(s) of this animal.');
+  t('Log category');
   t('Movement');
   t('Nickname(s)');
   t('Notes');
@@ -785,6 +817,7 @@ function farm_livestock_field_default_field_instances() {
   t('Specify the parent(s) of this animal.');
   t('Tag Type');
   t('Use these fields to record a movement with this log entry. This will be used to define the location of any referenced assets. The current location of any asset is determined by the most recently completed movement log. Only the "to" field is required.');
+  t('Use this to organize your logs into categories for easier searching and filtering later.');
   t('What animals do this medical log pertain to?');
   t('What is the species/breed of this animal? You can manage the list of available species/breeds in the ' . l('Animal Species/Breeds', 'farm/assets/animals/types') . ' vocabulary.');
 

modules/farm/farm_livestock/farm_livestock.field_group.inc

@@ -21,7 +21,7 @@ function farm_livestock_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'Assignment',
-    'weight' => '3',
+    'weight' => '4',
     'children' => array(
       0 => 'field_farm_log_owner',
     ),
@@ -39,6 +39,35 @@ function farm_livestock_field_group_info() {
   );
   $field_groups['group_farm_assignment|log|farm_medical|form'] = $field_group;
 
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_farm_category|log|farm_medical|form';
+  $field_group->group_name = 'group_farm_category';
+  $field_group->entity_type = 'log';
+  $field_group->bundle = 'farm_medical';
+  $field_group->mode = 'form';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'Category',
+    'weight' => '3',
+    'children' => array(
+      0 => 'field_farm_log_category',
+    ),
+    'format_type' => 'fieldset',
+    'format_settings' => array(
+      'label' => 'Category',
+      'instance_settings' => array(
+        'required_fields' => 1,
+        'id' => '',
+        'classes' => 'group-farm-category field-group-fieldset',
+        'description' => '',
+      ),
+      'formatter' => 'collapsed',
+    ),
+  );
+  $field_groups['group_farm_category|log|farm_medical|form'] = $field_group;
+
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -109,7 +138,7 @@ function farm_livestock_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'File attachments',
-    'weight' => '4',
+    'weight' => '5',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -282,6 +311,7 @@ function farm_livestock_field_group_info() {
   // Translatables
   // Included for use with string extractors like potx.
   t('Assignment');
+  t('Category');
   t('Description');
   t('File attachments');
   t('General information');

modules/farm/farm_livestock/farm_livestock.info

@@ -47,6 +47,7 @@ features[field_base][] = field_farm_animal_tag_location
 features[field_base][] = field_farm_animal_tag_type
 features[field_base][] = field_farm_animal_type
 features[field_group][] = group_farm_assignment|log|farm_medical|form
+features[field_group][] = group_farm_category|log|farm_medical|form
 features[field_group][] = group_farm_description|farm_asset|animal|form
 features[field_group][] = group_farm_files|farm_asset|animal|form
 features[field_group][] = group_farm_files|log|farm_medical|form
@@ -72,6 +73,7 @@ features[field_instance][] = field_collection_item-field_farm_animal_tag-field_f
 features[field_instance][] = log-farm_medical-field_farm_asset
 features[field_instance][] = log-farm_medical-field_farm_files
 features[field_instance][] = log-farm_medical-field_farm_images
+features[field_instance][] = log-farm_medical-field_farm_log_category
 features[field_instance][] = log-farm_medical-field_farm_log_owner
 features[field_instance][] = log-farm_medical-field_farm_movement
 features[field_instance][] = log-farm_medical-field_farm_notes

modules/farm/farm_livestock/farm_livestock.views_default.inc

@@ -905,6 +905,13 @@ function farm_livestock_views_default_views() {
     'link' => 1,
   );
   $handler->display->display_options['fields']['field_farm_asset']['delta_offset'] = '0';
+  /* Field: Log: Log category */
+  $handler->display->display_options['fields']['field_farm_log_category']['id'] = 'field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['table'] = 'field_data_field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['field'] = 'field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Category';
+  $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
+  $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
   /* Field: User: Name */
   $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
   $handler->display->display_options['fields']['name_1']['table'] = 'users';
@@ -963,6 +970,20 @@ function farm_livestock_views_default_views() {
   $handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner';
   $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
   $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
+  /* Filter criterion: Log: Log category (field_farm_log_category) */
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['id'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['table'] = 'field_data_field_farm_log_category';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['field'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['group'] = 1;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['operator_id'] = 'field_farm_log_category_tid_op';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['label'] = 'Category';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['operator'] = 'field_farm_log_category_tid_op';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['identifier'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['multiple'] = TRUE;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['type'] = 'select';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['vocabulary'] = 'farm_log_categories';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['hierarchy'] = 1;
   /* Filter criterion: Date: Date (log) */
   $handler->display->display_options['filters']['date_filter']['id'] = 'date_filter';
   $handler->display->display_options['filters']['date_filter']['table'] = 'log';
@@ -1062,6 +1083,7 @@ function farm_livestock_views_default_views() {
     t('Date'),
     t('Medical'),
     t('Assets'),
+    t('Category'),
     t('All'),
     t('Medical records for %1'),
     t('Start date'),

modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.features.field_instance.inc

@@ -84,6 +84,37 @@ function farm_livestock_eggs_field_default_field_instances() {
     ),
   );
 
+  // Exported field_instance: 'log-farm_eggs-field_farm_log_category'.
+  $field_instances['log-farm_eggs-field_farm_log_category'] = array(
+    'bundle' => 'farm_eggs',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => 'Use this to organize your logs into categories for easier searching and filtering later.',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'taxonomy',
+        'settings' => array(),
+        'type' => 'taxonomy_term_reference_link',
+        'weight' => 5,
+      ),
+    ),
+    'entity_type' => 'log',
+    'field_name' => 'field_farm_log_category',
+    'label' => 'Log category',
+    'required' => 0,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'options',
+      'settings' => array(),
+      'type' => 'options_select',
+      'weight' => 7,
+    ),
+  );
+
   // Exported field_instance: 'log-farm_eggs-field_farm_log_owner'.
   $field_instances['log-farm_eggs-field_farm_log_owner'] = array(
     'bundle' => 'farm_eggs',
@@ -156,10 +187,12 @@ function farm_livestock_eggs_field_default_field_instances() {
   // Included for use with string extractors like potx.
   t('Group');
   t('How many eggs were collected?');
+  t('Log category');
   t('Notes');
   t('Optionally assign this task to one or more people.');
   t('Owner');
   t('Quantity');
+  t('Use this to organize your logs into categories for easier searching and filtering later.');
   t('What group/flock were these eggs collected from?');
 
   return $field_instances;

modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.field_group.inc

@@ -21,7 +21,7 @@ function farm_livestock_eggs_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'Assignment',
-    'weight' => '2',
+    'weight' => '3',
     'children' => array(
       0 => 'field_farm_log_owner',
     ),
@@ -39,6 +39,35 @@ function farm_livestock_eggs_field_group_info() {
   );
   $field_groups['group_farm_assignment|log|farm_eggs|form'] = $field_group;
 
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_farm_category|log|farm_eggs|form';
+  $field_group->group_name = 'group_farm_category';
+  $field_group->entity_type = 'log';
+  $field_group->bundle = 'farm_eggs';
+  $field_group->mode = 'form';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'Category',
+    'weight' => '2',
+    'children' => array(
+      0 => 'field_farm_log_category',
+    ),
+    'format_type' => 'fieldset',
+    'format_settings' => array(
+      'label' => 'Category',
+      'instance_settings' => array(
+        'required_fields' => 1,
+        'id' => '',
+        'classes' => 'group-farm-category field-group-fieldset',
+        'description' => '',
+      ),
+      'formatter' => 'collapsed',
+    ),
+  );
+  $field_groups['group_farm_category|log|farm_eggs|form'] = $field_group;
+
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -101,6 +130,7 @@ function farm_livestock_eggs_field_group_info() {
   // Translatables
   // Included for use with string extractors like potx.
   t('Assignment');
+  t('Category');
   t('General information');
   t('Notes');
 

modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.info

@@ -23,10 +23,12 @@ features[ctools][] = views:views_default:3.0
 features[features_api][] = api:2
 features[field_base][] = field_farm_egg_qty
 features[field_group][] = group_farm_assignment|log|farm_eggs|form
+features[field_group][] = group_farm_category|log|farm_eggs|form
 features[field_group][] = group_farm_general|log|farm_eggs|form
 features[field_group][] = group_farm_notes|log|farm_eggs|form
 features[field_instance][] = log-farm_eggs-field_farm_animal_group
 features[field_instance][] = log-farm_eggs-field_farm_egg_qty
+features[field_instance][] = log-farm_eggs-field_farm_log_category
 features[field_instance][] = log-farm_eggs-field_farm_log_owner
 features[field_instance][] = log-farm_eggs-field_farm_notes
 features[log_type][] = farm_eggs

modules/farm/farm_livestock/farm_livestock_eggs/farm_livestock_eggs.views_default.inc

@@ -189,6 +189,13 @@ function farm_livestock_eggs_views_default_views() {
   $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';
   $handler->display->display_options['fields']['field_farm_animal_group']['type'] = 'taxonomy_term_reference_plain';
+  /* Field: Log: Log category */
+  $handler->display->display_options['fields']['field_farm_log_category']['id'] = 'field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['table'] = 'field_data_field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['field'] = 'field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Category';
+  $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
+  $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
   /* Field: User: Name */
   $handler->display->display_options['fields']['name']['id'] = 'name';
   $handler->display->display_options['fields']['name']['table'] = 'users';
@@ -239,6 +246,20 @@ function farm_livestock_eggs_views_default_views() {
   $handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner';
   $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
   $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
+  /* Filter criterion: Log: Log category (field_farm_log_category) */
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['id'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['table'] = 'field_data_field_farm_log_category';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['field'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['group'] = 1;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['operator_id'] = 'field_farm_log_category_tid_op';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['label'] = 'Category';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['operator'] = 'field_farm_log_category_tid_op';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['identifier'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['multiple'] = TRUE;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['type'] = 'select';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['vocabulary'] = 'farm_log_categories';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['hierarchy'] = 1;
   /* Filter criterion: Date: Date (log) */
   $handler->display->display_options['filters']['date_filter']['id'] = 'date_filter';
   $handler->display->display_options['filters']['date_filter']['table'] = 'log';
@@ -352,6 +373,7 @@ function farm_livestock_eggs_views_default_views() {
     t('Date'),
     t('Quantity'),
     t('Group'),
+    t('Category'),
     t('Notes'),
     t('Start date'),
     t('End date'),

modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc

@@ -129,6 +129,37 @@ function farm_soil_test_field_default_field_instances() {
     ),
   );
 
+  // Exported field_instance: 'log-farm_soil_test-field_farm_log_category'.
+  $field_instances['log-farm_soil_test-field_farm_log_category'] = array(
+    'bundle' => 'farm_soil_test',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => 'Use this to organize your logs into categories for easier searching and filtering later.',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'taxonomy',
+        'settings' => array(),
+        'type' => 'taxonomy_term_reference_link',
+        'weight' => 8,
+      ),
+    ),
+    'entity_type' => 'log',
+    'field_name' => 'field_farm_log_category',
+    'label' => 'Log category',
+    'required' => 0,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'options',
+      'settings' => array(),
+      'type' => 'options_select',
+      'weight' => 11,
+    ),
+  );
+
   // Exported field_instance: 'log-farm_soil_test-field_farm_log_owner'.
   $field_instances['log-farm_soil_test-field_farm_log_owner'] = array(
     'bundle' => 'farm_soil_test',
@@ -332,6 +363,7 @@ function farm_soil_test_field_default_field_instances() {
   t('Files');
   t('Laboratory');
   t('List the names of soils that are included in this sample. For soil maps and soil names, visit http://websoilsurvey.nrcs.usda.gov/app');
+  t('Log category');
   t('Notes');
   t('Optionally assign this task to one or more people.');
   t('Owner');
@@ -339,6 +371,7 @@ function farm_soil_test_field_default_field_instances() {
   t('Sample Points');
   t('Soil Names');
   t('Use the map to pinpoint the location(s) from which this sample is taken. If you are preparing a soil test, you may be sampling multiple points within a given area. All the points that comprise this sample should be included.');
+  t('Use this to organize your logs into categories for easier searching and filtering later.');
   t('What areas is this sample being taken from?');
   t('What laboratory performed the soil test?');
 

modules/farm/farm_soil/farm_soil_test/farm_soil_test.field_group.inc

@@ -21,7 +21,7 @@ function farm_soil_test_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'Assignment',
-    'weight' => '3',
+    'weight' => '4',
     'children' => array(
       0 => 'field_farm_log_owner',
     ),
@@ -39,6 +39,35 @@ function farm_soil_test_field_group_info() {
   );
   $field_groups['group_farm_assignment|log|farm_soil_test|form'] = $field_group;
 
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_farm_category|log|farm_soil_test|form';
+  $field_group->group_name = 'group_farm_category';
+  $field_group->entity_type = 'log';
+  $field_group->bundle = 'farm_soil_test';
+  $field_group->mode = 'form';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'Category',
+    'weight' => '3',
+    'children' => array(
+      0 => 'field_farm_log_category',
+    ),
+    'format_type' => 'fieldset',
+    'format_settings' => array(
+      'label' => 'Category',
+      'instance_settings' => array(
+        'required_fields' => 1,
+        'id' => '',
+        'classes' => 'group-farm-category field-group-fieldset',
+        'description' => '',
+      ),
+      'formatter' => 'collapsed',
+    ),
+  );
+  $field_groups['group_farm_category|log|farm_soil_test|form'] = $field_group;
+
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -50,7 +79,7 @@ function farm_soil_test_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'File attachments',
-    'weight' => '4',
+    'weight' => '5',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -161,6 +190,7 @@ function farm_soil_test_field_group_info() {
   // Translatables
   // Included for use with string extractors like potx.
   t('Assignment');
+  t('Category');
   t('File attachments');
   t('General information');
   t('Notes');

modules/farm/farm_soil/farm_soil_test/farm_soil_test.info

@@ -30,6 +30,7 @@ features[ctools][] = views:views_default:3.0
 features[features_api][] = api:2
 features[field_base][] = field_farm_soil_lab
 features[field_group][] = group_farm_assignment|log|farm_soil_test|form
+features[field_group][] = group_farm_category|log|farm_soil_test|form
 features[field_group][] = group_farm_files|log|farm_soil_test|form
 features[field_group][] = group_farm_general|log|farm_soil_test|form
 features[field_group][] = group_farm_notes|log|farm_soil_test|form
@@ -37,6 +38,7 @@ features[field_group][] = group_farm_soil|log|farm_soil_test|form
 features[field_instance][] = log-farm_soil_test-field_farm_area
 features[field_instance][] = log-farm_soil_test-field_farm_files
 features[field_instance][] = log-farm_soil_test-field_farm_images
+features[field_instance][] = log-farm_soil_test-field_farm_log_category
 features[field_instance][] = log-farm_soil_test-field_farm_log_owner
 features[field_instance][] = log-farm_soil_test-field_farm_notes
 features[field_instance][] = log-farm_soil_test-field_farm_soil_lab

modules/farm/farm_soil/farm_soil_test/farm_soil_test.views_default.inc

@@ -190,6 +190,13 @@ function farm_soil_test_views_default_views() {
   $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: Log category */
+  $handler->display->display_options['fields']['field_farm_log_category']['id'] = 'field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['table'] = 'field_data_field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['field'] = 'field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Category';
+  $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
+  $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
   /* Field: User: Name */
   $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
   $handler->display->display_options['fields']['name_1']['table'] = 'users';
@@ -263,6 +270,20 @@ function farm_soil_test_views_default_views() {
   $handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner';
   $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
   $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
+  /* Filter criterion: Log: Log category (field_farm_log_category) */
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['id'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['table'] = 'field_data_field_farm_log_category';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['field'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['group'] = 1;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['operator_id'] = 'field_farm_log_category_tid_op';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['label'] = 'Category';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['operator'] = 'field_farm_log_category_tid_op';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['identifier'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['multiple'] = TRUE;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['type'] = 'select';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['vocabulary'] = 'farm_log_categories';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['hierarchy'] = 1;
   /* Filter criterion: Date: Date (log) */
   $handler->display->display_options['filters']['date_filter']['id'] = 'date_filter';
   $handler->display->display_options['filters']['date_filter']['table'] = 'log';
@@ -363,6 +384,7 @@ function farm_soil_test_views_default_views() {
     t('Name'),
     t('Lab'),
     t('Areas'),
+    t('Category'),
     t('All'),
     t('Soil tests in %1'),
     t('Start date'),

modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc

@@ -127,6 +127,37 @@ function farm_water_test_field_default_field_instances() {
     ),
   );
 
+  // Exported field_instance: 'log-farm_water_test-field_farm_log_category'.
+  $field_instances['log-farm_water_test-field_farm_log_category'] = array(
+    'bundle' => 'farm_water_test',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => 'Use this to organize your logs into categories for easier searching and filtering later.',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'taxonomy',
+        'settings' => array(),
+        'type' => 'taxonomy_term_reference_link',
+        'weight' => 7,
+      ),
+    ),
+    'entity_type' => 'log',
+    'field_name' => 'field_farm_log_category',
+    'label' => 'Log category',
+    'required' => 0,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'options',
+      'settings' => array(),
+      'type' => 'options_select',
+      'weight' => 10,
+    ),
+  );
+
   // Exported field_instance: 'log-farm_water_test-field_farm_log_owner'.
   $field_instances['log-farm_water_test-field_farm_log_owner'] = array(
     'bundle' => 'farm_water_test',
@@ -300,12 +331,14 @@ function farm_water_test_field_default_field_instances() {
   t('Areas');
   t('Files');
   t('Laboratory');
+  t('Log category');
   t('Notes');
   t('Optionally assign this task to one or more people.');
   t('Owner');
   t('Photos');
   t('Sample points');
   t('Use the map to pinpoint the location(s) from which this sample is taken.');
+  t('Use this to organize your logs into categories for easier searching and filtering later.');
   t('What areas is this water sample being taken from?');
   t('What laboratory performed the water test?');
 

modules/farm/farm_water/farm_water_test/farm_water_test.field_group.inc

@@ -21,7 +21,7 @@ function farm_water_test_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'Assignment',
-    'weight' => '3',
+    'weight' => '4',
     'children' => array(
       0 => 'field_farm_log_owner',
     ),
@@ -39,6 +39,35 @@ function farm_water_test_field_group_info() {
   );
   $field_groups['group_farm_assignment|log|farm_water_test|form'] = $field_group;
 
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_farm_category|log|farm_water_test|form';
+  $field_group->group_name = 'group_farm_category';
+  $field_group->entity_type = 'log';
+  $field_group->bundle = 'farm_water_test';
+  $field_group->mode = 'form';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'Category',
+    'weight' => '3',
+    'children' => array(
+      0 => 'field_farm_log_category',
+    ),
+    'format_type' => 'fieldset',
+    'format_settings' => array(
+      'label' => 'Category',
+      'instance_settings' => array(
+        'required_fields' => 1,
+        'id' => '',
+        'classes' => 'group-farm-category field-group-fieldset',
+        'description' => '',
+      ),
+      'formatter' => 'collapsed',
+    ),
+  );
+  $field_groups['group_farm_category|log|farm_water_test|form'] = $field_group;
+
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -50,7 +79,7 @@ function farm_water_test_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'File attachments',
-    'weight' => '4',
+    'weight' => '5',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -161,6 +190,7 @@ function farm_water_test_field_group_info() {
   // Translatables
   // Included for use with string extractors like potx.
   t('Assignment');
+  t('Category');
   t('File attachments');
   t('General information');
   t('Notes');

modules/farm/farm_water/farm_water_test/farm_water_test.info

@@ -29,6 +29,7 @@ features[features_api][] = api:2
 features[field_base][] = field_farm_water_lab
 features[field_base][] = field_farm_water_sample_points
 features[field_group][] = group_farm_assignment|log|farm_water_test|form
+features[field_group][] = group_farm_category|log|farm_water_test|form
 features[field_group][] = group_farm_files|log|farm_water_test|form
 features[field_group][] = group_farm_general|log|farm_water_test|form
 features[field_group][] = group_farm_notes|log|farm_water_test|form
@@ -36,6 +37,7 @@ features[field_group][] = group_farm_water|log|farm_water_test|form
 features[field_instance][] = log-farm_water_test-field_farm_area
 features[field_instance][] = log-farm_water_test-field_farm_files
 features[field_instance][] = log-farm_water_test-field_farm_images
+features[field_instance][] = log-farm_water_test-field_farm_log_category
 features[field_instance][] = log-farm_water_test-field_farm_log_owner
 features[field_instance][] = log-farm_water_test-field_farm_notes
 features[field_instance][] = log-farm_water_test-field_farm_water_lab

modules/farm/farm_water/farm_water_test/farm_water_test.views_default.inc

@@ -189,6 +189,13 @@ function farm_water_test_views_default_views() {
   $handler->display->display_options['fields']['field_farm_water_lab']['id'] = 'field_farm_water_lab';
   $handler->display->display_options['fields']['field_farm_water_lab']['table'] = 'field_data_field_farm_water_lab';
   $handler->display->display_options['fields']['field_farm_water_lab']['field'] = 'field_farm_water_lab';
+  /* Field: Log: Log category */
+  $handler->display->display_options['fields']['field_farm_log_category']['id'] = 'field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['table'] = 'field_data_field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['field'] = 'field_farm_log_category';
+  $handler->display->display_options['fields']['field_farm_log_category']['label'] = 'Category';
+  $handler->display->display_options['fields']['field_farm_log_category']['type'] = 'taxonomy_term_reference_plain';
+  $handler->display->display_options['fields']['field_farm_log_category']['delta_offset'] = '0';
   /* Field: User: Name */
   $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
   $handler->display->display_options['fields']['name_1']['table'] = 'users';
@@ -262,6 +269,20 @@ function farm_water_test_views_default_views() {
   $handler->display->display_options['filters']['uid']['expose']['label'] = 'Owner';
   $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
   $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
+  /* Filter criterion: Log: Log category (field_farm_log_category) */
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['id'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['table'] = 'field_data_field_farm_log_category';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['field'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['group'] = 1;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['operator_id'] = 'field_farm_log_category_tid_op';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['label'] = 'Category';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['operator'] = 'field_farm_log_category_tid_op';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['identifier'] = 'field_farm_log_category_tid';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['expose']['multiple'] = TRUE;
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['type'] = 'select';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['vocabulary'] = 'farm_log_categories';
+  $handler->display->display_options['filters']['field_farm_log_category_tid']['hierarchy'] = 1;
   /* Filter criterion: Date: Date (log) */
   $handler->display->display_options['filters']['date_filter']['id'] = 'date_filter';
   $handler->display->display_options['filters']['date_filter']['table'] = 'log';
@@ -362,6 +383,7 @@ function farm_water_test_views_default_views() {
     t('Name'),
     t('Areas'),
     t('Laboratory'),
+    t('Category'),
     t('All'),
     t('Water tests in %1'),
     t('Start date'),