daniel/dumbo
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added abgelehnt feature, fixed counting up/downvotes on landing page and movies by date page

Browse Source
This commit is contained in:
Sebastian Uharek
2021-02-23 00:55:56 +01:00
parent c58fe40fbe
commit b03397d1dc
7 changed files with 184 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
app/views/abgelehnt.blade.php Normal file
View File

@@ -0,0 +1,56 @@
@extends('hello')
@section('content')
<div class="page-header"><h1>Abgelehnt</h1></div>
{{ $filme->links() }}
<table class="table">
<tr>
<th>Titel</th>
<th></th>
<th>Abgelehnt am</th>
<th>Vorgeschlagen von</th>
</tr>
@foreach($filme as $film)
<?php
$stimme = 2;
if(!is_null(Auth::user()) && Vote::where('film', $film->id)->where('user', Auth::user()->id)->count())
$stimme = Vote::where('film', $film->id)->where('user', Auth::user()->id)->first()->stimme;
?>
<tr>
<td>{{ HTML::link('film/' . $film->id, $film->name) }}</td>
<td>
<span class="glyphicon glyphicon-comment"></span> {{ $film->comments()->count()}}
@if($film->getBewertung() > 0)
&nbsp;<span class="label label-{{$labels[round($film->getBewertung())]}}">{{$film->getBewertung()}}</span>
@endif
@if($stimme == 1)
&nbsp;<span class="label label-success tooltip-enable" data-toggle="tooltip" title="Daf&uuml;r gestimmt."><span class="glyphicon glyphicon-thumbs-up"></span></span>
@elseif($stimme == 0)
&nbsp;<span class="label label-default tooltip-enable" data-toggle="tooltip" title="Nicht daf&uuml;r gestimmt."><span class="glyphicon glyphicon-hand-right"></span></span>
@endif
</td>
<td>{{ \Carbon\Carbon::parse($film->abgelehnt)->format('d.m.Y')}}</td>
<td><span class="badge">
<img class="img-circle pull-left" src="{{ $film->besitzer->getAvatar() }}" width="20"> {{$film->besitzer->name}}
</span></td>
</tr>
@endforeach
</table>
{{ $filme->links() }}
@stop
@section('title')
Gesehen ~
@stop
@section('script')
<script type="text/javascript">
$(function() {
$('.tooltip-enable').tooltip({ html: true, placement: "bottom" });
});
</script>
@stop

8
app/views/film.blade.php
View File

@@ -9,6 +9,8 @@
<div class="col-md-3">
@if(!is_null($film->gesehen))
<div class="label label-success"><span class="glyphicon glyphicon-check"></span> Gesehen am {{ \Carbon\Carbon::parse($film->gesehen)->format('d.m.Y') }}</div>
@elseif(!is_null($film->abgelehnt))
<div class="label label-warning"><span class="glyphicon glyphicon-remove"></span> Abgelehnt am {{ \Carbon\Carbon::parse($film->abgelehnt)->format('d.m.Y') }}</div>
@else
<div class="label label-danger" <?php if(!is_null(Auth::user()) && Auth::user()->admin) { echo "id='gesehen'"; } ?> style="cursor: pointer;"><span class="glyphicon glyphicon-unchecked"></span> Nicht gesehen</div>
@endif
@@ -98,7 +100,7 @@
<div class="clearfix"></div>
<hr>
@if($votes > 0 || is_null($film->gesehen))
@if($votes > 0 || is_null($film->gesehen) || is_null($film->abgelehnt))
@if($votes > 0)
<h2>Abstimmung</h2>
<p>Insgesamt haben <b>{{$votes}}</b> Personen abgestimmt. <b>{{$vposi}}</b> davon waren <i>daf&uuml;r</i>. @if($uvote[0])
@@ -127,7 +129,7 @@
@endif
@if(is_null($film->gesehen) && !is_null(Auth::user()))
@if(is_null($film->gesehen) && is_null($film->abgelehnt) && !is_null(Auth::user()))
<div class="container" style="text-align: center">
<div class="btn-group">
<a class="btn btn-lg btn-success <?php echo $uvote[0] && $uvote[1] ? "disabled" : ""; ?>" href="{{ url('vote', array('yes', Auth::user()->id, $film->id)) }}">
@@ -245,7 +247,7 @@
placement: "right",
trigger: "click",
title: "Als gesehen markieren",
content: "<div class='container'><a href='{{ url('mark-read/' . $film->id) }}' class='btn btn-success'>Gesehen</a><a href='{{ url('view-next/' . $film->id) }}' class='btn btn-warning'>Als n&auml;chstes sehen</a></div>"
content: "<div class='container'><a href='{{ url('mark-read/' . $film->id) }}' class='btn btn-success'>Gesehen</a><a href='{{ url('view-next/' . $film->id) }}' class='btn btn-warning'>Als n&auml;chstes sehen</a><a href='{{ url('mark-declined/' . $film->id) }}' class='btn btn-danger'>Ablehnen</a></div>"
});
});
</script>

1
app/views/hello.blade.php
View File

@@ -22,6 +22,7 @@
<li>{{ HTML::link('beliebt', 'Beliebt (Wertung)') }}</li>
<li>{{ HTML::link('vorgeschlagen', 'Vorgeschlagen (Datum)') }}</li>
<li>{{ HTML::link('gesehen', 'Gesehen') }}</li>
<li>{{ HTML::link('abgelehnt', 'Abgelehnt') }}</li>
<li>{{ HTML::link('neu', 'Film vorschlagen')}}</li>
<li>{{ HTML::link('stats', 'Statistiken') }}</li>
</ul>

28
app/views/index.blade.php
View File

@@ -105,6 +105,34 @@
<i>{{ link_to('gesehen', 'Mehr...', array('class' => 'list-group-item')); }}</i>
</div>
</div>
<div class="panel panel-warning">
<div class="panel-heading">Abgelehnte Filme</div>
<div class="panel-body">
<?php $topfilm = $abgelehnt->shift(); ?>
<img src="{{$images["declined"]}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
<h4>{{$topfilm->name}}
<small><span class="badge">
<img class="img-circle" src="{{ $topfilm->besitzer->getAvatar() }}" width="20"> {{$topfilm->besitzer->name}}
</span></small></h4>
<p>Bewertung:
@if($topfilm->getBewertung() > 0)
<span class="label label-{{$labels[round($topfilm->getBewertung())]}}">{{$topfilm->getBewertung()}}</span>
@else
&mdash;
@endif
</p>
<p>{{ link_to_route('film', "Filmdetails", array($topfilm->id), array('class' => 'btn btn-info btn-xs'))}}</p>
</div>
<div class="list-group">
@foreach ($abgelehnt as $film)
<a href="{{ route('film', array($film->id)); }}" class="list-group-item">{{$film->name}} <small><span class="badge">
<img class="img-circle" src="{{ $film->besitzer->getAvatar() }}" width="16"> {{$film->besitzer->name}}
</span></small></a>
@endforeach
<i>{{ link_to('abgelehnt', 'Mehr...', array('class' => 'list-group-item')); }}</i>
</div>
</div>
</div>
<div class="col-md-6">