Project

General

Profile

« Previous | Next » 

Revision c407b10a

Added by Andreas Kohlbecker about 3 years ago

ref #7599 ref #6866 specimen details in floating tables - gathering details

View differences:

modules/cdm_dataportal/includes/common.inc
495 495
  static $default_unit = 'm';
496 496

  
497 497
  $field_name = $field_base_name . 'Text';
498
  if (@is_string($object->$field_name)) {
498
  if (isset_not_empty($object->$field_name)) {
499 499
    // Freetext overrides all other data
500 500
    $min_max_markup = ' ' . $object->$field_name;
501 501
  } else {
502 502
    // create markup for the atomized min max data
503 503
    $min_max_array = statistical_values_array();
504
    if (@is_numeric($object->$field_base_name)) {
505
      $min_max_array['Min'] = new stdClass();
506
      $min_max_array['Min']->_value = $object->$field_base_name;
504
    if (isset_numerical($object->$field_base_name)) {
505
      $min_max_array['TypicalLowerBoundary'] = new stdClass();
506
      $min_max_array['TypicalLowerBoundary']->_value = $object->$field_base_name;
507 507
    }
508 508
    $field_name = $field_base_name . 'Max';
509
    if (@is_numeric($object->$field_name)) {
510
      $min_max_array['Max'] = new stdClass();
511
      $min_max_array['Max']->_value = $object->$field_name;
509
    if (isset_numerical($object->$field_name)) {
510
      $min_max_array['TypicalUpperBoundary'] = new stdClass();
511
      $min_max_array['TypicalUpperBoundary']->_value = $object->$field_name;
512
    } else {
513
      $min_max_array['Average'] = $min_max_array['TypicalLowerBoundary'];
514
      $min_max_array['TypicalLowerBoundary'] = null;
512 515
    }
513 516
    $min_max_markup = statistical_values($min_max_array, $default_unit);
514 517
  }
modules/cdm_dataportal/includes/occurrences_new.inc
200 200
  }
201 201
  if ($sob_dto->type == 'FieldUnit') {
202 202
    $render_array['field-unit'] = compose_cdm_field_unit_dto_location($sob_dto, $compact_mode);
203
    if(isset($sob_dto->gathering)){
204
      $render_array['gathering'] = compose_cdm_gathering_dto($sob_dto->gathering, $compact_mode);
203
    if(isset($sob_dto->gatheringEvent)){
204
      $render_array['gathering'] = compose_cdm_gathering_dto($sob_dto->gatheringEvent, $compact_mode);
205 205
    }
206 206
  }
207 207

  
......
261 261
    $table_row_data[] = cdm_sob_dto_table_row(cdm_occurrence_field_name_label('fieldNotes'), $fu_dto->fieldNotes);
262 262
  }
263 263

  
264
  return cdm_sob_dto_table($table_heading, $table_row_data, $fu_dto);
264
  return cdm_sob_dto_table("Location", $table_row_data, $fu_dto);
265

  
265 266
}
266 267

  
267 268
/**
......
293 294

  
294 295
  $table_row_data = [];
295 296
  if (isset_not_empty($gathering_dto->date)) {
296
    $table_row_data[] = cdm_sob_dto_table_row(cdm_occurrence_field_name_label('date'), partialToDate($gathering_dto->date));
297
    $table_row_data[] = cdm_sob_dto_table_row(cdm_occurrence_field_name_label('date'),
298
      partialToDate($gathering_dto->date));
299
  }
300
  if (isset_not_empty($gathering_dto->collector)) {
301
    $table_row_data[] = cdm_sob_dto_table_row(cdm_occurrence_field_name_label('collector'),
302
      $gathering_dto->collector);
303
  }
304
  if (isset_not_empty($gathering_dto->description)) {
305
    $table_row_data[] = cdm_sob_dto_table_row(cdm_occurrence_field_name_label('description'),
306
      $gathering_dto->description);
307
  }
308
  if (isset_not_empty($gathering_dto->locality)) {
309
    $table_row_data[] = cdm_sob_dto_table_row(cdm_occurrence_field_name_label('locality'),
310
      $gathering_dto->locality);
311
  }
312
  if (isset_not_empty($gathering_dto->country)) {
313
    $table_row_data[] = cdm_sob_dto_table_row(cdm_occurrence_field_name_label('country'),
314
      $gathering_dto->country);
315
  }
316
  if (isset_not_empty($gathering_dto->collectingMethod)) {
317
    $table_row_data[] = cdm_sob_dto_table_row(cdm_occurrence_field_name_label('collectingMethod'),
318
      $gathering_dto->collectingMethod);
319
  }
320
  if (isset($gathering_dto->exactLocation)) {
321
    $table_row_data[] = cdm_sob_dto_table_row(cdm_occurrence_field_name_label('exactLocation'),
322
      render_point($gathering_dto->exactLocation));
323
  }
324
  if (isset($gathering_dto->absoluteElevation)) {
325
    $table_row_data[] = cdm_sob_dto_table_row(cdm_occurrence_field_name_label('absoluteElevation'),
326
      statistical_values_from_gathering_event($gathering_dto, 'absoluteElevation'));
327
  }
328
  if (isset($gathering_dto->distanceToGround) && $gathering_dto->distanceToGround > 0) {
329
    $table_row_data[] = cdm_sob_dto_table_row(cdm_occurrence_field_name_label('distanceToGround'),
330
      statistical_values_from_gathering_event($gathering_dto, 'distanceToGround'));
331
  }
332
  if (isset($gathering_dto->distanceToWaterSurface) && $gathering_dto->distanceToWaterSurface > 0) {
333
    $table_row_data[] = cdm_sob_dto_table_row(cdm_occurrence_field_name_label('distanceToWaterSurface'),
334
      statistical_values_from_gathering_event($gathering_dto, 'distanceToWaterSurface'));
335
  }
336
  if(isset_not_empty($gathering_dto->collectingAreas)){
337
    $area_representations = array();
338
    foreach ($gathering_dto->collectingAreas as $area) {
339
      // $area_representations[] = l($area->representation_L10n, path_to_named_area($area->uuid));
340
      $area_representations[] = $area;
341
    }
342
    if (!empty($area_representations)) {
343
      $table_row_data[] = cdm_sob_dto_table_row(cdm_occurrence_field_name_label('collectingAreas'),
344
        implode(', ', $area_representations)
345
      );
346
    }
297 347
  }
298 348

  
299 349
  return cdm_sob_dto_table($table_heading, $table_row_data, $gathering_dto);
......
308 358
 * @param $sob_dto
309 359
 */
310 360
function cdm_sob_dto_table($table_heading, array $table_row_data, $sob_dto, $weight = null) {
311
  $sob_table = [
312
    "#theme" => "table",
313
    "#header" => [
314
      'data' => $table_heading,
361
  if(count($table_row_data) > 0 ) {
362
    $sob_table = [
363
      "#theme" => "table",
364
      "#header" => [
365
        'data' => $table_heading,
366
        "#attributes" => [
367
          'colspan' => 2
368
        ]
369
      ],
370
      "#rows" => $table_row_data,
315 371
      "#attributes" => [
316
        'colspan' => 2
317
      ]
318
    ],
319
    "#rows" => $table_row_data,
320
    "#attributes" => [
321
      "class" => [
322
        'specimen-or-observation-details',
323
        html_class_attribute_ref($sob_dto),
324
      ]
325
    ],
326
  ];
327
  if($weight){
328
    $sob_table['#weight'] = $weight;
372
        "class" => [
373
          'specimen-or-observation-details',
374
          html_class_attribute_ref($sob_dto),
375
        ]
376
      ],
377
    ];
378
    if($weight){
379
      $sob_table['#weight'] = $weight;
380
    }
381
    return $sob_table;
329 382
  }
330
  return $sob_table;
331 383
}
332 384

  
333 385
function cdm_sob_dto_table_row($label, $value) {
334
  return [
335
    'data' => [
336
      [
337
        'data' => str_replace(':', '', $label),
338
         'class' => [
339
          'label'
340
        ]
341
      ],
342
      $value],
343
    'no_striping' => TRUE,
344
  ];
386
  if($value){
387
    return [
388
      'data' => [
389
        [
390
          'data' => str_replace(':', '', $label),
391
           'class' => [
392
            'label'
393
          ]
394
        ],
395
        $value],
396
      'no_striping' => TRUE,
397
    ];
398
  }
345 399
}
themes/zen_dataportal/css/cdm.css
373 373
/* line 275, ../sass/cdm.scss */
374 374
div.derived-unit-tree table.specimen-or-observation-details tbody .label {
375 375
  text-align: right;
376
  white-space: nowrap;
376 377
  border-right: thin solid #dedede;
377 378
}
378
/* line 281, ../sass/cdm.scss */
379
/* line 282, ../sass/cdm.scss */
379 380
div.derived-unit-tree table.specimen-or-observation-details td, div.derived-unit-tree table.specimen-or-observation-details th {
380 381
  padding-right: 11.2px;
381 382
  padding-left: 11.2px;
382 383
}
383 384

  
384
/* line 288, ../sass/cdm.scss */
385
/* line 289, ../sass/cdm.scss */
385 386
div.derived-unit-tree-root .unit-content-wrapper {
386 387
  border-left: 3px dotted #dedede;
387 388
  margin-left: 3.2px;
388 389
}
389 390

  
390
/* line 298, ../sass/cdm.scss */
391
/* line 299, ../sass/cdm.scss */
391 392
ul.derived-unit-sub-tree ul {
392 393
  margin-left: 1.0em;
393 394
}
394
/* line 301, ../sass/cdm.scss */
395
/* line 302, ../sass/cdm.scss */
395 396
ul.derived-unit-sub-tree li {
396 397
  position: relative;
397 398
  margin-left: 0;
......
400 401
  line-height: 22.4px;
401 402
  border-left: 3px dotted #dedede;
402 403
}
403
/* line 311, ../sass/cdm.scss */
404
/* line 312, ../sass/cdm.scss */
404 405
ul.derived-unit-sub-tree li:last-child {
405 406
  border-left: none;
406 407
}
407
/* line 313, ../sass/cdm.scss */
408
/* line 314, ../sass/cdm.scss */
408 409
ul.derived-unit-sub-tree li:last-child .unit-header, ul.derived-unit-sub-tree li:last-child .unit-content {
409 410
  margin-left: 3px;
410 411
}
411
/* line 317, ../sass/cdm.scss */
412
/* line 318, ../sass/cdm.scss */
412 413
ul.derived-unit-sub-tree li:before {
413 414
  position: absolute;
414 415
  top: 3.2px;
......
422 423
  content: "";
423 424
  display: inline-block;
424 425
}
425
/* line 329, ../sass/cdm.scss */
426
/* line 330, ../sass/cdm.scss */
426 427
ul.derived-unit-sub-tree li:last-child:before {
427 428
  border-left: 3px dotted #dedede;
428 429
}
......
430 431
/*
431 432
 * Map
432 433
 */
433
/* line 337, ../sass/cdm.scss */
434
/* line 338, ../sass/cdm.scss */
434 435
.openlayers-container {
435 436
  margin-top: 5px;
436 437
  margin-bottom: 5px;
......
439 440
/*
440 441
 * Registration page & items
441 442
 */
442
/* line 347, ../sass/cdm.scss */
443
/* line 348, ../sass/cdm.scss */
443 444
.registration .type-status {
444 445
  font-weight: bold;
445 446
}
446
/* line 351, ../sass/cdm.scss */
447
/* line 352, ../sass/cdm.scss */
447 448
.registration .registration-date-and-institute {
448 449
  color: #999;
449 450
}
450
/* line 357, ../sass/cdm.scss */
451
/* line 358, ../sass/cdm.scss */
451 452
.registration .published-name .TaxonName .name {
452 453
  font-weight: bold;
453 454
}
454
/* line 361, ../sass/cdm.scss */
455
/* line 362, ../sass/cdm.scss */
455 456
.registration .typified-name .cdm\:TaxonName {
456 457
  color: #999;
457 458
}
458
/* line 363, ../sass/cdm.scss */
459
/* line 364, ../sass/cdm.scss */
459 460
.registration .typified-name .cdm\:TaxonName a {
460 461
  color: #999;
461 462
}
462
/* line 366, ../sass/cdm.scss */
463
/* line 367, ../sass/cdm.scss */
463 464
.registration .typified-name .cdm\:TaxonName .TaxonName .name {
464 465
  font-weight: bold;
465 466
}
466
/* line 372, ../sass/cdm.scss */
467
/* line 373, ../sass/cdm.scss */
467 468
.registration .registration-summary .registered_name .name {
468 469
  font-weight: bold;
469 470
}
470
/* line 375, ../sass/cdm.scss */
471
/* line 376, ../sass/cdm.scss */
471 472
.registration .registration-summary .referenced_typified_name {
472 473
  color: #999;
473 474
}
474
/* line 378, ../sass/cdm.scss */
475
/* line 379, ../sass/cdm.scss */
475 476
.registration .registration-summary .label {
476 477
  font-weight: bold;
477 478
}
......
479 480
/*
480 481
 * Theme settings page
481 482
 */
482
/* line 389, ../sass/cdm.scss */
483
/* line 390, ../sass/cdm.scss */
483 484
#system-theme-settings .image-preview {
484 485
  width: 600px;
485 486
  max-height: 150px;
486 487
  overflow: auto;
487 488
}
488
/* line 393, ../sass/cdm.scss */
489
/* line 394, ../sass/cdm.scss */
489 490
#system-theme-settings .image-preview img {
490 491
  max-width: none;
491 492
  /* reset style in mormalize.scss */
......
496 497
 *
497 498
 * using the same media queries here as in layout/_responsive.scss
498 499
 *****************************************************************************************/
499
/* line 406, ../sass/cdm.scss */
500
/* line 407, ../sass/cdm.scss */
500 501
#classification-breadcrumbs {
501 502
  font-size: 1.5em;
502 503
  line-height: 1.5em;
503 504
}
504 505

  
505 506
@media all and (min-width: 960px) {
506
  /* line 417, ../sass/cdm.scss */
507
  /* line 418, ../sass/cdm.scss */
507 508
  #classification-breadcrumbs {
508 509
    font-size: 1em;
509 510
  }
......
511 512
/***************************
512 513
 * TESTING ONLY 2020-02-20
513 514
 */
514
/* line 425, ../sass/cdm.scss */
515
/* line 426, ../sass/cdm.scss */
515 516
.font-noto {
516 517
  font-family: "Noto Sans", sans-serif !important;
517 518
}
themes/zen_dataportal/css/styles.css
2434 2434
/* line 275, ../sass/cdm.scss */
2435 2435
div.derived-unit-tree table.specimen-or-observation-details tbody .label {
2436 2436
  text-align: right;
2437
  white-space: nowrap;
2437 2438
  border-right: thin solid #dedede;
2438 2439
}
2439
/* line 281, ../sass/cdm.scss */
2440
/* line 282, ../sass/cdm.scss */
2440 2441
div.derived-unit-tree table.specimen-or-observation-details td, div.derived-unit-tree table.specimen-or-observation-details th {
2441 2442
  padding-right: 11.2px;
2442 2443
  padding-left: 11.2px;
2443 2444
}
2444 2445

  
2445
/* line 288, ../sass/cdm.scss */
2446
/* line 289, ../sass/cdm.scss */
2446 2447
div.derived-unit-tree-root .unit-content-wrapper {
2447 2448
  border-left: 3px dotted #dedede;
2448 2449
  margin-left: 3.2px;
2449 2450
}
2450 2451

  
2451
/* line 298, ../sass/cdm.scss */
2452
/* line 299, ../sass/cdm.scss */
2452 2453
ul.derived-unit-sub-tree ul {
2453 2454
  margin-left: 1.0em;
2454 2455
}
2455
/* line 301, ../sass/cdm.scss */
2456
/* line 302, ../sass/cdm.scss */
2456 2457
ul.derived-unit-sub-tree li {
2457 2458
  position: relative;
2458 2459
  margin-left: 0;
......
2461 2462
  line-height: 22.4px;
2462 2463
  border-left: 3px dotted #dedede;
2463 2464
}
2464
/* line 311, ../sass/cdm.scss */
2465
/* line 312, ../sass/cdm.scss */
2465 2466
ul.derived-unit-sub-tree li:last-child {
2466 2467
  border-left: none;
2467 2468
}
2468
/* line 313, ../sass/cdm.scss */
2469
/* line 314, ../sass/cdm.scss */
2469 2470
ul.derived-unit-sub-tree li:last-child .unit-header, ul.derived-unit-sub-tree li:last-child .unit-content {
2470 2471
  margin-left: 3px;
2471 2472
}
2472
/* line 317, ../sass/cdm.scss */
2473
/* line 318, ../sass/cdm.scss */
2473 2474
ul.derived-unit-sub-tree li:before {
2474 2475
  position: absolute;
2475 2476
  top: 3.2px;
......
2483 2484
  content: "";
2484 2485
  display: inline-block;
2485 2486
}
2486
/* line 329, ../sass/cdm.scss */
2487
/* line 330, ../sass/cdm.scss */
2487 2488
ul.derived-unit-sub-tree li:last-child:before {
2488 2489
  border-left: 3px dotted #dedede;
2489 2490
}
......
2491 2492
/*
2492 2493
 * Map
2493 2494
 */
2494
/* line 337, ../sass/cdm.scss */
2495
/* line 338, ../sass/cdm.scss */
2495 2496
.openlayers-container {
2496 2497
  margin-top: 10px;
2497 2498
  margin-bottom: 10px;
......
2500 2501
/*
2501 2502
 * Registration page & items
2502 2503
 */
2503
/* line 347, ../sass/cdm.scss */
2504
/* line 348, ../sass/cdm.scss */
2504 2505
.registration .type-status {
2505 2506
  font-weight: bold;
2506 2507
}
2507
/* line 351, ../sass/cdm.scss */
2508
/* line 352, ../sass/cdm.scss */
2508 2509
.registration .registration-date-and-institute {
2509 2510
  color: #999;
2510 2511
}
2511
/* line 357, ../sass/cdm.scss */
2512
/* line 358, ../sass/cdm.scss */
2512 2513
.registration .published-name .TaxonName .name {
2513 2514
  font-weight: bold;
2514 2515
}
2515
/* line 361, ../sass/cdm.scss */
2516
/* line 362, ../sass/cdm.scss */
2516 2517
.registration .typified-name .cdm\:TaxonName {
2517 2518
  color: #999;
2518 2519
}
2519
/* line 363, ../sass/cdm.scss */
2520
/* line 364, ../sass/cdm.scss */
2520 2521
.registration .typified-name .cdm\:TaxonName a {
2521 2522
  color: #999;
2522 2523
}
2523
/* line 366, ../sass/cdm.scss */
2524
/* line 367, ../sass/cdm.scss */
2524 2525
.registration .typified-name .cdm\:TaxonName .TaxonName .name {
2525 2526
  font-weight: bold;
2526 2527
}
2527
/* line 372, ../sass/cdm.scss */
2528
/* line 373, ../sass/cdm.scss */
2528 2529
.registration .registration-summary .registered_name .name {
2529 2530
  font-weight: bold;
2530 2531
}
2531
/* line 375, ../sass/cdm.scss */
2532
/* line 376, ../sass/cdm.scss */
2532 2533
.registration .registration-summary .referenced_typified_name {
2533 2534
  color: #999;
2534 2535
}
2535
/* line 378, ../sass/cdm.scss */
2536
/* line 379, ../sass/cdm.scss */
2536 2537
.registration .registration-summary .label {
2537 2538
  font-weight: bold;
2538 2539
}
......
2540 2541
/*
2541 2542
 * Theme settings page
2542 2543
 */
2543
/* line 389, ../sass/cdm.scss */
2544
/* line 390, ../sass/cdm.scss */
2544 2545
#system-theme-settings .image-preview {
2545 2546
  width: 600px;
2546 2547
  max-height: 150px;
2547 2548
  overflow: auto;
2548 2549
}
2549
/* line 393, ../sass/cdm.scss */
2550
/* line 394, ../sass/cdm.scss */
2550 2551
#system-theme-settings .image-preview img {
2551 2552
  max-width: none;
2552 2553
  /* reset style in mormalize.scss */
......
2557 2558
 *
2558 2559
 * using the same media queries here as in layout/_responsive.scss
2559 2560
 *****************************************************************************************/
2560
/* line 406, ../sass/cdm.scss */
2561
/* line 407, ../sass/cdm.scss */
2561 2562
#classification-breadcrumbs {
2562 2563
  font-size: 1.5em;
2563 2564
  line-height: 1.5em;
2564 2565
}
2565 2566

  
2566 2567
@media all and (min-width: 960px) {
2567
  /* line 417, ../sass/cdm.scss */
2568
  /* line 418, ../sass/cdm.scss */
2568 2569
  #classification-breadcrumbs {
2569 2570
    font-size: 1em;
2570 2571
  }
......
2572 2573
/***************************
2573 2574
 * TESTING ONLY 2020-02-20
2574 2575
 */
2575
/* line 425, ../sass/cdm.scss */
2576
/* line 426, ../sass/cdm.scss */
2576 2577
.font-noto {
2577 2578
  font-family: "Noto Sans", sans-serif !important;
2578 2579
}
themes/zen_dataportal/sass/cdm.scss
274 274
        background-color: $page-background-color;
275 275
        .label {
276 276
          text-align: right;
277
          white-space: nowrap;
277 278
          border-right: thin solid $menu-bar-background-color;
278 279

  
279 280
        }

Also available in: Unified diff