Merge pull request #30 from prismathic/develop

Merge changes

Author: prismaticoder

.gitignore

@@ -10,3 +10,6 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
+1_START_CBT.bat
+2_START_CBT.bat
+START_CBT.sh

app/Http/Controllers/AdminController.php

@@ -7,20 +7,18 @@
 use App\Subject;
 use App\Classes;
 use App\Exam;
-use App\Mark;
+use App\Imports\StudentsImport;
 use App\Question;
 use App\Option;
 use App\User;
-use Gate;
-use DB;
-use Auth;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Auth as FacadesAuth;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Hash;
-use PDF;
-use Illuminate\Support\Facades\Log;
+use Barryvdh\DomPDF\PDF;
 use Illuminate\Support\Facades\Session;
-use Illuminate\Support\Str;
+use Maatwebsite\Excel\Facades\Excel;
 
 class AdminController extends Controller
 {
@@ -115,9 +113,9 @@ public function restoreStudent($id) {
         return compact('student','message');
     }
 
-    public function generateStudentCode($class_id) {
+    protected function generateStudentCode($class_id) {
         $characters = 'ABCDEFGHJKLMNPQRSTUVWXYZ';
-        $code = mt_rand(5111, 9999) . $characters[rand(0, strlen($characters) - 1)] . $characters[rand(0, strlen($characters) - 1)];
+        $code = mt_rand(2111, 9999) . $characters[rand(0, strlen($characters) - 1)] . $characters[rand(0, strlen($characters) - 1)];
 
         $check = User::where('class_id',$class_id)->where('code', $code)->first();
 
@@ -150,6 +148,28 @@ public function addStudent(Request $request) {
         return compact('student','message');
     }
 
+    public function addMultipleStudents(Request $request) {
+        $class_id = $request->class_id;
+
+        try {
+            Excel::import(new StudentsImport($class_id), $request->students);
+
+            $students = User::where('class_id',$class_id)->get();
+            $message = "Student details Imported successfully!";
+            $success = true;
+
+            return compact('success','students','message');
+
+        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+            $failures = $e->failures();
+
+            $success = false;
+            $message = $failures[0]->errors();
+
+            return compact('success','message');
+       }
+    }
+
     public function getAllQuestions($subject,$class_id) {
         $subject = Subject::where('alias',$subject)->firstOrFail();
         $current_class = $subject->classes()->where('class_id', $class_id)->firstOrFail();

app/Http/Controllers/StudentController.php

@@ -4,12 +4,11 @@
 
 use App\Exam;
 use Illuminate\Http\Request;
-use Auth;
 use App\Question;
 use App\Subject;
 use App\Option;
 use App\Score;
-use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
 
 class StudentController extends Controller
@@ -30,7 +29,7 @@ public function index() {
         return view('home',compact('exams'));
     }
 
-    public function getExamQuestions(\Request $request, $subject) {
+    public function getExamQuestions(Request $request, $subject) {
         $subject = Subject::where('alias',$subject)->first();
         $user = Auth::user();
         $class_id = $user->class_id;
@@ -43,7 +42,7 @@ public function getExamQuestions(\Request $request, $subject) {
             $hours = $exam->hours;
             $minutes = $exam->minutes;
             $subject_id = $subject->id;
-            $seed = Auth::user()->code;
+            $seed = substr(Auth::user()->code,0,4);
 
             $questions = Question::where('exam_id',$exam->id)->with('options:id,question_id,body')->inRandomOrder($seed)->get();
 
@@ -60,7 +59,7 @@ public function submitExam(Request $request) {
         $exam_id = Session::get('exam_id');
 
         //first mark all the answers
-        $seed = Auth::user()->code;
+        $seed = substr(Auth::user()->code,0,4);
 
         $questions = Question::where('exam_id',$exam_id)->with('options')->inRandomOrder($seed)->get();
 

app/Imports/StudentsImport.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Imports;
+
+use App\User;
+use Illuminate\Validation\Rule;
+use Maatwebsite\Excel\Concerns\ToModel;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithValidation;
+
+class StudentsImport implements ToModel, WithHeadingRow, WithValidation
+{
+    private $class_id;
+
+    public function __construct(int $class_id)
+    {
+        $this->class_id = $class_id;
+    }
+    /**
+    * @param array $row
+    *
+    * @return \Illuminate\Database\Eloquent\Model|null
+    */
+    public function model(array $row)
+    {
+        return new User([
+            'lastname' => $row['surname'],
+            'firstname' => $row['first_name'],
+            'class_id' => $this->class_id,
+            'code' => $this->generateStudentCode()
+        ]);
+    }
+
+    public function rules(): array
+    {
+        return array(
+            'surname' => ['required' , 'string', 'min:2', 'regex:/^(?=.*?[a-zA-Z0-9])/'],
+            'first_name' => 'required|string|min:2|regex:/^(?=.*?[a-zA-Z0-9])/'
+        );
+    }
+
+    /**
+     * Custom Validation Messages
+     * @return array
+     */
+    public function customValidationMessages(): array {
+        return array(
+            'surname.regex' => 'Invalid :attribute provided: :input',
+            'surname.min' => 'Invalid :attribute provided: :input',
+            'surname.required' => 'Empty cell in :attribute field',
+            'surname.string' => 'Invalid :attribute provided: :input',
+            'first_name.regex' => 'Invalid :attribute provided: :input',
+            'first_name.min' => 'Invalid :attribute provided: :input',
+            'first_name.required' => 'Empty cell in :attribute field',
+            'first_name.string' => 'Invalid :attribute provided: :input'
+        );
+    }
+
+    private function generateStudentCode()
+    {
+        $characters = 'ABCDEFGHJKLMNPQRSTUVWXYZ';
+        $code = mt_rand(2111, 9999) . $characters[rand(0, strlen($characters) - 1)] . $characters[rand(0, strlen($characters) - 1)];
+
+        $check = User::where('class_id',$this->class_id)->where('code', $code)->first();
+
+        //recursively check whether another student exists in that class with the same code
+        return ($check) ? $this->generateStudentCode() : $code;
+    }
+}

app/Providers/AuthServiceProvider.php

@@ -38,7 +38,7 @@ public function boot()
             if ($admin->isSuperAdmin()) return true;
 
             $subject = $admin->subjects()->where('subject_id', $subject_id)->first();
-            $check = $subject->classes()->where('class_id',$class_id)->first();
+            $check = $subject ? $subject->classes()->where('class_id',$class_id)->first() : false;
 
             return $check ? true : false;
         });

composer.json

@@ -14,7 +14,8 @@
         "fideloper/proxy": "^4.0",
         "laravel/framework": "^7.0",
         "laravel/tinker": "^2.0",
-        "laravel/ui": "2.0"
+        "laravel/ui": "2.0",
+        "maatwebsite/excel": "^3.1"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.4",