add all local stuff

ji-ethics · May 10, 2019 · aa34ad1 · aa34ad1
1 parent aea1f39
commit aa34ad1
Show file tree

Hide file tree

Showing 52 changed files with 2,140 additions and 1,508 deletions.
diff --git a/app/Http/Controllers/Admin/LoginController.php b/app/Http/Controllers/Admin/LoginController.php
@@ -47,7 +47,7 @@ public function __construct()
 //    }
     public function showLoginForm()
     {
-        return view('admin/auth/login');
+        return view('admin.auth.login');
     }
 
     protected function guard()

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers\Auth;
 
+use Illuminate\Validation;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\http\request;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
@@ -38,11 +40,20 @@ public function __construct()
         $this->middleware('guest')->except('logout');
     }
 
-//    public function mylogin(Request $request)
-//    {
-//        if (Auth::attempt(['email' => $request->input('email'), 'password' => $request->input('password'), 'is_active' => 1])) {
-//            return redirect()->intended('/');
-//        }
-//
-//    }
+    public function mylogin(Request $request)
+    {
+        $this->validate(request(),[
+            'email' => 'required|email',
+            'password' => 'required',
+        ]);
+        if (Auth::attempt(['email' => $request->input('email'), 'password' => $request->input('password'), 'is_active' => 1])) {
+            return redirect('/');
+            //return redirect()->intended('/');
+        }
+        else {
+            throw \Illuminate\Validation\ValidationException::withMessages([
+                $this->username() => [trans('auth.failed')],
+            ]);
+        }
+    }
 }
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -28,7 +28,7 @@ class RegisterController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/register/agreement';
 
     /**
      * Create a new controller instance.
@@ -74,7 +74,7 @@ protected function create(array $data)
             'first_name' => $data['first_name'],
             'last_name' => $data['last_name'],
 //            'last_login' => now(),
-            'is_active' => 1
+            'is_active' => 0
         ]);
     }
 }
diff --git a/app/Http/Controllers/CaseStudyController.php b/app/Http/Controllers/CaseStudyController.php
@@ -6,11 +6,14 @@
 use Illuminate\Support\Facades\DB;
 use Symfony\Component\Console\Helper\Table;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
+
 
 class CaseStudyController extends Controller
 {
     public function chapter($id,$step_id)
     {
+        $user_id = Auth::id();
         $chapters = DB::table('chapters')
             ->select('chapters.id','chapters.title')
             ->orderBy('chapters.id')->get();
@@ -19,10 +22,10 @@ public function chapter($id,$step_id)
             ->select('case_study_material.id','case_study_material.title','case_study_material.details','case_study_material.reference')
             ->orderBy('case_study_material.id')->get();
 
-        $case_question = DB::table('case_study_step')
-            ->select('case_study_step.question_id','case_study_step.question_detail','case_study_step.step_id')
-            ->orderBy('case_study_step.step_id')
-            ->orderBy('case_study_step.question_id')->get();
+        $case_question = DB::table('case_study_question')
+            ->select('case_study_question.question_rank as question_id','case_study_question.detail as question_detail','case_study_question.step_id')
+            ->orderBy('case_study_question.step_id')
+            ->orderBy('case_study_question.question_rank')->get();
 
         $principle = DB::table('ethical_principles')
             ->join('detail_principles','ethical_principles.id','=','detail_principles.title_id')
@@ -31,57 +34,64 @@ public function chapter($id,$step_id)
             ->orderBy('detail_principles.detail_id')->get();
 
         $answer = DB::table('case_study_answer')
-            ->select('case_study_answer.question_answer','case_study_answer.step_id','case_study_answer.user_id','case_study_answer.question_id')
-            ->where('case_study_answer.case_id','=',$id)
-            ->orderBy('case_study_answer.step_id')
-            ->orderBy('case_study_answer.question_id')->get();
-
-        return view('CaseStudy', compact('case_study','chapters','case_question','principle','id','step_id','answer'));
+            ->join('case_to_question','case_study_answer.id','=','case_to_question.id')
+            ->join('case_study_question','case_study_question.id','=','case_to_question.question_id')
+            ->select('case_study_answer.answer as question_answer','case_study_question.step_id','case_study_question.question_rank as question_id')
+            ->where('case_to_question.case_id','=',$id)
+            ->where('case_study_answer.user_id','=',$user_id)
+            ->orderBy('case_study_question.step_id')
+            ->orderBy('case_study_question.question_rank')->get();
+
+        return view('CaseStudy', compact('case_study','chapters','case_question','principle','id','step_id','answer','user_id'));
     }//
     public function useransweredit()
     {
+        $user_id = Auth::id();
         foreach($_POST["question_id"] as $pointer)
         {
-            $user_id = $_POST["user_id"][$pointer-1];
             $case_id = $_POST["case_id"][$pointer-1];
             $case_step_id = $_POST["step_id"][$pointer-1];
             $question_id = $_POST["question_id"][$pointer-1];
             $question_answer = $_POST["question_answer"][$pointer-1];
 
+            $case_question_id = DB::table('case_study_question')
+                ->join('case_to_question','case_study_question.id','=','case_to_question.question_id')
+                ->select('case_to_question.id')
+                ->where('case_to_question.case_id','=',$case_id)
+                ->where('case_study_question.step_id','=',$case_step_id)
+                ->where('case_study_question.question_rank','=',$question_id)
+                ->get();
+            $case_question_id = json_decode($case_question_id,true);
+            $id = $case_question_id[0]['id'];
+
             $answer = DB::table('case_study_answer')
                 ->select('case_study_answer.user_id')
+                ->where('case_study_answer.id','=',$id)
                 ->where('case_study_answer.user_id','=',$user_id)
-                ->where('case_study_answer.case_id','=',$case_id)
-                ->where('case_study_answer.step_id','=',$case_step_id)
-                ->where('case_study_answer.question_id','=',$question_id)
                 ->get();
 
             if(count($answer) == 0) {
-                DB::transaction(function () use ($user_id, $case_id, $case_step_id, $question_id, $question_answer) {
+                DB::transaction(function () use ($user_id,$id, $question_answer) {
                     DB::table('case_study_answer')
                         ->insert([
                             'case_study_answer.user_id' => $user_id,
-                            'case_study_answer.case_id' => $case_id,
-                            'case_study_answer.step_id' => $case_step_id,
-                            'case_study_answer.question_id' => $question_id,
-                            'case_study_answer.question_answer' => $question_answer
+                            'case_study_answer.id' => $id,
+                            'case_study_answer.answer' => $question_answer
                         ]);
                 });
             }
             elseif(count($answer) != 0){
-                DB::transaction(function () use ($user_id, $case_id, $case_step_id, $question_id, $question_answer) {
+                DB::transaction(function () use ($user_id,$id, $question_answer) {
                     DB::table('case_study_answer')
                         ->where('case_study_answer.user_id', '=', $user_id)
-                        ->where('case_study_answer.case_id', '=', $case_id)
-                        ->where('case_study_answer.step_id', '=', $case_step_id)
-                        ->where('case_study_answer.question_id', '=', $question_id)
+                        ->where('case_study_answer.id', '=', $id)
                         ->update([
-                            'case_study_answer.question_answer' => $question_answer
+                            'case_study_answer.answer' => $question_answer
                         ]);
                 });
             }
         }
-
+        return redirect("/casestudy/$case_id/step/$case_step_id");
 
 
     }

diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
@@ -5,11 +5,14 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Symfony\Component\Console\Helper\Table;
+use Illuminate\Support\Facades\Auth;
+
 
 class ChapterController extends Controller
 {
     public function chapter($id,$section_rank)
     {
+        $user_id = Auth::user()->id;
         $sections = DB::table('sections')
             ->join('chapter_section','sections.id','=','chapter_section.section_id')
             ->join('chapters','chapters.id','=','chapter_section.chapter_id')
@@ -22,12 +25,24 @@ public function chapter($id,$section_rank)
             ->select('chapters.id','chapters.title')
             ->orderBy('chapters.id')->get();
 
+        $user_answer = DB::table('section_question_answer')
+            ->join('section_question','section_question_answer.id','=','section_question.id')
+            ->join('sections','section_question.section_id','=','sections.id')
+            ->join('chapter_section','sections.id','=','chapter_section.section_id')
+            ->select('section_question_answer.answer','section_question.question_rank as question_rank','section_question_answer.user_id','chapter_section.chapter_id as chapter_id','sections.rank as section_rank')
+            ->where('section_question_answer.user_id','=',$user_id)
+            ->orderBy('section_question.question_rank')->get();
+
         $sections_title = DB::table('sections')
             ->join('chapter_section','sections.id','=','chapter_section.section_id')
             ->select('sections.rank','sections.title','sections.id')
             ->where('chapter_section.chapter_id','=',$id)
             ->orderBy('sections.rank')->get();
 
+        $case_study = DB::table('case_study_material')
+            ->select('case_study_material.id','case_study_material.title','case_study_material.details','case_study_material.reference')
+            ->orderBy('case_study_material.id')->get();
+
         $chapter_section = DB::table('chapter_section')
             ->join('sections','chapter_section.section_id','=','sections.id')
             ->select('sections.rank as section_rank','chapter_section.chapter_id','chapter_section.section_id')
@@ -36,12 +51,66 @@ public function chapter($id,$section_rank)
         $section_question = DB::table('section_question')
             ->join('sections','section_question.section_id','=','sections.id')
             ->join('chapter_section','sections.id','=','chapter_section.section_id')
-            ->select('section_question.question_id','section_question.question')
+            ->select('section_question.question_rank','section_question.detail')
             ->where('chapter_section.chapter_id','=',$id)
             ->where('sections.rank','=',$section_rank)
-            ->orderBy('section_question.question_id')->get();
+            ->orderBy('section_question.question_rank')->get();
+
+
+        return view('chapter', compact('user_answer','sections','chapters','sections_title','case_study','chapter_section','section_question','id','section_rank'));
+    }
+    public function answeredit()
+    {
+        $user_id = Auth::user()->id;
+
+        foreach($_POST["question_id"] as $pointer)
+        {
+            $chapter_id = $_POST["chapter_id"][$pointer-1];
+            $sec_rank = $_POST["section_rank"][$pointer-1];
+            $question_id = $_POST["question_id"][$pointer-1];
+            $question_answer = $_POST["answer"][$pointer-1];
+
+            $section_question_id = DB::table('section_question')
+                ->join('sections','section_question.section_id','=','sections.id')
+                ->join('chapter_section','chapter_section.section_id','=','sections.id')
+                ->select('section_question.id')
+                ->where('chapter_section.chapter_id','=',$chapter_id)
+                ->where('sections.rank','=',$sec_rank)
+                ->where('section_question.question_rank','=',$question_id)
+                ->get();
+            $section_question_id = json_decode($section_question_id,true);
+            $id = $section_question_id[0]['id'];
+            $user_answer = DB::table('section_question_answer')
+                ->select('section_question_answer.id')
+                ->where('section_question_answer.user_id','=',$user_id)
+                ->where('section_question_answer.id','=',$id)
+                ->get();
+            $user_answer = json_decode($user_answer,true);
+
+            if(count($user_answer) == 0) {
+                DB::transaction(function () use ($user_id,$id, $question_answer) {
+                    DB::table('section_question_answer')
+                        ->insert([
+                            'section_question_answer.user_id' => $user_id,
+                            'section_question_answer.id' => $id,
+                            'section_question_answer.answer' => $question_answer
+                        ]);
+                });
+            }
+            elseif(count($user_answer) != 0){
+                DB::transaction(function () use ($user_id,$id, $question_answer) {
+                    DB::table('section_question_answer')
+                        ->where('section_question_answer.user_id', '=', $user_id)
+                        ->where('section_question_answer.id', '=', $id)
+                        ->update([
+                            'section_question_answer.answer' => $question_answer
+                        ]);
+                });
+            }
+        }
+
+
 
 
-        return view('chapter', compact('sections','chapters','sections_title','chapter_section','section_question'));
     }
 }