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/app/Http/Controllers/GeneralSettingsController.php

@@ -3,22 +3,31 @@
 namespace Streamline\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Streamline\Models\Clinic;
 use Streamline\Models\GeneralSettings;
 use Streamline\Models\Services;
 use Streamline\Models\PermissionCategory;
+use Streamline\Models\StreamlineSetupStep;
 use Streamline\Models\User;
 
-class GeneralSettingsController extends Controller {
+class GeneralSettingsController extends Controller
+{
 
-    public function edit_settings(){
+    public function edit_settings()
+    {
         $general_settings = GeneralSettings::find(1);
         $services = Services::pluck('name', 'id')->toArray();
         $services = ['' => '- select -'] + $services;
 
-        return view('general_settings.edit', compact('general_settings', 'services'));
+        $clinics = Clinic::pluck('name', 'id')->toArray();
+        $clinics = ['' => '- select -'] + $clinics;
+
+        return view('general_settings.edit', compact('general_settings', 'services', 'clinics'));
     }
 
-    public function save_settings(Request $request){
+    public function save_settings(Request $request)
+    {
 
         $general_settings = GeneralSettings::find(1);
         $general_settings->donor_feature = $request->donor_feature;
@@ -32,6 +41,8 @@ class GeneralSettingsController extends Controller {
         $general_settings->enable_sms = $request->enable_sms;
         $general_settings->incoming_prescription_confirmation_feature = $request->incoming_prescription_confirmation_feature;
         $general_settings->add_stamp_to_pdf_feature = $request->add_stamp_to_pdf_feature;
+        $general_settings->consultation_attendance = $request->consultation_attendance;
+        $general_settings->inpatient_sheet_extras= $request->inpatient_sheet_extras;
         $general_settings->add_lab_stamp_to_pdf_feature = $request->add_lab_stamp_to_pdf_feature;
         $general_settings->enable_dipensing_unpaid_prescription = $request->enable_dipensing_unpaid_prescription;
         $general_settings->item_batch_tracking = $request->item_batch_tracking;
@@ -65,6 +76,7 @@ class GeneralSettingsController extends Controller {
         $general_settings->view_investigation_price_on_order = $request->view_investigation_price_on_order;
         $general_settings->view_sundry_price_on_order = $request->view_sundry_price_on_order;
         $general_settings->view_service_price_on_order = $request->view_service_price_on_order;
+        $general_settings->eye_module_enabled = $request->eye_module_enabled;
         $general_settings->payments_from_banks_with_lesser_balance = $request->payments_from_banks_with_lesser_balance;
         $general_settings->system_language = $request->system_language;
         $general_settings->smart_triage_feature = $request->smart_triage_feature;
@@ -72,23 +84,29 @@ class GeneralSettingsController extends Controller {
         $general_settings->allow_dispensing_out_of_stock_drugs = $request->allow_dispensing_out_of_stock_drugs;
         $general_settings->allow_issuing_out_of_stock_drugs = $request->allow_issuing_out_of_stock_drugs;
         $general_settings->smart_discharge_feature = $request->smart_discharge_feature;
+        $general_settings->default_hospital_clinic = $request->default_hospital_clinic;
         $general_settings->enable_fingerprint = $request->enable_fingerprint;
         $general_settings->full_detail_receipt_print = $request->full_detail_receipt_print;
         $general_settings->inpatient_sheet_with_detailed_notes = $request->inpatient_sheet_with_detailed_notes;
         $general_settings->show_symptoms_on_consultation = $request->show_symptoms_on_consultation;
         $general_settings->select_clinic_order_type = $request->select_clinic_order_type;
         $general_settings->enable_hiv_and_gbv_screening_tool = $request->enable_hiv_and_gbv_screening_tool;
+        $general_settings->enable_hiv_screening_tool = $request->enable_hiv_screening_tool;
+        $general_settings->enable_gbv_screening_tool = $request->enable_gbv_screening_tool;
+        $general_settings->stock_levels_to_consider = $request->stock_levels_to_consider;
+        $general_settings->allow_lab_number_editing = $request->allow_lab_number_editing;
+        $general_settings->allow_editing_name_of_lab_doctor = $request->allow_editing_name_of_lab_doctor;
         $general_settings->save();
 
         flash("Settings have been updated")->success();
 
-        if (session()->has('streamline_setup')) { 
+        if (session()->has('streamline_setup')) {
             //update the streamline setup table with the new finished step
-            $streamline_setup = new \Streamline\Models\StreamlineSetupStep;
+            $streamline_setup = new StreamlineSetupStep;
             $streamline_setup->step = "general settings configuration";
             $streamline_setup->completion_status = 1;
             $streamline_setup->save();
-            session()->forget('streamline_setup');                   
+            session()->forget('streamline_setup');
             return redirect("home");
         }
         return redirect("general_settings/edit");
@@ -105,9 +123,9 @@ class GeneralSettingsController extends Controller {
     {
         $activated_categories_array = $request->permission_category;
         $all_permission_categories = PermissionCategory::pluck('id')->toArray();
-        
+
         //loop through the categories and activate only the checked ones
-        for ($i=0; $i < count($all_permission_categories); $i++) { 
+        for ($i = 0; $i < count($all_permission_categories); $i++) {
             $category = PermissionCategory::find($all_permission_categories[$i]);
             if (in_array($all_permission_categories[$i], $activated_categories_array)) {
                 $category->is_module_active = 1;
@@ -116,21 +134,21 @@ class GeneralSettingsController extends Controller {
             }
             $category->update();
         }
-        
+
         flash("Active modules have been activated")->success();
         return redirect("activate_streamline_modules");
     }
 
     public function edit_personal_settings(Request $request)
     {
-        $general_settings = User::find(auth()->user()->id);
+        $general_settings = User::find(Auth::id());
 
         return view('general_settings.personal_settings_edit', compact('general_settings'));
     }
 
     public function save_personal_settings(Request $request)
     {
-        $user = User::find(auth()->user()->id);
+        $user = User::find(Auth::id());
         if ($user) {
             $user->system_language = $request->system_language;
             $user->update();
@@ -139,7 +157,7 @@ class GeneralSettingsController extends Controller {
             return redirect('personal_settings/edit');
         }
 
-        flash('system could not update the settings')->success();        
+        flash('system could not update the settings')->success();
         return redirect()->back();
     }
 
@@ -158,13 +176,10 @@ class GeneralSettingsController extends Controller {
 
             flash('settings have been updated')->success();
             return redirect()->route('general_settings.active_users_limit_settings');
-
         } catch (\Throwable $th) {
 
-            flash('system could not update the settings')->error();        
+            flash('system could not update the settings')->error();
             return redirect()->back();
         }
-        
     }
-
 }