ops-tech updates in cm single

app/Helpers/helpers.php

@@ -1235,3 +1235,20 @@ function getLogo(){
     if(config('app.internalName')) return asset('/img/'.config('app.internalName').'/logo_white.svg');
     return asset('/img/logo_white.svg');
 }
+
+if(!function_exists('printQueryLog')) {
+    function printQueryLog($log) {
+        echo "<h2>Long Queries: >50ms</h2>";
+        $totalDBTime = 0;
+        foreach($log as $logEntry) {
+            if($logEntry['time'] > 50) {
+                echo '<div style="background: #18171B; margin-bottom: 1rem;">';
+                dump($logEntry['time'] . ' ms');
+                dump($logEntry['query']);
+                echo "</div>";
+            }
+            $totalDBTime += $logEntry['time'];
+        }
+        dd('TOTAL Query Time: ' . $totalDBTime);
+    }
+}

app/Http/Controllers/PracticeManagementController.php

@@ -1892,7 +1892,7 @@ WHERE
 
     public function rpmMatrixForAdmin(Request $request) {
 
-        if($request->get('ql')) DB::enableQueryLog();
+        if($request->get('_ql')) DB::enableQueryLog();
 
         $performer = $this->performer();
 
@@ -1961,6 +1961,10 @@ WHERE
                 $conditions[] = "(client.client_engagement_status_category = '{$v}')";
             }
         }
+        else {
+            $conditions[] = "(client.client_engagement_status_category IS NULL OR client.client_engagement_status_category = 'ACTIVE')";
+        }
+
         if(trim($request->input('f_name'))) {
             $v = trim($request->input('f_name'));
             $conditions[] = "(client.name_first ILIKE '%{$v}%' OR client.name_last ILIKE '%{$v}%')";
@@ -2443,7 +2447,7 @@ EXISTS (SELECT 1 FROM measurement mstat WHERE mstat.care_month_id = care_month.i
         $statResult = DB::select($statQuery);
         $stats['gt40M'] = $statResult[0]->count;*/
 
-        if($request->get('ql')) dd(DB::getQueryLog());
+        if($request->get('_ql')) dd(DB::getQueryLog());
 
         return view('app.practice-management.rpm-matrix-for-admin', compact('patients', 'daysRemaining', 'careMonthStart', 'paginator', 'perPage', 'stats'));
     }

js-dev/stag-popup.js

@@ -218,12 +218,13 @@ function refreshDynamicStagPopup(_url = false, _target = null) {
     }
     return false;
 }
-function hasResponseError(_data) {
+function hasResponseError(_data, _hideMask = true) {
     let msg = 'Unknown error!';
     if (_data) {
         if (_data.success) return false;
         else if (_data.message) msg = _data.message;
     }
+    if(_hideMask) hideMask();
     toastr.error(msg);
     return true;
 }

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

@@ -1215,14 +1215,14 @@ $leanView = request()->input('popupmode') && request()->input('fromNoteUid');
                     </div>
                 @endif
 
-                @if($careMonth->number_of_days_with_remote_measurements >= 16)
+                {{--@if($careMonth->number_of_days_with_remote_measurements >= 16)--}}
 
                     {{-- bills --}} {{-- only admins --}}
                     @if($pro->pro_type === 'ADMIN')
 
                         <hr class="m-negator my-0">
 
-                        <div class="screen-only m-neg-4 mb-3">
+                        <div class="screen-only m-neg-3 mb-3">
                             @include('app.generic-bills.inline-for-cm', ['patient' => $patient, 'careMonth' => $careMonth, 'class' => 'p-3 border-bottom', 'label' => 'MCP'])
                         </div>
 
@@ -1518,24 +1518,24 @@ $leanView = request()->input('popupmode') && request()->input('fromNoteUid');
                                                             <thead>
                                                             <tr class="">
                                                                 <th colspan="3" class="border-top-0 border-bottom">
-                                                                    <div>
-                                                                    <span moe class="d-block" title="Submit Claim">
-                                                                        <a class="" href="" show start>Generate Submission to Payer (1°)</a>
-                                                                        <form
-                                                                            url="/api/mbClaim/createFromClaimForPrimaryPayer">
-                                                                            <input type="hidden" name="claimUid"
-                                                                                   value="{{$claim->uid}}">
+                                                                    <div moe class="d-block mb-2" title="Submit Claim">
+                                                                        <a class="" href="" show start>Generate Submission</a>
+                                                                        <form url="/api/mbClaim/createFromClaimForPrimaryPayer">
+                                                                            <input type="hidden" name="claimUid" value="{{$claim->uid}}">
                                                                             <p>Generate Submission?</p>
                                                                             <div class="mb-0">
-                                                                                <button class="btn btn-primary btn-sm"
-                                                                                        submit>Submit</button>
-                                                                                <button
-                                                                                    class="btn btn-default border btn-sm"
-                                                                                    cancel>Cancel</button>
+                                                                                <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                                                                             </div>
                                                                         </form>
-                                                                    </span>
                                                                     </div>
+                                                                    <div class="d-block" title="Submit Claim">
+                                                                        <a class="generate-submission-and-close"
+                                                                           data-claim-uid="{{$claim->uid}}"
+                                                                           data-caremonth-uid="{{$careMonth->uid}}"
+                                                                           href="#" show start>Generate &amp; Close Claiming</a>
+                                                                    </div>
+
                                                                 </th>
                                                             </tr>
                                                             </thead>
@@ -1643,7 +1643,7 @@ $leanView = request()->input('popupmode') && request()->input('fromNoteUid');
                         @endif
                     @endif
 
-                @endif
+                {{--@endif--}}
 
                 {{-- invoices --}}
                 @if($pro->pro_type === 'ADMIN')
@@ -1811,6 +1811,39 @@ $leanView = request()->input('popupmode') && request()->input('fromNoteUid');
                             runMCInitializer('vitalsGraphUnified_{{$careMonth->id}}');
                         }
 
+                        // generate and close
+                        $('.generate-submission-and-close')
+                            .off('click.gcc')
+                            .on('click.gcc', function(_e) {
+
+                                _e.preventDefault();
+                                _e.stopPropagation();
+
+                                showMask();
+
+                                // generate submission
+                                $.post('/api/mbClaim/createFromClaimForPrimaryPayer', {
+                                    claimUid: $(this).attr('data-claim-uid')
+                                }, function (_data) {
+                                    if(!hasResponseError(_data)) {
+
+                                        // close claiming
+                                        $.post('/api/careMonth/closeClaiming', {
+                                            uid: $(this).attr('data-caremonth-uid')
+                                        }, function (_data) {
+                                            if(!hasResponseError(_data)) {
+
+                                                // done
+                                                fastReload();
+
+                                            }
+                                        }, 'json')
+                                    }
+                                }, 'json')
+
+                                return false;
+                            });
+
                     }
 
                     addMCInitializer('care-month-dashboard-{{$patient->uid}}', init, '#care-month-container-{{$patient->uid}}');