Some refactoring to accomodate new updates

app/Console/Commands/InstallRms.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\User;
-use App\Role;
+use App\UserType;
 use App\Department;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
@@ -42,7 +42,7 @@ public function __construct()
     public function handle()
     {
         DB::transaction(function () {
-            $this->setRole();
+            $this->setUserTypes();
             $this->setDepartment();
             $this->setDefaultUsers();
         });
@@ -64,11 +64,11 @@ public function setDefaultUsers()
         return $user->createNew(config('default.superadmin'));
     }
 
-    public function setRole()
+    public function setUserTypes()
     {
-        $role = new Role();
-        foreach (config('default.roles') as $defaultRole) {
-            $role->createNew($defaultRole);
+        $userType = new UserType();
+        foreach (config('default.user_type') as $defaultRole) {
+            $userType->createNew($defaultRole);
         }
         return ;
     }

app/Http/Controllers/AuthController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Mockery\Exception;
 
 class AuthController extends Controller
 {
@@ -16,7 +17,7 @@ public function postLogin(Request $request)
     {
         $data = $request->all();
         try{
-            if (auth()->attempt(['identification_no' => $data['identification_no'], 'password' => $data['password'], 'is_active' => true])) {
+            if (auth()->attempt(['email' => $data['email'], 'password' => $data['password'], 'is_active' => true])) {
                 return redirect()->intended(route('home'));
             }
             return redirect()->back()->with('error', 'Identification No and Password Combination Incorrect')->withInput();
@@ -32,4 +33,5 @@ public function logout()
         auth()->logout();
         return redirect()->route('login');
     }
+
 }

app/Http/Controllers/ResultController.php

@@ -140,11 +140,12 @@ public function updateStatus(Request $request, Result $resultObject)
     {
         try
         {
-
+            $result = $resultObject->updateResultStatus($request->all());
+            return apiSuccess($result);
         }
         catch (\Exception $e)
         {
-
+            return apiFailure($e);
         }
     }
 }

app/Http/Controllers/StudentController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Student;
+use App\User;
 use Illuminate\Http\Request;
 
 class StudentController extends Controller
@@ -13,7 +14,7 @@ public function index()
     {
         return view('students.index');
     }
-    public function add(Request $request, Student $student)
+    public function add(Request $request, User $user)
     {
         /*$this->validate()*/
 
@@ -28,7 +29,7 @@ public function add(Request $request, Student $student)
         }
     }
 
-    public function edit(Request $request, Student $student)
+    public function edit(Request $request, User $user)
     {
         /*$this->validate()*/
 
@@ -43,7 +44,7 @@ public function edit(Request $request, Student $student)
         }
     }
 
-    public function delete(Request $request, Student $student)
+    public function delete(Request $request, User $user)
     {
         try
         {
@@ -56,7 +57,7 @@ public function delete(Request $request, Student $student)
         }
     }
 
-    public function viewStudent(Request $request, Student $student)
+    public function viewStudent(Request $request, User $user)
     {
         try
         {

app/Http/Controllers/UserTypeController.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\UserType;
+use Illuminate\Http\Request;
+
+class UserTypeController extends Controller
+{
+    //
+
+    public function index()
+    {
+        return view('user_type.index');
+    }
+
+    public function add(Request $request, UserType $userType)
+    {
+        try
+        {
+            $result = $userType->createNew($request->all());
+            return apiSuccess($result);
+        }
+        catch (\Exception $e)
+        {
+            return apiFailure($e);
+        }
+    }
+
+
+    public function delete(Request $request, UserType $userType)
+    {
+        try
+        {
+            $result = $userType->deleteRole($request->all());
+            return apiSuccess($result);
+        }
+        catch (\Exception $e)
+        {
+            return apiFailure($e);
+        }
+    }
+
+    public function viewRoles(UserType $userType)
+    {
+        try
+        {
+            $result = $userType->viewAll();
+            return apiSuccess($result);
+        }
+        catch (\Exception $e)
+        {
+            return apiFailure($e);
+        }
+    }
+
+    public function viewRole(Request $request, UserType $userType)
+    {
+        try
+        {
+            $result = $userType->view($request->all());
+            return apiSuccess($result);
+        }
+        catch (\Exception $e)
+        {
+            return apiFailure($e);
+        }
+    }
+
+    public function edit(Request $request, UserType $userType)
+    {
+        try
+        {
+            $result = $userType->updateRole($request->all());
+            return apiSuccess($result);
+        }
+        catch (\Exception $e)
+        {
+            return apiFailure($e);
+        }
+    }
+}

app/Result.php

@@ -53,6 +53,18 @@ public function updateResult($data)
                             ]);
     }
 
+    public function updateResultStatus($data)
+    {
+        $data['staff_id'] = auth()->id();
+        return $this->where('student_id', $data['student_id'])
+            ->where('semester', $data['semester'])
+            ->where('year', $data['year'])
+            ->update([
+                'status' => $data['status'],
+                'staff_id' => $data['staff_id']
+            ]);
+    }
+
     public function viewAll()
     {
         $result = $this->all();

app/User.php

@@ -16,7 +16,7 @@ class User extends Authenticatable
      */
     protected $fillable = [
         'firstname', 'middlename', 'lastname', 'tel_no', 'email', 'password',
-        'identification_no', 'department_id', 'role_id', 'staff_id', 'is_active'
+        'identification_no', 'department_id', 'user_type', 'staff_id', 'is_active'
     ];
 
     /**
@@ -71,7 +71,7 @@ public function updateUser($data)
                 'email' => $data['email'],
                 'identification_no' => $data['identification_no'],
                 'department_id' => $data['department_id'],
-                'role_id' => $data['role_id'],
+                'user_type' => $data['user_type'],
                 'staff_id' => $data['staff_id']
                 ]
             );

app/UserType.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class UserType extends Model
+{
+    protected $fillable = ['name', 'description', 'staff_id'];
+    //
+
+    public function createNew($data)
+    {
+        isset($data['staff_id']) ? $data['staff_id'] : $data['staff_id'] = auth()->id();
+        return $this->create($data);
+    }
+
+    public function deleteRole($data)
+    {
+        return $this->delete($data);
+    }
+
+    public function view(Array $requests)
+    {
+        foreach ($requests as $request)
+        {
+            $results[] = $this->where('id', $request)->get();
+        }
+
+        return $results;
+    }
+
+    public function viewAll()
+    {
+        $result = $this->all();
+        return $result;
+    }
+
+    public function updateRole($data)
+    {
+        $data['staff_id'] = auth()->id();
+        return $this->where('id', $data['id'])
+            ->update([
+                'name' => $data['name'],
+                'description' => $data['description'],
+                'staff_id' => $data['staff_id']
+            ]);
+    }
+}

app/parent.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class parent extends Model
+{
+    //
+}

config/auth.php

@@ -8,7 +8,7 @@
     |--------------------------------------------------------------------------
     |
     | This option controls the default authentication "guard" and password
-    | reset options for your application. You may change these defaults
+    | reset options for your application. You may change these defaultst!      ·
     | as required, but they're a perfect start for most applications.
     |
     */

config/default.php

@@ -10,12 +10,15 @@
         'email'     => 'timothy33.tf@gmail.com',
         'tel_no'     => '07088775522',
         'department_id' => 1,
-        'role_id'   => 1,
+        'user_type'   => 1,
         'staff_id' => 1,
     ],
 
-    'roles'     => [
-        ['name' => 'SuperAdmin', 'description' => 'Has all rights to any part of the system', 'staff_id' => 1, ]
+    'user_type'     => [
+        ['name' => 'SuperAdmin', 'description' => 'Has all rights to any part of the system', 'staff_id' => 1, ],
+        ['name' => 'Admin', 'description' => 'Has rights to create,delete and update all except admins', 'staff_id' => 1, ],
+        ['name' => 'Student', 'description' => 'The main subject of the Application', 'staff_id' => 1, ],
+        ['name' => 'Parent', 'description' => 'Parent of the Student', 'staff_id' => 1, ],
     ],
 
     'department'   => [

database/migrations/2014_10_12_000000_create_users_table.php

@@ -23,7 +23,7 @@ public function up()
             $table->string('identification_no')->unique();
             $table->string('password');
             $table->integer('department_id');
-            $table->integer('role_id');
+            $table->integer('user_type');
             $table->integer('staff_id');
             $table->boolean('is_active')->default(true);
             $table->rememberToken();