From a285bcceac9e2cf3f0715e3df5a9403a109901d9 Mon Sep 17 00:00:00 2001 From: "Montzar.ah.01" Date: Sat, 25 Apr 2026 19:45:15 +0000 Subject: [PATCH] NASER fix some issue --- app/Http/Controllers/Controller.php | 14 ++++-------- app/Http/Controllers/TaskController.php | 25 +++++++++++++++------ app/Models/Tasks.php | 4 ++-- resources/views/tasks/tasks.blade.php | 30 +++++-------------------- 4 files changed, 30 insertions(+), 43 deletions(-) diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index b32fbe96..ef87bcb6 100755 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -72,7 +72,7 @@ namespace App\Http\Controllers; // ]); if ($admin->bale) { try { - $response = Http::post('https://tapi.bale.ai/1482838710:sYbLzby0tuLRzHvP4d3LsbcNwg2sjSDLTAU/sendMessage', [ + $response = Http::withoutVerifying()->post('https://tapi.bale.ai/1482838710:sYbLzby0tuLRzHvP4d3LsbcNwg2sjSDLTAU/sendMessage', [ "chat_id" => $admin->bale, 'text' => $message, ]); @@ -86,7 +86,7 @@ namespace App\Http\Controllers; } }else{ try { - $response = Http::post('https://tapi.bale.ai/1482838710:sYbLzby0tuLRzHvP4d3LsbcNwg2sjSDLTAU/sendMessage', [ + $response = Http::withoutVerifying()->post('https://tapi.bale.ai/1482838710:sYbLzby0tuLRzHvP4d3LsbcNwg2sjSDLTAU/sendMessage', [ "chat_id" => '985309723', 'text' => $message, ]); @@ -101,12 +101,7 @@ namespace App\Http\Controllers; foreach ($admins as $admin) { try{ - Http::/*withOptions([ - 'curl' => [ - CURLOPT_IPRESOLVE => CURL_IPRESOLVE_V4, - CURLOPT_TCP_FASTOPEN => 1, - ] - ])->*/withoutVerifying()->post('https://tapi.bale.ai/1482838710:sYbLzby0tuLRzHvP4d3LsbcNwg2sjSDLTAU/sendMessage', [ + Http::withoutVerifying()->post('https://tapi.bale.ai/1482838710:sYbLzby0tuLRzHvP4d3LsbcNwg2sjSDLTAU/sendMessage', [ "chat_id" => $admin->bale, 'text' => $message, ]); @@ -124,8 +119,7 @@ namespace App\Http\Controllers; "chat_id" => $admin->bale, 'text' => $message, ]); - } catch (\Exception $e) { - } + } catch (\Exception $e) {} } } } diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php index 0c2f6c26..2a7fe444 100755 --- a/app/Http/Controllers/TaskController.php +++ b/app/Http/Controllers/TaskController.php @@ -138,7 +138,7 @@ class TaskController extends Controller $user = User::where('user_name', $_COOKIE['user_identity'])->first(); if ($user) { if ($user->is_admin == 1) { - $tasks = Tasks::with(['duration', 'comments.user']) + $tasks = Tasks::with(['duration', 'comments.user', 'appName']) ->orderBy('target_date', 'desc') ->get(); // dd($tasks); @@ -182,6 +182,22 @@ class TaskController extends Controller 'tasks' => (new Tasks())->filterByState($tasks), 'count' => $count, 'user_id' => $user->id, + 'isAdminLevel1' => $user->is_admin == 1, + 'mentionUsers' => User::select('id', 'name', 'user_name')->get(), + 'appsList' => App::select('id', 'name_fa')->get(), + 'priorityLabels' => [ + 'urgent' => 'فوری', + 'high' => 'بالا', + 'medium' => 'متوسط', + 'low' => 'پایین' + ], + 'priorityColors' => [ + 'urgent' => 'bg-red-100 text-red-800', + 'high' => 'bg-orange-100 text-orange-800', + 'medium' => 'bg-yellow-100 text-yellow-800', + 'low' => 'bg-green-100 text-green-800' + ], + ]); } else { return back()->with('message', [ @@ -529,12 +545,7 @@ class TaskController extends Controller private function send_bale($chat_id, $message) { try { - Http::withOptions([ - 'curl' => [ - CURLOPT_IPRESOLVE => CURL_IPRESOLVE_V4, - CURLOPT_TCP_FASTOPEN => 1, - ] - ])->withoutVerifying()->post('https://tapi.bale.ai/1482838710:sYbLzby0tuLRzHvP4d3LsbcNwg2sjSDLTAU/sendMessage', [ + Http::withoutVerifying()->post('https://tapi.bale.ai/1482838710:sYbLzby0tuLRzHvP4d3LsbcNwg2sjSDLTAU/sendMessage', [ "chat_id" => $chat_id, 'text' => $message, ]); diff --git a/app/Models/Tasks.php b/app/Models/Tasks.php index a0af21c4..64275fc6 100755 --- a/app/Models/Tasks.php +++ b/app/Models/Tasks.php @@ -62,8 +62,8 @@ class Tasks extends Model return $this->belongsTo(User::class); } - public function app(){ - return $this->belogsTo(App::class); + public function appName(){ + return $this->belongsTo(App::class, 'app' , 'id'); } public function duration(){ diff --git a/resources/views/tasks/tasks.blade.php b/resources/views/tasks/tasks.blade.php index 5d51ce4e..d64ae2e8 100755 --- a/resources/views/tasks/tasks.blade.php +++ b/resources/views/tasks/tasks.blade.php @@ -6,13 +6,6 @@ use App\Models\User; use App\Models\App; -$mentionUsers = User::select('id', 'name', 'user_name')->get(); -$appsList = App::select('id', 'name_fa')->get(); -$isAdminLevel1 = false; -if (isset($_COOKIE['user_identity'])) { - $isAdminLevel1 = (int)User::where('user_name', $_COOKIE['user_identity'])->value('is_admin') === 1; -} - $backlog = << @@ -67,18 +60,7 @@ $state = [ ]; //$p_tasks = Pivot_Tasks::get(); -$priorityLabels = [ - 'urgent' => 'فوری', - 'high' => 'بالا', - 'medium' => 'متوسط', - 'low' => 'پایین' -]; -$priorityColors = [ - 'urgent' => 'bg-red-100 text-red-800', - 'high' => 'bg-orange-100 text-orange-800', - 'medium' => 'bg-yellow-100 text-yellow-800', - 'low' => 'bg-green-100 text-green-800' -]; + ?> @extends('app') @@ -115,8 +97,7 @@ $priorityColors = [ اولویت - تاریخ - شروع + {{ $isAdminLevel1 ? 'نام اپ' : 'تاریخ شروع' }} مهلت @@ -155,6 +136,7 @@ $priorityColors = [ $actionType = $ended_at ? 'start' : ($started_at ? 'end' : 'start'); $p_id = $lastDuration?->id ?? ''; @endphp +{{--@if($_COOKIE['user_identity'] == 'naser_me') {{dump($task)}} @endif--}}
@@ -173,7 +155,7 @@ $priorityColors = [ - {{ $task->start_date ? Jalalian::fromCarbon(Carbon::parse($task->start_date))->format('Y/m/d') : '-' }} + {{ $isAdminLevel1 ? $task->appName->name_fa : Jalalian::fromCarbon(Carbon::parse($task->start_date))->format('Y/m/d') }} {{ $task->target_date ? Jalalian::fromCarbon(Carbon::parse($task->target_date))->format('Y/m/d') : '-' }} @@ -772,7 +754,7 @@ $priorityColors = [ const appTypes = {1:'خانگی', 2:'همکار'}; if (appNameEl) { const app = (appsList || []).find(a => String(a.id) === String(task.app)); - appNameEl.textContent = app?.name_fa ` (${appTypes[app.type]})` || '-'; + appNameEl.textContent = app ? `${app.name_fa} (${appTypes[app.type]})` : '-'; } // اولویت @@ -1119,4 +1101,4 @@ $priorityColors = [ -@endsection \ No newline at end of file +@endsection