small layout changes and added time stamp in session to set time limit on test

This commit is contained in:
mwalbeck 2016-09-26 17:34:05 +02:00
parent bde382c1ff
commit 40aa77386b
22 changed files with 40 additions and 92 deletions

View file

@ -15,11 +15,15 @@ class TestController extends Controller
{
public function startTest(Test $test)
{
if (null !== session("start_time") && session("start_time")+3600 > time()) {
return redirect()->action('TestController@showQuestion');
}
if (Auth::user()->testTaken($test->id)) {
//insert session flash
return redirect('/home');
}
session(['questions' => $test->randomizeQuestions(), 'question_counter' => 1, 'test' => $test, 'wrong_answers' => 0, 'is_correct' => false, 'has_failed' => false, 'last_question' => false]);
session(['questions' => $test->randomizeQuestions(), 'question_counter' => 1, 'test' => $test, 'wrong_answers' => 0, 'is_correct' => false, 'has_failed' => false, 'last_question' => false, 'start_time' => time()]);
return redirect()->action('TestController@showQuestion');
}

View file

@ -1,9 +1,9 @@
@extends('layouts.base')
@section('content')
<div class="container">
<div class="container-fluid">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-default">
<div class="panel-heading">Groups</div>
<div class="panel-body">

View file

@ -2,7 +2,7 @@
@section('content')
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-default">
<div class="panel-heading">Tests</div>
<div class="panel-body">

View file

@ -2,7 +2,7 @@
@section('content')
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6 col-md-offset-3">
<h1>Are you Sure!</h1>
</br>
<form method="POST" action="/{{ Auth::user()->getAdminPath() }}/groups/{{ $group->id }}/delete">

View file

@ -3,7 +3,7 @@
@section('content')
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6 col-md-offset-3">
<h1>Edit Group: {{ $group->name }}</h1>
</br>
<form method="POST" action="/{{ Auth::user()->getAdminPath() }}/groups/{{ $group->id }}/edit">

View file

@ -2,7 +2,7 @@
@section('content')
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6 col-md-offset-3">
<h1>Create New Group</h1>
</br>
<form method="POST" action="/{{ Auth::user()->getAdminPath() }}/groups/new">

View file

@ -1,46 +0,0 @@
@extends('layouts.base')
@section('content')
<div class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">Password</div>
<div class="panel-body">
<form method="post" action="/settings/update/password">
{{ csrf_field() }}
{{ method_field('PATCH') }}
<div class="form-group">
<h4>Change Password</h4>
<label>Old Password</label>
<input type="password" class="form-control" name="password_old">
<br>
<label>New Password</label>
<input type="password" class="form-control" name="password1_new">
<br>
<label>Repeat New Password</label>
<input type="password" class="form-control" name="password2_new">
</div>
<button type="submit" class="btn btn-default">Submit</button>
</form>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">Email</div>
<div class="panel-body">
<form method="post" action="/settings/update/email">
{{ csrf_field() }}
{{ method_field('PATCH') }}
<div class="form-group">
<h4>Change Email</h4>
<label>Email</label>
<input type="text" class="form-control" name="email" value="{{ $user->email }}">
</div>
<button type="submit" class="btn btn-default">Submit</button>
</form>
</div>
</div>
</div>
</div>
</div>
@stop

View file

@ -1,9 +1,9 @@
@extends('layouts.base')
@section('content')
<div class="container">
<div class="container-fluid">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-default">
<div class="panel-heading">Groups</div>
<div class="panel-body">

View file

@ -1,9 +1,9 @@
@extends('layouts.base')
@section('content')
<div class="container">
<div class="container-fluid">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-default">
<div class="panel-heading">Tests</div>
<div class="panel-body">

View file

@ -25,14 +25,6 @@
<div class="container">
<div class="navbar-header">
<!-- Collapsed Hamburger -->
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#app-navbar-collapse">
<span class="sr-only">Toggle Navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<!-- Branding Image -->
<a class="navbar-brand" href="{{ url('/home') }}">
Elearning
@ -41,17 +33,11 @@
<div class="collapse navbar-collapse" id="app-navbar-collapse">
<!-- Left Side Of Navbar -->
<ul class="nav navbar-nav">
<li><a href="/home">Tests</a></li>
<li><a href="/stats">Statistik</a></li>
<li><a href="/settings">Indstillinger</a></li>
@if (Auth::check())
@if (Auth::user()->isModerator())
<li><a href="/mod">Moderator</a></li>
@elseif (Auth::user()->isAdministrator())
<li><a href="/admin">Admin</a></li>
@endif
@endif
</ul>
<!-- Right Side Of Navbar -->
@ -61,6 +47,14 @@
<li><a href="{{ url('/login') }}">Login</a></li>
<li><a href="{{ url('/register') }}">Register</a></li>
@else
<!-- Administration links -->
@if (Auth::check())
@if (Auth::user()->isModerator())
<li><a href="/mod">Moderator</a></li>
@elseif (Auth::user()->isAdministrator())
<li><a href="/admin">Admin</a></li>
@endif
@endif
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
{{ Auth::user()->name }} <span class="caret"></span>
@ -91,4 +85,4 @@
<!-- Scripts -->
<script src="/js/app.js"></script>
</body>
</html>
</html>

View file

@ -2,7 +2,7 @@
@section('content')
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6 col-md-offset-3">
<h1>Are you Sure!</h1>
</br>
<form method="POST" action="/{{ Auth::user()->getAdminPath() }}/tests/{{ $test->id }}/delete">

View file

@ -1,9 +1,8 @@
@extends('layouts.base')
@section('content')
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6 col-md-offset-3">
<h1>Edit Test: {{ $test->title }}</h1>
</br>
<form method="POST" action="/{{ Auth::user()->getAdminPath() }}/tests/{{ $test->id }}/edit">
@ -38,6 +37,5 @@
<button type="submit" class="btn btn-default">Submit</button>
</form>
</div>
</div>
</div>s
@stop

View file

@ -1,7 +1,6 @@
@extends('layouts.test')
@section('content')
<div class="container-fluid">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-default">
@ -21,5 +20,4 @@
</div>
</div>
</div>
@stop

View file

@ -3,7 +3,7 @@
@section('content')
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6 col-md-offset-3">
<h1>Create New Test</h1>
</br>
<form method="POST" action="/{{ Auth::user()->getAdminPath() }}/tests/new">

View file

@ -2,7 +2,7 @@
@section('content')
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6 col-md-offset-3">
<h1>Are you Sure!</h1>
</br>
<form method="POST" action="/{{ Auth::user()->getAdminPath() }}/questions/{{ $question->id }}">

View file

@ -3,7 +3,7 @@
@section('content')
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6 col-md-offset-3">
<h1>Edit Question</h1>
</br>
<form method="POST" action="/{{ Auth::user()->getAdminPath() }}/questions/{{ $question->id }}">

View file

@ -2,7 +2,7 @@
@section('content')
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6 col-md-offset-3">
<h1>Question {{ $question_number }}</h1>
</br>
<form method="POST" action="/{{ Auth::user()->getAdminPath() }}/tests/{{ $test->id }}/question">

View file

@ -1,9 +1,9 @@
@extends('layouts.base')
@section('content')
<div class="container">
<div class="container-fluid">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-default">
<div class="panel-heading">Tests</div>
<div class="panel-body">

View file

@ -2,7 +2,7 @@
@section('content')
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6 col-md-offset-3">
<h1>Are you Sure!</h1>
</br>
<form method="POST" action="/{{ Auth::user()->getAdminPath() }}/users/{{ $user->id }}">

View file

@ -2,7 +2,7 @@
@section('content')
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="col-md-6 col-md-offset-3">
<h1>Create New User</h1>
</br>
<form method="POST" action="//users/new">

View file

@ -1,9 +1,9 @@
@extends('layouts.base')
@section('content')
<div class="container">
<div class="container-fluid">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-default">
<div class="panel-heading">Password</div>
<div class="panel-body">

View file

@ -1,9 +1,9 @@
@extends('layouts.base')
@section('content')
<div class="container">
<div class="container-fluid">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-default">
<div class="panel-heading">Users</div>
<div class="panel-body">