del visits.approved_by_reception and add appointme

Author: stepkos

app/Http/Controllers/PatientController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\User;
+use App\Models\Visit;
 use App\Models\VisitType;
 use Illuminate\Http\Request;
 
@@ -13,16 +14,31 @@ public function get_home() {
         $visits = User::allFutureVisits(auth()->user()->id);
         return view("patient.home", compact('visits'));
     }
-
+    
     public function get_all_doctors() {
         return view("patient.all_doctors", ["doctors" => User::allDoctors()]);
     }
-
+    
     public function get_add_appointment() {
-
+        
         $doctors = User::allDoctors();
         $visitTypes = VisitType::all();
-
+        
         return view("patient.add_appointment", compact('doctors', 'visitTypes'));
     }
+
+    public function post_add_appointment(Request $request) {
+
+        $dateOfVisit = $request->get('visit_date').' '.$request->get('visit_time');
+
+        Visit::create([
+            'patient_id' => $request->get('patient_id'),
+            'doctor_id' => $request->get('doctor_id'),
+            'visit_type_id' => $request->get('visit_type_id'),
+            'date' => $dateOfVisit,
+            'description' => $request->get('description')
+        ]);
+
+        return redirect()->route('patient_add_appointment');
+    }
 }

app/Models/Visit.php

@@ -11,6 +11,14 @@ class Visit extends Model
 {
     use HasFactory;
 
+    protected $fillable = [
+        'patient_id',
+        'doctor_id',
+        'visit_type_id',
+        'date',
+        'description',
+    ];
+
     public static function allFullData() {
         return DB::table('full_visit_view')
                     ->get();

database/factories/VisitFactory.php

@@ -27,7 +27,6 @@ public function definition()
             'visit_type_id' => rand(1, $visit_type_count),
             'date' => $this->faker->dateTimeBetween('-1 year', '+1 year'),
             'description' => $this->faker->paragraph(),
-            'approved_by_reception' => rand(0, 1) == 1
         ];
     }
 }

database/migrations/2021_10_31_211802_create_visits_table.php

@@ -20,7 +20,6 @@ public function up()
             $table->unsignedBigInteger('visit_type_id');
             $table->dateTime('date', $precision=0);
             $table->text('description');
-            $table->boolean('approved_by_reception');
             $table->timestamps();
         });
 

database/migrations/2021_11_16_204806_create_full_visit_view.php

@@ -19,14 +19,14 @@ public function up()
         // tak wiem że to skomplikowane zapytania, ale prościej się nie dało przy takich relacjach :)
         DB::statement("create view full_visit_view as 
         
-        select id1 as 'visit_id', patient, patient_id, doctor, doctor_id, date, date_add(date, interval standard_duration hour) as estimated_end,  description, approved_by_reception, type, standard_duration
+        select id1 as 'visit_id', patient, patient_id, doctor, doctor_id, date, date_add(date, interval standard_duration hour) as estimated_end,  description, type, standard_duration
         from 
             (select visits.id as 'id1', users.name as 'patient' , users.id as 'patient_id'
             from visits 
             inner join users 
             on visits.patient_id = users.id) as s1
         inner join 
-            (select visits.id as 'id2', users.name as 'doctor', users.id as 'doctor_id',visits.date, visits.description, visits.approved_by_reception, visit_types.type, visit_types.standard_duration
+            (select visits.id as 'id2', users.name as 'doctor', users.id as 'doctor_id',visits.date, visits.description, visit_types.type, visit_types.standard_duration
             from visits 
             inner join users 
             on visits.doctor_id = users.id

resources/views/patient/add_appointment.blade.php

@@ -8,23 +8,30 @@
     <div id="appointment_banner">
         Umawianie wizyty
     </div>
-    <form id="appointment_form">
+    <form id="appointment_form" method="POST">
         <div id="form_down">
-            <select id="form_doctor" name="doctor_name">
+
+            @csrf
+
+            <input type="hidden" value="{{ auth()->user()->id }}" name="patient_id">
+
+            <select id="form_doctor" name="doctor_id">
                 @foreach($doctors as $doctor)
                     <option value="{{ $doctor->id }}">{{ $doctor->name }}</option>
                 @endforeach
             </select>
-            <select id="form_doctor" name="visit_type">
+            <select id="form_doctor" name="visit_type_id">
                 @foreach($visitTypes as $visitType)
                     <option value="{{ $visitType->id }}">{{ $visitType->type }}</option>
                 @endforeach
             </select>
-            <textarea id="form_description" placeholder="Krótki opis dla lekarza..." name="short_description"></textarea>
+            <textarea id="form_description" placeholder="Krótki opis dla lekarza..." name="description"></textarea>
             <input type="date" name="visit_date" />
             <input type="time" name="visit_time" />
             <input type="submit" />
-            <span id="error">Error ci wyjebało</span>
+
+            <span id="error">Error test test</span>
+
         </div>
 
         <div id="appointment_work_hours">

routes/web.php

@@ -29,12 +29,12 @@
 Route::group(['middleware' => 'auth'], function() {
 
     //Patient
-    Route::group(['middleware' => 'checkPatient'], function(){
+    Route::group(['middleware' => 'checkPatient'], function() {
 
         Route::get('/patient_home', [PatientController::class, 'get_home'])->name('patient_home');
         Route::get('/patient_all_doctors', [PatientController::class, 'get_all_doctors'])->name('patient_all_doctors');
         Route::get('/patient_add_appointment', [PatientController::class, 'get_add_appointment'])->name('patient_add_appointment');
-        // TODO POST dodawanie wizyty
+        Route::post('/patient_add_appointment', [PatientController::class, 'post_add_appointment']);
 
     });
 
@@ -53,7 +53,7 @@
     });
 
     // Doctor
-    Route::group(['middleware' => 'checkDoctor'], function(){
+    Route::group(['middleware' => 'checkDoctor'], function() {
 
         Route::get('/doctor_home', [DoctorController::class, 'get_home'])->name('doctor_home');
         Route::get('/doctor_home_archive', [DoctorController::class, 'get_home_archive'])->name('doctor_home_archive');