almost done. all pages done. Finishing with the Course Registration

TimothyMee · Mar 1, 2018 · 9b88a66 · 9b88a66
1 parent cec5606
commit 9b88a66
Show file tree

Hide file tree

Showing 38 changed files with 14,306 additions and 7,398 deletions.
diff --git a/app/Course.php b/app/Course.php
@@ -7,7 +7,7 @@
 class Course extends Model
 {
     //
-    protected $fillable = ['name', 'course_code', 'unit', 'staff_id'];
+    protected $fillable = ['name', 'course_code', 'unit','image','professor_id', 'staff_id'];
 
     public function createNew($data)
     {
@@ -44,6 +44,6 @@ public function updateCourses($data)
     {
         $data['staff_id'] = auth()->id();
         return $this->where('id', $data['id'])
-                    ->update(['name' => $data['name'],'course_code' => $data['course_code'],'unit' => $data['unit']]);
+                    ->update(['name' => $data['name'],'course_code' => $data['course_code'],'unit' => $data['unit'], 'professor_id' => $data['professor_id']]);
     }
 }
diff --git a/app/Department.php b/app/Department.php
@@ -6,7 +6,7 @@
 
 class Department extends Model
 {
-    protected $fillable = ['name', 'college_name'];
+    protected $fillable = ['name', 'college_name', 'HOD'];
     //
     public function createNew($data)
     {
@@ -38,8 +38,11 @@ public function updateDepartment($data)
     {
         $data['staff_id'] = auth()->id();
         return $this->where('id', $data['id'])
-            ->update(['name' => $data['name']],
-                ['college_name' => $data['college_name']]);
+            ->update([
+                'name' => $data['name'],
+                'college_name' => $data['college_name'],
+                'HOD' => $data['HOD']
+                ]);
     }
 
 }
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\User;
+use Illuminate\Http\Request;
+
+class AdminController extends Controller
+{
+    //
+
+    public function index()
+    {
+        return view('admin.index');
+    }
+
+    public function edit()
+    {
+        return view ('admin.edit');
+    }
+
+    public function postEdit(Request $request, User $user)
+    {
+        try
+        {
+            $result = $user->updateUser($request->all());
+            return apiSuccess($result);
+        }
+        catch (\Exception $e)
+        {
+            return apiFailure($e);
+        }
+    }
+
+    public function add()
+    {
+        return view('admin.add');
+    }
+
+    public function postAdd(Request $request, User $user)
+    {
+        try
+        {
+            $result = $user->createNew($request->all());
+            if ($result){
+                return apiSuccess($result);
+            }
+            else{
+                return apiFailure('');
+            }
+        }
+        catch (\Exception $e)
+        {
+            return apiFailure($e);
+        }
+    }
+
+}
diff --git a/app/Http/Controllers/CourseController.php b/app/Http/Controllers/CourseController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Course;
+use App\User;
 use Illuminate\Http\Request;
 
 class CourseController extends Controller
@@ -13,21 +14,46 @@ public function index()
     {
         return view('courses.index');
     }
-    public function add(Request $request, Course $course)
+
+    public function add(User $user)
+    {
+        $professors = $user->viewUserType(['4']);
+        return view ('courses.add')->with('professors', $professors[0]);
+    }
+
+    public function postAdd(Request $request, Course $course, User $user)
     {
         try
         {
+            if($request->hasFile('photo')){
+                try{
+                    $image = $request->file('photo');
+                    $imageName = OptimiseImage($image, $request['course_code']);
+                    $request['image'] = $imageName;
+                }
+                catch (\Exception $e){
+                    echo '<script>alert("Upload a valid image");</script>';
+                }
+            }
+            else
+            {
+                $professors = $user->viewUserType(['4']);
+                return view ('courses.add')->with('professors', $professors[0]);
+            }
+
+            if($request['password']!= $request['c_password']){
+                $request['password'] = '';
+            }
+
             $result = $course->createNew($request->all());
+
             if ($result){
-                return apiSuccess($result);
-            }
-            else{
-                return apiFailure('');
+                return view('courses.index');
             }
         }
         catch (\Exception $e)
         {
-            return apiFailure($e);
+            echo '<script>alert("Try again later and fill all fields");</script>';
         }
     }
 
@@ -57,7 +83,11 @@ public function viewCourse(Request $request, Course $course)
         }
     }
 
-    public function edit(Request $request, Course $course)
+    public function edit()
+    {
+        return view('courses.edit');
+    }
+    public function postEdit(Request $request, Course $course)
     {
         try
         {

diff --git a/app/Http/Controllers/DepartmentController.php b/app/Http/Controllers/DepartmentController.php
@@ -12,7 +12,18 @@ public function index()
     {
         return  view('department.index');
     }
-    public function add(Request $request, Department $department)
+
+    public function edit()
+    {
+        return view ('department.edit');
+    }
+
+    public function add()
+    {
+        return view('department.add');
+    }
+
+    public function postAdd(Request $request, Department $department)
     {
         try
         {
@@ -65,7 +76,7 @@ public function viewDepartment(Request $request, Department $department)
         }
     }
 
-    public function edit(Request $request, Department $department)
+    public function postEdit(Request $request, Department $department)
     {
         try
         {

diff --git a/app/Http/Controllers/StudentController.php b/app/Http/Controllers/StudentController.php
@@ -14,7 +14,13 @@ public function index()
     {
         return view('students.index');
     }
-    public function add(Request $request, User $user)
+
+    public function add()
+    {
+        return view('students.add');
+    }
+
+    public function postAdd(Request $request, User $user)
     {
         /*$this->validate()*/
 
@@ -29,13 +35,16 @@ public function add(Request $request, User $user)
         }
     }
 
-    public function edit(Request $request, User $user)
+    public function edit()
     {
-        /*$this->validate()*/
+        return view ('students.edit');
+    }
 
+    public function postEdit(Request $request, User $user)
+    {
         try
         {
-            $result = $student->updateStudent($request->all());
+            $result = $user->updateUser($request->all());
             return apiSuccess($result);
         }
         catch (\Exception $e)
@@ -48,7 +57,7 @@ public function delete(Request $request, User $user)
     {
         try
         {
-            $result = $student->deleteUser($request->all());
+            $result = $user->deleteUser($request->all());
             return apiSuccess($result);
         }
         catch (\Exception $e)

diff --git a/database/migrations/2018_01_14_122043_create_departments_table.php b/database/migrations/2018_01_14_122043_create_departments_table.php
@@ -17,6 +17,7 @@ public function up()
             $table->increments('id');
             $table->string('name');
             $table->string('college_name')->nullable();
+            $table->integer('HOD');
             $table->timestamps();
         });
     }

diff --git a/public/images/ACC 101. b/public/images/ACC 101.