Project

General

Profile

« Previous | Next » 

Revision 90713556

Added by Andreas Kohlbecker over 13 years ago

display of specimens with occurence map & remember tab

View differences:

modules/cdm_dataportal/theme/cdm_dataportal.page.theme
84 84
	if(!isset($media[0])) {
85 85
		$hideTabs[] = theme('cdm_taxonpage_tab', 'Images');
86 86
	}
87
	
87

  
88 88
	$descriptionElementCount = cdm_ws_get(CDM_WS_PORTAL_TAXON_DESCRIPTIONS_ELEMENTSBYTYPE, array($taxon->uuid, 'IndividualsAssociation'), "count=true");
89 89
  if($descriptionElementCount->Integer < 1) {
90 90
    $hideTabs[] = theme('cdm_taxonpage_tab', 'Specimens');
......
136 136
  		}
137 137
  		$taxonDescriptions = null; // release memory
138 138
  	}
139
  	 
139

  
140 140
  	$mergedTrees = cdm_ws_descriptions_by_featuretree($featureTree, $nonStructuredDescriptions, variable_get('cdm_dataportal_descriptions_separated', FALSE));
141 141

  
142 142
  	$out .= '<div id="general">';
......
170 170
  	$out .= '</div>';
171 171
  }
172 172

  
173
  // --- SPECIMENS --- // 
173
  // --- SPECIMENS --- //
174 174
  if($descriptionElementCount > 0 && ($page_part == 'specimens' || $page_part == 'all') ){
175 175
  	$out .= '<div id="specimens">';
176 176
  	if($page_part == 'all'){
......
215 215
	RenderHints::pushToRenderStack('taxon_page_specimens');
216 216

  
217 217
  $descriptionElements = cdm_ws_get(CDM_WS_PORTAL_TAXON_DESCRIPTIONS_ELEMENTSBYTYPE, array($taxon->uuid, 'IndividualsAssociation') );
218

  
219
  if(variable_get('cdm_dataportal_map_openlayers', 1)){
220

  
221
  	  $occurrenceQuery = cdm_ws_get(CDM_WS_GEOSERVICE_OCCURRENCEMAP, $taxon->uuid);
222
  	  $occurrenceQuery = $occurrenceQuery->String;
223
  	  //$query_string = 'l=v%3Aatbi%2Ce_w_0&legend=0&ms=400%2C350&od=1%3A44.29481%2C6.82161|44.29252%2C6.822873|44.29247%2C6.82346|44.29279%2C6.823678|44.29269%2C6.82394|44.28482%2C6.887252|44.11469%2C7.287144|44.11468%2C7.289168&os=1%3Ac%2F8B0000%2F10%2FAporrectodea caliginosa&recalculate=false&image=false';
224

  
225
  	  $out .= get_openlayers_map(variable_get('cdm_dataportal_geoservice_display_width', false), $occurrenceQuery);
226

  
227
  	}
228

  
218 229
  if($descriptionElements){
219
  	
220
//  	if(variable_get('cdm_dataportal_map_openlayers', 1)){
221
//  	  _add_js_openlayers_map();
222
//
223
//      $out = '<div id="openlayers">';
224
//      $out .= '<div id="openlayers_map" class="smallmap" '
225
////      .'distributionQuery="'.$query_string.'"'
226
////      .'legendFormatQuery="'.$legendFormatQueryStr.'"'
227
//      .'style="width: '.$display_width.'px; height:'.($display_width / 2).'px"></div>';
228
//      $out .= '</div>';
229
//  	}
230
  	
231
  	$out .= '<ul class="specimens">';
232
    foreach($descriptionElements as $descriptionElement) {
233
    	if($descriptionElement->associatedSpecimenOrObservation){
234
    	 $out .= '<li class="descriptionElement descriptionElement_IndividualsAssociation">' . $descriptionElement->associatedSpecimenOrObservation->titleCache . '</li>';
235
    	}
236
    }
237
    $out .= '</ul>';
230
  	$out_specimenList = '<ul class="specimens">';
231
  	foreach($descriptionElements as $descriptionElement) {
232
  		if($descriptionElement->associatedSpecimenOrObservation){
233

  
234
  			$out_specimenList .= '<li class="descriptionElement descriptionElement_IndividualsAssociation">' . $descriptionElement->associatedSpecimenOrObservation->titleCache . '</li>';
235
  		}
236
  	}
237
  	$out_specimenList .= '</ul>';
238 238
  }
239

  
240
  $out .= $out_specimenList;
241

  
242

  
239 243
	RenderHints::popFromRenderStack();
240 244
	return $out;
241 245
}

Also available in: Unified diff