From d4a3de78ecc553885b5c26a097ef76170b4b59a9 Mon Sep 17 00:00:00 2001 From: AbdullahiAbdulkabir Date: Wed, 17 Jun 2020 12:07:01 +0100 Subject: [PATCH] changes --- .../Controllers/Admin/AdminController.php | 116 +++++----- app/Http/Controllers/Admin/UserController.php | 2 +- .../Controllers/Doctor/DoctorController.php | 2 +- .../LabController.php} | 2 +- .../{ => Nurse}/NurseController.php | 0 ...{UserControllerr.php => OldController.php} | 0 .../PharmacistsController.php | 0 .../{ => RecordOfficer}/ROController.php | 0 app/Http/Controllers/patientController.php | 198 ++++++++++-------- resources/views/admin/edit.blade.php | 115 ++++++++++ .../{home.blade.php => admin/index.blade.php} | 6 +- resources/views/auth/register.blade.php | 2 +- resources/views/common/success.blade.php | 14 -- .../index.blade.php} | 0 .../index.blade.php} | 10 +- resources/views/layouts/app.blade.php | 1 - resources/views/newpatient.blade.php | 165 --------------- resources/views/patient/create.blade.php | 164 +++++++++++++++ routes/web.php | 74 +++---- 19 files changed, 493 insertions(+), 378 deletions(-) rename app/Http/Controllers/{labController.php => Lab/LabController.php} (97%) rename app/Http/Controllers/{ => Nurse}/NurseController.php (100%) rename app/Http/Controllers/{UserControllerr.php => OldController.php} (100%) rename app/Http/Controllers/{ => Pharmacist}/PharmacistsController.php (100%) rename app/Http/Controllers/{ => RecordOfficer}/ROController.php (100%) create mode 100644 resources/views/admin/edit.blade.php rename resources/views/{home.blade.php => admin/index.blade.php} (98%) rename resources/views/{delegatesailment.blade.php => delegate/index.blade.php} (100%) rename resources/views/{doctor.blade.php => doctor/index.blade.php} (97%) delete mode 100644 resources/views/newpatient.blade.php create mode 100644 resources/views/patient/create.blade.php diff --git a/app/Http/Controllers/Admin/AdminController.php b/app/Http/Controllers/Admin/AdminController.php index 7cf3e73..47c6694 100644 --- 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 index 440d052..b6e7a4b 100644 --- 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 index e3109b5..36be252 100644 --- 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 b/app/Http/Controllers/Lab/LabController.php similarity index 97% rename from app/Http/Controllers/labController.php rename to app/Http/Controllers/Lab/LabController.php index 0549afd..982a692 100644 --- a/app/Http/Controllers/labController.php +++ b/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 b/app/Http/Controllers/Nurse/NurseController.php similarity index 100% rename from app/Http/Controllers/NurseController.php rename to app/Http/Controllers/Nurse/NurseController.php diff --git a/app/Http/Controllers/UserControllerr.php b/app/Http/Controllers/OldController.php similarity index 100% rename from app/Http/Controllers/UserControllerr.php rename to app/Http/Controllers/OldController.php diff --git a/app/Http/Controllers/PharmacistsController.php b/app/Http/Controllers/Pharmacist/PharmacistsController.php similarity index 100% rename from app/Http/Controllers/PharmacistsController.php rename to app/Http/Controllers/Pharmacist/PharmacistsController.php diff --git a/app/Http/Controllers/ROController.php b/app/Http/Controllers/RecordOfficer/ROController.php similarity index 100% rename from app/Http/Controllers/ROController.php rename to app/Http/Controllers/RecordOfficer/ROController.php diff --git a/app/Http/Controllers/patientController.php b/app/Http/Controllers/patientController.php index 78cc975..9bf4220 100644 --- 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]); + } } diff --git a/resources/views/admin/edit.blade.php b/resources/views/admin/edit.blade.php new file mode 100644 index 0000000..2ca33f7 --- /dev/null +++ b/resources/views/admin/edit.blade.php @@ -0,0 +1,115 @@ +@extends('layouts.doctorhead') + +@section('content') +
+
+
+
+
Register
+ +
+
+ + {{ csrf_field() }} + + +
+ + +
+ + + @if ($errors->has('name')) + + {{ $errors->first('fname') }} + + @endif +
+ +
+
+ + +
+ + + @if ($errors->has('name')) + + {{ $errors->first('sname') }} + + @endif +
+ +
+ +
+ + +
+ + + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +
+
+ + +
+ + +
+ + + @if ($errors->has('password')) + + {{ $errors->first('password') }} + + @endif +
+
+
+ +
+ +
+
+ + +
+
+ +
+
+
+
+
+
+
+
+@endsection diff --git a/resources/views/home.blade.php b/resources/views/admin/index.blade.php similarity index 98% rename from resources/views/home.blade.php rename to resources/views/admin/index.blade.php index 50bf794..7e4a161 100644 --- a/resources/views/home.blade.php +++ b/resources/views/admin/index.blade.php @@ -4,7 +4,7 @@
- @include('common.errors') + @include('../common.errors') @if(session()->has('message'))
{{session()->get('message')}} @@ -13,7 +13,7 @@

- +
@@ -223,7 +223,7 @@ @foreach($users as $user) @if($user->status==App\User::PHARMACIST) - {{count($user)}} + {{$user->surname}} diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 6f76808..2a0894c 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -76,7 +76,7 @@ - + @if ($errors->has('status')) diff --git a/resources/views/common/success.blade.php b/resources/views/common/success.blade.php index 2afd6bf..e69de29 100644 --- a/resources/views/common/success.blade.php +++ b/resources/views/common/success.blade.php @@ -1,14 +0,0 @@ -@if (count($errors) > 0) - -
- Whoops! Something went wrong! - -

- -
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
-@endif \ No newline at end of file diff --git a/resources/views/delegatesailment.blade.php b/resources/views/delegate/index.blade.php similarity index 100% rename from resources/views/delegatesailment.blade.php rename to resources/views/delegate/index.blade.php diff --git a/resources/views/doctor.blade.php b/resources/views/doctor/index.blade.php similarity index 97% rename from resources/views/doctor.blade.php rename to resources/views/doctor/index.blade.php index 58ffbfd..793dc59 100644 --- a/resources/views/doctor.blade.php +++ b/resources/views/doctor/index.blade.php @@ -2,6 +2,11 @@ @section('content')
+
    @@ -21,6 +26,7 @@
    +
    @@ -238,9 +244,7 @@
    - - - + diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 7e0e902..9800630 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -82,7 +82,6 @@ - @yield('content')
    diff --git a/resources/views/newpatient.blade.php b/resources/views/newpatient.blade.php deleted file mode 100644 index dbcf455..0000000 --- a/resources/views/newpatient.blade.php +++ /dev/null @@ -1,165 +0,0 @@ -@extends('layouts.doctorhead') -@section('content') - - - -
    -
    - -
      -
    1. - Dashboard -
      2. -
    2. - {{Auth::user()->status}} -
      3. -
    - @include('common.errors') -
    -
    - @if($errors) - @foreach($errors as $error) -
    - {{$error}} -
    - @endforeach - @endif - -
    -
    New Patient
    -
    -
    - {{ csrf_field() }} -
    - Personal Data -
    -
    - - -
    -
    - - -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    - - -
    -
    -
    -
    -
    -
    - -
    - - - - -@endsection \ No newline at end of file diff --git a/resources/views/patient/create.blade.php b/resources/views/patient/create.blade.php new file mode 100644 index 0000000..ebe80c6 --- /dev/null +++ b/resources/views/patient/create.blade.php @@ -0,0 +1,164 @@ +@extends('layouts.doctorhead') +@section('content') + + +
    +
    + +
      +
    1. + Dashboard +
      2. +
    2. + {{Auth::user()->status}} +
      3. +
    + @include('common.errors') +
    +
    + @if($errors) + @foreach($errors as $error) +
    + {{$error}} +
    + @endforeach + @endif + +
    +
    New Patient
    +
    +
    + {{ csrf_field() }} +
    + Personal Data +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + +
    + + + + +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 7b586b0..0e4aa5a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -32,31 +32,33 @@ Route::post('/', 'Admin\UserController@create')->name('register'); }); Route::get('/home', 'Admin\AdminController@index')->name('home'); - Route::get('/delete/{mssnid}', 'UserController@delete'); - }); - - Route::post('/update', 'HomeController@update'); - Route::get('/profile',function(){ - return view('update'); + Route::get('/delete/{mssnid}', 'Admin\UserController@delete'); + Route::post('/update', 'Admin\AdminController@update'); + Route::get('/profile',function(){ + return view('admin.edit'); + }); }); // ALL ROUTES FOR THE DOCTORS Route::prefix('doctor')->group(function(){ Route::get('/', 'Doctor\DoctorController@index')->name('doctor'); - Route::get('/addp',function(){ - return view('newpatient'); + Route::prefix('patient')->group(function(){ + Route::get('/',function(){ + return view('patient.create'); + }); }); + Route::get('/profile',function(){ return view('update'); }); - Route::get('/attend/{id}', 'patientController@attend'); + Route::get('/attend/{id}', 'PatientController@attend'); Route::post('/update', 'Doctor\DoctorController@update'); - Route::post('/create', 'patientController@newpatient'); - Route::get('/admit/{mssnid}', 'patientController@admit'); - Route::post('/admitted/', 'patientController@admitted'); - Route::post('/send', 'patientController@sendrphar'); - Route::post('/sendl', 'patientController@sendrlab'); - Route::get('/delegates','patientController@delegates'); + Route::post('/create', 'PatientController@newpatient'); + Route::get('/admit/{mssnid}', 'PatientController@admit'); + Route::post('/admitted/', 'PatientController@admitted'); + Route::post('/send', 'PatientController@sendToPharmacy'); + Route::post('/sendl', 'PatientController@sendToLab'); + Route::get('/delegates','PatientController@delegates'); }); // Route::get('/ad', function(){ @@ -64,40 +66,40 @@ // }); - Route::post('/clerk', 'patientController@clerk'); + Route::post('/clerk', 'PatientController@clerk'); // ALL ROUTES FOR THE NURSES Route::prefix('nurse')->group(function(){ - Route::get('/', 'NurseController@index')->name('nurse'); - Route::post('/update', 'NurseController@update'); - Route::get('/admit/{mssnid}', 'NurseController@admit'); - Route::post('/admitted/', 'NurseController@admitted'); - Route::get('/discharge/{mssnid}', 'NurseController@discharge'); + Route::get('/', 'Nurse\NurseController@index')->name('nurse'); + Route::post('/update', 'Nurse\NurseController@update'); + Route::get('/admit/{mssnid}', 'Nurse\NurseController@admit'); + Route::post('/admitted/', 'Nurse\NurseController@admitted'); + Route::get('/discharge/{mssnid}', 'Nurse\NurseController@discharge'); Route::get('/addp',function(){ - return view('newpatient'); + return view('patient.create'); }); - Route::post('/create', 'NurseController@newpatient'); - Route::get('/attend/{id}', 'NurseController@attend'); + Route::post('/create', 'Nurse\NurseController@newpatient'); + Route::get('/attend/{id}', 'Nurse\NurseController@attend'); Route::get('/nurse/profile',function(){ return view('update'); }); - Route::post('/send', 'NurseController@sendrphar'); - Route::post('/sendl', 'NurseController@sendrlab'); + Route::post('/send', 'Nurse\NurseController@sendrphar'); + Route::post('/sendl', 'Nurse\NurseController@sendrlab'); }); // ALL ROUTES FOR Pharmacists Route::prefix('pharmacist')->group(function(){ - Route::get('/', 'PharmacistsController@index')->name('pharmacists'); - Route::get('/issue/{mssnid}', 'PharmacistsController@prescribe'); + Route::get('/', 'Pharmacist\PharmacistsController@index')->name('pharmacists'); + Route::get('/issue/{mssnid}', 'Pharmacist\PharmacistsController@prescribe'); }); // ALL ROUTES FOR LAB SCIENTISTS Route::prefix('lab')->group(function(){ - Route::get('/', 'labController@index')->name('lab'); - Route::get('/test/{mssnid}', 'labController@test'); - Route::post('/testsent/{mssnid}', 'labController@testsent'); - Route::get('/history/{mssnid}', 'labController@history'); + Route::get('/', 'Lab\LabController@index')->name('lab'); + Route::get('/test/{mssnid}', 'Lab\LabController@test'); + Route::post('/testsent/{mssnid}', 'Lab\LabController@testsent'); + Route::get('/history/{mssnid}', 'Lab\LabController@history'); Route::get('/profile',function(){ return view('update'); }); @@ -105,10 +107,10 @@ // ALL ROUTES FOR Record Officer Route::prefix('ro')->group(function(){ - Route::get('/', 'RoController@index')->name('ro'); - Route::get('/record/{mssnid}', 'RoController@record')->name('ro'); - Route::get('/record/edit/{mssnid}', 'RoController@edit')->name('ro'); - Route::post('/record/edited/{mssnid}', 'RoController@editpatient')->name('ro'); + Route::get('/', 'RecordOfficer\RoController@index')->name('ro'); + Route::get('/record/{mssnid}', 'RecordOfficer\RoController@record')->name('ro'); + Route::get('/record/edit/{mssnid}', 'RecordOfficer\RoController@edit')->name('ro'); + Route::post('/record/edited/{mssnid}', 'RecordOfficer\RoController@editpatient')->name('ro'); }); Route::get('/test/',function(){ return view('search');