admin and mod view for test and users now have group show, and creating tests and users have dropdown for groups
This commit is contained in:
parent
32d5e034e1
commit
3569d1909b
12 changed files with 142 additions and 28 deletions
app/Http/Controllers
|
@ -7,7 +7,7 @@ use Illuminate\Support\Facades\Auth;
|
|||
use App\Http\Requests;
|
||||
use App\Test;
|
||||
use App\User;
|
||||
use App\Question;
|
||||
use App\Group;
|
||||
|
||||
class AdminController extends Controller
|
||||
{
|
||||
|
@ -21,15 +21,33 @@ class AdminController extends Controller
|
|||
return view('admin.index');
|
||||
}
|
||||
|
||||
public function showUsers()
|
||||
public function showGroups()
|
||||
{
|
||||
$groups = Group::all();
|
||||
return view('admin.groups', compact('groups'));
|
||||
}
|
||||
|
||||
public function showAllUsers()
|
||||
{
|
||||
$users = User::all();
|
||||
return view('users.showall', compact('users'));
|
||||
}
|
||||
|
||||
public function showTests()
|
||||
public function showGroupUsers(Group $group)
|
||||
{
|
||||
$users = $group->users;
|
||||
return view('users.showall', compact('users'));
|
||||
}
|
||||
|
||||
public function showAllTests()
|
||||
{
|
||||
$tests = Test::all();
|
||||
return view('tests.showall', compact('tests'));
|
||||
}
|
||||
|
||||
public function showGroupTests(Group $group)
|
||||
{
|
||||
$tests = $group->tests;
|
||||
return view('tests.showall', compact('tests'));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,6 +9,7 @@ use App\Test;
|
|||
use App\Testdetail;
|
||||
use App\Question;
|
||||
use App\Option;
|
||||
use App\Group;
|
||||
|
||||
class TestController extends Controller
|
||||
{
|
||||
|
@ -142,11 +143,19 @@ class TestController extends Controller
|
|||
|
||||
public function newTest()
|
||||
{
|
||||
if (Auth::user()->isAdministrator()) {
|
||||
$groups = Group::all();
|
||||
return view('tests.new', compact('groups'));
|
||||
}
|
||||
return view('tests.new');
|
||||
}
|
||||
|
||||
public function editTest(Test $test)
|
||||
{
|
||||
if (Auth::user()->isAdministrator()) {
|
||||
$groups = Group::all();
|
||||
return view('tests.edit', compact('test'), compact('groups'));
|
||||
}
|
||||
return view('tests.edit', compact('test'));
|
||||
}
|
||||
|
||||
|
|
|
@ -3,9 +3,10 @@
|
|||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use App\Http\Requests;
|
||||
use App\User;
|
||||
use App\Group;
|
||||
|
||||
class UserController extends Controller
|
||||
{
|
||||
|
@ -39,6 +40,10 @@ class UserController extends Controller
|
|||
|
||||
public function newUser()
|
||||
{
|
||||
if (Auth::user()->isAdministrator()) {
|
||||
$groups = Group::all();
|
||||
return view('users.new', compact('groups'));
|
||||
}
|
||||
return view('users.new');
|
||||
}
|
||||
}
|
||||
|
|
Reference in a new issue