Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2

app/Http/Controllers/AdminController.php

@@ -549,11 +549,17 @@ class AdminController extends Controller
             if($missing_default_settings === 'NO_MCP_COMPANY_LOCATION') $patients = $patients->whereNull('default_mcp_company_location_id');
         }
 
-        $unsigned_care_plans = $request->get('unsigned_care_plans');
-        if($unsigned_care_plans){
-            $patients = $patients->whereHas('notes', function($noteQuery){ 
+        $care_plan = $request->get('care_plan');
+        if($care_plan){
+            if($care_plan === 'UNSIGNED_CARE_PLANS'){
+              $patients = $patients->whereHas('notes', function($noteQuery){ 
                 return $noteQuery->where('cm_setup_manager_signature_status', '!=', 'SIGNED');
-            });
+                });  
+            }
+            if($care_plan === 'UNCLEARED_CARE_PLANS'){
+                $patients = $patients->where('has_care_plan_flag', true)->where('is_flag_cleared', false);
+            }
+            
         }
 
         $patients = $patients->orderBy('created_at', 'DESC')->paginate(50);

app/Models/SupplyOrder.php

@@ -49,4 +49,9 @@ class SupplyOrder extends Model
     {
         return $this->hasOne(Pro::class, 'id', 'created_by_pro_id');
     }
+
+    public function Note()
+    {
+        return $this->hasOne(Note::class, 'id', 'note_id');
+    }
 }

resources/views/app/admin/patients_missing_defsult_settings_filters.blade.php

@@ -91,10 +91,14 @@
 		</div>
 	</div>
 
-	<div class="sm-section d-flex justify-content-center" style="width:330px !important;">
-		<div class="form-check" style="margin-top: 30px;">
-			<input type="checkbox" class="form-check-input" id="unsigned_care_plans" name="unsigned_care_plans" v-model="filters.unsigned_care_plans">
-			<label class="form-check-label font-weight-normal" for="unsigned_care_plans">Include patients with unsigned care plans</label>
+	<div class="sm-section" style="width: 185px !important;">
+		<div class="">
+			<label>Care Plan:</label>
+			<select class="form-control" name="care_plan" v-model="filters.care_plan">
+				<option value="">Any</option>
+				<option value="UNSIGNED_CARE_PLANS">Unsigned Care Plans</option>
+				<option value="UNCLEARED_CARE_PLANS">Uncleared Care Plans</option>
+			</select>
 		</div>
 	</div>
 
@@ -117,7 +121,7 @@ $allFilterKeys = [
 	'insurance',
 	'chart_number',
 	'missing_default_settings',
-	'unsigned_care_plans'
+	'care_plan'
 ];
 for ($i = 0; $i < count($allFilterKeys); $i++) {
 	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {

resources/views/app/patient/shipments.blade.php

@@ -178,6 +178,11 @@
                                                     </div>
                                                 </form>
                                             </div>
+                                            @if($iSupplyOrder->note && !$iSupplyOrder->note->is_signed_by_hcp)
+                                                <small class="text-danger text-sm">
+                                                <i class="fas fa-exclamation-triangle text-danger"></i> Note not signed by HCP.
+                                                </small>
+                                            @endif
                                         </td>
                                     </tr>
                                 @endforeach