geolba/tethys
6
0
Fork 0
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

landing page via php (blade)

Browse Source
This commit is contained in:
Arno Kaimbacher 2020-03-10 18:58:46 +01:00
parent a080faa91d
commit 43748471dc
9 changed files with 378 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/Http/Controllers/Frontend/PagesController.php
View File

@ -32,20 +32,20 @@ class PagesController extends Controller
$dataset->load('titles');
$dataset->load('abstracts');
$authors = $dataset->persons()
->wherePivot('role', 'author')
->orderBy('link_documents_persons.sort_order', 'desc')
->get();
// $authors = $dataset->persons()
// ->wherePivot('role', 'author')
// ->orderBy('link_documents_persons.sort_order', 'desc')
// ->get();
$contributors = $dataset->persons()
->wherePivot('role', 'contributor')
->orderBy('link_documents_persons.sort_order', 'desc')
->get();
// $contributors = $dataset->persons()
// ->wherePivot('role', 'contributor')
// ->orderBy('link_documents_persons.sort_order', 'desc')
// ->get();
$submitters = $dataset->persons()
->wherePivot('role', 'submitter')
->orderBy('link_documents_persons.sort_order', 'desc')
->get();
// $submitters = $dataset->persons()
// ->wherePivot('role', 'submitter')
// ->orderBy('link_documents_persons.sort_order', 'desc')
// ->get();
// $authors = $dataset->persons()
// ->wherePivot('role', 'author')
@ -54,6 +54,7 @@ class PagesController extends Controller
// return view('frontend.dataset.show', compact('dataset', 'authors', 'contributors', 'submitters'));
return view('frontend.dataset.show', compact('id'));
return view('frontend.dataset.show', compact('dataset'));
//return view('frontend.dataset.show', compact('id'));//wenn über solr
}
}

20
app/Models/Dataset.php
View File

@ -188,6 +188,11 @@ class Dataset extends Model
return $this->hasMany(Title::class, 'document_id', 'id');
}
public function mainTitle()
{
return $this->hasMany(Title::class, 'document_id', 'id')->where('type', 'Main')->first();
}
public function addMainTitle(Title $title)
{
$title->type = 'main';
@ -205,6 +210,10 @@ class Dataset extends Model
return $this->hasMany(Description::class, 'document_id', 'id');
}
public function mainAbstract()
{
return $this->hasMany(Description::class, 'document_id', 'id')->where('type', 'Abstract')->first();
}
public function addMainAbstract(Description $title)
{
$title->type = 'abstract';
@ -320,4 +329,15 @@ class Dataset extends Model
return 0;
}
}
public function geoLocation()
{
// return $this->coverage->x_min;
$geolocation =
'SOUTH-BOUND LATITUDE: ' . $this->coverage->x_min . ","
. ' * WEST-BOUND LONGITUDE: ' . $this->coverage->y_min . ","
. ' * NORTH-BOUND LATITUDE: ' . $this->coverage->x_max . ","
. ' * EAST-BOUND LONGITUDE: ' . $this->coverage->y_max;
return $geolocation;
}
}

2
public/js/landingpage/main.js
View File

File diff suppressed because one or more lines are too long

2
public/js/search/main.js
View File

File diff suppressed because one or more lines are too long

77
public/solr.xslt
View File

@ -38,7 +38,8 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:php="http://php.net/xsl">
<xsl:output method="xml" indent="yes" />
@ -77,7 +78,8 @@
<xsl:variable name="yearInverted" select="65535 - $year"/>
<xsl:element name="field">
<xsl:attribute name="name">year_inverted</xsl:attribute>
<xsl:value-of select="$yearInverted"/>:<xsl:value-of select="$year"/>
<xsl:value-of select="$yearInverted"/>
: <xsl:value-of select="$year"/>
</xsl:element>
</xsl:if>
@ -147,9 +149,9 @@
<xsl:attribute name="name">author_sort</xsl:attribute>
<xsl:for-each select="/Opus/Rdr_Dataset/PersonAuthor">
<xsl:value-of select="@LastName" />
<xsl:text> </xsl:text>
<xsl:text></xsl:text>
<xsl:value-of select="@FirstName" />
<xsl:text> </xsl:text>
<xsl:text></xsl:text>
</xsl:for-each>
</xsl:element>
@ -188,7 +190,7 @@
<xsl:element name="field">
<xsl:attribute name="name">referee</xsl:attribute>
<xsl:value-of select="@FirstName" />
<xsl:text> </xsl:text>
<xsl:text></xsl:text>
<xsl:value-of select="@LastName" />
</xsl:element>
</xsl:for-each>
@ -199,13 +201,13 @@
<xsl:element name="field">
<xsl:attribute name="name">persons</xsl:attribute>
<xsl:value-of select="@FirstName" />
<xsl:text> </xsl:text>
<xsl:text></xsl:text>
<xsl:value-of select="@LastName" />
</xsl:element>
</xsl:if>
</xsl:for-each>
<!-- doctype -->
<!-- datatype -->
<xsl:element name="field">
<xsl:attribute name="name">doctype</xsl:attribute>
<xsl:value-of select="/Opus/Rdr_Dataset/@Type" />
@ -231,7 +233,7 @@
<xsl:element name="field">
<xsl:attribute name="name">belongs_to_bibliography</xsl:attribute>
<xsl:choose>
<xsl:when test="/Opus/Rdr_Dataset/@BelongsToBibliography = 0" >
<xsl:when test="/Opus/Rdr_Dataset/@BelongsToBibliography = 0">
<xsl:text>false</xsl:text>
</xsl:when>
<xsl:otherwise>
@ -291,6 +293,14 @@
</xsl:element>
</xsl:for-each>
<!-- abstract additional -->
<xsl:for-each select="/Opus/Rdr_Dataset/TitleAbstractAdditional">
<xsl:element name="field">
<xsl:attribute name="name">abstract_additional</xsl:attribute>
<xsl:value-of select="@Value" />
</xsl:element>
</xsl:for-each>
<!-- series ids and series number per id (modeled as dynamic field) -->
<xsl:for-each select="/Opus/Rdr_Dataset/Series">
<xsl:element name="field">
@ -300,14 +310,16 @@
<xsl:element name="field">
<xsl:attribute name="name">
<xsl:text>series_number_for_id_</xsl:text><xsl:value-of select="@Id"/>
<xsl:text>series_number_for_id_</xsl:text>
<xsl:value-of select="@Id"/>
</xsl:attribute>
<xsl:value-of select="@Number"/>
</xsl:element>
<xsl:element name="field">
<xsl:attribute name="name">
<xsl:text>doc_sort_order_for_seriesid_</xsl:text><xsl:value-of select="@Id"/>
<xsl:text>doc_sort_order_for_seriesid_</xsl:text>
<xsl:value-of select="@Id"/>
</xsl:attribute>
<xsl:value-of select="@DocSortOrder"/>
</xsl:element>
@ -345,6 +357,43 @@
</xsl:element>
</xsl:if>
<xsl:if test="/Opus/Rdr_Dataset/Coverage">
<xsl:element name="field">
<xsl:attribute name="name">geo_location</xsl:attribute>
<xsl:variable name="geolocation" select="concat(
'SOUTH-BOUND LATITUDE: ', /Opus/Rdr_Dataset/Coverage/@XMin,
' * WEST-BOUND LONGITUDE: ', /Opus/Rdr_Dataset/Coverage/@YMin,
' * NORTH-BOUND LATITUDE: ', /Opus/Rdr_Dataset/Coverage/@XMax,
' * EAST-BOUND LONGITUDE: ', /Opus/Rdr_Dataset/Coverage/@YMax
)" />
<!-- <xsl:variable name="geolocation" select="concat('test', /Opus/Rdr_Dataset/Coverage/@XMin)" /> -->
<xsl:value-of select="$geolocation" />
<xsl:text>&#xA;</xsl:text>
<xsl:if test="@ElevationMin != '' and @ElevationMax != ''">
<xsl:value-of select="concat(' * ELEVATION MIN: ', @ElevationMin, ' * ELEVATION MAX: ', @ElevationMax)" />
</xsl:if>
<xsl:if test="@ElevationAbsolut != ''">
<xsl:value-of select="concat(' * ELEVATION ABSOLUT: ', @ElevationAbsolut)" />
</xsl:if>
<xsl:text>&#xA;</xsl:text>
<xsl:if test="@DepthMin != '' and @DepthMax != ''">
<xsl:value-of select="concat(' * DEPTH MIN: ', @DepthMin, ' * DEPTH MAX: ', @DepthMax)" />
</xsl:if>
<xsl:if test="@DepthAbsolut != ''">
<xsl:value-of select="concat(' * DEPTH ABSOLUT: ', @DepthAbsolut)" />
</xsl:if>
<xsl:text>&#xA;</xsl:text>
<xsl:if test="@TimeMin != '' and @TimeMax != ''">
<xsl:value-of select="concat(' * TIME MIN: ', @TimeMin, ' * TIME MAX: ', @TimeMax)" />
</xsl:if>
<xsl:if test="@TimeAbsolut != ''">
<xsl:value-of select="concat(' * TIME ABSOLUT: ', @TimeAbsolut)" />
</xsl:if>
</xsl:element>
</xsl:if>
<!-- identifier (multi valued) -->
<xsl:for-each select="/Opus/Rdr_Dataset/Identifier">
<xsl:element name="field">
@ -353,6 +402,14 @@
</xsl:element>
</xsl:for-each>
<!-- identifier (multi valued) -->
<xsl:for-each select="/Opus/Rdr_Dataset/Reference">
<xsl:element name="field">
<xsl:attribute name="name">reference</xsl:attribute>
<xsl:value-of select="@Value"/>
</xsl:element>
</xsl:for-each>
</xsl:element>
</xsl:element>

32
resources/js/landingpage/components/dataset.vue
View File

@ -1,19 +1,19 @@
<template>
<div class="box" v-if="post">
<div class="box" v-if="dataset">
<div class="dataset_heaader">
<div class="dataset__blog-meta">published: {{ toDayDateTimeString(post.server_date_published) }}</div>
<h1 class="dataset__title">{{ post.title_output }}</h1>
<div class="dataset__blog-meta">published: {{ toDayDateTimeString(dataset.server_date_published) }}</div>
<h1 class="dataset__title">{{ dataset.title_output }}</h1>
<p class="dataset__id">{{ post.id }}</p>
<p class="dataset__id">{{ dataset.id }}</p>
</div>
<div class="dataset">
<p class="dataset__abstract">{{ post.abstract_output }}</p>
<p class="dataset__abstract">{{ dataset.abstract_output }}</p>
<p class="dataset__abstract" v-if="post.subject && post.subject.length > 0">keywords: {{ post.subject.join(', ') }}</p>
<p class="dataset__abstract">creating corporation: {{ post.creating_corporation }}</p>
<p class="dataset__abstract">publisher: {{ post.publisher_name }}</p>
<p class="dataset__abstract" v-if="dataset.subject && dataset.subject.length > 0">keywords: {{ dataset.subject.join(', ') }}</p>
<p class="dataset__abstract">creating corporation: {{ dataset.creating_corporation }}</p>
<p class="dataset__abstract">publisher: {{ dataset.publisher_name }}</p>
<p class="dataset__abstract">coverage: {{ dataset.geo_location }}</p>
</div>
</div>
</template>
@ -32,7 +32,7 @@ export default class Dataset extends Vue {
metaInfo() {
return {
title: this.post && this.post.title
title: this.dataset && this.dataset.title
};
}
@ -63,7 +63,7 @@ export default class Dataset extends Vue {
return time;
}
post = null;
dataset = null;
host = "https://repository.geologie.ac.at/";
path = "solr/rdr_data/select?";
endpoint = this.host + this.path;
@ -72,8 +72,8 @@ export default class Dataset extends Vue {
getPost(id) {
axios(this.endpoint + "&q=id:" + id)
.then(response => {
this.post = response.data.response.docs[0];
// this.post.title_output = "Ein etwas längerer Titel zum Testen!!! Test";
this.dataset = response.data.response.docs[0];
// this.dataset.title_output = "Ein etwas längerer Titel zum Testen!!! Test";
})
.catch(error => {
console.log("-----error-------");
@ -90,7 +90,7 @@ export default class Dataset extends Vue {
<style lang="scss" scoped>
.box {
margin: 0 auto;
padding: 115px 20px 70px;
padding: 100px 20px 70px;
// background-color: salmon;
@ -113,8 +113,8 @@ export default class Dataset extends Vue {
}
&__id {
position: absolute;
font-size: 280px;
bottom: -50px;
font-size: 250px;
bottom: -40px;
margin: 0;
color: #eeeeee;
right: -20px;

2
resources/js/search/search-results/dataservice.ts
View File

@ -54,7 +54,7 @@ export default {
Object.entries(filterItems).forEach(([key, valueArray]) => {
// console.log(`${key} ${valueArray}`);
valueArray.forEach(function (value) {
filterFields += "&fq=" + key + ":(" + value + ")";
filterFields += '&fq=' + key + ':("' + value + '")';
});
});

179
resources/views/frontend/dataset/show.blade.php
View File

@ -3,19 +3,182 @@
<section class="normal dataset u-full-width">
<div id="app"></div>
<div id="app">
<main>
<div class="content">
<div class="box" v-if="dataset">
<div class="dataset_heaader">
<div class="dataset__blog-meta">published: {{ $dataset->server_date_published->toDayDateTimeString() }}
</div>
<h1 class="dataset__title">{{ $dataset->mainTitle()->value }}</h1>
<p class="dataset__id">{{ $dataset->id }}</p>
</div>
<div class="dataset">
<p class="dataset__abstract">{{ $dataset->mainAbstract()->value }}</p>
@if($dataset->authors()->exists())
<p class="dataset__abstract" v-if="dataset.subject && dataset.subject.length > 0">
Ersteller/Autor: {{ $dataset->authors->implode('full_name', ', ') }}
</p>
@endif
@if($dataset->contributors()->exists())
<p class="dataset__abstract" v-if="dataset.subject && dataset.subject.length > 0">
Beitragende: {{ $dataset->contributors->implode('full_name', ', ') }}
</p>
@endif
@if($dataset->subjects()->exists())
<p class="dataset__abstract" v-if="dataset.subject && dataset.subject.length > 0">
Schlüsselwörter: {{ $dataset->subjects->implode('value', ', ') }}
</p>
@endif
<p class="dataset__abstract">Erstellungsjahr: {{ $dataset->server_date_published->year }}</p>
<p class="dataset__abstract">Sprache: {{ $dataset->language }}</p>
<p class="dataset__abstract">Objekttyp: {{ $dataset->type }}</p>
<p class="dataset__abstract">Herausgeber: {{ $dataset->creating_corporation }}</p>
<p class="dataset__abstract">Publisher: {{ $dataset->publisher_name }}</p>
<p class="dataset__abstract">Coverage: {{ $dataset->geoLocation() }}</p>
@if($dataset->hasEmbargoPassed() == true)
<table id="items" class="pure-table pure-table-horizontal">
<thead>
<tr>
<th>Path Name</th>
</tr>
</thead>
<tbody>
@foreach($dataset->files as $key => $file)
<tr>
<td>
@if($file->exists() === true)
<a href="{{ route('file.download', ['id' => $file->id]) }}"> {{ $file->label }} </a>
@else
<span class="alert">missing file: {{ $file->path_name }}</span>
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
@else
<span>Datensatz hat noch ein gültiges Embargo-Datum.</span>
@endif
</div>
</div>
</div>
</main>
</div>
</section>
@stop
@section('head')
<style>
/* body {
margin: 0;
padding: 0;
} */
#app {
font-family: "Avenir", Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;
}
h1,
h2 {
font-weight: normal;
}
main {
display: flex;
/* height: calc(100vh - 90px); */
max-width: 1200px;
margin-top: 90px;
margin-left: auto;
margin-right: auto;
overflow: hidden;
}
aside {
flex: 1 0 30%;
height: 100%;
overflow-y: auto;
width: 30%;
padding: 50px 30px;
box-sizing: border-box;
border-right: 1px solid #42b983;
}
.content {
// flex: 1 1 80%;
// display: flex;
align-items: center;
justify-content: center;
}
.box {
margin: 0 auto;
padding: 100px 20px 70px;
// background-color: salmon;
}
.dataset_heaader {
// background-color: lightgray;
position: relative;
}
.dataset {
// max-width: 500px;
}
.dataset__title {
position: relative;
text-transform: uppercase;
z-index: 1;
}
.dataset__abstract {
position: relative;
z-index: 1;
}
.dataset__id {
position: absolute;
font-size: 250px;
bottom: -40px;
margin: 0;
color: #eeeeee;
right: -20px;
line-height: 1;
font-weight: 900;
z-index: 0;
}
.dataset__blog-meta {
padding: 10px 0 20px;
color: #c2c2c2;
// font-size: 0.8em;
margin-top: -1.7em;
}
</style>
@endsection
@section('after-scripts')
<script>
window.Laravel = <?php echo json_encode([
'csrf_token' => csrf_token(),
'id' => $id,
]); ?>
</script>
<script src="{{ asset('js/landingpage/main.js') }}"></script>
@stop

75
solr.xslt
View File

@ -77,7 +77,8 @@
<xsl:variable name="yearInverted" select="65535 - $year"/>
<xsl:element name="field">
<xsl:attribute name="name">year_inverted</xsl:attribute>
<xsl:value-of select="$yearInverted"/>:<xsl:value-of select="$year"/>
<xsl:value-of select="$yearInverted"/>
: <xsl:value-of select="$year"/>
</xsl:element>
</xsl:if>
@ -147,9 +148,9 @@
<xsl:attribute name="name">author_sort</xsl:attribute>
<xsl:for-each select="/Opus/Rdr_Dataset/PersonAuthor">
<xsl:value-of select="@LastName" />
<xsl:text> </xsl:text>
<xsl:text></xsl:text>
<xsl:value-of select="@FirstName" />
<xsl:text> </xsl:text>
<xsl:text></xsl:text>
</xsl:for-each>
</xsl:element>
@ -188,7 +189,7 @@
<xsl:element name="field">
<xsl:attribute name="name">referee</xsl:attribute>
<xsl:value-of select="@FirstName" />
<xsl:text> </xsl:text>
<xsl:text></xsl:text>
<xsl:value-of select="@LastName" />
</xsl:element>
</xsl:for-each>
@ -199,13 +200,13 @@
<xsl:element name="field">
<xsl:attribute name="name">persons</xsl:attribute>
<xsl:value-of select="@FirstName" />
<xsl:text> </xsl:text>
<xsl:text></xsl:text>
<xsl:value-of select="@LastName" />
</xsl:element>
</xsl:if>
</xsl:for-each>
<!-- doctype -->
<!-- datatype -->
<xsl:element name="field">
<xsl:attribute name="name">doctype</xsl:attribute>
<xsl:value-of select="/Opus/Rdr_Dataset/@Type" />
@ -231,7 +232,7 @@
<xsl:element name="field">
<xsl:attribute name="name">belongs_to_bibliography</xsl:attribute>
<xsl:choose>
<xsl:when test="/Opus/Rdr_Dataset/@BelongsToBibliography = 0" >
<xsl:when test="/Opus/Rdr_Dataset/@BelongsToBibliography = 0">
<xsl:text>false</xsl:text>
</xsl:when>
<xsl:otherwise>
@ -291,6 +292,14 @@
</xsl:element>
</xsl:for-each>
<!-- abstract additional -->
<xsl:for-each select="/Opus/Rdr_Dataset/TitleAbstractAdditional">
<xsl:element name="field">
<xsl:attribute name="name">abstract_additional</xsl:attribute>
<xsl:value-of select="@Value" />
</xsl:element>
</xsl:for-each>
<!-- series ids and series number per id (modeled as dynamic field) -->
<xsl:for-each select="/Opus/Rdr_Dataset/Series">
<xsl:element name="field">
@ -300,14 +309,16 @@
<xsl:element name="field">
<xsl:attribute name="name">
<xsl:text>series_number_for_id_</xsl:text><xsl:value-of select="@Id"/>
<xsl:text>series_number_for_id_</xsl:text>
<xsl:value-of select="@Id"/>
</xsl:attribute>
<xsl:value-of select="@Number"/>
</xsl:element>
<xsl:element name="field">
<xsl:attribute name="name">
<xsl:text>doc_sort_order_for_seriesid_</xsl:text><xsl:value-of select="@Id"/>
<xsl:text>doc_sort_order_for_seriesid_</xsl:text>
<xsl:value-of select="@Id"/>
</xsl:attribute>
<xsl:value-of select="@DocSortOrder"/>
</xsl:element>
@ -345,6 +356,43 @@
</xsl:element>
</xsl:if>
<xsl:if test="/Opus/Rdr_Dataset/Coverage">
<xsl:element name="field">
<xsl:attribute name="name">geo_location</xsl:attribute>
<xsl:variable name="geolocation" select="concat(
'SOUTH-BOUND LATITUDE: ', /Opus/Rdr_Dataset/Coverage/@XMin,
' * WEST-BOUND LONGITUDE: ', /Opus/Rdr_Dataset/Coverage/@YMin,
' * NORTH-BOUND LATITUDE: ', /Opus/Rdr_Dataset/Coverage/@XMax,
' * EAST-BOUND LONGITUDE: ', /Opus/Rdr_Dataset/Coverage/@YMax
)" />
<!-- <xsl:variable name="geolocation" select="concat('test', /Opus/Rdr_Dataset/Coverage/@XMin)" /> -->
<xsl:value-of select="$geolocation" />
<xsl:text>&#xA;</xsl:text>
<xsl:if test="@ElevationMin != '' and @ElevationMax != ''">
<xsl:value-of select="concat(' * ELEVATION MIN: ', @ElevationMin, ' * ELEVATION MAX: ', @ElevationMax)" />
</xsl:if>
<xsl:if test="@ElevationAbsolut != ''">
<xsl:value-of select="concat(' * ELEVATION ABSOLUT: ', @ElevationAbsolut)" />
</xsl:if>
<xsl:text>&#xA;</xsl:text>
<xsl:if test="@DepthMin != '' and @DepthMax != ''">
<xsl:value-of select="concat(' * DEPTH MIN: ', @DepthMin, ' * DEPTH MAX: ', @DepthMax)" />
</xsl:if>
<xsl:if test="@DepthAbsolut != ''">
<xsl:value-of select="concat(' * DEPTH ABSOLUT: ', @DepthAbsolut)" />
</xsl:if>
<xsl:text>&#xA;</xsl:text>
<xsl:if test="@TimeMin != '' and @TimeMax != ''">
<xsl:value-of select="concat(' * TIME MIN: ', @TimeMin, ' * TIME MAX: ', @TimeMax)" />
</xsl:if>
<xsl:if test="@TimeAbsolut != ''">
<xsl:value-of select="concat(' * TIME ABSOLUT: ', @TimeAbsolut)" />
</xsl:if>
</xsl:element>
</xsl:if>
<!-- identifier (multi valued) -->
<xsl:for-each select="/Opus/Rdr_Dataset/Identifier">
<xsl:element name="field">
@ -353,6 +401,15 @@
</xsl:element>
</xsl:for-each>
<!-- identifier (multi valued) -->
<xsl:for-each select="/Opus/Rdr_Dataset/Reference">
<xsl:element name="field">
<xsl:attribute name="name">reference</xsl:attribute>
<xsl:value-of select="json-to-xml(/Opus/Rdr_Dataset/Reference)"/>
<!-- <xsl:value-of select="@Value"/> -->
</xsl:element>
</xsl:for-each>
</xsl:element>
</xsl:element>