/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 378bc1ce

Added by Andreas Kohlbecker over 5 years ago

ID 378bc1ce4c8e704cde2fc41d11ab4f81b3b2275d
Parent 669f08ee
Child e0613197

fix #3650 visibility of distribution and specimen maps configurable

         // --- Distribution map
         $distribution_map_query_parameters = NULL;
         if (isset($descriptionElements['DistributionInfoDTO'])) {
         if(variable_get(DISTRIBUTION_MAP_VISIBILITY) == 'always' ||
             variable_get(DISTRIBUTION_MAP_VISIBILITY) == 'automatic' && isset($descriptionElements['DistributionInfoDTO']->mapUriParams)
+          )
+        {
           $distribution_map_query_parameters = $descriptionElements['DistributionInfoDTO']->mapUriParams;
+        }
         $map_render_element = compose_distribution_map($distribution_map_query_parameters);

         if (count($specimensOrObservations) > 0) {
             $occurrence_queryDto = cdm_ws_get(CDM_WS_GEOSERVICE_OCCURRENCEMAP, $taxon->uuid,  $by_associatedtaxon_query);
             if( isset($occurrence_queryDto->occurrenceQuery) ) {
                 $occurrence_query = $occurrence_queryDto->occurrenceQuery;
                 $legend_format_query = null;
                 $distribution_query = NULL;
                 $render_array['map'] = compose_map('specimens', $occurrence_query, $distribution_query, $legend_format_query, array());
+            }
           if(variable_get(SPECIMEN_MAP_VISIBILITY) == 'always' ||
             variable_get(SPECIMEN_MAP_VISIBILITY) == 'automatic' &&
               (isset($occurrence_queryDto->fieldUnitPoints[0]) || isset($occurrence_queryDto->derivedUnitPoints[0]))
+            )
+          {
             $occurrence_query = $occurrence_queryDto->occurrenceQuery;
             $legend_format_query = null;
             $distribution_query = NULL;
             $render_array['map'] = compose_map('specimens', $occurrence_query, $distribution_query, $legend_format_query, array());
+          }
+        }
         if(variable_get('cdm_dataportal_compressed_specimen_derivate_table')){

     define('DISTRIBUTION_CONDENSED_RECIPE', 'distribution_condensed_recipe');
     define('DISTRIBUTION_CONDENSED_RECIPE_DEFAULT', 'EuroPlusMed');
     define('DISTRIBUTION_STATUS_COLORS', 'distribution_status_colors');
     define('DISTRIBUTION_ORDER_MODE', 'distribution_order_mode');
     define('DISTRIBUTION_ORDER_MODE_DEFAULT', 'TREE');
-...
+      )
     )));
     /**
      * Constant for the drupal variable key distribution_map_visibility
+     *
      * possible values:
      *  - never
      *  - automatic
      *  - always
      */
     define('DISTRIBUTION_MAP_VISIBILITY', 'distribution_map_visibility');
     define('DISTRIBUTION_MAP_VISIBILITY_DEFAULT', 'automatic');
     /**
      * Constant for the drupal variable key specimen_map_visibility
+     *
      * possible values:
      *  - never
      *  - automatic
      *  - always
      */
     define('SPECIMEN_MAP_VISIBILITY', 'specimen_map_visibility');
     define('SPECIMEN_MAP_VISIBILITY_DEFAULT', 'automatic');
     define('CDM_TAXON_MEDIA_FILTER', 'cdm_taxon_media_filter');
     define('CDM_TAXON_MEDIA_FILTER_DEFAULT', serialize(
         array(
-...
         '#collapsible' => TRUE,
         '#collapsed' => FALSE,
         '#type' => 'fieldset',
         '#description' => 'This section covers general settings regarding the textual representation of distributions.
             Map related settings are found in the '
         '#description' => 'This section covers general settings regarding the textual representation of distributions and the visibility of the map.
             Map settings regarding the geometry, layers, etc are found in the '
           . l('geo & map tab', 'admin/config/cdm_dataportal/settings/geo') .
           '. Further settings regarding the distribution feature block can be found in above in this tab at '
           . l(
-...
       );
       $form['taxon_profile']['distribution_layout'][DISTRIBUTION_MAP_VISIBILITY] = _cdm_map_visibility_setting('distribution');
       $form['taxon_profile']['distribution_layout'][DISTRIBUTION_CONDENSED] = array(
         '#type' => 'checkbox',
         '#title' => t('Condensed distribution'),
-...
           <strong>specimens</strong> tab.'),
       );
         $form['taxon_specimens']['cdm_dataportal_compressed_specimen_derivate_table'] = array(
             '#type' => 'checkbox',
             '#title' => t('Show specimen derivatives in a compressed table'),
             '#default_value' => variable_get('cdm_dataportal_compressed_specimen_derivate_table', CDM_DATAPORTAL_COMPRESSED_SPECIMEN_DERIVATE_TABLE),
             '#description' => t('If checked, the specimen will be listed in a table. Every row represents
             a collection and it can be expanded to get an overview of the specimens and their derivates.'),
         );
         $form['taxon_specimens']['cdm_dataportal_compressed_specimen_derivate_table_show_determined_as'] = array(
             '#type' => 'checkbox',
             '#title' => t('Show "Associated with" in specimen table.'),
             '#default_value' => variable_get('cdm_dataportal_compressed_specimen_derivate_table_show_determined_as', CDM_DATAPORTAL_COMPRESSED_SPECIMEN_DERIVATE_TABLE_SHOW_DETERMINED_AS)
         );
       $form['taxon_specimens'][SPECIMEN_MAP_VISIBILITY]  = _cdm_map_visibility_setting('specimen');
       $form['taxon_specimens']['cdm_dataportal_compressed_specimen_derivate_table'] = array(
         '#type' => 'checkbox',
         '#title' => t('Show specimen derivatives in a compressed table'),
         '#default_value' => variable_get('cdm_dataportal_compressed_specimen_derivate_table', CDM_DATAPORTAL_COMPRESSED_SPECIMEN_DERIVATE_TABLE),
         '#description' => t('If checked, the specimen will be listed in a table. Every row represents
         a collection and it can be expanded to get an overview of the specimens and their derivates.'),
       );
       $form['taxon_specimens']['cdm_dataportal_compressed_specimen_derivate_table_show_determined_as'] = array(
         '#type' => 'checkbox',
         '#title' => t('Show "Associated with" in specimen table.'),
         '#default_value' => variable_get('cdm_dataportal_compressed_specimen_derivate_table_show_determined_as', CDM_DATAPORTAL_COMPRESSED_SPECIMEN_DERIVATE_TABLE_SHOW_DETERMINED_AS)
       );
       $featureTrees = cdm_get_featureTrees_as_options(TRUE);
       $profile_feature_tree_uuid = variable_get(CDM_OCCURRENCE_FEATURETREE_UUID, UUID_DEFAULT_FEATURETREE);
-...
         $profile_feature_tree_uuid = UUID_DEFAULT_FEATURETREE;
+      }
       $form['taxon_specimens']['feature_trees'][CDM_OCCURRENCE_FEATURETREE_UUID] = array(
           '#type' => 'radios',
           '#title' => t('Specimen description feature tree') . ':',
           '#default_value' => $profile_feature_tree_uuid,
           '#options' =>  $featureTrees['options'],
           '#pre_render' => array('form_pre_render_conditional_form_element', 'radios_prepare_options_suffix'),
           '#options_suffixes' => $featureTrees['treeRepresentations'],
           '#description' => t('Select the feature tree to be used for displaying specimen descriptions. Click "Show Details" to see the Feature Tree elements.'
           ),
         '#type' => 'radios',
         '#title' => t('Specimen description feature tree') . ':',
         '#default_value' => $profile_feature_tree_uuid,
         '#options' =>  $featureTrees['options'],
         '#pre_render' => array('form_pre_render_conditional_form_element', 'radios_prepare_options_suffix'),
         '#options_suffixes' => $featureTrees['treeRepresentations'],
         '#description' => t('Select the feature tree to be used for displaying specimen descriptions. Click "Show Details" to see the Feature Tree elements.'
         ),
       );
       $form_name = CDM_DATAPORTAL_SPECIMEN_GALLERY_NAME;
-...
+    }
     /**
      * Creates a form element for the constants DISTRIBUTION_MAP_VISIBILITY, SPECIMEN_MAP_VISIBILITY.
+     *
      * @param $map_id
      * @param $form
      * @return mixed
      */
     function _cdm_map_visibility_setting($map_id)
+    {
       return array(
         '#type' => 'select',
         '#title' => t(ucfirst($map_id) . ' map visibility'),
         '#default_value' => variable_get(constant(strtoupper($map_id) . '_MAP_VISIBILITY'), constant(strtoupper($map_id) . '_MAP_VISIBILITY_DEFAULT')),
         '#options' => array('always' => 'always', 'automatic' => 'automatic', 'never' => 'never'),
         '#description' => "The visibility of the map can managed <b>automatically</b> depending on whether there is data to show or not.
             The map also can forced to show up <b>always</b> or <b>never</b>."
       );
+    }
     /**
      * @todo document this function.
      */
     function cdm_settings_layout_search() {

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 378bc1ce

Added by Andreas Kohlbecker over 5 years ago

Project

General

Profile

EDIT

Revision 378bc1ce

Added by Andreas Kohlbecker over 5 years ago

Related issues