Merge pull request #388 from dbarzin/dev

Dev

Author: dbarzin

app/Http/Controllers/ControlController.php

@@ -291,7 +291,7 @@ public function index(Request $request)
     }
 
     /**
-     * Show the form for creating a new resource.
+     * Show the form for creating a new Control.
      *
      * @return \Illuminate\Http\Response
      */
@@ -323,9 +323,12 @@ public function create()
 
         // get all attributes
         $values = [];
-        $attributes = DB::table('measures')->select('attributes')->get();
+        $attributes = DB::table('attributes')->select('values')
+            ->union(DB::table('measures')
+                ->select(DB::raw('attributes as value')))
+                ->get();
         foreach ($attributes as $key) {
-            foreach (explode(' ', $key->attributes) as $value) {
+            foreach (explode(' ', $key->values) as $value) {
                 array_push($values, $value);
             }
         }
@@ -583,9 +586,12 @@ public function edit(int $id)
 
         // get all attributes
         $values = [];
-        $attributes = DB::table('measures')->select('attributes')->get();
+        $attributes = DB::table('attributes')->select('values')
+            ->union(DB::table('measures')
+                ->select(DB::raw('attributes as value')))
+                ->get();
         foreach ($attributes as $key) {
-            foreach (explode(' ', $key->attributes) as $value) {
+            foreach (explode(' ', $key->values) as $value) {
                 array_push($values, $value);
             }
         }
@@ -638,9 +644,12 @@ public function clone(Request $request)
 
         // get all attributes
         $values = [];
-        $attributes = DB::table('measures')->select('attributes')->get();
+        $attributes = DB::table('attributes')->select('values')
+            ->union(DB::table('measures')
+                ->select(DB::raw('attributes as value')))
+                ->get();
         foreach ($attributes as $key) {
-            foreach (explode(' ', $key->attributes) as $value) {
+            foreach (explode(' ', $key->values) as $value) {
                 array_push($values, $value);
             }
         }

app/Http/Controllers/MeasureController.php

@@ -95,18 +95,18 @@ public function create()
 
         // get all attributes
         $values = [];
-        $attributes = DB::table('attributes')
-            ->select('values')
-            ->get();
-        foreach ($attributes as $attribute) {
-            foreach (explode(' ', $attribute->values) as $value) {
-                if (strlen($value) > 0) {
-                    array_push($values, $value);
-                }
+        $attributes = DB::table('attributes')->select('values')
+            ->union(DB::table('measures')
+                ->select(DB::raw('attributes as value')))
+                ->get();
+        foreach ($attributes as $key) {
+            foreach (explode(' ', $key->values) as $value) {
+                array_push($values, $value);
             }
-            sort($values);
-            $values = array_unique($values);
         }
+        sort($values);
+        $values = array_unique($values);
+
         // for clone action
         $measure = null;
 
@@ -235,14 +235,13 @@ public function edit(int $id)
 
         // get all attributes
         $values = [];
-        $attributes = DB::table('attributes')
-            ->select('values')
-            ->get();
-        foreach ($attributes as $attribute) {
-            foreach (explode(' ', $attribute->values) as $value) {
-                if (strlen($value) > 0) {
-                    array_push($values, $value);
-                }
+        $attributes = DB::table('attributes')->select('values')
+            ->union(DB::table('measures')
+                ->select(DB::raw('attributes as value')))
+                ->get();
+        foreach ($attributes as $key) {
+            foreach (explode(' ', $key->values) as $value) {
+                array_push($values, $value);
             }
         }
         sort($values);
@@ -533,7 +532,7 @@ public function activate(Request $request)
         $control = new Control();
         $control->name = $request->get('name');
         $control->scope = $request->get('scope');
-        $control->attributes = $request->get('attributes[]');
+        $control->attributes = request('attributes') !== null ? implode(' ', request('attributes')) : null;
         $control->objective = $request->get('objective');
         $control->input = $request->get('input');
         $control->model = $request->get('model');

app/Providers/AppServiceProvider.php

@@ -4,9 +4,11 @@
 
 use DB;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\URL;
+use Illuminate\Support\Number;
 use Illuminate\Support\ServiceProvider;
 use Log;
 
@@ -52,6 +54,7 @@ public function boot()
             $this->bootOIDCSocialite();
         }
 
+        // Show appVersion from version.txt in Blades
         view()->composer('*', function ($view) {
             $version = trim(file_get_contents(base_path('version.txt')));
             $view->with('appVersion', $version);

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "version": "2025.05.18",
+  "version": "2025.05.20",
   "license": "GPL-3.0",
   "author": "Didier Barzin",
   "repository": "https://www.github.com/dbarzin/deming",

package.json

@@ -1,15 +1,6 @@
 @extends("layout")
 
 @section("content")
-
-<?php
-function bytesToHuman($bytes) {
-    $units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
-    for ($i = 0; $bytes > 1024; $i++) $bytes /= 1024;
-    return round($bytes, 2) . ' ' . $units[$i];
-}
-?>
-
 <div data-role="panel" data-title-caption="{{ trans('cruds.document.list') }}" data-collapsible="false" data-title-icon="<span class='mif-file-text'></span>">
 
 <table class="table">
@@ -35,7 +26,7 @@ function bytesToHuman($bytes) {
             <a href="/doc/show/{{ $doc->id }}">{{ substr($doc->filename,0,32) }}</a>
         </td>
         <td>
-            {{ bytesToHuman($doc->size) }}
+            {{ \Illuminate\Support\Number::fileSize($doc->size) }}
         </td>
         <td>
             {{ $doc->hash }}

resources/views/documents/check.blade.php

@@ -1 +1 @@
-2025.05.18
+2025.05.20