Преглед изворни кода

StatTree - ability to render trees for specific pro

Vijayakrishnan пре 3 година
родитељ
комит
741617e823

+ 1 - 2
app/Http/Controllers/StatTreeController.php

@@ -407,7 +407,6 @@ class StatTreeController extends Controller
             if($statTreeLine->statTree->pro_scope_clause) {
                 $clauses[] = str_replace('@PRO_ID', $mvPro->id, $statTreeLine->statTree->pro_scope_clause);
             }
-            $query = 'SELECT COUNT(*) FROM '.$model.' WHERE '. implode(" AND ", $clauses);
         }
 
         $query = 'SELECT COUNT(*) FROM '.$model.' WHERE '. implode(" AND ", $clauses);
@@ -489,7 +488,7 @@ class StatTreeController extends Controller
         // refresh counts
         $lines = $statTree->lines;
         foreach ($lines as $line) {
-            $query = $this->applyStatTreeLineQueryClauses($line);
+            $query = $this->applyStatTreeLineQueryClauses($line, $request->input('proUid'));
             if ($query && $query !== 'error') {
                 $line->last_refresh_count = $query[0]->count;
             }

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

@@ -31,13 +31,13 @@
 
                 onSelected: function(_e, _data) {
                     @if(!@$reportTarget)
-                        openDynamicStagPopup('/practice-management/stat-tree-lines/view-data/' + _data.node.data.uid,
+                        openDynamicStagPopup('/practice-management/stat-tree-lines/view-data/' + _data.node.data.uid + '{{@$showForPro ? '?proUid=' . $showForPro->uid : ''}}',
                             null,
                             _data.node.data.displayLabel,
                             false,
                             'medium');
                     @else
-                        $.get('/practice-management/stat-tree-lines/view-data/' + _data.node.data.uid, _data => {
+                        $.get('/practice-management/stat-tree-lines/view-data/' + _data.node.data.uid + '{{@$showForPro ? '?proUid=' . $showForPro->uid : ''}}', _data => {
                             $('{{$reportTarget}}').html(_data);
                         });
                     @endif
@@ -55,7 +55,7 @@
 
                     // get data
                     showMask();
-                    $.get('{{ route('practice-management.statTrees.view.linesJSON', $statTree) }}', _data => {
+                    $.get('{{ route('practice-management.statTrees.view.linesJSON', $statTree) }}{{@$showForPro ? '?proUid=' . $showForPro->uid : ''}}', _data => {
 
                         // init tree with data
                         this.el