소스 검색

Stat tree edit - view-data - show arg values above matrix

Vijayakrishnan 3 년 전
부모
커밋
4b670e5a6d

+ 3 - 3
app/Http/Controllers/StatTreeController.php

@@ -371,7 +371,7 @@ class StatTreeController extends Controller
             foreach ($lineClause->clause->clauseArgs as $clauseArg) {
 
                 $value = null;
-                foreach ($lineClause->statTreeLineClauseArgs as $lineClauseArg) {
+                foreach ($lineClause->lineClauseArgs as $lineClauseArg) {
                     if($lineClauseArg->clause_arg_id === $clauseArg->id) {
                         $value = $lineClauseArg->default_value;
                     }
@@ -469,7 +469,7 @@ class StatTreeController extends Controller
         // clause
         $lineClause = $line->displayLineClause();
         $args = [];
-        foreach($lineClause->statTreeLineClauseArgs as $stlcArg) {
+        foreach($lineClause->lineClauseArgs as $stlcArg) {
             if($stlcArg->clauseArg) {
                 $args[] = [
                     "arg_text" => $stlcArg->clauseArg->arg_text,
@@ -584,7 +584,7 @@ class StatTreeController extends Controller
                 $statTreeLineClause->save();
 
                 // copy clause args for parent line clauses
-                foreach ($parentLineClause->statTreeLineClauseArgs as $parentLineClauseArg) {
+                foreach ($parentLineClause->lineClauseArgs as $parentLineClauseArg) {
                     $statTreeLineClauseArg = new StatTreeLineClauseArg();
                     $nextId = DB::select("select nextval('stat_tree_line_clause_arg_id_seq')");
                     $statTreeLineClauseArg->id = $nextId[0]->nextval;

+ 1 - 1
app/Http/Controllers/StatTreeLineController.php

@@ -170,7 +170,7 @@ class StatTreeLineController extends Controller
             foreach ($lineClause->clause->clauseArgs as $clauseArg) {
 
                 $value = null;
-                foreach ($lineClause->statTreeLineClauseArgs as $lineClauseArg) {
+                foreach ($lineClause->lineClauseArgs as $lineClauseArg) {
                     if($lineClauseArg->clause_arg_id === $clauseArg->id) {
                         $value = $lineClauseArg->default_value;
                     }

+ 2 - 2
app/Models/StatTreeLine.php

@@ -67,7 +67,7 @@ class StatTreeLine extends Model
         $args = [];
         $displayLineClause = $this->displayLineClause();
         if(!!$displayLineClause) {
-            foreach($displayLineClause->statTreeLineClauseArgs as $stlcArg) {
+            foreach($displayLineClause->lineClauseArgs as $stlcArg) {
                 $args[] = [
                     "uid" => $stlcArg->uid,
                     "arg_text" => $stlcArg->clauseArg->arg_text,
@@ -106,7 +106,7 @@ class StatTreeLine extends Model
             $newStatTreeLineClause->save();
 
             // line clause args
-            foreach ($srcLineClause->statTreeLineClauseArgs as $srcLineClauseArg) {
+            foreach ($srcLineClause->lineClauseArgs as $srcLineClauseArg) {
                 $newStatTreeLineClauseArg = new StatTreeLineClauseArg();
                 $nextId = DB::select("select nextval('stat_tree_line_clause_arg_id_seq')");
                 $newStatTreeLineClauseArg->id = $nextId[0]->nextval;

+ 1 - 1
app/Models/StatTreeLineClause.php

@@ -14,7 +14,7 @@ class StatTreeLineClause extends Model
         return $this->hasOne(Clause::class, 'id', 'clause_id');
     }
 
-    public function statTreeLineClauseArgs() {
+    public function lineClauseArgs() {
         return $this->hasMany(StatTreeLineClauseArg::class, 'stat_tree_line_clause_id', 'id')->orderBy('id');
     }
 

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

@@ -13,7 +13,18 @@
         @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">{{$lineClause->clause_label}}</div>
+                    <div class="border rounded px-2 py-1 mr-2 bg-light">{{$lineClause->clause_label}}
+                        @if(count($lineClause->lineClauseArgs))
+                            <?php
+                            $argsLabel = [];
+                            foreach($lineClause->lineClauseArgs as $lineClauseArg) {
+                                $argLabel = $lineClauseArg->clauseArg->arg_text . ': ' . $lineClauseArg->default_value;
+                                $argsLabel[] = $argLabel;
+                            }
+                            ?>
+                            ({{implode(', ', $argsLabel)}})
+                        @endif
+                    </div>
                 @endforeach
             </div>
             <table class="table table-sm table-striped table-bordered">