diff --git a/app/Http/Controllers/PersonController.php b/app/Http/Controllers/PersonController.php index 4a0692a..acd247b 100644 --- a/app/Http/Controllers/PersonController.php +++ b/app/Http/Controllers/PersonController.php @@ -6,6 +6,7 @@ use Illuminate\Http\Request; use App\Models\Person; use App\Http\Controllers\JsonResponse; use Illuminate\Database\Eloquent\Builder; +use Inertia\Inertia; class PersonController extends Controller { @@ -74,10 +75,15 @@ class PersonController extends Controller $qr = $this->process_rule(null,$currentQuery["rules"],$condition); - if ($qr) $result = $qr->get(); + if ($qr) $result = $qr->first(); else $result = []; - return response()->json($result); + return Inertia::render( + 'Rpo/Results', + [ + 'result' => $result + ] + ); } } diff --git a/package-lock.json b/package-lock.json index 9f9c1db..a8c3b6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@suadelabs/vue3-multiselect": "^1.0.2", "dayjs": "^1.11.7", "font-awesome": "^4.7.0", + "vue-json-to-html-table": "^0.0.7", "vue-tailwind-datepicker": "^1.2.6" }, "devDependencies": { @@ -2256,6 +2257,14 @@ "@vue/shared": "3.2.45" } }, + "node_modules/vue-json-to-html-table": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/vue-json-to-html-table/-/vue-json-to-html-table-0.0.7.tgz", + "integrity": "sha512-9EOAabId86DkGCR5KO5AEmMXOa7YTAgcubDCdHMx6SbcU29EnxeyoT0IFPwEkJcTZ4PQLtCgwaREUl85DjNl9w==", + "dependencies": { + "vue": "^3.2.16" + } + }, "node_modules/vue-tailwind-datepicker": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/vue-tailwind-datepicker/-/vue-tailwind-datepicker-1.2.6.tgz", @@ -3777,6 +3786,14 @@ "@vue/shared": "3.2.45" } }, + "vue-json-to-html-table": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/vue-json-to-html-table/-/vue-json-to-html-table-0.0.7.tgz", + "integrity": "sha512-9EOAabId86DkGCR5KO5AEmMXOa7YTAgcubDCdHMx6SbcU29EnxeyoT0IFPwEkJcTZ4PQLtCgwaREUl85DjNl9w==", + "requires": { + "vue": "^3.2.16" + } + }, "vue-tailwind-datepicker": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/vue-tailwind-datepicker/-/vue-tailwind-datepicker-1.2.6.tgz", diff --git a/package.json b/package.json index 7985d61..0aef6b3 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "@suadelabs/vue3-multiselect": "^1.0.2", "dayjs": "^1.11.7", "font-awesome": "^4.7.0", + "vue-json-to-html-table": "^0.0.7", "vue-tailwind-datepicker": "^1.2.6" } } diff --git a/routes/web.php b/routes/web.php index 31488c2..30d6fa1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -30,6 +30,9 @@ Route::get('/', function () { return Inertia::render('Rpo'); }); +Route::get('/results', function () { + return Inertia::render('Results'); +})->name('results'); Route::get('/dashboard', function () { return Inertia::render('Dashboard'); diff --git a/yarn.lock b/yarn.lock index 9c983b4..1343080 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1171,6 +1171,13 @@ optionalDependencies: "fsevents" "~2.3.2" +"vue-json-to-html-table@^0.0.7": + "integrity" "sha512-9EOAabId86DkGCR5KO5AEmMXOa7YTAgcubDCdHMx6SbcU29EnxeyoT0IFPwEkJcTZ4PQLtCgwaREUl85DjNl9w==" + "resolved" "https://registry.npmjs.org/vue-json-to-html-table/-/vue-json-to-html-table-0.0.7.tgz" + "version" "0.0.7" + dependencies: + "vue" "^3.2.16" + "vue-tailwind-datepicker@^1.2.6": "integrity" "sha512-OCOL6hqhnu998hI8K6qGwyhHUOcgBhXhhWXSCQTAB040ALryO8IPYLef+qbsra27BG5aB4IJN87bUQXg5Ks1Tg==" "resolved" "https://registry.npmjs.org/vue-tailwind-datepicker/-/vue-tailwind-datepicker-1.2.6.tgz" @@ -1185,7 +1192,7 @@ dependencies: "is-plain-object" "3.0.1" -"vue@^3.0.0", "vue@^3.0.1", "vue@^3.2.25", "vue@^3.2.38", "vue@^3.2.41", "vue@>= 3", "vue@>= 3.0.0 < 4", "vue@>=3.0.3", "vue@>=3.2.0", "vue@2 || 3", "vue@3.2.45": +"vue@^3.0.0", "vue@^3.0.1", "vue@^3.2.16", "vue@^3.2.25", "vue@^3.2.38", "vue@^3.2.41", "vue@>= 3", "vue@>= 3.0.0 < 4", "vue@>=3.0.3", "vue@>=3.2.0", "vue@2 || 3", "vue@3.2.45": "integrity" "sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA==" "resolved" "https://registry.npmjs.org/vue/-/vue-3.2.45.tgz" "version" "3.2.45"