Updated PDFs print

app/Http/Controllers/CareMonthController.php

@@ -38,7 +38,6 @@ class CareMonthController extends Controller
 
     public function print(Request $request, Client $patient, CareMonth $careMonth, $type = 'detailed' )
     {
-        dd($type);
         return view('app.patient.care-month.print', compact('patient', 'careMonth', 'type'));
     }
 }

resources/views/app/patient/care-month/dashboard.blade.php

@@ -88,8 +88,10 @@
                     <div class="d-flex align-items-center">
                         <span class="text-dark font-weight-bold font-size-14">Care Month</span>&nbsp;for&nbsp;<span class="text-dark font-weight-bold">{{friendly_month($careMonth->start_date)}}</span>
                         <div class="ml-3">
-                            <a href="{{ route('patients.view.care-months.view.detailed-print', ['patient' => $patient, 'careMonth' => $careMonth]) }}" class="mr-2" target="_blank" native><i class="fas fa-print fa-fw"></i> Print Detailed</a>
-                            <a href="{{ route('patients.view.care-months.view.measurements-print', ['patient' => $patient, 'careMonth' => $careMonth]) }}" class="" target="_blank" native><i class="fas fa-print fa-fw"></i> Print Summary</a>
+                            <a href="{{ route('patients.view.care-months.view.print', ['patient' => $patient, 'careMonth' => $careMonth, 'type' => 'detailed']) }}" class="mr-2" target="_blank" native><i class="fas fa-print fa-fw"></i> Print Detailed</a>
+                            <a href="{{ route('patients.view.care-months.view.print', ['patient' => $patient, 'careMonth' => $careMonth, 'type' => 'measurements']) }}" class="mr-2" target="_blank" native><i class="fas fa-print fa-fw"></i> Print All Measurements Summary</a>
+                            <a href="{{ route('patients.view.care-months.view.print', ['patient' => $patient, 'careMonth' => $careMonth, 'type' => 'measurements-bp']) }}" class="mr-2" target="_blank" native><i class="fas fa-print fa-fw"></i> Print Measurements (BP)</a>
+                            <a href="{{ route('patients.view.care-months.view.print', ['patient' => $patient, 'careMonth' => $careMonth, 'type' => 'measurements-wt']) }}" class="mr-2" target="_blank" native><i class="fas fa-print fa-fw"></i> Print Measurements (Wt.)</a>
                         </div>
                     </div>
                 </div>

resources/views/app/patient/care-month/partials/print/measurements.blade.php

@@ -14,6 +14,7 @@
             $plottableMeasurements = [];
         @endphp
         @foreach ($measurementsInCareMonth as $measurement)
+            @if($measurementType && stripos($measurement->label, $measurementType) === false ) @continue @endif
             @if (!empty($measurement->label) && !in_array($measurement->label, ['SBP', 'DBP']) && !$measurement->is_cellular_zero)
                 <tr>
                     <td class="px-2">

resources/views/app/patient/care-month/print.blade.php

@@ -8,21 +8,46 @@
         }
     </style>
     <div id="printableScreen" style="padding: 15px;">
-        <div style="text-align:center;margin-top:15px;margin-bottom: 30px;">
-            <h6 class="font-weight-bold text-uppercase">{{ $patient->displayName() }}</h6>
-            <div style="margin-bottom: 5px;font-weight:bold;">NP: {{ $careMonth->mcp ? $careMonth->mcp->displayName() : '---' }}</div>
-            <div>
-                <span class="text-dark font-weight-bold">Care Month</span>&nbsp;for&nbsp;<span
-                    class="text-dark font-weight-bold">{{ friendly_month($careMonth->start_date) }}</span>
+        <div class="d-flex align-items-start justify-content-center" style="margin-top:15px;margin-bottom: 30px;">
+            <div class="">
+                <div class="border-bottom pb-2 mb-2 text-center">
+                    <h6 class="font-weight-bold text-uppercase">{{ $patient->displayName() }}</h6>
+                    <div style="margin-bottom: 5px;font-weight:bold;"><span style="color: #6c757d;">DOB</span>:  {{ $patient->dob ? friendly_date($patient->dob) : '---' }}</div>
+                    <div style="margin-bottom: 5px;font-weight:bold;"><span style="color: #6c757d;">NP</span>:  {{ $careMonth->mcp ? $careMonth->mcp->displayName() : '---' }}</div>
+                    <div>
+                        <span class="text-dark font-weight-bold">Care Month</span>&nbsp;for&nbsp;<span
+                            class="text-dark font-weight-bold">{{ friendly_month($careMonth->start_date) }}</span>
+                    </div>
+                </div>
+                <div>
+                    <div style="margin-bottom: 5px;font-weight:bold;"><span style="color: #6c757d;">Company</span>:  
+                        {{$careMonth->companyPro && $careMonth->companyPro->company ? $careMonth->companyPro->company->name : '-'}}
+                    </div>
+                    <div style="margin-bottom: 5px;font-weight:bold;"><span style="color: #6c757d;">Location</span>:  
+                        {{$careMonth->companyLocation ? $careMonth->companyLocation->line1 . ', ' . $careMonth->companyLocation->city : '-'}}
+                    </div>                    
+                </div>
             </div>
+            
         </div>
-        
-        <div style="margin-bottom: 30px;">
-            @include('app.patient.care-month.partials.print.rm-reasons')
-        </div>
+
+        @if($type === 'detailed')
+            <div style="margin-bottom: 30px;">
+                @include('app.patient.care-month.partials.print.rm-reasons')
+            </div>
+        @endif
 
         <div>
-            @include('app.patient.care-month.partials.print.measurements')
+            <?php
+                $measurementType = null;
+                if($type === 'measurements-bp'){
+                    $measurementType = 'BP';
+                }
+                if($type === 'measurements-wt'){
+                   $measurementType = 'Wt'; 
+                }
+            ?>
+            @include('app.patient.care-month.partials.print.measurements', ['measurementType' => $measurementType])
         </div>
     </div>
     <script>
@@ -34,7 +59,7 @@
             document.body.innerHTML = originalContents;
         }
         document.addEventListener("DOMContentLoaded", function(event) {
-            printDiv('printableScreen');
+            //printDiv('printableScreen');
         });
     </script>
 @endsection

routes/web.php

@@ -636,7 +636,7 @@ Route::middleware('pro.auth')->group(function () {
             Route::get('care-months', 'PatientController@careMonths')->name('care-months');
             Route::name('care-months.view.')->prefix('care-months/view/{careMonth}')->group(function () {
                 Route::get('', 'CareMonthController@dashboard')->name('dashboard');
-                Route::get('/print/{type}', 'CareMonthController@print')->name('print');
+                Route::get('/print/{type?}', 'CareMonthController@print')->name('print');
             });
 
             // appointment calendar