a bit more refactoring and changed the layout of views/admin folder

This commit is contained in:
mwalbeck 2016-09-11 19:28:27 +02:00
parent 5a330b1e64
commit a3dca2142e
20 changed files with 86 additions and 49 deletions

4
.directory Normal file
View file

@ -0,0 +1,4 @@
[Dolphin]
Timestamp=2016,9,11,19,17,33
Version=3
ViewMode=1

View file

@ -6,7 +6,6 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Http\Requests;
use App\Test;
use App\Group;
use App\User;
use App\Question;
use App\Option;
@ -27,12 +26,12 @@ class AdminController extends Controller
public function showUser()
{
$users = User::all();
return view('admin.show.users', compact('users'));
return view('admin.user.showall', compact('users'));
}
public function delUser(User $user)
{
return view('admin.delete.user', compact('user'));
return view('admin.user.delete', compact('user'));
}
public function deleteUser(User $user)
@ -43,7 +42,7 @@ class AdminController extends Controller
public function user()
{
return view('admin.new.user');
return view('admin.user.new');
}
public function addUser()
@ -56,18 +55,18 @@ class AdminController extends Controller
public function showTests()
{
$tests = Test::all();
return view('admin.show.tests', compact('tests'));
return view('admin.test.showall', compact('tests'));
}
public function showTest(Test $test)
{
$questions = $test->questions;
return view('admin.show.test', compact('test'), compact('questions'));
return view('admin.test.show', compact('test'), compact('questions'));
}
public function test()
{
return view('admin.new.test');
return view('admin.test.new');
}
public function addTest()
@ -79,49 +78,53 @@ class AdminController extends Controller
public function editTest(Test $test)
{
return view('admin.edit.test', compact('test'));
return view('admin.test.edit', compact('test'));
}
public function delTest(Test $test)
{
return view('admin.delete.test', compact('test'));
return view('admin.test.delete', compact('test'));
}
public function delQuestion(Question $question)
{
return view('admin.delete.question', compact('question'));
return view('admin.test.question.delete', compact('question'));
}
/* REFACTOR */
public function updateTest(Test $test)
{
$test->update(request()->all());
$test->updateTest(request()->all());
return redirect("/admin/tests/$test->id");
}
public function deleteTest(Test $test)
{
$questions = $test->questions;
foreach ($questions as $question) {
$options = $question->options;
foreach ($options as $option) {
$option->delete();
}
$question->delete();
}
$test->delete();
return redirect('/admin/tests');
}
public function question(Test $test)
{
$question_number = count($test->questions)+1;
return view('admin.new.question', compact('test'), compact('question_number'));
$question_number = $test->nextQuestionNumber();
return view('admin.test.question.new', compact('test'), compact('question_number'));
}
public function deleteTest(Test $test)
{
$test->deleteTest();
return redirect('/admin/tests');
}
public function deleteQuestion(Question $question)
{
$test = $question->test;
$question->deleteQuestion();
return redirect("/admin/tests/$test->id");
}
public function editQuestion(Question $question)
{
$options = $question->options;
return view('admin.test.question.edit', compact('question'), compact('options'));
}
/* REFACTOR */
public function addQuestion(Test $test)
{
$question = new Question;
@ -148,23 +151,6 @@ class AdminController extends Controller
return redirect("/admin/tests/$test->id");
}
public function deleteQuestion(Question $question)
{
$test = $question->test;
$options = $question->options;
foreach ($options as $option) {
$option->delete();
}
$question->delete();
return redirect("/admin/tests/$test->id");
}
public function editQuestion(Question $question)
{
$options = $question->options;
return view('admin.edit.question', compact('question'), compact('options'));
}
public function updateQuestion(Question $question)
{
$test = $question->test;

View file

@ -52,6 +52,5 @@ class HomeController extends Controller
{
$user = Auth::user();
$user->updateEmail(request()->all());
return redirect('/settings');
}
}

View file

@ -10,4 +10,10 @@ class Option extends Model
{
return $this->belongsTo(Question::class);
}
public function deleteOption()
{
$this->delete();
return true;
}
}

View file

@ -24,4 +24,14 @@ class Question extends Model
return true;
}
}
public function deleteQuestion()
{
$options = $this->options;
foreach ($options as $option) {
$option->deleteOption();
}
$this->delete();
return true;
}
}

View file

@ -52,4 +52,24 @@ class Test extends Model
$this->save();
return true;
}
public function updateTest($request)
{
$test->update($request);
}
public function nextQuestionNumber()
{
return count($this->questions)+1;
}
public function deleteTest()
{
$questions = $this->questions;
foreach ($questions as $question) {
$question->deleteQuestion();
}
$this->delete();
return true;
}
}

4
resources/.directory Normal file
View file

@ -0,0 +1,4 @@
[Dolphin]
Timestamp=2016,9,11,19,17,37
Version=3
ViewMode=1

View file

@ -0,0 +1,4 @@
[Dolphin]
Timestamp=2016,9,11,19,17,39
Version=3
ViewMode=1

View file

@ -0,0 +1,4 @@
[Dolphin]
Timestamp=2016,9,11,19,17,43
Version=3
ViewMode=1