From 3b3481d18cee99a00a0646bbc0826c41bd2b2bd6 Mon Sep 17 00:00:00 2001 From: Arno Kaimbacher Date: Tue, 26 May 2020 21:46:06 +0200 Subject: [PATCH] - add matomo tracking code in views\layouts\app.blade.php - delete old unused views in views\rdr\borrow\*** - composer updates --- .../Controllers/Oai/RequestController.php | 2 +- composer.lock | 48 +++++++----- resources/views/layouts/app.blade.php | 15 ++++ resources/views/rdr/borrow/borrow.blade.php | 74 ------------------- resources/views/rdr/borrow/histori.blade.php | 40 ---------- resources/views/rdr/borrow/report.blade.php | 41 ---------- 6 files changed, 47 insertions(+), 173 deletions(-) delete mode 100644 resources/views/rdr/borrow/borrow.blade.php delete mode 100644 resources/views/rdr/borrow/histori.blade.php delete mode 100644 resources/views/rdr/borrow/report.blade.php diff --git a/app/Http/Controllers/Oai/RequestController.php b/app/Http/Controllers/Oai/RequestController.php index 03fe76b..4cdb3b4 100644 --- a/app/Http/Controllers/Oai/RequestController.php +++ b/app/Http/Controllers/Oai/RequestController.php @@ -157,7 +157,7 @@ class RequestController extends Controller $email = "repository@geologie.ac.at"; $repositoryName = "Tethys RDR"; $repIdentifier = "tethys.at"; - $sampleIdentifier = "oai:" . $repIdentifier . ":27"; //$this->_configuration->getSampleIdentifier(); + $sampleIdentifier = "oai:" . $repIdentifier . ":1"; //$this->_configuration->getSampleIdentifier(); $earliestDateFromDb = Dataset::earliestPublicationDate() != null ? Dataset::earliestPublicationDate()->server_date_published->format('Y-m-d\TH:i:s\Z') : null; diff --git a/composer.lock b/composer.lock index e30261f..025e802 100755 --- a/composer.lock +++ b/composer.lock @@ -234,20 +234,20 @@ }, { "name": "doctrine/inflector", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7" + "reference": "3fc171224a316569faad2df6b18a1fd8cce5a56d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7", - "reference": "18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/3fc171224a316569faad2df6b18a1fd8cce5a56d", + "reference": "3fc171224a316569faad2df6b18a1fd8cce5a56d", "shasum": "" }, "require": { - "php": "^7.2" + "php": "^7.2 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^7.0", @@ -321,24 +321,24 @@ "type": "tidelift" } ], - "time": "2020-05-11T11:25:59+00:00" + "time": "2020-05-25T20:08:47+00:00" }, { "name": "doctrine/lexer", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6" + "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", - "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", + "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", "shasum": "" }, "require": { - "php": "^7.2" + "php": "^7.2 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^6.0", @@ -383,7 +383,21 @@ "parser", "php" ], - "time": "2019-10-30T14:39:59+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "type": "tidelift" + } + ], + "time": "2020-05-25T17:44:05+00:00" }, { "name": "dragonmantank/cron-expression", @@ -821,16 +835,16 @@ }, { "name": "laravel/framework", - "version": "v6.18.15", + "version": "v6.18.16", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "a1fa3ddc0bb5285cafa6844b443633f7627d75dc" + "reference": "73f18a6bc58fb91aa83925161db25aa3674b73e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/a1fa3ddc0bb5285cafa6844b443633f7627d75dc", - "reference": "a1fa3ddc0bb5285cafa6844b443633f7627d75dc", + "url": "https://api.github.com/repos/laravel/framework/zipball/73f18a6bc58fb91aa83925161db25aa3674b73e9", + "reference": "73f18a6bc58fb91aa83925161db25aa3674b73e9", "shasum": "" }, "require": { @@ -964,7 +978,7 @@ "framework", "laravel" ], - "time": "2020-05-19T17:03:02+00:00" + "time": "2020-05-26T14:31:44+00:00" }, { "name": "laravel/tinker", diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 5856d43..71722fc 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -47,6 +47,21 @@ + + + @yield('head') diff --git a/resources/views/rdr/borrow/borrow.blade.php b/resources/views/rdr/borrow/borrow.blade.php deleted file mode 100644 index d185a1c..0000000 --- a/resources/views/rdr/borrow/borrow.blade.php +++ /dev/null @@ -1,74 +0,0 @@ -@extends('layouts.app') - -@section('content') - -

Borrow

- -
- - {!! Form::open(['route' => 'borrow.post']) !!} - -
- {!! Form::label('student_id', 'Student..') !!} - - - {!! Form::select('person_id', $persons, null, ['id' => 'person_id', 'class' => 'form-control']) !!} -
- -
- {!! Form::label('project', 'Project..') !!} - - - -
- -
- {!! Form::label('book_id', 'Book..') !!} - - -
- -
- {!! Form::submit('Borrow', ['class' => 'btn btn-primary form-control']) !!} -
- - - {!! Form::close() !!} - - -
-@stop - -@section('scripts') - - - -@stop \ No newline at end of file diff --git a/resources/views/rdr/borrow/histori.blade.php b/resources/views/rdr/borrow/histori.blade.php deleted file mode 100644 index 6f51f06..0000000 --- a/resources/views/rdr/borrow/histori.blade.php +++ /dev/null @@ -1,40 +0,0 @@ -@extends('layouts.app') - -@section('content') - -

Histori

- -
- - - - - - - - - - - - - - - - @foreach($transactions as $transaction) - - - - - - - - - - @endforeach - - - -
StudentBookBorrowed AtReturned AtFines
{{ $transaction->student->last_name }}{{ $transaction->book->title }}{{ date('d-M-y', $transaction->borrowed_at) }}{{ date('d-M-y', $transaction->returned_at) }}{{ $transaction->fines }}
- -
-@stop \ No newline at end of file diff --git a/resources/views/rdr/borrow/report.blade.php b/resources/views/rdr/borrow/report.blade.php deleted file mode 100644 index 5c283ee..0000000 --- a/resources/views/rdr/borrow/report.blade.php +++ /dev/null @@ -1,41 +0,0 @@ -@extends('layouts.app') - -@section('content') - -

Bericht

- -
- - - - - - - - - - - - - - - @foreach($transactions as $transaction) - - - - - - - - - - - - @endforeach - - - -
PersonBookBorrowed At
What You Gonna Do
{{ $transaction->student->last_name }}{{ $transaction->book->title }}{{ date('d-M-y', $transaction->borrowed_at) }}  return  extend borrow time
- -
-@stop \ No newline at end of file