Import latest app updates from streamline

An updated set of source files and initialization was provided by streamline to
address issues observed during initial testing. These files have been updated in
order to generate a new set of app images.

docker/streamline-src/Modules/Patients/Http/Controllers/PatientFlowMonitoringController.php

@@ -42,35 +42,29 @@ class PatientFlowMonitoringController extends Controller {
             session()->put('order_by', $order_by);
         }
 
-        $filters = [];
-
         if($search_by === 0){
             // last 24 hours
-            $last_day = Carbon::now()->subDay();
+            $start_date_search = Carbon::yesterday()->startOfDay()->toDateTimeString();
+            $end_date_search = Carbon::yesterday()->endOfDay()->toDateTimeString();
 
-            array_push($filters, ['patient_episodes.created_at', '>', $last_day]);
-            $date_search = "Last 24 hours";
+            $date_search = "Yesterday";
         } elseif($search_by == 1){
             // custom date
-            $start_date_search = Carbon::parse($reg_date)->startOfDay()->toDateTimeString();;
-            $end_date_search = Carbon::parse($reg_date)->endOfDay()->toDateTimeString();;
+            $start_date_search = Carbon::parse($reg_date)->startOfDay()->toDateTimeString();
+            $end_date_search = Carbon::parse($reg_date)->endOfDay()->toDateTimeString();
 
-            array_push($filters, ['patient_episodes.created_at', '>', $start_date_search]);
-            array_push($filters, ['patient_episodes.created_at', '<', $end_date_search]);
             $date_search = streamline_date($start_date_search);
         } elseif($search_by == 2){
             // custom date range
-            $start_date_search = Carbon::parse($start_date)->startOfDay()->toDateTimeString();;
-            $end_date_search = Carbon::parse($end_date)->endOfDay()->toDateTimeString();;
+            $start_date_search = Carbon::parse($start_date)->startOfDay()->toDateTimeString();
+            $end_date_search = Carbon::parse($end_date)->endOfDay()->toDateTimeString();
 
-            array_push($filters, ['patient_episodes.created_at', '>', $start_date_search]);
-            array_push($filters, ['patient_episodes.created_at', '<', $end_date_search]);
             $date_search = streamline_date($start_date_search) . " to " . streamline_date($end_date_search);
         } else {
             // Today
-            $today = Carbon::today()->toDateTimeString();
+            $start_date_search = Carbon::today()->startOfDay()->toDateTimeString();
+            $end_date_search = Carbon::today()->endOfDay()->toDateTimeString();
 
-            array_push($filters, ['patient_episodes.created_at', '>=', $today]);
             $date_search = "Today";
         }
 
@@ -106,7 +100,7 @@ class PatientFlowMonitoringController extends Controller {
                 ->leftJoin('ante_natal_clinic_followups as a', 'patient_episodes.id', '=', 'a.episode_id')
                 ->leftJoin('triage', 'patient_episodes.id', '=', 'triage.episode_id')
                 ->select('patient_episodes.*', 'consultations.primary_diagnosis','consultations.outcome_id','consultations.completed','consultations.created_by as consultation_created_by','consultations.updated_by as consultation_updated_by','consultations.consultation_done_by', 'a.primary_diagnosis as antenatal_primary_diagnosis','a.outcome_id as antenatal_outcome_id','a.completion_status as antenatal_completed','a.created_by as antenatal_created_by','a.updated_by as antenatal_updated_by', 'triage.id as episode_triage_id', 'triage.severe_grade', 'triage.clinic_allocation')
-                ->where($filters)
+                ->whereBetween('patient_episodes.created_at', [$start_date_search, $end_date_search])
                 ->orderByRaw($order_by_text)
                 ->paginate(200);
             $clinic_name = "OPD";
@@ -116,7 +110,8 @@ class PatientFlowMonitoringController extends Controller {
                 ->leftJoin('consultations', 'patient_episodes.id', '=', 'consultations.episode_id')
                 ->leftJoin('ante_natal_clinic_followups as a', 'patient_episodes.id', '=', 'a.episode_id')
                 ->leftJoin('triage', 'patient_episodes.id', '=', 'triage.episode_id')
-                ->where(['patient_episodes.clinic_id' => $clinic_id])->where($filters)
+                ->where(['patient_episodes.clinic_id' => $clinic_id])
+                ->whereBetween('patient_episodes.created_at', [$start_date_search, $end_date_search])
                 ->orderByRaw($order_by_text)
                 ->select('patient_episodes.*', 'consultations.primary_diagnosis','consultations.outcome_id','consultations.completed','consultations.created_by as consultation_created_by','consultations.updated_by as consultation_updated_by','consultations.consultation_done_by', 'a.primary_diagnosis as antenatal_primary_diagnosis','a.outcome_id as antenatal_outcome_id','a.completion_status as antenatal_completed','a.created_by as antenatal_created_by','a.updated_by as antenatal_updated_by','triage.id as episode_triage_id', 'triage.severe_grade', 'triage.clinic_allocation')
                 ->paginate(200);
@@ -129,9 +124,11 @@ class PatientFlowMonitoringController extends Controller {
         $clinics = [0 => 'OPD'] + $clinics;
         $clinics = ['' => '- select -'] + $clinics;
 
+        $diagnoses = DB::table('diagnoses')->where('available', 1)->whereNull('deleted_at')->pluck("name", "id")->toArray();
+
         $wards = DB::table('wards')->where('available', 1)->whereNull('deleted_at')->pluck("name", "id")->prepend('- select -', '');
 
-        return view('patients::patient_flow_monitoring.index', compact('patient_episodes', 'clinics', 'patient_categories','clinic_name','search_by', 'date_search', 'wards'));
+        return view('patients::patient_flow_monitoring.index', compact('patient_episodes', 'clinics', 'patient_categories','clinic_name','search_by', 'date_search', 'wards', 'diagnoses'));
     }
 
     public function patient_route($episode_id, $route){
@@ -145,7 +142,9 @@ class PatientFlowMonitoringController extends Controller {
 
         if($route == 'triage'){
             $url = '/triage';
+            session()->put('triage_without_etat', 0);
         } elseif ($route == 'consultation'){
+            session()->put('consultation_with_notes', 0);
             $url = '/consultation/route';
         } elseif ($route == 'create_anaesthetics'){
             $url = '/anaesthetics/create';
@@ -164,11 +163,17 @@ class PatientFlowMonitoringController extends Controller {
         } elseif ($route == 'investigation') {
             $url = '/investigations/investigations_review';
         } elseif ($route == 'triage_without_etat') {
-            $url = '/triage/create_without_etat';
+            session()->put('triage_without_etat', 1);
+            $url = '/triage';
         } elseif ($route == 'consultation_with_notes') {
-            $url = '/consultation/create_with_notes';
+            session()->put('consultation_with_notes', 1);
+            $url = '/consultation/route';
         } elseif ($route == 'view_patient_history') {
             $url = '/patient_episodes/';
+        } elseif ($route == 'main_exam') {
+            $url = '/eye_clinic/main_exam_route';
+        } elseif ($route == 'base_refraction_exam') {
+            $url = '/eye_clinic/base_exam_refraction';
         }
 
         return response()->json($url);
@@ -219,11 +224,8 @@ class PatientFlowMonitoringController extends Controller {
             
             return redirect('/patient_episodes/');
         } catch (QueryException $e) {
-            $errorCode = $e->errorInfo[1];
-            if ($errorCode == 1062) { //error code for duplicate entry to a unique field
-                flash("This episode already exists!")->error();
-                return back()->withInput();
-            }
+            flash("This episode already exists!")->error();
+            return back()->withInput();
         }
     }
 }