From 31d9aae393a2332a6f2d7a63c22357c61ed7fa47 Mon Sep 17 00:00:00 2001
From: Jacob <rkjacob007@gmail.com>
Date: Thu, 1 Jul 2021 11:29:00 +0530
Subject: [PATCH] Subject,Course creation done. Need to complete validation and
 tests

---
 Contributing.MD                               |   1 +
 .../Http/Controllers/AttendanceController.php |   4 +-
 src/app/Http/Controllers/CourseController.php | 137 ++++++++++++++++++
 .../Http/Controllers/SubjectController.php    | 122 ++++++++++++++++
 src/app/Models/Subject.php                    |   4 +-
 .../views/attendance/index.blade.php          |   1 -
 src/resources/views/courses/create.blade.php  |  49 +++++++
 src/resources/views/courses/edit.blade.php    |  65 +++++++++
 src/resources/views/courses/index.blade.php   |  51 +++++++
 src/resources/views/subjects/create.blade.php |  27 ++++
 src/resources/views/subjects/edit.blade.php   |  30 ++++
 src/resources/views/subjects/index.blade.php  |  39 +++++
 src/resources/views/welcome.blade.php         |   4 +-
 src/routes/web.php                            |   6 +
 14 files changed, 536 insertions(+), 4 deletions(-)
 create mode 100644 src/app/Http/Controllers/CourseController.php
 create mode 100644 src/app/Http/Controllers/SubjectController.php
 create mode 100644 src/resources/views/courses/create.blade.php
 create mode 100644 src/resources/views/courses/edit.blade.php
 create mode 100644 src/resources/views/courses/index.blade.php
 create mode 100644 src/resources/views/subjects/create.blade.php
 create mode 100644 src/resources/views/subjects/edit.blade.php
 create mode 100644 src/resources/views/subjects/index.blade.php

diff --git a/Contributing.MD b/Contributing.MD
index 910a99b..556feec 100644
--- a/Contributing.MD
+++ b/Contributing.MD
@@ -3,6 +3,7 @@
 ## Table of contents
 
 - [Standard of Code](#standard-of-code)
+- [Laravel Best Practices ](https://github.com/alexeymezenin/laravel-best-practices)
 - [Initial Setup](#initial-setup-and-credentials)
 - [Running shell commands inside container](#running-shell-commands-inside-the-container)
 - [Installing PHP Packages](#installing-php-packages)
diff --git a/src/app/Http/Controllers/AttendanceController.php b/src/app/Http/Controllers/AttendanceController.php
index b10cc8e..97476be 100644
--- a/src/app/Http/Controllers/AttendanceController.php
+++ b/src/app/Http/Controllers/AttendanceController.php
@@ -31,9 +31,11 @@ public function index(AttendanceRequest $request)
         // HOD can view their dept
         // Staff advisor, Faculty can view their class
         $request->validated();
+        print $request->ip();
 
         $auth_user = Auth::user();
         $faculty = $auth_user->faculty;
+        // print $auth_user;
         if ($auth_user->isAdmin() || $faculty?->isPrincipal()) {
             // OR Principal
             $query = Attendance::getBaseQuery($request->get("from"), $request->get("to"));
@@ -258,7 +260,7 @@ public function update(AttendanceRequest $request, $attendance_id)
             }
             $absentee->leave_excuse = $leave_type;
 
-            // TODO Bulk update is possible?
+            // TODO Bulk update is <po></po>ssible?
             $absentee->save();
         }
 
diff --git a/src/app/Http/Controllers/CourseController.php b/src/app/Http/Controllers/CourseController.php
new file mode 100644
index 0000000..e5d166f
--- /dev/null
+++ b/src/app/Http/Controllers/CourseController.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Enums\CourseTypes;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use App\Models\Subject;
+use App\Models\Course;
+use App\Models\Faculty;
+use App\Models\Classroom;
+use App\Http\Requests\SubjectRequest;
+
+class CourseController extends Controller
+{
+
+    /*
+     *Middleware for checking whether user is HOD
+     */
+
+
+    public function index(){
+        $auth_user = Auth::user();
+        $faculty = $auth_user->faculty;
+        $department_code = $faculty->department_code;
+
+        if ($faculty && $faculty->isHOD()) {
+            $courses = Course::with(['Classroom','Subject','Faculty'])->get();
+//        No idea to filter hod's department related stuff from database,so basically filtering in views
+            return view('courses.index',["courses" => $courses,"department_code" => $department_code]);
+        }
+
+    }
+
+    public function create(){
+        // HOD create subjects here - get request do it returns
+        //  that page to HOD
+        $auth_user = Auth::user();
+        $faculty = $auth_user->faculty;
+        // print $faculty;
+        $department_code = $faculty->department_code;
+
+        $classrooms = Classroom::all();
+        $faculties = Faculty::where('department_code',$department_code)->get();
+        $subjects = Subject::where('department_code',$department_code)->get();
+        $types = CourseTypes::getKeys();
+
+        return view('courses.create',["classrooms"=>$classrooms,"faculties"=>$faculties,"types"=>$types,"subjects"=>$subjects]);
+    }
+
+    public function store(Request $request){
+        // create new subject - POST
+
+        /*
+         * Needs to do request validation
+         * Move Course creation to model
+         * Javascipt function to check Course is already existing or not
+         * Optimise Course creation
+         */
+
+        $auth_user = Auth::user();
+        $faculty = $auth_user->faculty;
+        $department_code = $faculty->department_code;
+
+        $data = $request->input();
+
+        $course  = new Course();
+        $course->type = CourseTypes::getValue($data["type"]);
+        $course->faculty_id=$data["faculty"];
+        $course->classroom_id = $data["classroom"];
+        $course->subject_code = $data["subject"];
+//        Here is room for improvement instead of again querying in database table,we can infer it from above
+//        message/ do we need this in the first place <<Semester>>
+        $course->semester = Classroom::where('id',$data["classroom"])->get('semester')->first()->semester;
+        $course->save();
+
+
+
+        return redirect()->route('courses.index');
+
+
+    }
+
+
+    public function edit($id){
+        //get page for updating specific subject
+        // check whether this hod has permission to update this course
+
+        $auth_user = Auth::user();
+        $faculty = $auth_user->faculty;
+        $department_code = $faculty->department_code;
+
+        $classrooms = Classroom::all();
+        $faculties = Faculty::where('department_code',$department_code)->get();
+        $subjects = Subject::where('department_code',$department_code)->get();
+        $types = CourseTypes::getKeys();
+        $course = Course::where('id',$id)->first();
+        $courseType = CourseTypes::getKey($course->type); // we need this as as we are displaying value of enum but store key in db
+        return view('courses.edit',["classrooms"=>$classrooms,"faculties"=>$faculties,"types"=>$types,"subjects"=>$subjects,"course"=>$course,"courseType"=>$courseType]);
+    }
+
+    public function update(Request $request ,$id){
+        // modifying the existing course resource
+
+        /*
+         * Needs to do request validation
+         * Move Course creation to model
+         * Javascipt function to check subject code is unique or not in client side
+         * Optimise Course creation
+         * Update method - PUT/PATCH ?
+         * Check whether this HOD has power to update this course
+         */
+
+        $auth_user = Auth::user();
+        $faculty = $auth_user->faculty;
+        $department_code = $faculty->department_code;
+
+        $data = $request->input();
+        $editCourse = Course::where('id',$id)->first(); // need to find better method than this
+//        this queries and retreives , but we dont' need retreival here ,only updation is needed
+        $editCourse->faculty_id=$data["faculty"];
+        $editCourse->classroom_id = $data["classroom"];
+        $editCourse->subject_code = $data["subject"];
+        $editCourse->type = CourseTypes::getValue($data["type"]);
+        $editCourse->semester = Classroom::where('id',$data["classroom"])->get('semester')->first()->semester;
+        $editCourse->save();
+        return redirect()->route('courses.index');
+
+    }
+
+    public function destroy($id){
+        // delete specific subjects - delete request
+        // check for permission to delete this stuff by current hod
+        $response=Course::where('id',$id)->delete();
+        return redirect()->route('courses.index');
+    }
+}
diff --git a/src/app/Http/Controllers/SubjectController.php b/src/app/Http/Controllers/SubjectController.php
new file mode 100644
index 0000000..1193613
--- /dev/null
+++ b/src/app/Http/Controllers/SubjectController.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use App\Models\Subject;
+use App\Models\Faculty;
+use App\Http\Requests\SubjectRequest;
+
+class SubjectController extends Controller
+{
+
+
+
+
+    /*
+     *Middleware for checking whether user is HOD
+    */
+
+
+
+    public function index(){
+        $auth_user = Auth::user();
+        $faculty = $auth_user->faculty;
+        // print $faculty;
+        $department_code = $faculty->department_code;
+        // print $department_code;
+
+        if ($faculty && $faculty->isHOD()) {
+            $subjects = Subject::where('department_code',$department_code)->get();
+            // $faculty = Faculty::where('department_code',$department_code)->get();
+            return view('subjects.index',["subjects" => $subjects]);
+        }
+
+    }
+
+    public function create(){
+        // HOD create subjects here - get request do it returns
+        //  that page to HOD
+        return view('subjects.create');
+    }
+
+    public function store(Request $request){
+        // create new subject - POST
+
+        /*
+         * Needs to do request validation
+         * Move subject creation to model
+         * Javascipt function to check subject code is already existing or not
+         * Optimise Subject creation
+         */
+        $auth_user = Auth::user();
+        $faculty = $auth_user->faculty;
+        $department_code = $faculty->department_code;
+
+        $data = $request->input();
+
+        $subject  = new Subject();
+        $subject->name = $data["name"];
+        $subject->credits = $data["credit"];
+        $subject->code = $data["courseId"];
+        //This is the primary key check for its uniqueness and return error
+        $subject->department_code = $department_code;
+        $subject->save();
+
+
+
+        return redirect()->route('subjects.index');
+
+
+    }
+
+
+
+    public function edit($subject_code){
+        //get page for updating specific subject
+        // check whether this hod has permission to see this subject
+        $subject = Subject::where('code',$subject_code)->get()->first();
+        return view('subjects.edit',["subject"=>$subject]);
+    }
+
+    public function update(Request $request){
+        // modifying the existing subject configuration
+
+        /*
+         * Needs to do request validation
+         * Move subject creation to model
+         * Javascipt function to check subject code is unique or not in client side
+         * Optimise Subject creation
+         * Update method - PUT/PATCH ?
+         * Check whether this HOD has power to update this subject
+         */
+        $auth_user = Auth::user();
+        $faculty = $auth_user->faculty;
+        $department_code = $faculty->department_code;
+        print $request;
+//      Since subject-code is unique check whether that is existing and return error,currently we dont do that
+        $data = $request->input();
+        $code = $data["code"];
+        $subject = Subject::where('code',$code)->first();
+        $subject->name = $data["name"];
+        $subject->credits = $data["credit"];
+        $subject->code = $data["code"];
+        $subject->save();
+        return redirect()->route('subjects.index');
+
+    }
+
+    public function destroy($subject_code){
+        // delete specific subjects - delete request
+        // check for permission to delete this stuff by current hod
+        $auth_user = Auth::user();
+        $faculty = $auth_user->faculty;
+        $department_code = $faculty->department_code;
+
+        $response=Subject::where('code',$subject_code)->delete();
+        // use this to send response to confirm deletion
+        return redirect()->route('subjects.index');
+
+    }
+}
diff --git a/src/app/Models/Subject.php b/src/app/Models/Subject.php
index 73d0c87..99cde0e 100644
--- a/src/app/Models/Subject.php
+++ b/src/app/Models/Subject.php
@@ -17,7 +17,7 @@ class Subject extends Model
 
     protected $fillable = [
         'name',
-        'credit'
+        'credits'
     ];
 
     protected function courses()
@@ -29,4 +29,6 @@ protected function department()
     {
         return $this->hasOne(Department::class);
     }
+
+
 }
diff --git a/src/resources/views/attendance/index.blade.php b/src/resources/views/attendance/index.blade.php
index 2d522dd..1447c14 100644
--- a/src/resources/views/attendance/index.blade.php
+++ b/src/resources/views/attendance/index.blade.php
@@ -1,5 +1,4 @@
 @extends("layouts.layout")
-
 @section("head")
     <script>
         function deleteAttendance(url){
diff --git a/src/resources/views/courses/create.blade.php b/src/resources/views/courses/create.blade.php
new file mode 100644
index 0000000..5146e2e
--- /dev/null
+++ b/src/resources/views/courses/create.blade.php
@@ -0,0 +1,49 @@
+@extends('layouts.layout')
+
+
+@section('content')
+<h1> Create New Course </h1>
+<form action="{{route('courses.store')}}" method="POST">
+    @csrf
+    <div>
+        <label for="subject">Select a subject :</label>
+        <select name="subject" id="subject">
+            @foreach ($subjects as $subject)
+                <option value="{{$subject->code}}">{{$subject->code}} {{$subject->name}}</option>
+            @endforeach
+        </select>
+        <a href ="{{route('subjects.create')}}">Add New Subject</a>
+    </div>
+    <br>
+    <div>
+        <label for="faculty">Select a faculty :</label>
+        <select name="faculty" id="faculty">
+            @foreach ($faculties as $faculty)
+                <option value="{{$faculty->id}}">{{$faculty->id}} {{$faculty->name}}</option>
+            @endforeach
+        </select>
+    </div>
+    <br>
+    <div>
+        <label for="classroom">Select a classroom :</label>
+        <select name="classroom" id="classroom">
+            @foreach ($classrooms as $classroom)
+                <option value="{{$classroom->id}}">{{$classroom->degree_type}} Semester {{$classroom->semester}} {{$classroom->department_code}}</option>
+            @endforeach
+        </select>
+    </div>
+    <br>
+    <div>
+        <label for="type">Select Couse Type :</label>
+        <select name="type" id="type">
+            @foreach ($types as $type)
+                <option value="{{$type}}">{{$type}} </option>
+            @endforeach
+        </select>
+    </div>
+    <br>
+    <div>
+      <button>Create Course</button>
+    </div>
+  </form>
+@endsection
diff --git a/src/resources/views/courses/edit.blade.php b/src/resources/views/courses/edit.blade.php
new file mode 100644
index 0000000..5a6c284
--- /dev/null
+++ b/src/resources/views/courses/edit.blade.php
@@ -0,0 +1,65 @@
+@extends('layouts.layout')
+
+
+@section('content')
+    <h1> Edit Course </h1>
+    <form action="{{route('courses.update',['course'=>$course->id])}}" method="POST">
+        @csrf
+        @method('PUT')
+        <div>
+            <label for="subject">Select a subject :</label>
+            <select name="subject" id="subject">
+                @foreach ($subjects as $subject)
+                    @if($subject->code == $course->subject_code)
+                        <option value="{{$subject->code}}" selected>{{$subject->code}} {{$subject->name}}</option>
+                    @else
+                    <option value="{{$subject->code}}">{{$subject->code}} {{$subject->name}}</option>
+                    @endif
+                @endforeach
+            </select>
+        </div>
+        <br>
+        <div>
+            <label for="faculty">Select a faculty :</label>
+            <select name="faculty" id="faculty">
+                @foreach ($faculties as $faculty)
+                    @if($faculty->id == $course->faculty_id)
+                        <option value="{{$faculty->id}}" selected >{{$faculty->id}} {{$faculty->name}}</option>
+                    @else
+                    <option value="{{$faculty->id}}">{{$faculty->id}} {{$faculty->name}}</option>
+                    @endif
+                @endforeach
+            </select>
+        </div>
+        <br>
+        <div>
+            <label for="classroom">Select a classroom :</label>
+            <select name="classroom" id="classroom">
+                @foreach ($classrooms as $classroom)
+                    @if($classroom->id == $course->classroom_id)
+                        <option value="{{$classroom->id}}" selected >{{$classroom->degree_type}} Semester {{$classroom->semester}} {{$classroom->department_code}}</option>
+                    @else
+                    <option value="{{$classroom->id}}">{{$classroom->degree_type}} Semester {{$classroom->semester}} {{$classroom->department_code}}</option>
+                    @endif
+                @endforeach
+            </select>
+        </div>
+        <br>
+        <div>
+            <label for="type">Select Course Type :</label>
+            <select name="type" id="type">
+                @foreach ($types as $type)
+                    @if($type == $courseType)
+                        <option value="{{$type}}" selected>{{$type}} </option>
+                    @else
+                    <option value="{{$type}}">{{$type}} </option>
+                    @endif
+                @endforeach
+            </select>
+        </div>
+        <br>
+        <div>
+            <button>Create Course</button>
+        </div>
+    </form>
+@endsection
diff --git a/src/resources/views/courses/index.blade.php b/src/resources/views/courses/index.blade.php
new file mode 100644
index 0000000..cafd3fa
--- /dev/null
+++ b/src/resources/views/courses/index.blade.php
@@ -0,0 +1,51 @@
+@extends('layouts.layout')
+
+@section('content')
+    <h1>Course Details</h1>
+
+    <table>
+        <tr>
+            <th>ID</th>
+            <th>SEMESTER</th>
+            <th>TYPE</th>
+            <th>IS_ACTIVE</th>
+            <th>FACULTY ID</th>
+            <th>FACULTY NAME</th>
+            <th>SUBJECT CODE</th>
+            <th>SUBJECT NAME</th>
+            <th>DEGREE</th>
+            <th>SEMESTER</th>
+            <th>OPTIONS</th>
+        </tr>
+        @foreach ($courses as $course)
+            @if($course->Classroom->department_code==$department_code or $course->Subject->department_code==$department_code)
+            <tr>
+                <td>{{$course->id}}</td>
+                <td>{{$course->semester}}</td>
+                <td>{{$course->type}}</td>
+                <td>{{$course->active}}</td>
+                <td>{{$course->Faculty->id}}</td>
+                <td>{{$course->Faculty->name}}</td>
+                <td>{{$course->Subject->code}}</td>
+                <td>{{$course->Subject->name}}</td>
+                <td>{{$course->Classroom->degree_type}}</td>
+                <td>{{$course->Classroom->semester}}</td>
+                <td>
+                    <form method="post" action="{{route('courses.destroy',['course'=>$course->id])}}">
+                        @csrf
+                        @method('DELETE')
+                        <button >delete</button>
+                    </form>
+                    <form method="get" action="{{route('courses.edit',['course'=>$course->id])}}">
+                        <button >edit</button>
+                    </form>
+                </td>
+            </tr>
+            @endif
+        @endforeach
+        <a href ="{{route('courses.create')}}">Create New Course</a>
+        <br>
+        <br>
+
+
+
diff --git a/src/resources/views/subjects/create.blade.php b/src/resources/views/subjects/create.blade.php
new file mode 100644
index 0000000..3339d94
--- /dev/null
+++ b/src/resources/views/subjects/create.blade.php
@@ -0,0 +1,27 @@
+@extends('layouts.layout')
+
+
+@section('content')
+<h1> New Subject here </h1>
+<form action="{{route('subjects.store')}}" method="POST">
+    @csrf
+    <table>
+    <tr>
+        <td><label for="courseId">Course ID</label></td>
+        <td><input name="courseId" id="courseId" value="CSE406"></td>
+    </tr>
+    <tr>
+        <td><label for="name">Course Name</label></td>
+        <td><input name="name" id="name" value="DBMS"></td>
+    </tr>
+    <tr>
+        <td><label for="credit">Credit</label></td>
+        <td><input name="credit" id="credit" value="4" type="number"></td>
+    </tr>
+
+    <div>
+      <button>Add Subject</button>
+    </div>
+    </table>
+  </form>
+@endsection
diff --git a/src/resources/views/subjects/edit.blade.php b/src/resources/views/subjects/edit.blade.php
new file mode 100644
index 0000000..aa84831
--- /dev/null
+++ b/src/resources/views/subjects/edit.blade.php
@@ -0,0 +1,30 @@
+@extends('layouts.layout')
+
+
+@section('content')
+    <h1> Update Subject </h1>
+    <form method="post" action="{{route('subjects.update',['subject'=>$subject->code])}}" >
+        @csrf
+        @method('PUT')
+{{--        Confused about the method tos pecify, here updating the entire resource completely so PUT--}}
+        <table>
+            <tr>
+                <td><label for="code">Code</label></td>
+                <td><input name="code" id="code" value="{{$subject->code}}"></td>
+            </tr>
+            <tr>
+                <td><label for="name">Subject Name</label></td>
+                <td><input name="name" id="name" value="{{$subject->name}}"></td>
+            </tr>
+            <tr>
+                <td><label for="credit">Credit</label></td>
+                <td><input name="credit" id="credit" value="{{$subject->credits}}" type="number"></td>
+            </tr>
+
+            <div>
+                <button>Update Subject</button>
+            </div>
+        </table>
+    </form>
+
+@endsection
diff --git a/src/resources/views/subjects/index.blade.php b/src/resources/views/subjects/index.blade.php
new file mode 100644
index 0000000..04490a5
--- /dev/null
+++ b/src/resources/views/subjects/index.blade.php
@@ -0,0 +1,39 @@
+@extends('layouts.layout')
+
+@section('content')
+    <h1>Subject Allocation </h1>
+
+    <table>
+        <tr>
+            <th>CODE</th>
+            <th>NAME</th>
+            <th>CREDIT</th>
+            <th>IS_ACTIVE</th>
+            <th>OPTIONS</th>
+        </tr>
+        @foreach ($subjects as $subject)
+        <tr>
+            <td>{{$subject->code}}</td>
+            <td>{{$subject->name}}</td>
+            <td>{{$subject->credits}}</td>
+            <td>{{$subject->is_active}}</td>
+            <td>
+                <form method="post" action="{{route('subjects.destroy',['subject'=>$subject->code])}}">
+                    @csrf
+                    @method('DELETE')
+                    <button >delete</button>
+                </form>
+                <form method="get" action="{{route('subjects.edit',['subject'=>$subject->code])}}">
+                    <button >edit</button>
+                </form>
+            </td>
+
+        </tr>
+        @endforeach
+        <a href ="{{route('subjects.create')}}">Add New Subject</a>
+        <br>
+        <br>
+
+
+    </table>
+@endsection
diff --git a/src/resources/views/welcome.blade.php b/src/resources/views/welcome.blade.php
index 3d9942c..f6fbcb6 100644
--- a/src/resources/views/welcome.blade.php
+++ b/src/resources/views/welcome.blade.php
@@ -3,5 +3,7 @@
 @section("content")
     <a href="{{route("roles.index")}}">Roles</a><br/>
     <a href="{{route("users.index")}}">Users</a><br/>
-    <a href="{{route('attendance.index')}}">Attendance</a>
+    <a href="{{route('attendance.index')}}">Attendance</a><br>
+    <a href="{{route('subjects.index')}}">Subjects (Login as HOD to see this work)</a><br>
+    <a href="{{route('courses.index')}}">Courses (Login as HOD to see this work)</a>
 @endsection
diff --git a/src/routes/web.php b/src/routes/web.php
index df03223..7071031 100644
--- a/src/routes/web.php
+++ b/src/routes/web.php
@@ -5,6 +5,10 @@
 use App\Http\Controllers\RoleController;
 use App\Http\Controllers\AuthController;
 use App\Http\Controllers\AttendanceController;
+use App\Http\Controllers\SubjectController;
+use App\Http\Controllers\CourseController;
+
+
 
 /*
 |--------------------------------------------------------------------------
@@ -24,6 +28,8 @@
     Route::resource('roles', RoleController::class);
     Route::get("auth/logout", [AuthController::class, "logout"])->name("logout");
     Route::resource("attendance", AttendanceController::class);
+    Route::resource("subjects",SubjectController::class);
+    Route::resource("courses",CourseController::class);
 });
 
 Route::group(["middleware" => ["guest"]], function () {