Update UI, resilience in load-query

app/Console/Commands/GenerateTreeCommand.php

@@ -537,8 +537,9 @@ class GenController {
             if(isset($method->columns[$column])) {
                 $columnTitle = $method->columns[$column]["label"];
                 if(isset($method->columns[$column]["query"])) {
-                    $columnValue = "<?= \Illuminate\Support\Facades\DB::" .
-                        "select(\"{$method->columns[$column]["query"]}\")[0]->result ?>";
+                    $columnValue = "<?php \$_r = \Illuminate\Support\Facades\DB::" .
+                        "select(\"{$method->columns[$column]["query"]}\");\n" .
+                        "echo (\$_r && count(\$_r)) ? \$_r[0]->result : '-'; ?>";
                 }
                 if(isset($method->columns[$column]["link"])) {
                     $hasLink = true;
@@ -710,8 +711,9 @@ class GenController {
             if(isset($method->columns[$column])) {
                 $columnTitle = $method->columns[$column]["label"];
                 if(isset($method->columns[$column]["query"])) {
-                    $columnValue = "<?= \Illuminate\Support\Facades\DB::" .
-                        "select(\"{$method->columns[$column]["query"]}\")[0]->result ?>";
+                    $columnValue = "<?php \$_r = \Illuminate\Support\Facades\DB::" .
+                        "select(\"{$method->columns[$column]["query"]}\");\n" .
+                        "echo (\$_r && count(\$_r)) ? \$_r[0]->result : '-'; ?>";
                 }
                 if(isset($method->columns[$column]["link"])) {
                     $hasLink = true;
@@ -757,8 +759,9 @@ class GenController {
                         if(isset($method->columns[$field])) {
                             $columnTitle = $method->columns[$field]["label"];
                             if(isset($method->columns[$field]["query"])) {
-                                $columnValue = "<?= \Illuminate\Support\Facades\DB::" .
-                                    "select(\"{$method->columns[$field]["query"]}\")[0]->result ?>";
+                                $columnValue = "<?php \$_r = \Illuminate\Support\Facades\DB::" .
+                                    "select(\"{$method->columns[$field]["query"]}\");\n" .
+                                    "echo (\$_r && count(\$_r)) ? \$_r[0]->result : '-'; ?>";
                             }
                             if(isset($method->columns[$field]["link"])) {
                                 $hasLink = true;
@@ -1048,7 +1051,7 @@ class GenControllerMethod {
         ];
         if(count($parts) > 2) {
             $query = $parts[2];
-            $query = preg_replace("/\\$([a-zA-Z0-9_]+)/", "{\$$recordVariable->$1}", $query);
+            $query = preg_replace("/\\$([a-zA-Z0-9_]+)/", "\" . ($$recordVariable->$1 ? $$recordVariable->$1 : -1) . \"", $query);
             $spec['query'] = $query;
         }
         if($link) {

generatecv/tree-templates/info.template.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>_NAME_: Single [_UID_]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>_NAME_: Single [_UID_]</div>
+</h4>

generatecv/tree-templates/show.template.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('_INFO_VIEW_')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('_SUB_LINKS_VIEW_')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('_INFO_VIEW_')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

resources/views/layouts/pro-logged-in.blade.php

@@ -99,8 +99,8 @@
     <!-- Content Wrapper. Contains page content -->
     <div class="content-wrapper">
         <!-- Main content -->
-        <section class="content">
-            <div class="container-fluid py-3">
+        <section class="content p-0">
+            <div class="container-fluid p-0">
                 <div class="row mb-2">
                     <div class="col-12" id="main-content">
                         @yield('content')