changes

AbdullahiAbdulkabir · Jun 17, 2020 · d4a3de7 · d4a3de7
1 parent 60f014d
commit d4a3de7
Show file tree

Hide file tree

Showing 19 changed files with 493 additions and 378 deletions.
diff --git a/app/Http/Controllers/Admin/AdminController.php b/app/Http/Controllers/Admin/AdminController.php
@@ -11,72 +11,66 @@
 
 class AdminController extends Controller
 {
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware(['auth','admin']);
-    }
+  /**
+   * Create a new controller instance.
+   *
+   * @return void
+   */
+  public function __construct()
+  {
+      $this->middleware(['auth','admin']);
+  }
 
-    /**
-     * Show the application dashboard.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        $patient = DB::table('patients')->get();
-        // $p = DB::table('patients')->get();
+  /**
+   * Show the application dashboard.
+   *
+   * @return \Illuminate\Http\Response
+   */
+  public function index()
+  {
+    $patient = DB::table('patients')->get();
+
+    $users = DB::table('users')->get();
+
+    if (Auth::user()->status==User::ADMIN) {
+      return view('admin.index', ['patients'=> $patient,'users'=> $users]);
 
-        $users = DB::table('users')->get();
-        if (Auth::user()->status==User::ADMIN) {
-          return view('home', ['patients'=> $patient,'users'=> $users]);
+    }
+    // elseif (Auth::user()->status==User::RECORD_OFFICER) {
+    //   return view('ro', ['patients'=> $patient]);   
+    // }else{
 
-        }elseif (Auth::user()->status==User::RECORD_OFFICER) {
-          return view('/ro', ['patients'=> $patient]);   
-        }else{
+    // return view('/'.strtolower(Auth::user()->status), ['patients'=> $patient]);   
+    // }
+  }
 
-        return view('/'.strtolower(Auth::user()->status), ['patients'=> $patient]);   
-        }
 
-
-    }
+  public function update(Request $request)
+  {
+      $request->validate([
+        'first_name' => 'required|string|max:255',
+        'surname' => 'required|string|max:255',
+        'email' => 'required|string|email|max:255',
+        'status' => 'string',
+        'password' => 'required|string|min:6',
 
-    public function update(Request $request)
-    {
-        $request->validate([
-             'fname' => 'required|string|max:255',
-            'sname' => 'required|string|max:255',
-            'email' => 'required|string|email|max:255',
-            'status' => 'string',
-            'password' => 'required|string|min:6',
+      ]);
 
-        ]);
-
-        $id=$request->input('id');
-        $fname=$request->input('fname');
-        $sname=$request->input('sname');
-        $email=$request->input('email');
-        $status=$request->input('status');
-        $password=$request->input('password');
-        $data = array( 
-            'first_name' => $fname,
-            'surname' => $sname,
-            'email' => $email,
-            'status' => $status,
-            'password' => bcrypt($password)
-         );
-        $p = DB::table('patients')->get();
-        $q =DB::table('users')->where('id',$id)->update($data);
-        if($status=='Admin'){
-        return redirect('/home', ['p'=> $p]);
-        }elseif ($status=='Nurse') {
-        return redirect('/nurse', ['p'=> $p]);
-        }elseif ($status=='Doctor') {
-        return redirect('/doctor', ['p'=> $p]);
-        }
-    }
+      $data = array( 
+          'first_name' => $request->input('first_name'),
+          'surname' => $request->input('surname'),
+          'email' => $request->input('email'),
+          'status' => $request->input('status'),
+          'password' => bcrypt($request->input('password'))
+       );
+
+      $user =DB::table('users')->where('id',$request->input('id'))->update($data);
+
+      if($user){
+        return redirect()->route('home')->with('message','Profile updated');
+      }else{
+        return redirect()->route('home')->with('error','An error occured');
+      }
+
+  }
 }
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
@@ -11,7 +11,7 @@ class UserController extends Controller
 {
     public function __construct()
     {
-        $this->middleware('auth');
+        $this->middleware(['auth','admin']);
     }
 
     public function showRegisterView()

diff --git a/app/Http/Controllers/Doctor/DoctorController.php b/app/Http/Controllers/Doctor/DoctorController.php
@@ -26,7 +26,7 @@ public function index()
         $patient = DB::table('patients')->get();
 
             // dd($patient);
-         return view('doctor', ['patients'=> $patient,'p'=> $patient]);
+         return view('doctor.index', ['patients'=> $patient,'p'=> $patient]);
     }
     public function update(Request $request)
     {

diff --git a/app/Http/Controllers/labController.php → app/Http/Controllers/Lab/LabController.php b/app/Http/Controllers/labController.php → app/Http/Controllers/Lab/LabController.php
@@ -6,7 +6,7 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Facades\DB;
-class labController extends Controller
+class LabController extends Controller
 {
     public function index()
     {

diff --git a/app/Http/Controllers/NurseController.php → ...ttp/Controllers/Nurse/NurseController.php b/app/Http/Controllers/NurseController.php → ...ttp/Controllers/Nurse/NurseController.php
diff --git a/app/Http/Controllers/UserControllerr.php → app/Http/Controllers/OldController.php b/app/Http/Controllers/UserControllerr.php → app/Http/Controllers/OldController.php
diff --git a/...ttp/Controllers/PharmacistsController.php → ...lers/Pharmacist/PharmacistsController.php b/...ttp/Controllers/PharmacistsController.php → ...lers/Pharmacist/PharmacistsController.php
diff --git a/app/Http/Controllers/ROController.php → ...ontrollers/RecordOfficer/ROController.php b/app/Http/Controllers/ROController.php → ...ontrollers/RecordOfficer/ROController.php
diff --git a/app/Http/Controllers/patientController.php b/app/Http/Controllers/patientController.php
@@ -7,17 +7,18 @@
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Facades\DB;
 
-class patientController extends Controller
+class PatientController extends Controller
 {
-public function __construct()
-    {
-        $this->middleware('doctor');
-    }
 
-    public function newpatient(Request $request)
-    {
+  public function __construct()
+  {
+      $this->middleware('doctor');
+  }
+
+  public function newPatient(Request $request)
+  {
 
-    	 $request->validate([
+    $request->validate([
   	'mssnId' => 'required|unique:patients|max:13',
   	'firstname' => 'required|min:3',
   	'othername' => 'min:2',
@@ -32,6 +33,7 @@ public function newpatient(Request $request)
   	'marritalStatus' => 'required|min:3',
 
      ]);
+
     $patient = array(
     'mssnid' => $request->input('mssnId'),
   	'firstname' => $request->input('firstname'),
@@ -46,22 +48,28 @@ public function newpatient(Request $request)
   	'occupation' => $request->input('occupation'),
   	'maritalstatus' => $request->input('marritalStatus') );
      $result= DB::table('patients')->insert($patient); 
-       return redirect('doctor')->with('message', 'Patient created');
-
-    }
-     public function attend($mssnid)
-    {
-       $patient = DB::table('patients')
-            ->select('patients.*','patientsinstance.*')
-            ->join('patientsinstance', 'patientsinstance.patientsid', '=', 'patients.mssnid')
-            ->where('mssnid',$mssnid)
-            ->get();
-
-        return view('attendpatient',['patientdet'=>$patient]);    
+
+    if($result){
+        return redirect()->route('doctor')->with('message','Patient created');
+    }else{
+        return redirect()->route('doctor')->with('error','An error occured');
     }
+
+  }
+
+ public function attend($mssnid)
+  {
+    $patient = DB::table('patients')
+      ->select('patients.*','patientsinstance.*')
+      ->join('patientsinstance', 'patientsinstance.patientsid', '=', 'patients.mssnid')
+      ->where('mssnid',$mssnid)
+      ->get();
+
+      return view('attendpatient',['patient_details'=>$patient]);    
+  }
 
-    public function updatemedical()
-    {
+  public function updateMedical(Request $request)
+  {
      $patient = array(
     'mssnid' => $request->input('mssnId'),
     'firstname' => $request->input('firstname'),
@@ -75,76 +83,84 @@ public function updatemedical()
     'dob' => $request->input('dob'),
     'occupation' => $request->input('occupation'),
     'maritalstatus' => $request->input('marritalStatus') );
+
      $result= DB::table('patients')->insert($patient); 
-    }
-    public function clerk(Request $request)
-    {
-      $clerk = $request->input('clerk');
-      $mssnid = $request->input('mssnId');
-
-      DB::table('patientsinstance')->where('patientsId',$mssnid)->update(['clerking'=>$clerk]); 
-       return redirect('doctor/attend/'. $mssnid)->with('message', $mssnid.' pinned');
-
-    }
-    public function sendrphar(Request $request)
-    {
-    	  $request->validate([
-             'sendToPharmacy' => 'required|string|max:255',
-             'doctorseen' => 'string|max:255',
-
-        ]);	    	
-      $mssnid = $request->input('mssnId');
-      $sendToPharmacy = $request->input('sendToPharmacy');
-    	$doctorseen = $request->input('doctorseen');
-      DB::table('patientsinstance')->where('patientsId',$mssnid)->update(['doctorRemarkpha'=>$sendToPharmacy,'seenDoctor'=>$doctorseen]); 
-    		return redirect('doctor')->with('message', $mssnid.' Sent to pharmacy');
-
-    }
-    public function sendrlab(Request $request)
-    {
-       $request->validate([
-             'sendToLab' => 'required|string|max:255',
-        ]); 
-        date_default_timezone_set('Africa/Lagos');
-        $time = date('j F Y h:i:s A');
-      $mssnid = $request->input('mssnId');
-    	$sendToLab = $request->input('sendToLab');
-      $doctorseen = $request->input('doctorseen');
-      DB::table('patientsinstance')->where('patientsId',$mssnid)->update(['doctorRemarklab'=>$sendToLab,'seenDoctor'=>$doctorseen,'labrequestdate'=>$time]); 
-    	 return redirect('doctor')->with('message', $mssnid.' Sent to lab');
-
-    }
+  }
+
+  public function clerk(Request $request)
+  {
+    $clerk = $request->input('clerk');
+    $mssn_id = $request->input('mssnId');
 
-    public function admit(Request $request, $mssnid)
-    {
-            $request->validate([
-        'mssnid' => 'unique:patientsinstance,patientsId',]);
-       $patient = DB::table('patients')
-            ->select('patients.*')
-            // ->join('patientsinstance', 'patientsinstance.patientsid', '=', 'patients.mssnid')
-            ->where('mssnid',$mssnid)
-            ->get();
-      return view('userpatient', ['patient'=> $patient]);
-    }
+    DB::table('patientsinstance')->where('patientsId',$mssn_id)->update(['clerking'=>$clerk]); 
+     return redirect('doctor/attend/'. $mssn_id)->with('message', $mssn_id.' pinned');
+
+  }
+  public function sendToPharmacy(Request $request)
+  {
+	  $request->validate([
+         'sendToPharmacy' => 'required|string|max:255',
+         'doctorseen' => 'string|max:255',
 
-    public function admitted(Request $request)
-    {
-         $request->validate([
-        'mssnId' => 'required|unique:patientsinstance,patientsId',
-        'complaint' => 'required|unique:patientsinstance,patientsId',
-        ]);
-        $mssnid=$request->input('mssnId');
-        $complaint=$request->input('complaint');
-
-        $admit= '1';
-
-      DB::table('patients')->where('mssnid',$mssnid)->update(['complaint'=>$complaint]); 
-      DB::table('patientsinstance')->insert(['complaint'=>$complaint,'patientsId'=>$mssnid,'admit'=>$admit]);
-    	return redirect('doctor')->with('message', $mssnid.' Amitted'); 	
-    }
-    public function delegates()
-    {
-     $delegates = DB::table('personal')->where('view_date','>=','2017-09-29')->paginate(155);
-     return view('delegatesailment',['delegates'=>$delegates]);
-    }
+    ]);	    	
+  $mssn_id = $request->input('mssnId');
+  $sendToPharmacy = $request->input('sendToPharmacy');
+	$doctorseen = $request->input('doctorseen');
+  DB::table('patientsinstance')->where('patientsId',$mssn_id)->update(['doctorRemarkpha'=>$sendToPharmacy,'seenDoctor'=>$doctorseen]); 
+		return redirect('doctor')->with('message', $mssn_id.' Sent to pharmacy');
+
+  }
+  public function sendToLab(Request $request)
+  {
+    $request->validate([
+         'sendToLab' => 'required|string|max:255',
+    ]); 
+    date_default_timezone_set('Africa/Lagos');
+    $time = date('j F Y h:i:s A');
+    $mssn_id = $request->input('mssnId');
+  	$sendToLab = $request->input('sendToLab');
+    $doctorseen = $request->input('doctorseen');
+    DB::table('patientsinstance')->where('patientsId',$mssn_id)->update(['doctorRemarklab'=>$sendToLab,'seenDoctor'=>$doctorseen,'labrequestdate'=>$time]); 
+	 return redirect('doctor')->with('message', $mssn_id.' Sent to lab');
+
+  }
+
+  public function admit(Request $request, $mssn_id)
+  {
+    $request->validate([
+      'mssnid' => 'unique:patientsinstance,patientsId'
+    ]);
+    $patient = DB::table('patients')
+      ->select('patients.*')
+      // ->join('patientsinstance', 'patientsinstance.patientsid', '=', 'patients.mssnid')
+      ->where('mssnid',$mssn_id)
+      ->get();
+    return view('userpatient', ['patient'=> $patient]);
+  }
+
+  public function admitted(Request $request)
+  {
+    $request->validate([
+    'mssnId' => 'required|unique:patientsinstance,patientsId',
+    'complaint' => 'required|unique:patientsinstance,patientsId',
+    ]);
+    $mssn_id=$request->input('mssnId');
+    $complaint=$request->input('complaint');
+
+    $admit= '1';
+
+    DB::table('patients')->where('mssnid',$mssn_id)->update(['complain'=>$complaint]); 
+    DB::table('patientsinstance')->insert(['complain'=>$complaint,'patientsId'=>$mssn_id,'admit'=>$admit]);
+  	return redirect('doctor')->with('message', $mssn_id.' Amitted'); 	
+  }
+
+  public function delegates()
+  {
+
+   $delegates = DB::table('personal')
+      ->where('date_registered','>=','2017-09-29')
+      ->whereNotIn('ailments',['Not Applicable','Not Listed','#'])->paginate(155);
+
+   return view('delegate.index',['delegates'=>$delegates]);
+  }
 }