gitmedia/mivita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update 20.10.2025

Browse source
This commit is contained in:
Kevin Adametz 2025-10-20 17:42:08 +02:00
parent 8c11130b5d
commit a939cd51ef
616 changed files with 84821 additions and 4121 deletions
Download patch file Download diff file Expand all files Collapse all files

116
app/Http/Controllers/BusinessControllerOptimized.php
View file

@ -32,7 +32,7 @@ class BusinessControllerOptimized extends Controller
private $filter_next_level = [
0 => 'Alle Status',
1 => 'Qualifiziert (grün)',
2 => 'In Arbeit (gelb)',
2 => 'In Arbeit (gelb)',
3 => 'Kein Level (rot)'
];
private $month;
@ -49,7 +49,7 @@ class BusinessControllerOptimized extends Controller
public function show()
{
$this->setFilterVars();
$data = [
'filter_months' => HTMLHelper::getTransMonths(),
'filter_years' => HTMLHelper::getYearRange(),
@ -58,7 +58,7 @@ class BusinessControllerOptimized extends Controller
'filter_next_level' => $this->filter_next_level,
'optimized' => true, // Flag für View um zu zeigen, dass optimierte Version läuft
];
return view('admin.business_optimized.show', $data);
}
@ -69,7 +69,7 @@ class BusinessControllerOptimized extends Controller
{
$startTime = microtime(true);
$startMemory = memory_get_usage();
try {
$this->setFilterVars();
$this->month = session('business_user_filter_month');
@ -79,25 +79,26 @@ class BusinessControllerOptimized extends Controller
// Verwende optimierte TreeCalcBot-Version
$TreeCalcBot = new TreeCalcBotOptimized($this->month, $this->year, 'admin');
// Prüfe ob Live-Berechnung für Struktur erzwungen wird
$forceLiveCalculation = Request::get('force_live_calculation', false) ||
Request::get('force_live_structure', false) ||
Request::get('live', false);
$forceLiveCalculation = Request::get('force_live_calculation', false) ||
Request::get('force_live_structure', false) ||
Request::get('live', false);
if ($forceLiveCalculation) {
Log::info("BusinessControllerOptimized: Force live calculation requested");
$TreeCalcBot->initStructureAdmin(true, $forceLiveCalculation); // check=true, forceLiveCalculation=true
} else {
Log::info("BusinessControllerOptimized: Force live calculation not requested");
$TreeCalcBot->initStructureAdmin(); // Standard: verwende gespeicherte wenn verfügbar
}
$endTime = microtime(true);
$endMemory = memory_get_usage();
$executionTime = round(($endTime - $startTime) * 1000, 2);
$memoryUsed = $this->formatBytes($endMemory - $startMemory);
$calculationType = $forceLiveCalculation ? " (LIVE)" : " (CACHE)";
Log::info("BusinessControllerOptimized: Structure built in {$executionTime}ms, Memory: {$memoryUsed}{$calculationType}");
@ -115,12 +116,11 @@ class BusinessControllerOptimized extends Controller
'optimized' => true,
'forceLiveCalculation' => $forceLiveCalculation,
];
return view('admin.business_optimized.structure', $data);
} catch (\Exception $e) {
Log::error("BusinessControllerOptimized: Error in structure: " . $e->getMessage());
return view('admin.business_optimized.error', [
'error' => $e->getMessage(),
'month' => $this->month,
@ -135,7 +135,7 @@ class BusinessControllerOptimized extends Controller
public function userDetail($user_id)
{
$startTime = microtime(true);
try {
$user = User::with(['account', 'user_level', 'user_sponsor.account'])->findOrFail($user_id);
$this->setFilterVars();
@ -143,22 +143,22 @@ class BusinessControllerOptimized extends Controller
$data = [];
$data['month'] = session('business_user_filter_month');
$data['year'] = session('business_user_filter_year');
Log::info("BusinessControllerOptimized: Building user detail for user {$user_id}");
$TreeCalcBot = new TreeCalcBotOptimized($data['month'], $data['year'], 'admin');
// Prüfe ob Live-Berechnung über URL-Parameter erzwungen wird
$forceLiveCalculation = Request::get('force_live_calculation', false) ||
Request::get('force_live', false) ||
Request::get('live', false);
$forceLiveCalculation = Request::get('force_live_calculation', false) ||
Request::get('force_live', false) ||
Request::get('live', false);
if ($forceLiveCalculation) {
Log::info("BusinessControllerOptimized: Force live calculation requested for user {$user_id}");
}
$TreeCalcBot->initBusinesslUserDetail($user, $forceLiveCalculation);
if (!$TreeCalcBot->__get('business_user')) {
Log::warning("BusinessControllerOptimized: No business user found for {$user_id}");
abort(403, 'No business user found');
@ -166,23 +166,22 @@ class BusinessControllerOptimized extends Controller
$endTime = microtime(true);
$executionTime = round(($endTime - $startTime) * 1000, 2);
$data['performance'] = [
'execution_time' => $executionTime,
'user_id' => $user_id,
'calculation_type' => $forceLiveCalculation ? 'Live' : 'Cache'
];
$data['forceLiveCalculation'] = $forceLiveCalculation;
$calculationType = $forceLiveCalculation ? " (LIVE)" : " (CACHE)";
Log::info("BusinessControllerOptimized: User detail built in {$executionTime}ms{$calculationType}");
return view('admin.business_optimized.user_detail', compact('TreeCalcBot', 'user', 'data'));
} catch (\Exception $e) {
Log::error("BusinessControllerOptimized: Error in userDetail for {$user_id}: " . $e->getMessage());
return view('admin.business_optimized.error', [
'error' => $e->getMessage(),
'user_id' => $user_id
@ -215,10 +214,9 @@ class BusinessControllerOptimized extends Controller
} else {
return $this->userCurrentlyDatatableOptimized();
}
} catch (\Exception $e) {
Log::error("BusinessControllerOptimized: Error in userDatatable: " . $e->getMessage());
return response()->json([
'error' => 'Datatable could not be loaded: ' . $e->getMessage()
], 500);
@ -231,7 +229,7 @@ class BusinessControllerOptimized extends Controller
private function userStoredDatatableOptimized(): JsonResponse
{
$query = $this->initStoredSearchOptimized();
return \DataTables::eloquent($query)
->addColumn('id', function (UserBusiness $userBusiness) {
return TreeHelperOptimized::generateActionButtons($userBusiness->user_id);
@ -308,10 +306,10 @@ class BusinessControllerOptimized extends Controller
private function userCurrentlyDatatableOptimized(): JsonResponse
{
$repository = new BusinessUserRepository($this->month, $this->year);
// Nutze Repository für optimierte Abfragen
$query = $this->initCurrentlySearchOptimized();
return \DataTables::eloquent($query)
->addColumn('id', function (User $user) {
return TreeHelperOptimized::generateActionButtons($user->id);
@ -352,11 +350,11 @@ class BusinessControllerOptimized extends Controller
->where('month', $this->month)
->where('year', $this->year)
->first();
if ($userBusiness) {
return NextLevelBadgeHelper::generateBadgeFromUserBusiness($userBusiness);
}
return NextLevelBadgeHelper::renderNoDataBadge();
})
->addColumn('payment_account_date', function (User $user) {
@ -364,28 +362,28 @@ class BusinessControllerOptimized extends Controller
})
->filterColumn('m_account', function ($query, $keyword) {
if ($keyword != "") {
$query->whereRaw("user_businesses.m_account LIKE ?", '%' . $keyword . '%');
$query->whereRaw("user_accounts.m_account LIKE ?", '%' . $keyword . '%');
}
})
->filterColumn('first_name', function ($query, $keyword) {
if ($keyword != "") {
$query->whereRaw("user_businesses.first_name LIKE ?", '%' . $keyword . '%');
$query->whereRaw("user_accounts.first_name LIKE ?", '%' . $keyword . '%');
}
})
->filterColumn('last_name', function ($query, $keyword) {
if ($keyword != "") {
$query->whereRaw("user_businesses.last_name LIKE ?", '%' . $keyword . '%');
$query->whereRaw("user_accounts.last_name LIKE ?", '%' . $keyword . '%');
}
})
->filterColumn('email', function ($query, $keyword) {
if ($keyword != "") {
$query->whereRaw("user_businesses.email LIKE ?", '%' . $keyword . '%');
$query->whereRaw("users.email LIKE ?", '%' . $keyword . '%');
}
})
->orderColumn('id', 'users.id $1')
->orderColumn('m_account', 'user_accounts.m_account $1')
->orderColumn('first_name', 'first_name $1')
->orderColumn('last_name', 'last_name $1')
->orderColumn('first_name', 'user_accounts.first_name $1')
->orderColumn('last_name', 'user_accounts.last_name $1')
->orderColumn('email', 'users.email $1')
->orderColumn('active_account', 'users.payment_account $1')
->rawColumns(['id', 'is_qual_kp', 'sales_volume_KP_points', 'sales_volume_total', 'sponsor', 'active_account', 'next_level_qualified'])
@ -423,26 +421,26 @@ class BusinessControllerOptimized extends Controller
switch ($nextLevelFilter) {
case 1: // Qualifiziert (grün) - hat next_qual_user_level
$query->whereNotNull('user_businesses.next_qual_user_level')
->where('user_businesses.next_qual_user_level', '!=', '[]');
->where('user_businesses.next_qual_user_level', '!=', '[]');
break;
case 2: // In Arbeit (gelb) - hat next_can_user_level aber kein next_qual_user_level
$query->where(function($q) {
$query->where(function ($q) {
$q->whereNull('user_businesses.next_qual_user_level')
->orWhere('user_businesses.next_qual_user_level', '=', '[]');
->orWhere('user_businesses.next_qual_user_level', '=', '[]');
})
->whereNotNull('user_businesses.next_can_user_level')
->where('user_businesses.next_can_user_level', '!=', '[]');
->whereNotNull('user_businesses.next_can_user_level')
->where('user_businesses.next_can_user_level', '!=', '[]');
break;
case 3: // Kein Level (rot) - hat weder next_qual noch next_can
$query->where(function($q) {
$q->where(function($q1) {
$query->where(function ($q) {
$q->where(function ($q1) {
$q1->whereNull('user_businesses.next_qual_user_level')
->orWhere('user_businesses.next_qual_user_level', '=', '[]');
->orWhere('user_businesses.next_qual_user_level', '=', '[]');
})
->where(function($q2) {
$q2->whereNull('user_businesses.next_can_user_level')
->orWhere('user_businesses.next_can_user_level', '=', '[]');
});
->where(function ($q2) {
$q2->whereNull('user_businesses.next_can_user_level')
->orWhere('user_businesses.next_can_user_level', '=', '[]');
});
});
break;
}
@ -563,15 +561,15 @@ class BusinessControllerOptimized extends Controller
private function getFilterLevels(): array
{
$levels = [0 => 'Alle Level'];
$userLevels = \App\Models\UserLevel::orderBy('pos')->get(['id', 'name']);
foreach ($userLevels as $level) {
$levels[$level->id] = $level->name;
}
return $levels;
}
// Performance-optimierte Badge-Generierung wurde in NextLevelBadgeHelper ausgelagert
// Alte performance-lastige Methoden wurden entfernt um die Datatable-Performance zu verbessern
}
}