conflict

app/Http/Controllers/StatTreeController.php

@@ -660,8 +660,8 @@ class StatTreeController extends Controller
         $statTreeLine->tree_order_position_index = $position;
         $statTreeLine->last_refresh_count = null;
         $statTreeLine->tsv_text_for_report_columns = null;
-        $statTreeLine->goal_condition = (!$line->goalCondition ? null : $line->goalCondition);
-        $statTreeLine->goal_percent = ($line->goalPercent === -1 ? null : $line->goalPercent);
+        $statTreeLine->goal_condition = (!@$line->goalCondition ? null : $line->goalCondition);
+        $statTreeLine->goal_percent = (!@$line->goalPercent || $line->goalPercent === -1 ? null : $line->goalPercent);
         $statTreeLine->parent_stat_tree_line_id = $parentLine ? $parentLine->id : null;
         $statTreeLine->save();
 

app/Http/Controllers/StatTreeLineController.php

@@ -51,7 +51,7 @@ class StatTreeLineController extends Controller
             $columns[] = $column;
         }
         if(count($line->reportColumns)) {
-            $result = $this->queryStatTreeLineData($line, $selectColumns, $columns, $request);
+            $result = self::queryStatTreeLineData($line, $selectColumns, $columns, $request);
             if($result[0] === false) {
                 $total = 0;
                 $rows = [];
@@ -157,7 +157,7 @@ class StatTreeLineController extends Controller
             $selectColumns[] = "{$reportColumn->display_key} as v_{$reportColumn->id}";
         }
         if(count($line->reportColumns)) {
-            $result = $this->queryStatTreeLineData($line, $selectColumns, $columns, $request);
+            $result = self::queryStatTreeLineData($line, $selectColumns, $columns, $request);
             $total = $result[0];
             $rows = $result[1];
             $paginator = new LengthAwarePaginator($rows, $total, $request->input('per_page') ?: 20, $request->input('page') ?: 1);
@@ -213,7 +213,7 @@ class StatTreeLineController extends Controller
         return DB::select($query);
     }
 
-    protected function queryStatTreeLineData(StatTreeLine $statTreeLine, $selectColumns, $columns, Request $request)
+    public static function queryStatTreeLineData(StatTreeLine $statTreeLine, $selectColumns, $columns, Request $request)
     {
 
         $model = $statTreeLine->statTree ? $statTreeLine->statTree->model : $statTreeLine->model;

resources/views/app/stat-tree/stat-tree-lines/view-data-inline.blade.php

@@ -0,0 +1,176 @@
+<div class="mcp-theme-1 popup-content-container p-3">
+    @if(@$rows === 'error')
+        <div class="text-secondary">
+            <i class="fa fa-exclamation-triangle"></i>
+            Query error / missing arg values!
+        </div>
+    @else
+        @if(!count($columns))
+            <div class="text-secondary">
+                <i class="fa fa-exclamation-triangle"></i>
+                Report columns not configured for this report!
+            </div>
+        @else
+            <div class="mb-2 d-flex flex-wrap">
+                @foreach($line->lineClauses as $lineClause)
+                    <div class="border rounded px-2 py-1 mr-2 bg-light clause-label-part">{{$lineClause->clause_label}}
+                        @if(count($lineClause->lineClauseArgs))
+                            <?php
+                            $argsLabel = [];
+                            foreach($lineClause->lineClauseArgs as $lineClauseArg) {
+                                $argLabel = $lineClauseArg->clauseArg->arg_text . ': ' . $lineClauseArg->value;
+                                $argsLabel[] = $argLabel;
+                            }
+                            ?>
+                            [{{implode(', ', $argsLabel)}}]
+                        @endif
+                    </div>
+                @endforeach
+            </div>
+
+            <!-- filters -->
+            <a href="#" class="toggle-filters" onclick="$('#view-data-filters-form').toggle(); return false;">Toggle Filter</a>
+            <form action="" id="view-data-filters-form" onsubmit="return false;">
+                <input type="hidden" name="sort_by" value="{{request()->input('sort_by')}}">
+                <input type="hidden" name="sort_dir" value="{{request()->input('sort_dir')}}">
+                <table class="table table-sm table-striped table-bordered mb-0 mt-2 bg-aliceblue">
+                    <thead>
+                        <?php $lastColumnRendered = false; ?>
+                        @foreach($columns as $column)
+                            <tr>
+                                <th class="border-bottom-0 width-150px font-weight-normal align-middle text-nowrap {{request()->input($column['as'] . '_op') ? 'font-weight-bold text-info' : ''}}">{{$column['label']}}</th>
+
+                                <th class="border-bottom-0 width-150px p-0 align-middle">
+                                    <select class="form-control form-control-sm min-width-unset border-0 rounded-0 shadow-none" name="{{$column['as']}}_op">
+                                        <option value="">-- select --</option>
+                                        <?php
+                                        switch($column['type']) {
+                                            case 'integer':
+                                            case 'bigint':
+                                            case 'decimal':
+                                                ?>
+                                                <option {{request()->input($column['as'] . '_op') === '=' ? 'selected' : ''}} value="=">Equal</option>
+                                                <option {{request()->input($column['as'] . '_op') === '!=' ? 'selected' : ''}} value="!=">Not equal</option>
+                                                <option {{request()->input($column['as'] . '_op') === '<' ? 'selected' : ''}} value="<">Lesser than</option>
+                                                <option {{request()->input($column['as'] . '_op') === '<=' ? 'selected' : ''}} value="<=">Lesser than or equal to</option>
+                                                <option {{request()->input($column['as'] . '_op') === '>' ? 'selected' : ''}} value=">">Greater than</option>
+                                                <option {{request()->input($column['as'] . '_op') === '>=' ? 'selected' : ''}} value=">=">Greater than or equal to</option>
+                                                <?php
+                                                break;
+                                            case 'string':
+                                            case 'text':
+                                            case 'varchar':
+                                                ?>
+                                                <option {{request()->input($column['as'] . '_op') === '=' ? 'selected' : ''}} value="=">Is</option>
+                                                <option {{request()->input($column['as'] . '_op') === '!=' ? 'selected' : ''}} value="!=">Is Not</option>
+                                                <option {{request()->input($column['as'] . '_op') === 'ILIKE' ? 'selected' : ''}} value="ILIKE">Contains</option>
+                                                <option {{request()->input($column['as'] . '_op') === 'NOT ILIKE' ? 'selected' : ''}} value="NOT ILIKE">Does not contain</option>
+                                                <?php
+                                                break;
+                                            case 'bool':
+                                            case 'boolean':
+                                                ?>
+                                                <option {{request()->input($column['as'] . '_op') === '=' ? 'selected' : ''}} value="=">Is</option>
+                                                <?php
+                                                break;
+                                            case 'date':
+                                            case 'datetime':
+                                                ?>
+                                                <option {{request()->input($column['as'] . '_op') === '=' ? 'selected' : ''}} value="=">Start/End</option>
+                                                <?php
+                                                break;
+                                        }
+                                        ?>
+                                    </select>
+                                </th>
+
+                                <th class="border-bottom-0 p-0 align-middle">
+                                    <div class="d-flex align-items-center">
+                                    <?php
+                                    switch($column['type']) {
+                                        case 'integer':
+                                        case 'bigint':
+                                        case 'decimal':
+                                            ?>
+                                            <input type="number" name="{{$column['as']}}_value" value="{{request()->input($column['as'] . '_value')}}" class="min-width-unset shadow-none form-control form-control-sm border-0 rounded-0">
+                                            <?php
+                                            break;
+                                        case 'string':
+                                        case 'text':
+                                        case 'varchar':
+                                            ?>
+                                            <input type="text" name="{{$column['as']}}_value" value="{{request()->input($column['as'] . '_value')}}" class="min-width-unset shadow-none form-control form-control-sm border-0 rounded-0">
+                                            <?php
+                                            break;
+                                        case 'bool':
+                                        case 'boolean':
+                                            ?>
+                                            <select class="form-control form-control-sm min-width-unset shadow-none border-0 rounded-0" name="{{$column['as']}}_value">
+                                                <option {{request()->input($column['as'] . '_value') === 'TRUE' ? 'selected' : ''}} value="TRUE">True</option>
+                                                <option {{request()->input($column['as'] . '_value') === 'FALSE' ? 'selected' : ''}} value="FALSE">False</option>
+                                            </select>
+                                            <?php
+                                            break;
+                                        case 'date':
+                                        case 'datetime':
+                                            ?>
+                                            <input type="date" name="{{$column['as']}}_value_start" value="{{request()->input($column['as'] . '_value_start')}}" class="min-width-unset shadow-none width-200px form-control form-control-sm border-0 rounded-0" placeholder="Start">
+                                            <input type="date" name="{{$column['as']}}_value_end" value="{{request()->input($column['as'] . '_value_end')}}" class="min-width-unset shadow-none width-200px form-control form-control-sm border-top-0 border-bottom-0 rounded-0" placeholder="End">
+                                            <?php
+                                            break;
+                                    }
+                                    ?>
+                                    </div>
+                                </th>
+                            </tr>
+                        @endforeach
+                        <tr>
+                            <th class="border-bottom-0 width-200px align-top bg-white" colspan="3">
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-primary mr-2" type="button"
+                                            onclick="return fastLoad('{{request()->route()->toSymfonyRoute()->getPath()}}?proUid={{request()->input('proUid')}}&' + $('#view-data-filters-form').serialize())">
+                                        Filter
+                                    </button>
+                                    <button class="btn btn-sm btn-default border" type="button"
+                                            onclick="return fastLoad('{{request()->route()->toSymfonyRoute()->getPath()}}?proUid={{request()->input('proUid')}}')">
+                                        Reset
+                                    </button>
+                                </div>
+                            </th>
+                        </tr>
+                    </thead>
+                </table>
+            </form>
+
+            <table class="table table-sm table-striped table-bordered mt-3">
+                <thead>
+                <tr>
+                    @foreach($columns as $column)
+                    <th class="border-bottom-0 text-left">
+                        @include('app.stat-tree._sort_header', ['route' => request()->route()->toSymfonyRoute()->getPath(), 'label' => $column['label'], 'key' => $column['as']])
+                    </th>
+                    @endforeach
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($rows as $row)
+                    <tr>
+                        @foreach($columns as $column)
+                            <td>
+                                @if($column['type'] === 'date')
+                                    {{friendly_date($row->{$column['as']})}}
+                                @elseif($column['type'] === 'datetime')
+                                    {{friendly_date_time($row->{$column['as']})}}
+                                @else
+                                    {{ $row->{$column['as']} }}
+                                @endif
+                            </td>
+                        @endforeach
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+            {!! $paginator->withQueryString()->links() !!}
+        @endif
+    @endif
+</div>

resources/views/app/stat-tree/stat-tree-lines/view-data.blade.php

@@ -127,11 +127,11 @@
                                     <th class="border-bottom-0 width-200px align-top bg-white" rowspan="{{count($columns)}}">
                                         <div class="d-flex align-items-center">
                                             <button class="btn btn-sm btn-primary mr-2"
-                                                    onclick="return refreshDynamicStagPopup('{{route('practice-management.statTreeLines.view-data', compact('line'))}}?' + $('#view-data-filters-form').serialize())">
+                                                    onclick="return refreshDynamicStagPopup('{{route('practice-management.statTreeLines.view-data', compact('line'))}}?proUid={{request()->input('proUid')}}&' + $('#view-data-filters-form').serialize())">
                                                 Filter
                                             </button>
                                             <button class="btn btn-sm btn-default border"
-                                                    onclick="$('#view-data-filters-form table').find('input, select').val(''); return refreshDynamicStagPopup('{{route('practice-management.statTreeLines.view-data', compact('line'))}}?' + $('#view-data-filters-form').serialize())">
+                                                    onclick="return refreshDynamicStagPopup('{{route('practice-management.statTreeLines.view-data', compact('line'))}}?proUid={{request()->input('proUid')}}')">
                                                 Reset
                                             </button>
                                         </div>

resources/views/app/stat-tree/stat-trees/sub/edit.blade.php

@@ -317,7 +317,7 @@
                                                             </th>
                                                             @foreach($multiPros as $multiPro)
                                                                 <th data-pro-uid="{{$multiPro->uid}}" count-required>
-                                                                    <div class="pro-label position-relative" title="{{$multiPro->name_display}}">{{$multiPro->name_display}}
+                                                                    <div class="pro-label position-relative" title="{{$multiPro->name_display ?: $multiPro->name_first}}">{{$multiPro->name_display ?: $multiPro->name_first}}
                                                                         <a href="#" class="mv-delete-pro-trigger rounded-circle bg-white c-pointer" data-pro-uid="{{$multiPro->uid}}"><i class="fa fa-times text-danger"></i></a>
                                                                     </div>
                                                                 </th>
@@ -389,19 +389,46 @@
                                                     <h6 class="font-weight-bold m-0 text-secondary">Report Columns</h6>
                                                 </div>
                                                 <div class="px-2">
-                                                    <div class="mb-2 d-flex align-items-baseline">
-                                                        <span class="text-secondary mr-1 text-nowrap">Quick Add:</span>
-                                                        <div class="flex-grow-1 position-relative">
-                                                            <input type="text"
-                                                                   name="displayKey"
-                                                                   class="form-control form-control-sm"
-                                                                   placeholder="Column name"
-                                                                   stag-suggest stag-suggest-left
-                                                                   stag-suggest-ep="/column-suggest"
-                                                                   stag-suggest-extra="table={{$statTree->model}}"
-                                                                   autocomplete="off">
+                                                    <form class="border p-2">
+                                                        <div class="mb-1 d-flex align-items-baseline">
+                                                            <span class="text-secondary mr-1 text-nowrap width-70px">Label:</span>
+                                                            <div class="flex-grow-1 position-relative">
+                                                                <input required type="text"
+                                                                       name="label"
+                                                                       class="form-control form-control-sm">
+                                                            </div>
                                                         </div>
-                                                    </div>
+                                                        <div class="mb-1 d-flex align-items-baseline">
+                                                            <span class="text-secondary mr-1 text-nowrap width-70px">Column:</span>
+                                                            <div class="flex-grow-1 position-relative">
+                                                                <input required type="text"
+                                                                       name="display_key"
+                                                                       class="form-control form-control-sm"
+{{--                                                                       stag-suggest stag-suggest-left--}}
+{{--                                                                       stag-suggest-ep="/column-suggest"--}}
+{{--                                                                       stag-suggest-extra="table={{$statTree->model}}"--}}
+                                                                       autocomplete="off">
+                                                            </div>
+                                                        </div>
+                                                        <div class="mb-1 d-flex align-items-baseline">
+                                                            <span class="text-secondary mr-1 text-nowrap width-70px">Type:</span>
+                                                            <div class="flex-grow-1 position-relative">
+                                                                <select required class="form-control form-control-sm min-width-unset" name="type" required>
+                                                                    <option value="">-- select --</option>
+                                                                    <option value="numeric">Number</option>
+                                                                    <option value="date">Date</option>
+                                                                    <option value="text">String</option>
+                                                                    <option value="bool">Boolean</option>
+                                                                </select>
+                                                            </div>
+                                                        </div>
+                                                        <div class="mb-1 d-flex align-items-baseline">
+                                                            <span class="text-secondary mr-1 text-nowrap width-70px"></span>
+                                                            <div class="flex-grow-1 position-relative">
+                                                                <button class="btn btn-sm btn-primary add-column">Add Column</button>
+                                                            </div>
+                                                        </div>
+                                                    </form>
                                                     <table class="table table-sm table-bordered table-striped">
                                                         <thead>
                                                         <tr>
@@ -1256,7 +1283,29 @@
                                 },
                             };
 
-                            linePropsColumn.find('input[stag-suggest][name="displayKey"]')
+                            $(document)
+                                .off('click', '.add-column')
+                                .on('click', '.add-column', function() {
+                                    let form = $(this).closest('form');
+                                    if(!form[0].checkValidity()) {
+                                        form[0].reportValidity();
+                                        return false;
+                                    }
+                                    let columns = StatTree.getSelectedNodeColumns();
+                                    columns.push({
+                                        label: form.find('[name="label"]').val(),
+                                        display_key: form.find('[name="display_key"]').val(),
+                                        type: form.find('[name="type"]').val(),
+                                    });
+                                    StatTree.setSelectedNodeColumns(columns);
+                                    StatTree.onSelected();
+                                    StatTree.setDirty();
+                                    form[0].reset();
+                                    form.find('[name="label"]').focus();
+                                    return false;
+                                });
+
+                            /*linePropsColumn.find('input[stag-suggest][name="displayKey"]')
                                 .off('stag-suggest-selected')
                                 .on('stag-suggest-selected', (_e, _input, _data) => {
                                     let columns = StatTree.getSelectedNodeColumns();
@@ -1270,7 +1319,7 @@
                                     StatTree.onSelected();
                                     StatTree.setDirty();
                                     return false;
-                                });
+                                });*/
 
                             $(document)
                                 .off('click', '.move-column-up')

resources/views/app/stat-tree/view-matrix.blade.php

@@ -0,0 +1,25 @@
+<?php
+if(!@$line) $line = \App\Models\StatTreeLine::where('uid', $uid)->first();
+$total = 0;
+$rows = [];
+$columns = [];
+$selectColumns = [];
+$paginator = null;
+foreach ($line->reportColumns as $reportColumn) {
+    $columns[] = [
+        "label" => $reportColumn->label,
+        "column" => $reportColumn->display_key,
+        "type" => $reportColumn->field_type,
+        "as" => "v_{$reportColumn->id}"
+    ];
+    $selectColumns[] = "{$reportColumn->display_key} as v_{$reportColumn->id}";
+}
+if(count($line->reportColumns)) {
+    $result = \App\Http\Controllers\StatTreeLineController::queryStatTreeLineData($line, $selectColumns, $columns, request());
+    $total = $result[0];
+    $rows = $result[1];
+    $paginator = new \Illuminate\Pagination\LengthAwarePaginator($rows, $total, request()->input('per_page') ?: 20, request()->input('page') ?: 1);
+    $paginator->setPath(request()->route()->toSymfonyRoute()->getPath());
+}
+?>
+@include('app.stat-tree.stat-tree-lines.view-data-inline', compact('line', 'total', 'rows', 'columns', 'paginator'))

resources/views/app/stat-tree/view.blade.php

@@ -100,12 +100,12 @@
                     function calculateDropPercent(node, parent = null) {
                         let realNode = StatTree.el.jstree(true).get_node(node.id);
                         if(!realNode.data) return;
-                        if(parent && parent.data.lastRefreshCount !== null) {
-                            if(node.data.lastRefreshCount !== null) {
-                                realNode.data.dropPercent = (((parent.data.lastRefreshCount - node.data.lastRefreshCount) / parent.data.lastRefreshCount) * 100);
+                        if(parent && parent.data.lastRefreshCount !== null && parent.data.lastRefreshCount !== -1) {
+                            if(node.data.lastRefreshCount !== null && node.data.lastRefreshCount !== -1) {
+                                realNode.data.dropPercent = ((node.data.lastRefreshCount / parent.data.lastRefreshCount) * 100);
                                 if(realNode.data.dropPercent) {
                                     let element = StatTree.el.jstree(true).get_node(node.id, true), cssClass = '';
-                                    if(realNode.data.dropPercent > 75) {
+                                    /*if(realNode.data.dropPercent > 75) {
                                         cssClass = 'drop-76-100';
                                     }
                                     else if(realNode.data.dropPercent > 50 && realNode.data.dropPercent <= 75) {
@@ -116,11 +116,48 @@
                                     }
                                     else if(realNode.data.dropPercent > 0 && realNode.data.dropPercent <= 25) {
                                         cssClass = 'drop-0-25';
-                                    }
+                                    }*/
+                                    cssClass = 'drop-0-25';
                                     element.find('>a.jstree-anchor')
                                         .addClass('has-drop-visualization')
                                         .addClass(cssClass)
-                                        .attr('data-drop-percent', (realNode.data.dropPercent.toFixed(1)) + '% ⤵');
+                                        .attr('data-drop-percent', (realNode.data.dropPercent.toFixed(3)) + '% ⤵');
+
+                                    if(!!realNode.data.goalCondition && realNode.data.goalPercent !== -1) {
+                                        let goalLabel = '';
+                                        switch(realNode.data.goalCondition) {
+                                            case '=':
+                                                if(realNode.data.dropPercent !== realNode.data.goalPercent) {
+                                                    goalLabel = 'Should be = ' + realNode.data.goalPercent + '%';
+                                                }
+                                                break;
+                                            case '>':
+                                                if(realNode.data.dropPercent <= realNode.data.goalPercent) {
+                                                    goalLabel = 'Should be > ' + realNode.data.goalPercent + '%';
+                                                }
+                                                break;
+                                            case '<':
+                                                if(realNode.data.dropPercent >= realNode.data.goalPercent) {
+                                                    goalLabel = 'Should be < ' + realNode.data.goalPercent + '%';
+                                                }
+                                                break;
+                                            case '>=':
+                                                if(realNode.data.dropPercent < realNode.data.goalPercent) {
+                                                    goalLabel = 'Should be >= ' + realNode.data.goalPercent + '%';
+                                                }
+                                                break;
+                                            case '<=':
+                                                if(realNode.data.dropPercent > realNode.data.goalPercent) {
+                                                    goalLabel = 'Should be <= ' + realNode.data.goalPercent + '%';
+                                                }
+                                                break;
+                                        }
+                                        if(!!goalLabel) {
+                                            element.find('>a.jstree-anchor')
+                                                .addClass('has-goal-label')
+                                                .attr('data-goal-label', '⚠ ' + goalLabel);
+                                        }
+                                    }
                                 }
                             }
                         }

resources/views/layouts/template.blade.php

@@ -200,9 +200,11 @@
                             <a class="dropdown-item" href="{{ route('practice-management.notes-resolution-center-v2') }}">Notes Resolution Center V2</a>
                             <a class="dropdown-item" href="{{ route('practice-management.rpm-matrix-admin') }}">RPM (Admin)</a>
                             <a class="dropdown-item" href="{{ route('practice-management.daily-treatment-services') }}">Daily Treatment Services</a>
-
                             <a class="dropdown-item" href="{{ route('practice-management.client-pro-changes') }}">Client Pro Changes</a>
+<<<<<<< HEAD
                             {{--<a class="dropdown-item" href="{{ route('practice-management.previousBills') }}">Previous Bills</a>--}}
+=======
+>>>>>>> 3f606ec4f60894fc95cc55db3f549be1d2b3f42c
                             <a class="dropdown-item" href="{{ route('invoice-center.companies') }}">Invoice Center</a>
                             <a class="dropdown-item" href="{{ route('practice-management.financialTransactions') }}">Financial Transactions</a>
                             <a class="dropdown-item" href="/practice-management/bills/not-yet-signed">Pending Bills to Sign</a>
@@ -211,22 +213,66 @@
                             <a class="dropdown-item" href="{{ route('unmapped-sms') }}">Unmapped SMS</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>
+<<<<<<< HEAD
 
+=======
+>>>>>>> 3f606ec4f60894fc95cc55db3f549be1d2b3f42c
                             <a class="dropdown-item" href="{{ route('practice-management.billing-report') }}">Billing Report</a>
-
                             <a class="dropdown-item" href="{{ route('practice-management.processingBillMatrix') }}">Processing Bills</a>
                             <a class="dropdown-item" href="{{ route('practice-management.processingBillMatrix2') }}">Processing Bills (RPM)</a>
                             <a class="dropdown-item" href="{{ route('practice-management.pro-financials') }}">Pro Financials</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.process-claims') }}">Process Claims</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.hcp-note-activity') }}">HCP Note Activity</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.allNotes') }}">All Notes</a>
+                            @if($pro->id == '1' || $pro->id == '16')
+                                <a class="dropdown-item" href="{{ route('practice-management.treatmentServiceUtil') }}">Treatment Service Util.</a>
+                            @endif
+                            <a class="dropdown-item" href="{{ route('practice-management.supply-orders') }}">Supply Orders</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.shipments') }}">Shipments</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.generic-bills') }}">Admin. Bills</a>
+                            <a class="dropdown-item" href="/practice-management/rates/all">Payment Rates</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.patientsAccountsInvites') }}">Patients Accounts Invites</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.memos') }}">Memos</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.segmentTemplates') }}">Segment Templates</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.visitTemplates') }}">Visit Templates</a>
+                            <a class="dropdown-item" href="{{ route('admin.bdt_devices') }}">BDT Devices</a>
+                            <a class="dropdown-item" href="{{ route('admin.patientsMissingDefasultSettings') }}">Patients Missing Default Settings</a>
+                        </div>
+                    </li>
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle opacity-60" href="#" id="practice-management" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <i class="mr-1 fas fa-tasks"></i> Unused
+                        </a>
+                        <div class="dropdown-menu mcp-theme-1 no-overflow-menu p-0" aria-labelledby="practice-management">
+                            <a class="dropdown-item" href="{{ route('practice-management.notes-resolution-center') }}">Notes Resolution Center</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.rpmMatrix') }}">RPM Matrix</a>
+                            <a class="dropdown-item" href="{{ route('pro-care-month-report') }}">Care Month Report</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.rm-bills-to-sign') }}">RM Bills to Sign</a>
+                            <a class="dropdown-item" href="{{ route('unmapped-sms') }}">Unmapped SMS</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.cellularMeasurements') }}">Cellular Measurements</a>
+<<<<<<< HEAD
                             <a class="dropdown-item" href="{{ route('practice-management.process-claims') }}">Process Claims</a>
                             <a class="dropdown-item" href="{{ route('practice-management.client-ccm-rm-status') }}">Client RM Status</a>
                             <a class="dropdown-item" href="{{ route('practice-management.hcp-note-activity') }}">HCP Note Activity</a>
                             <a class="dropdown-item" href="{{ route('practice-management.allNotes') }}">All Notes</a>
 
+=======
+                            <a class="dropdown-item" href="{{ route('practice-management.cellularDeviceManager') }}">Cellular Device Manager</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.medicarePartBClaims') }}">Medicare Part B Claims</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.patientClaimSummary') }}">Patient Claim Summary</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.claims') }}">Claim Matrix</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.process-notes') }}">Process Notes</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.notes-processing-center') }}">Notes Processing Center</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.client-ccm-rm-status') }}">Client RM Status</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.rmActionReport') }}">RM Action Report</a>
+>>>>>>> 3f606ec4f60894fc95cc55db3f549be1d2b3f42c
                             @if($pro->id == '1' || $pro->id == '16')
                                 <a class="dropdown-item" href="{{ route('practice-management.treatmentServiceUtil') }}">Treatment Service Util.</a>
                             @endif
                             <a class="dropdown-item" href="{{ route('practice-management.tickets') }}">Tickets</a>
+<<<<<<< HEAD
                             <a class="dropdown-item" href="{{ route('practice-management.supply-orders') }}">Supply Orders</a>
                             <a class="dropdown-item" href="{{ route('practice-management.shipments') }}">Shipments</a>
                             <a class="dropdown-item" href="{{ route('practice-management.handouts') }}">Handouts</a>
@@ -243,6 +289,16 @@
                             <a class="dropdown-item" href="{{ route('admin.bdt_devices') }}">BDT Devices</a>
                             <a class="dropdown-item" href="{{ route('admin.patientsMissingDefasultSettings') }}">Patients Missing Default Settings</a>
 
+=======
+                            <a class="dropdown-item" href="{{ route('practice-management.packs-multi-print') }}">Print Pack Labels</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.handouts') }}">Handouts</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.mc-code-checks') }}">MC Code Checks</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.clauses.list') }}">Clauses</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.statTrees.list') }}">Stat Trees</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.statTreeLineReports.reports') }}">Stat Trees Line Reports</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.clientsBdtDevices') }}">Clients BDT Devices</a>
+                            <a class="dropdown-item" href="{{ route('admin.part_b_patients') }}">Part B Patients</a>
+>>>>>>> 3f606ec4f60894fc95cc55db3f549be1d2b3f42c
                         </div>
                     </li>
                 @endif