Merge branch 'master' into dev-vj

app/Http/Controllers/PracticeManagementController.php

@@ -25,6 +25,7 @@ use App\Models\ProTransaction;
 use App\Models\Shipment;
 use App\Models\SupplyOrder;
 use App\Models\Ticket;
+use App\Models\ClientMeasurementDaysPerMonth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
 use PDF;
@@ -35,6 +36,15 @@ use Illuminate\Http\Request;
 class PracticeManagementController extends Controller
 {
 
+    public function remoteMonitoringReport(Request $request)
+	{
+		$rows = null;
+		$proID = $this->performer()->pro->id;
+		$isAdmin = $this->performer()->pro->pro_type == 'ADMIN';
+		$rows = $isAdmin ? ClientMeasurementDaysPerMonth::all() : ClientMeasurementDaysPerMonth::where('mcp_pro_id', $proID)->orderBy('year_month', 'asc')->orderBy('num_of_days_with_measurement', 'asc')->get();
+		return view ('app.practice-management.remote-monitoring-report', compact('rows'));
+	}
+
     public function billingReport(Request $request)
     {
         $rows = BillingReport::paginate(50);
@@ -828,6 +838,7 @@ class PracticeManagementController extends Controller
         $supplyOrders = SupplyOrder::where('signed_by_pro_id', $this->performer()->pro->id)
             ->where('is_cancelled', true)
             ->where('is_cancellation_acknowledged', false)
+	    ->orderBy('created_at', 'desc')
             ->paginate();
         return view('app.practice-management.supply-orders-cancelled-but-unacknowledged', compact('supplyOrders'));
     }

app/Models/ClientMeasurementDaysPerMonth.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Support\Collection;
+
+# use Illuminate\Database\Eloquent\Model;
+
+class ClientMeasurementDaysPerMonth extends Model
+{
+
+    protected $table = 'client_measurement_days_per_month';
+
+}

resources/views/app/practice-management/remote-monitoring-report.blade.php

@@ -0,0 +1,46 @@
+@extends ('layouts/template')
+
+@section('content')
+    <div class="p-3 mcp-theme-1">
+        <div class="card">
+            <div class="card-header p-3 d-flex align-items-center">
+                <strong class="mr-4">
+                    <i class="fas fa-user-injured"></i>
+                    Remote Monitoring Report
+                </strong>
+            </div>
+            <div class="card-body p-0">
+                <table class="table table-sm table-condensed p-0 m-0" style="table-layout: fixed">
+                    <thead class="bg-light">
+                        <tr>
+                            <th class="px-3 border-0">Patient</th>
+                            <th class="border-0">Month/Year</th>
+                            <th class="border-0"># Days with Measurements</th>
+                            <th class="border-0">HCP</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($rows as $row)
+                            <tr>
+                                <td>
+                                    <a href="/patients/view/{{ $row->uid }}">
+                                        <b>{{ implode(", ", [$row->name_last, $row->name_first]) }}</b>
+                                    </a>
+                                </td>
+                                <td>
+                                        {{ $row->year_month }}
+                                </td>
+                                <td>
+                                	{{ $row->num_of_days_with_measurement }}
+				</td>
+				<td>
+                                        <b>{{ implode(", ", [$row->mcp_pro_lname, $row->mcp_pro_fname]) }}</b>
+				</td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/layouts/template.blade.php

@@ -113,6 +113,7 @@
                         <a class="dropdown-item" href="{{ route('practice-management.myFavorites') }}">My Favorites</a>
                         <a class="dropdown-item" href="{{ route('practice-management.proAvailability') }}">Pro Availability</a>
                         <a class="dropdown-item" href="{{ route('practice-management.proCalendar') }}">Pro Calendar</a>
+                        <a class="dropdown-item" href="{{ route('practice-management.remoteMonitoringReport') }}">Remote Monitoring Report</a>
 
                         <a class="dropdown-item" href="{{ route('practice-management.billingManager') }}">Billing Manager</a>
                         <a class="dropdown-item" href="{{ route('practice-management.billing-report') }}">Billing Report</a>

routes/web.php

@@ -71,6 +71,7 @@ Route::middleware('pro.auth')->group(function () {
 
 
     Route::name('practice-management.')->prefix('practice-management')->group(function () {
+        Route::get('remote-monitoring-report', 'PracticeManagementController@remoteMonitoringReport')->name('remoteMonitoringReport');
         Route::get('rates/{selectedProUid?}', 'PracticeManagementController@rates')->name('rates');
         Route::get('dashboard', 'PracticeManagementController@dashboard')->name('dashboard');
         Route::get('previous-bills', 'PracticeManagementController@previousBills')->name('previousBills');