- add matomo tracking code in views\layouts\app.blade.php
- delete old unused views in views\rdr\borrow\*** - composer updates
This commit is contained in:
Arno Kaimbacher
parent
19e2d7ea95
commit
3b3481d18c
|
|
@ -157,7 +157,7 @@ class RequestController extends Controller
|
||||||
$email = "repository@geologie.ac.at";
|
$email = "repository@geologie.ac.at";
|
||||||
$repositoryName = "Tethys RDR";
|
$repositoryName = "Tethys RDR";
|
||||||
$repIdentifier = "tethys.at";
|
$repIdentifier = "tethys.at";
|
||||||
$sampleIdentifier = "oai:" . $repIdentifier . ":27"; //$this->_configuration->getSampleIdentifier();
|
$sampleIdentifier = "oai:" . $repIdentifier . ":1"; //$this->_configuration->getSampleIdentifier();
|
||||||
$earliestDateFromDb = Dataset::earliestPublicationDate() != null ?
|
$earliestDateFromDb = Dataset::earliestPublicationDate() != null ?
|
||||||
Dataset::earliestPublicationDate()->server_date_published->format('Y-m-d\TH:i:s\Z') : null;
|
Dataset::earliestPublicationDate()->server_date_published->format('Y-m-d\TH:i:s\Z') : null;
|
||||||
|
|
||||||
|
|
|
||||||
48
composer.lock
generated
48
composer.lock
generated
|
|
@ -234,20 +234,20 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/inflector",
|
"name": "doctrine/inflector",
|
||||||
"version": "2.0.1",
|
"version": "2.0.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/doctrine/inflector.git",
|
"url": "https://github.com/doctrine/inflector.git",
|
||||||
"reference": "18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7"
|
"reference": "3fc171224a316569faad2df6b18a1fd8cce5a56d"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/doctrine/inflector/zipball/18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7",
|
"url": "https://api.github.com/repos/doctrine/inflector/zipball/3fc171224a316569faad2df6b18a1fd8cce5a56d",
|
||||||
"reference": "18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7",
|
"reference": "3fc171224a316569faad2df6b18a1fd8cce5a56d",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.2"
|
"php": "^7.2 || ^8.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"doctrine/coding-standard": "^7.0",
|
"doctrine/coding-standard": "^7.0",
|
||||||
|
|
@ -321,24 +321,24 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-05-11T11:25:59+00:00"
|
"time": "2020-05-25T20:08:47+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/lexer",
|
"name": "doctrine/lexer",
|
||||||
"version": "1.2.0",
|
"version": "1.2.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/doctrine/lexer.git",
|
"url": "https://github.com/doctrine/lexer.git",
|
||||||
"reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6"
|
"reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
|
"url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
|
||||||
"reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
|
"reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.2"
|
"php": "^7.2 || ^8.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"doctrine/coding-standard": "^6.0",
|
"doctrine/coding-standard": "^6.0",
|
||||||
|
|
@ -383,7 +383,21 @@
|
||||||
"parser",
|
"parser",
|
||||||
"php"
|
"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",
|
"name": "dragonmantank/cron-expression",
|
||||||
|
|
@ -821,16 +835,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/framework",
|
"name": "laravel/framework",
|
||||||
"version": "v6.18.15",
|
"version": "v6.18.16",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/framework.git",
|
"url": "https://github.com/laravel/framework.git",
|
||||||
"reference": "a1fa3ddc0bb5285cafa6844b443633f7627d75dc"
|
"reference": "73f18a6bc58fb91aa83925161db25aa3674b73e9"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/framework/zipball/a1fa3ddc0bb5285cafa6844b443633f7627d75dc",
|
"url": "https://api.github.com/repos/laravel/framework/zipball/73f18a6bc58fb91aa83925161db25aa3674b73e9",
|
||||||
"reference": "a1fa3ddc0bb5285cafa6844b443633f7627d75dc",
|
"reference": "73f18a6bc58fb91aa83925161db25aa3674b73e9",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -964,7 +978,7 @@
|
||||||
"framework",
|
"framework",
|
||||||
"laravel"
|
"laravel"
|
||||||
],
|
],
|
||||||
"time": "2020-05-19T17:03:02+00:00"
|
"time": "2020-05-26T14:31:44+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/tinker",
|
"name": "laravel/tinker",
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,21 @@
|
||||||
<!-- Javascript
|
<!-- Javascript
|
||||||
–––––––––––––––––––––––––––––––––––––––––––––––––– -->
|
–––––––––––––––––––––––––––––––––––––––––––––––––– -->
|
||||||
<script type="text/javascript" src="/js/scripts.js"></script>
|
<script type="text/javascript" src="/js/scripts.js"></script>
|
||||||
|
<!-- Matomo -->
|
||||||
|
<script type="text/javascript">
|
||||||
|
var _paq = window._paq || [];
|
||||||
|
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
|
||||||
|
_paq.push(['trackPageView']);
|
||||||
|
_paq.push(['enableLinkTracking']);
|
||||||
|
(function() {
|
||||||
|
var u="https://webstat.geologie.ac.at/";
|
||||||
|
_paq.push(['setTrackerUrl', u+'matomo.php']);
|
||||||
|
_paq.push(['setSiteId', '8']);
|
||||||
|
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
|
||||||
|
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
|
||||||
|
})();
|
||||||
|
</script>
|
||||||
|
<!-- End Matomo Code -->
|
||||||
@yield('head')
|
@yield('head')
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,74 +0,0 @@
|
||||||
@extends('layouts.app')
|
|
||||||
|
|
||||||
@section('content')
|
|
||||||
|
|
||||||
<h1 class="title">Borrow</h1>
|
|
||||||
|
|
||||||
<div class="col-md-8">
|
|
||||||
|
|
||||||
{!! Form::open(['route' => 'borrow.post']) !!}
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
{!! Form::label('student_id', 'Student..') !!}
|
|
||||||
|
|
||||||
<!--third parameter is default option
|
|
||||||
name of select is 'student_id'
|
|
||||||
second parameter is the associative array -->
|
|
||||||
{!! Form::select('person_id', $persons, null, ['id' => 'person_id', 'class' => 'form-control']) !!}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
{!! Form::label('project', 'Project..') !!}
|
|
||||||
<!--{!! Form::select('project', $categories, null, ['id' => 'project', 'class' => 'form-control']) !!} -->
|
|
||||||
<select id="project" name="project" class="form-control" >
|
|
||||||
|
|
||||||
@foreach($categories as $project)
|
|
||||||
<option value="{{ $project->id }}" >{{ $project->name }}</option>
|
|
||||||
@endforeach
|
|
||||||
|
|
||||||
</select>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
{!! Form::label('book_id', 'Book..') !!}
|
|
||||||
<!--{!! Form::select('book_id', [], null, ['id' => 'book_id', 'class' => 'form-control']) !!} -->
|
|
||||||
<select id="book_id" name="book_id" class="form-control">
|
|
||||||
<option>-- Choice The Book --</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
{!! Form::submit('Borrow', ['class' => 'btn btn-primary form-control']) !!}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
{!! Form::close() !!}
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
@stop
|
|
||||||
|
|
||||||
@section('scripts')
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
|
||||||
$('#project').on('change', function(e){
|
|
||||||
console.log(e);
|
|
||||||
var project_id = e.target.value;
|
|
||||||
//ajax
|
|
||||||
$.get('api/dropdown/borrow/' + project_id, function(data){
|
|
||||||
|
|
||||||
//if success data
|
|
||||||
$('#book_id').empty();
|
|
||||||
$.each(data, function(index, booksObj){
|
|
||||||
|
|
||||||
$('#book_id').append('<option value="' +booksObj.id+ '">' +booksObj.title+ '</option>');
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
@stop
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
@extends('layouts.app')
|
|
||||||
|
|
||||||
@section('content')
|
|
||||||
|
|
||||||
<h1 class="title">Histori</h1>
|
|
||||||
|
|
||||||
<div class="col-md-8">
|
|
||||||
|
|
||||||
<table class="table table-striped table-bordered">
|
|
||||||
|
|
||||||
<thead>
|
|
||||||
|
|
||||||
<th>Student</th>
|
|
||||||
<th>Book</th>
|
|
||||||
<th>Borrowed At</th>
|
|
||||||
<th>Returned At</th>
|
|
||||||
<th>Fines</th>
|
|
||||||
|
|
||||||
</thead>
|
|
||||||
|
|
||||||
<tbody>
|
|
||||||
|
|
||||||
@foreach($transactions as $transaction)
|
|
||||||
|
|
||||||
<tr>
|
|
||||||
<td>{{ $transaction->student->last_name }}</td>
|
|
||||||
<td>{{ $transaction->book->title }}</td>
|
|
||||||
<td>{{ date('d-M-y', $transaction->borrowed_at) }}</td>
|
|
||||||
<td>{{ date('d-M-y', $transaction->returned_at) }}</td>
|
|
||||||
<td>{{ $transaction->fines }}</td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
@endforeach
|
|
||||||
|
|
||||||
</tbody>
|
|
||||||
|
|
||||||
</table>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
@stop
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
||||||
@extends('layouts.app')
|
|
||||||
|
|
||||||
@section('content')
|
|
||||||
|
|
||||||
<h1 class="title">Bericht</h1>
|
|
||||||
|
|
||||||
<div class="col-md-12">
|
|
||||||
|
|
||||||
<table class="table table-striped table-bordered">
|
|
||||||
|
|
||||||
<thead>
|
|
||||||
|
|
||||||
<th>Person</th>
|
|
||||||
<th>Book</th>
|
|
||||||
<th>Borrowed At</th>
|
|
||||||
<th colspan="2"><center>What You Gonna Do</center></th>
|
|
||||||
|
|
||||||
</thead>
|
|
||||||
|
|
||||||
<tbody>
|
|
||||||
|
|
||||||
@foreach($transactions as $transaction)
|
|
||||||
|
|
||||||
<tr>
|
|
||||||
|
|
||||||
<td>{{ $transaction->student->last_name }}</td>
|
|
||||||
<td>{{ $transaction->book->title }}</td>
|
|
||||||
<td>{{ date('d-M-y', $transaction->borrowed_at) }}</td>
|
|
||||||
<td><a href="{{ route('borrow.pengembalian', $transaction->id) }}"><span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span> return</a></td>
|
|
||||||
<td><a href="{{ route('borrow.perpanjang', $transaction->id) }}"><span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> extend borrow time</a></td>
|
|
||||||
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
@endforeach
|
|
||||||
|
|
||||||
</tbody>
|
|
||||||
|
|
||||||
</table>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
@stop
|
|
||||||
Loading…
Reference in New Issue
Block a user