+ ->label(function ($row) {
+ if (! Auth::user()->can('assign users')) {
+ return '';
+ }
+
+ return '
';
- })
- ->html(),
+ })
+ ->html(),
];
}
@@ -109,7 +113,7 @@ class ProjectUsersTable extends DataTableComponent
if (! array_key_exists($role, self::ROLES)) {
return;
}
- \App\Models\Project::findOrFail($this->projectId)
+ Project::findOrFail($this->projectId)
->users()->updateExistingPivot($userId, ['role_in_project' => $role]);
$this->dispatch('project-users-changed');
$this->dispatch('notify', 'Rol actualizado.');
@@ -118,7 +122,7 @@ class ProjectUsersTable extends DataTableComponent
public function removeUser($userId): void
{
abort_unless(Auth::user()->can('assign users'), 403);
- \App\Models\Project::findOrFail($this->projectId)->users()->detach($userId);
+ Project::findOrFail($this->projectId)->users()->detach($userId);
$this->dispatch('project-users-changed');
$this->dispatch('notify', 'Usuario eliminado del proyecto.');
}
diff --git a/app/Livewire/Reports/ReportBuilder.php b/app/Livewire/Reports/ReportBuilder.php
index 66d3ee0..de84c43 100644
--- a/app/Livewire/Reports/ReportBuilder.php
+++ b/app/Livewire/Reports/ReportBuilder.php
@@ -10,7 +10,7 @@ use Livewire\Component;
class ReportBuilder extends Component
{
public Project $project;
-
+
public array $filters = [
'date_from' => null,
'date_to' => null,
@@ -19,8 +19,9 @@ class ReportBuilder extends Component
'include_charts' => false,
'format' => 'html',
];
-
+
public bool $showPreview = false;
+
public ?array $previewData = null;
public function mount(Project $project)
@@ -32,7 +33,7 @@ class ReportBuilder extends Component
public function authorizeAccess(): void
{
$user = auth()->guard()->user();
- if (!$user->can('manage all') && !$this->project->users()->where('user_id', $user->id)->exists()) {
+ if (! $user->can('manage all') && ! $this->project->users()->where('user_id', $user->id)->exists()) {
abort(403);
}
}
@@ -122,4 +123,4 @@ class ReportBuilder extends Component
'availableEntities' => (new ReportFilters)->getAvailableEntities(),
]);
}
-}
\ No newline at end of file
+}
diff --git a/app/Livewire/Reports/ReportsDashboard.php b/app/Livewire/Reports/ReportsDashboard.php
index f6bcb9d..414db92 100644
--- a/app/Livewire/Reports/ReportsDashboard.php
+++ b/app/Livewire/Reports/ReportsDashboard.php
@@ -2,31 +2,32 @@
namespace App\Livewire\Reports;
-use Livewire\Component;
-use Livewire\Attributes\Layout;
-use App\Models\Project;
-use App\Models\Phase;
use App\Models\Inspection;
+use App\Models\Phase;
+use App\Models\Project;
use Carbon\Carbon;
+use Livewire\Attributes\Layout;
+use Livewire\Component;
#[Layout('layouts.app')]
class ReportsDashboard extends Component
{
public $dateRange = 'month'; // week, month, quarter, year
+
public $chartData = [];
-
+
public function mount()
{
$this->loadChartData();
}
-
+
public function loadChartData()
{
// Project progress over time (last 6 months)
- $projects = Project::with(['phases' => function($query) {
+ $projects = Project::with(['phases' => function ($query) {
$query->select('project_id', 'progress_percent', 'updated_at');
}])->get();
-
+
// Simulate monthly progress data (since we don't have historical stored)
// In a real app, we'd have a progress_history table or similar
$months = [];
@@ -35,7 +36,7 @@ class ReportsDashboard extends Component
$month = $current->copy()->subMonths($i);
$months[] = $month->format('M Y');
}
-
+
$projectProgress = [];
foreach ($projects as $project) {
$progressData = [];
@@ -49,54 +50,54 @@ class ReportsDashboard extends Component
}
$projectProgress[] = [
'name' => $project->name,
- 'data' => $progressData
+ 'data' => $progressData,
];
}
-
+
// Inspections by type (last 6 months)
$inspections = Inspection::with(['template', 'feature'])
->whereDate('created_at', '>=', Carbon::now()->subMonths(6))
->get();
-
- $inspectionTypes = $inspections->groupBy(function($inspection) {
+
+ $inspectionTypes = $inspections->groupBy(function ($inspection) {
return $inspection->template ? $inspection->template->name : 'Sin plantilla';
- })->map(function($group) {
+ })->map(function ($group) {
return $group->count();
});
-
+
// Projects by status
$projectsByStatus = Project::selectRaw('status, count(*) as count')
->groupBy('status')
->pluck('count', 'status')
->toArray();
-
+
// Average phase progress by project
$projectPhaseProgress = Project::with(['phases'])
->get()
- ->map(function($project) {
+ ->map(function ($project) {
return [
'name' => $project->name,
- 'progress' => $project->phases->avg('progress_percent') ?? 0
+ 'progress' => $project->phases->avg('progress_percent') ?? 0,
];
});
-
+
$this->chartData = [
'months' => $months,
'projectProgress' => $projectProgress,
'inspectionTypes' => [
'labels' => $inspectionTypes->keys()->toArray(),
- 'data' => $inspectionTypes->values()->toArray()
+ 'data' => $inspectionTypes->values()->toArray(),
],
'projectsByStatus' => [
- 'labels' => array_map(function($status) {
+ 'labels' => array_map(function ($status) {
return ucfirst(str_replace('_', ' ', $status));
}, array_keys($projectsByStatus)),
- 'data' => array_values($projectsByStatus)
+ 'data' => array_values($projectsByStatus),
],
- 'projectPhaseProgress' => $projectPhaseProgress
+ 'projectPhaseProgress' => $projectPhaseProgress,
];
}
-
+
public function render()
{
return view('livewire.reports.reports-dashboard');
diff --git a/app/Livewire/Users/AdminUsers.php b/app/Livewire/Users/AdminUsers.php
index 5e0f0d0..54f3e26 100644
--- a/app/Livewire/Users/AdminUsers.php
+++ b/app/Livewire/Users/AdminUsers.php
@@ -2,14 +2,15 @@
namespace App\Livewire\Users;
-use Livewire\Component;
use App\Models\User;
-use Spatie\Permission\Models\Role;
use Illuminate\Support\Facades\Auth;
+use Livewire\Component;
+use Spatie\Permission\Models\Role;
class AdminUsers extends Component
{
public string $search = '';
+
public $roles;
public function mount(): void
@@ -21,10 +22,9 @@ class AdminUsers extends Component
public function getUsersProperty()
{
return User::with('roles')
- ->when($this->search, fn($q) =>
- $q->where(fn($q2) => $q2
- ->where('name', 'like', '%' . $this->search . '%')
- ->orWhere('email', 'like', '%' . $this->search . '%')))
+ ->when($this->search, fn ($q) => $q->where(fn ($q2) => $q2
+ ->where('name', 'like', '%'.$this->search.'%')
+ ->orWhere('email', 'like', '%'.$this->search.'%')))
->orderBy('name')
->get();
}
@@ -33,6 +33,7 @@ class AdminUsers extends Component
{
if ($userId === Auth::id()) {
$this->dispatch('notify', 'No puedes eliminarte a ti mismo.');
+
return;
}
User::findOrFail($userId)->delete();
diff --git a/app/Livewire/Users/UserForm.php b/app/Livewire/Users/UserForm.php
index 4f13e76..aba54b7 100644
--- a/app/Livewire/Users/UserForm.php
+++ b/app/Livewire/Users/UserForm.php
@@ -2,14 +2,14 @@
namespace App\Livewire\Users;
-use Livewire\Component;
-use Livewire\Attributes\Layout;
-use App\Models\User;
use App\Models\Company;
-use Spatie\Permission\Models\Role;
+use App\Models\User;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Illuminate\Validation\Rules\Password;
+use Livewire\Attributes\Layout;
+use Livewire\Component;
+use Spatie\Permission\Models\Role;
#[Layout('layouts.app')]
class UserForm extends Component
@@ -17,21 +17,29 @@ class UserForm extends Component
public ?User $user = null;
// Información personal
- public string $title = '';
- public string $lastName = '';
+ public string $title = '';
+
+ public string $lastName = '';
+
public string $firstName = '';
// Validación
public string $userStatus = 'active';
- public string $validFrom = '';
+
+ public string $validFrom = '';
+
public string $validUntil = '';
+
public string $formPassword = '';
// Contacto
- public ?int $companyId = null;
- public string $address = '';
- public string $phone = '';
- public string $email = '';
+ public ?int $companyId = null;
+
+ public string $address = '';
+
+ public string $phone = '';
+
+ public string $email = '';
// Permisos
public string $formRole = '';
@@ -44,6 +52,7 @@ class UserForm extends Component
// Catálogos
public $roles;
+
public $companies;
/** Idiomas disponibles (código => nombre + archivo de bandera). */
@@ -58,47 +67,47 @@ class UserForm extends Component
{
abort_unless(Auth::user()->can('create users') || Auth::user()->can('edit users'), 403);
- $this->roles = Role::orderBy('name')->get();
+ $this->roles = Role::orderBy('name')->get();
$this->companies = Company::where('estado', 'activo')->orderBy('name')->get();
- $this->formRole = $this->roles->first()?->name ?? '';
+ $this->formRole = $this->roles->first()?->name ?? '';
if ($user && $user->exists) {
- $this->user = $user;
- $this->title = $user->title ?? '';
- $this->lastName = $user->last_name ?? '';
- $this->firstName = $user->first_name ?? '';
- $this->userStatus = $user->status ?? 'active';
- $this->validFrom = $user->valid_from?->format('Y-m-d') ?? '';
+ $this->user = $user;
+ $this->title = $user->title ?? '';
+ $this->lastName = $user->last_name ?? '';
+ $this->firstName = $user->first_name ?? '';
+ $this->userStatus = $user->status ?? 'active';
+ $this->validFrom = $user->valid_from?->format('Y-m-d') ?? '';
$this->validUntil = $user->valid_until?->format('Y-m-d') ?? '';
- $this->companyId = $user->company_id;
- $this->address = $user->address ?? '';
- $this->phone = $user->phone ?? '';
- $this->email = $user->email;
- $this->notes = $user->notes ?? '';
- $this->formRole = $user->roles->first()?->name ?? $this->formRole;
- $this->locale = $user->locale ?? $this->locale;
+ $this->companyId = $user->company_id;
+ $this->address = $user->address ?? '';
+ $this->phone = $user->phone ?? '';
+ $this->email = $user->email;
+ $this->notes = $user->notes ?? '';
+ $this->formRole = $user->roles->first()?->name ?? $this->formRole;
+ $this->locale = $user->locale ?? $this->locale;
}
}
protected function rules(): array
{
- $id = $this->user?->id ?? 'NULL';
+ $id = $this->user?->id ?? 'NULL';
$rules = [
- 'lastName' => 'required|string|max:100',
- 'firstName' => 'required|string|max:100',
- 'title' => 'nullable|string|max:20',
+ 'lastName' => 'required|string|max:100',
+ 'firstName' => 'required|string|max:100',
+ 'title' => 'nullable|string|max:20',
'userStatus' => 'required|in:active,inactive,suspended',
- 'validFrom' => 'nullable|date',
+ 'validFrom' => 'nullable|date',
'validUntil' => 'nullable|date|after_or_equal:validFrom',
- 'companyId' => 'required|exists:companies,id',
- 'address' => 'nullable|string',
- 'phone' => 'nullable|string|max:30',
- 'email' => "required|email|max:255|unique:users,email,{$id}",
- 'formRole' => 'required|exists:roles,name',
- 'locale' => 'required|in:' . implode(',', array_keys($this->languages)),
+ 'companyId' => 'required|exists:companies,id',
+ 'address' => 'nullable|string',
+ 'phone' => 'nullable|string|max:30',
+ 'email' => "required|email|max:255|unique:users,email,{$id}",
+ 'formRole' => 'required|exists:roles,name',
+ 'locale' => 'required|in:'.implode(',', array_keys($this->languages)),
];
- if (!$this->user) {
+ if (! $this->user) {
$rules['formPassword'] = ['required', Password::min(8)->letters()->mixedCase()->numbers()];
} elseif ($this->formPassword !== '') {
$rules['formPassword'] = [Password::min(8)->letters()->mixedCase()->numbers()];
@@ -108,20 +117,22 @@ class UserForm extends Component
}
protected $validationAttributes = [
- 'lastName' => 'apellidos',
- 'firstName' => 'nombre',
- 'userStatus' => 'estado',
- 'validFrom' => 'fecha de inicio',
- 'validUntil' => 'fecha de fin',
- 'companyId' => 'empresa',
- 'formPassword'=> 'contraseña',
- 'formRole' => 'rol',
- 'locale' => 'idioma',
+ 'lastName' => 'apellidos',
+ 'firstName' => 'nombre',
+ 'userStatus' => 'estado',
+ 'validFrom' => 'fecha de inicio',
+ 'validUntil' => 'fecha de fin',
+ 'companyId' => 'empresa',
+ 'formPassword' => 'contraseña',
+ 'formRole' => 'rol',
+ 'locale' => 'idioma',
];
public function copyCompanyAddress(): void
{
- if (!$this->companyId) return;
+ if (! $this->companyId) {
+ return;
+ }
$company = Company::find($this->companyId);
if ($company?->address) {
$this->address = $company->address;
@@ -135,25 +146,26 @@ class UserForm extends Component
if ($this->user && $this->user->id === Auth::id()
&& $this->user->hasRole('Admin') && $this->formRole !== 'Admin') {
$this->addError('formRole', 'No puedes quitarte el rol Admin a ti mismo.');
+
return;
}
- $fullName = trim($this->firstName . ' ' . $this->lastName);
+ $fullName = trim($this->firstName.' '.$this->lastName);
$data = [
- 'name' => $fullName,
- 'title' => $this->title ?: null,
+ 'name' => $fullName,
+ 'title' => $this->title ?: null,
'first_name' => $this->firstName,
- 'last_name' => $this->lastName,
- 'status' => $this->userStatus,
- 'valid_from' => $this->validFrom ?: null,
- 'valid_until'=> $this->validUntil ?: null,
+ 'last_name' => $this->lastName,
+ 'status' => $this->userStatus,
+ 'valid_from' => $this->validFrom ?: null,
+ 'valid_until' => $this->validUntil ?: null,
'company_id' => $this->companyId,
- 'address' => $this->address ?: null,
- 'phone' => $this->phone ?: null,
- 'email' => $this->email,
- 'notes' => $this->notes ?: null,
- 'locale' => $this->locale,
+ 'address' => $this->address ?: null,
+ 'phone' => $this->phone ?: null,
+ 'email' => $this->email,
+ 'notes' => $this->notes ?: null,
+ 'locale' => $this->locale,
];
if ($this->formPassword !== '') {
diff --git a/app/Livewire/Users/UserTable.php b/app/Livewire/Users/UserTable.php
index 4d2b4bd..9ac9e68 100644
--- a/app/Livewire/Users/UserTable.php
+++ b/app/Livewire/Users/UserTable.php
@@ -2,13 +2,13 @@
namespace App\Livewire\Users;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Auth;
use Rappasoft\LaravelLivewireTables\DataTableComponent;
use Rappasoft\LaravelLivewireTables\Views\Column;
use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Auth;
use Spatie\Permission\Models\Role;
-use App\Models\User;
class UserTable extends DataTableComponent
{
@@ -17,17 +17,17 @@ class UserTable extends DataTableComponent
public function configure(): void
{
$this->setPrimaryKey('id')
- ->setDefaultSort('name', 'asc')
- ->setSortingPillsEnabled(false)
- ->setAdditionalSelects([
- 'users.id as id',
- 'users.email as email',
- 'users.email_verified_at as email_verified_at',
- 'users.status as status',
- 'users.phone as phone',
- 'users.company_id as company_id',
- 'users.created_at as created_at',
- ]);
+ ->setDefaultSort('name', 'asc')
+ ->setSortingPillsEnabled(false)
+ ->setAdditionalSelects([
+ 'users.id as id',
+ 'users.email as email',
+ 'users.email_verified_at as email_verified_at',
+ 'users.status as status',
+ 'users.phone as phone',
+ 'users.company_id as company_id',
+ 'users.created_at as created_at',
+ ]);
}
public function builder(): Builder
@@ -39,90 +39,91 @@ class UserTable extends DataTableComponent
{
return [
Column::make('Usuario', 'name')
- ->sortable()
- ->searchable()
- ->format(function ($value, $row) {
- $initial = strtoupper(mb_substr($value, 0, 1));
- $html = '
';
- $html .= '
+ ->sortable()
+ ->searchable()
+ ->format(function ($value, $row) {
+ $initial = strtoupper(mb_substr($value, 0, 1));
+ $html = '
';
+ $html .= '
';
- $html .= '
';
- $html .= '
'.e($value).'
';
- $html .= '
'.e($row->email).'
';
- $html .= '
';
- return $html;
- })
- ->html(),
+ $html .= '
';
+ $html .= '
'.e($value).'
';
+ $html .= '
'.e($row->email).'
';
+ $html .= '
';
+
+ return $html;
+ })
+ ->html(),
Column::make('Empresa')
- ->label(fn ($row) =>
- $row->company
- ? '
'.e($row->company->name).''
- : '
—'
- )
- ->html(),
+ ->label(fn ($row) => $row->company
+ ? '
'.e($row->company->name).''
+ : '
—'
+ )
+ ->html(),
Column::make('Rol')
- ->label(function ($row) {
- if ($row->roles->isEmpty()) {
- return '
Sin rol';
- }
- return $row->roles->map(fn ($role) =>
- '
'.e($role->name).''
- )->implode(' ');
- })
- ->html(),
+ ->label(function ($row) {
+ if ($row->roles->isEmpty()) {
+ return '
Sin rol';
+ }
+
+ return $row->roles->map(fn ($role) => '
'.e($role->name).''
+ )->implode(' ');
+ })
+ ->html(),
Column::make('Estado', 'status')
- ->sortable()
- ->format(function ($value) {
- $map = [
- 'active' => ['badge-success', 'Activo'],
- 'inactive' => ['badge-ghost', 'Inactivo'],
- 'suspended' => ['badge-error', 'Suspendido'],
- ];
- [$cls, $label] = $map[$value ?? 'active'] ?? ['badge-ghost', ucfirst($value ?? '')];
- return '
'.$label.'';
- })
- ->html(),
+ ->sortable()
+ ->format(function ($value) {
+ $map = [
+ 'active' => ['badge-success', 'Activo'],
+ 'inactive' => ['badge-ghost', 'Inactivo'],
+ 'suspended' => ['badge-error', 'Suspendido'],
+ ];
+ [$cls, $label] = $map[$value ?? 'active'] ?? ['badge-ghost', ucfirst($value ?? '')];
+
+ return '
'.$label.'';
+ })
+ ->html(),
Column::make('Verificado', 'email_verified_at')
- ->sortable()
- ->format(fn ($value) =>
- $value
- ? '
'
- : '
'
- )
- ->html(),
+ ->sortable()
+ ->format(fn ($value) => $value
+ ? '
'
+ : '
'
+ )
+ ->html(),
Column::make('Acciones')
- ->label(function ($row) {
- $ver = route('admin.users.show', $row->id);
- $editar = route('admin.users.edit', $row->id);
- $name = addslashes($row->name);
- $isSelf = $row->id === Auth::id();
+ ->label(function ($row) {
+ $ver = route('admin.users.show', $row->id);
+ $editar = route('admin.users.edit', $row->id);
+ $name = addslashes($row->name);
+ $isSelf = $row->id === Auth::id();
- $html = '
';
+
+ return $html;
+ })
+ ->html(),
];
}
@@ -133,16 +134,15 @@ class UserTable extends DataTableComponent
return [
SelectFilter::make('Rol')
->options($roleOptions)
- ->filter(fn (Builder $query, string $value) =>
- $query->whereHas('roles', fn ($q) => $q->where('name', $value))
+ ->filter(fn (Builder $query, string $value) => $query->whereHas('roles', fn ($q) => $q->where('name', $value))
),
SelectFilter::make('Estado', 'status')
->options([
- '' => 'Estado: todos',
- 'active' => 'Activo',
- 'inactive' => 'Inactivo',
- 'suspended' => 'Suspendido',
+ '' => 'Estado: todos',
+ 'active' => 'Activo',
+ 'inactive' => 'Inactivo',
+ 'suspended' => 'Suspendido',
])
->filter(fn (Builder $query, string $value) => $query->where('status', $value)),
];
@@ -150,7 +150,9 @@ class UserTable extends DataTableComponent
public function deleteUser(int $id): void
{
- if ($id === Auth::id()) return;
+ if ($id === Auth::id()) {
+ return;
+ }
User::findOrFail($id)->delete();
}
}
diff --git a/app/Livewire/Users/UserView.php b/app/Livewire/Users/UserView.php
index 5624507..a15c2f2 100644
--- a/app/Livewire/Users/UserView.php
+++ b/app/Livewire/Users/UserView.php
@@ -2,40 +2,45 @@
namespace App\Livewire\Users;
-use Livewire\Component;
-use Livewire\Attributes\Layout;
-use App\Models\User;
-use App\Models\Project;
use App\Models\Inspection;
use App\Models\Issue;
+use App\Models\Project;
+use App\Models\User;
use Illuminate\Support\Facades\Auth;
+use Livewire\Attributes\Layout;
+use Livewire\Component;
use Spatie\Permission\Models\Permission;
use Spatie\Permission\PermissionRegistrar;
#[Layout('layouts.app')]
class UserView extends Component
{
- public User $user;
+ public User $user;
+
public string $activeTab = 'ficha';
// Projects tab
- public ?int $addProjectId = null;
+ public ?int $addProjectId = null;
+
public string $addProjectRole = '';
+
public $availableProjects;
// Notes tab
- public string $notes = '';
- public bool $editingNotes = false;
+ public string $notes = '';
+
+ public bool $editingNotes = false;
// Recent activity (loaded once)
public $recentInspections;
+
public $recentIssues;
public function mount(User $user): void
{
abort_unless(Auth::user()->can('view users'), 403);
- $this->user = $user->load(['roles', 'company', 'projects.phases']);
+ $this->user = $user->load(['roles', 'company', 'projects.phases']);
$this->notes = $user->notes ?? '';
$this->loadAvailableProjects();
@@ -72,7 +77,7 @@ class UserView extends Component
public function assignProject(): void
{
$this->validate([
- 'addProjectId' => 'required|exists:projects,id',
+ 'addProjectId' => 'required|exists:projects,id',
'addProjectRole' => 'nullable|string|max:100',
], [], ['addProjectId' => 'proyecto', 'addProjectRole' => 'rol en proyecto']);
@@ -81,7 +86,7 @@ class UserView extends Component
]);
$this->user->load('projects.phases');
- $this->addProjectId = null;
+ $this->addProjectId = null;
$this->addProjectRole = '';
$this->loadAvailableProjects();
$this->dispatch('notify', 'Proyecto asignado.');
@@ -146,13 +151,14 @@ class UserView extends Component
->groupBy(fn ($perm) => $perm->group ?: 'General')
->sortBy(function ($perms, $section) use ($order) {
$i = array_search($section, $order, true);
+
return $i === false ? 999 : $i;
});
return view('livewire.users.user-view', [
- 'grouped' => $grouped,
+ 'grouped' => $grouped,
'directPerms' => $this->user->getDirectPermissions()->pluck('name')->toArray(),
- 'rolePerms' => $this->user->getPermissionsViaRoles()->pluck('name')->toArray(),
+ 'rolePerms' => $this->user->getPermissionsViaRoles()->pluck('name')->toArray(),
]);
}
}
diff --git a/app/Models/ActivityLog.php b/app/Models/ActivityLog.php
index 7d82abb..f1d0e48 100644
--- a/app/Models/ActivityLog.php
+++ b/app/Models/ActivityLog.php
@@ -12,18 +12,18 @@ class ActivityLog extends Model
protected $fillable = ['action', 'model_type', 'model_id', 'user_id', 'changes', 'created_at'];
protected $casts = [
- 'changes' => 'array',
+ 'changes' => 'array',
'created_at' => 'datetime',
];
public static function record(string $action, Model $model, array $changes = []): void
{
static::create([
- 'action' => $action,
+ 'action' => $action,
'model_type' => class_basename($model),
- 'model_id' => $model->getKey(),
- 'user_id' => Auth::id(),
- 'changes' => empty($changes) ? null : $changes,
+ 'model_id' => $model->getKey(),
+ 'user_id' => Auth::id(),
+ 'changes' => empty($changes) ? null : $changes,
'created_at' => now(),
]);
}
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 3344810..442f93e 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -2,7 +2,6 @@
namespace App\Models;
-use App\Models\User;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
@@ -35,7 +34,7 @@ class Company extends Model
public function projects()
{
return $this->belongsToMany(Project::class, 'company_project')
- ->withPivot('role_in_project')
- ->withTimestamps();
+ ->withPivot('role_in_project')
+ ->withTimestamps();
}
}
diff --git a/app/Models/Feature.php b/app/Models/Feature.php
index 34c89d0..25edad5 100644
--- a/app/Models/Feature.php
+++ b/app/Models/Feature.php
@@ -2,14 +2,15 @@
namespace App\Models;
+use App\Traits\LogsActivity;
+use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes;
-use App\Traits\LogsActivity;
class Feature extends Model
{
- use SoftDeletes, LogsActivity;
+ use LogsActivity, SoftDeletes;
const STATUSES = ['planned', 'started', 'in_progress', 'completed', 'verified'];
@@ -22,15 +23,15 @@ class Feature extends Model
];
protected $casts = [
- 'geometry' => 'array',
- 'properties' => 'array',
- 'is_active' => 'boolean',
- 'planned_start' => 'date',
- 'planned_end' => 'date',
- 'actual_start' => 'date',
- 'actual_end' => 'date',
- 'baseline_start' => 'date',
- 'baseline_end' => 'date',
+ 'geometry' => 'array',
+ 'properties' => 'array',
+ 'is_active' => 'boolean',
+ 'planned_start' => 'date',
+ 'planned_end' => 'date',
+ 'actual_start' => 'date',
+ 'actual_end' => 'date',
+ 'baseline_start' => 'date',
+ 'baseline_end' => 'date',
];
public function featureType()
@@ -80,13 +81,13 @@ class Feature extends Model
public function getStatusColorAttribute(): string
{
- return match($this->status) {
- 'planned' => '#6b7280',
- 'started' => '#3b82f6',
+ return match ($this->status) {
+ 'planned' => '#6b7280',
+ 'started' => '#3b82f6',
'in_progress' => '#f59e0b',
- 'completed' => '#10b981',
- 'verified' => '#8b5cf6',
- default => '#6b7280',
+ 'completed' => '#10b981',
+ 'verified' => '#8b5cf6',
+ default => '#6b7280',
};
}
@@ -99,7 +100,7 @@ class Feature extends Model
return null;
}
$end = $this->actual_end ?? now()->toDateString();
-
+
return $this->planned_end->diffInDays($end, false);
}
@@ -109,28 +110,28 @@ class Feature extends Model
return null;
}
$start = $this->actual_start ?? now()->toDateString();
-
+
return $this->planned_start->diffInDays($start, false);
}
- public function getPlannedProgressAtAttribute(?\Carbon\Carbon $date = null): float
+ public function getPlannedProgressAtAttribute(?Carbon $date = null): float
{
$date = $date ?? now();
-
+
if (! $this->planned_start || ! $this->planned_end) {
return 0;
}
-
+
if ($date <= $this->planned_start) {
return 0;
}
if ($date >= $this->planned_end) {
return 100;
}
-
+
$totalDays = $this->planned_start->diffInDays($this->planned_end);
$elapsedDays = $this->planned_start->diffInDays($date);
-
+
return round(($elapsedDays / $totalDays) * 100, 2);
}
@@ -138,11 +139,11 @@ class Feature extends Model
{
$pv = $this->planned_progress_at;
$ev = $this->progress;
-
+
if ($pv <= 0) {
return null;
}
-
+
return round($ev / $pv, 2);
}
@@ -152,6 +153,7 @@ class Feature extends Model
if ($spi === null) {
return null;
}
+
return $spi >= 0.95;
}
}
diff --git a/app/Models/Inspection.php b/app/Models/Inspection.php
index fdc3d2b..e230126 100644
--- a/app/Models/Inspection.php
+++ b/app/Models/Inspection.php
@@ -2,13 +2,13 @@
namespace App\Models;
+use App\Traits\LogsActivity;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
-use App\Traits\LogsActivity;
class Inspection extends Model
{
- use SoftDeletes, LogsActivity;
+ use LogsActivity, SoftDeletes;
protected static function booted(): void
{
@@ -19,7 +19,8 @@ class Inspection extends Model
}
const STATUSES = ['pending', 'in_progress', 'completed', 'approved', 'rejected'];
- const RESULTS = ['pass', 'fail', 'conditional'];
+
+ const RESULTS = ['pass', 'fail', 'conditional'];
protected $fillable = [
'project_id', 'layer_id', 'feature_id', 'template_id', 'user_id',
@@ -28,7 +29,7 @@ class Inspection extends Model
];
protected $casts = [
- 'data' => 'array',
+ 'data' => 'array',
'completed_at' => 'datetime',
];
@@ -72,7 +73,18 @@ class Inspection extends Model
return $this->hasMany(Issue::class);
}
- public function scopePending($q) { return $q->where('status', 'pending'); }
- public function scopeCompleted($q) { return $q->where('status', 'completed'); }
- public function scopeRejected($q) { return $q->where('status', 'rejected'); }
+ public function scopePending($q)
+ {
+ return $q->where('status', 'pending');
+ }
+
+ public function scopeCompleted($q)
+ {
+ return $q->where('status', 'completed');
+ }
+
+ public function scopeRejected($q)
+ {
+ return $q->where('status', 'rejected');
+ }
}
diff --git a/app/Models/Issue.php b/app/Models/Issue.php
index 70f9fff..825f7c6 100644
--- a/app/Models/Issue.php
+++ b/app/Models/Issue.php
@@ -2,17 +2,19 @@
namespace App\Models;
+use App\Traits\LogsActivity;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
-use App\Traits\LogsActivity;
class Issue extends Model
{
- use SoftDeletes, LogsActivity;
+ use LogsActivity, SoftDeletes;
+
+ const STATUSES = ['open', 'in_review', 'resolved', 'closed'];
- const STATUSES = ['open', 'in_review', 'resolved', 'closed'];
const PRIORITIES = ['low', 'medium', 'high', 'critical'];
- const TYPES = ['defect', 'safety', 'quality', 'documentation', 'other'];
+
+ const TYPES = ['defect', 'safety', 'quality', 'documentation', 'other'];
protected $fillable = [
'project_id', 'feature_id', 'inspection_id',
@@ -23,17 +25,55 @@ class Issue extends Model
protected $casts = ['resolved_at' => 'datetime'];
- public function project() { return $this->belongsTo(Project::class); }
- public function feature() { return $this->belongsTo(Feature::class); }
- public function inspection() { return $this->belongsTo(Inspection::class); }
- public function reporter() { return $this->belongsTo(User::class, 'reported_by'); }
- public function assignee() { return $this->belongsTo(User::class, 'assigned_to'); }
- public function media() { return $this->morphMany(Media::class, 'mediable'); }
- public function tasks() { return $this->hasMany(IssueTask::class)->orderBy('order')->orderBy('id'); }
- public function comments() { return $this->hasMany(IssueComment::class)->orderBy('created_at'); }
+ public function project()
+ {
+ return $this->belongsTo(Project::class);
+ }
- public function scopeOpen($q) { return $q->where('status', 'open'); }
- public function scopeCritical($q) { return $q->where('priority', 'critical'); }
+ public function feature()
+ {
+ return $this->belongsTo(Feature::class);
+ }
+
+ public function inspection()
+ {
+ return $this->belongsTo(Inspection::class);
+ }
+
+ public function reporter()
+ {
+ return $this->belongsTo(User::class, 'reported_by');
+ }
+
+ public function assignee()
+ {
+ return $this->belongsTo(User::class, 'assigned_to');
+ }
+
+ public function media()
+ {
+ return $this->morphMany(Media::class, 'mediable');
+ }
+
+ public function tasks()
+ {
+ return $this->hasMany(IssueTask::class)->orderBy('order')->orderBy('id');
+ }
+
+ public function comments()
+ {
+ return $this->hasMany(IssueComment::class)->orderBy('created_at');
+ }
+
+ public function scopeOpen($q)
+ {
+ return $q->where('status', 'open');
+ }
+
+ public function scopeCritical($q)
+ {
+ return $q->where('priority', 'critical');
+ }
/** Resolution progress derived from the checklist: done tasks / total. */
public function getProgressAttribute(): int
@@ -42,6 +82,7 @@ class Issue extends Model
if ($total === 0) {
return in_array($this->status, ['resolved', 'closed'], true) ? 100 : 0;
}
+
return (int) round($this->tasks->where('is_done', true)->count() / $total * 100);
}
@@ -53,23 +94,23 @@ class Issue extends Model
public function getPriorityColorAttribute(): string
{
- return match($this->priority) {
- 'low' => '#6b7280',
- 'medium' => '#f59e0b',
- 'high' => '#ef4444',
+ return match ($this->priority) {
+ 'low' => '#6b7280',
+ 'medium' => '#f59e0b',
+ 'high' => '#ef4444',
'critical' => '#7c3aed',
- default => '#6b7280',
+ default => '#6b7280',
};
}
public function getStatusColorAttribute(): string
{
- return match($this->status) {
- 'open' => '#ef4444',
+ return match ($this->status) {
+ 'open' => '#ef4444',
'in_review' => '#f59e0b',
- 'resolved' => '#10b981',
- 'closed' => '#6b7280',
- default => '#6b7280',
+ 'resolved' => '#10b981',
+ 'closed' => '#6b7280',
+ default => '#6b7280',
};
}
@@ -77,11 +118,11 @@ class Issue extends Model
public static function typeLabels(): array
{
return [
- 'defect' => 'Defecto',
- 'safety' => 'Seguridad',
- 'quality' => 'Calidad',
+ 'defect' => 'Defecto',
+ 'safety' => 'Seguridad',
+ 'quality' => 'Calidad',
'documentation' => 'Documentación',
- 'other' => 'Otro',
+ 'other' => 'Otro',
];
}
@@ -92,12 +133,12 @@ class Issue extends Model
public function getTypeColorAttribute(): string
{
- return match($this->type) {
- 'defect' => '#ef4444',
- 'safety' => '#f97316',
- 'quality' => '#0ea5e9',
+ return match ($this->type) {
+ 'defect' => '#ef4444',
+ 'safety' => '#f97316',
+ 'quality' => '#0ea5e9',
'documentation' => '#8b5cf6',
- default => '#6b7280',
+ default => '#6b7280',
};
}
}
diff --git a/app/Models/IssueComment.php b/app/Models/IssueComment.php
index 0cb50eb..9a4ebf2 100644
--- a/app/Models/IssueComment.php
+++ b/app/Models/IssueComment.php
@@ -14,7 +14,18 @@ class IssueComment extends Model
'uuid', 'client_updated_at',
];
- public function issue() { return $this->belongsTo(Issue::class); }
- public function user() { return $this->belongsTo(User::class); }
- public function media() { return $this->morphMany(Media::class, 'mediable'); }
+ public function issue()
+ {
+ return $this->belongsTo(Issue::class);
+ }
+
+ public function user()
+ {
+ return $this->belongsTo(User::class);
+ }
+
+ public function media()
+ {
+ return $this->morphMany(Media::class, 'mediable');
+ }
}
diff --git a/app/Models/IssueTask.php b/app/Models/IssueTask.php
index 34cbbd7..442335f 100644
--- a/app/Models/IssueTask.php
+++ b/app/Models/IssueTask.php
@@ -16,9 +16,9 @@ class IssueTask extends Model
];
protected $casts = [
- 'is_done' => 'boolean',
- 'done_at' => 'datetime',
- 'due_date' => 'date',
+ 'is_done' => 'boolean',
+ 'done_at' => 'datetime',
+ 'due_date' => 'date',
'overdue_notified_at' => 'datetime',
];
@@ -26,14 +26,29 @@ class IssueTask extends Model
public function scopeOverdue($q)
{
return $q->where('is_done', false)
- ->whereNotNull('due_date')
- ->whereDate('due_date', '<', now()->toDateString());
+ ->whereNotNull('due_date')
+ ->whereDate('due_date', '<', now()->toDateString());
}
- public function issue() { return $this->belongsTo(Issue::class); }
- public function assignee() { return $this->belongsTo(User::class, 'assigned_to'); }
- public function completer() { return $this->belongsTo(User::class, 'done_by'); }
- public function media() { return $this->morphMany(Media::class, 'mediable'); }
+ public function issue()
+ {
+ return $this->belongsTo(Issue::class);
+ }
+
+ public function assignee()
+ {
+ return $this->belongsTo(User::class, 'assigned_to');
+ }
+
+ public function completer()
+ {
+ return $this->belongsTo(User::class, 'done_by');
+ }
+
+ public function media()
+ {
+ return $this->morphMany(Media::class, 'mediable');
+ }
/** Overdue = has a due date in the past and not yet done. */
public function getIsOverdueAttribute(): bool
diff --git a/app/Models/Layer.php b/app/Models/Layer.php
index 087cbb8..32ba570 100644
--- a/app/Models/Layer.php
+++ b/app/Models/Layer.php
@@ -5,13 +5,12 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
-
class Layer extends Model
{
use SoftDeletes;
protected $fillable = [
- 'project_id', 'phase_id', 'name', 'color', 'geojson_data', 'original_file', 'uploaded_by'
+ 'project_id', 'phase_id', 'name', 'color', 'geojson_data', 'original_file', 'uploaded_by',
];
protected $casts = [
@@ -32,6 +31,7 @@ class Layer extends Model
{
return $this->belongsTo(User::class, 'uploaded_by');
}
+
public function features()
{
return $this->hasMany(Feature::class);
@@ -46,4 +46,4 @@ class Layer extends Model
{
return $this->morphMany(Media::class, 'mediable');
}
-}
\ No newline at end of file
+}
diff --git a/app/Models/Media.php b/app/Models/Media.php
index 02c6cc6..2e0c3d7 100644
--- a/app/Models/Media.php
+++ b/app/Models/Media.php
@@ -48,10 +48,17 @@ class Media extends Model
public function getFormattedSizeAttribute()
{
$bytes = $this->file_size;
- if ($bytes >= 1073741824) return round($bytes / 1073741824, 2) . ' GB';
- if ($bytes >= 1048576) return round($bytes / 1048576, 1) . ' MB';
- if ($bytes >= 1024) return round($bytes / 1024) . ' KB';
- return $bytes . ' B';
+ if ($bytes >= 1073741824) {
+ return round($bytes / 1073741824, 2).' GB';
+ }
+ if ($bytes >= 1048576) {
+ return round($bytes / 1048576, 1).' MB';
+ }
+ if ($bytes >= 1024) {
+ return round($bytes / 1024).' KB';
+ }
+
+ return $bytes.' B';
}
// Scopes
@@ -72,4 +79,4 @@ class Media extends Model
Storage::delete($media->file_path);
});
}
-}
\ No newline at end of file
+}
diff --git a/app/Models/PendingSync.php b/app/Models/PendingSync.php
index 015dd48..10155f7 100644
--- a/app/Models/PendingSync.php
+++ b/app/Models/PendingSync.php
@@ -12,4 +12,4 @@ class PendingSync extends Model
'payload' => 'array',
'synced_at' => 'datetime',
];
-}
\ No newline at end of file
+}
diff --git a/app/Models/Phase.php b/app/Models/Phase.php
index 5f608ef..3168f25 100644
--- a/app/Models/Phase.php
+++ b/app/Models/Phase.php
@@ -2,6 +2,7 @@
namespace App\Models;
+use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes;
@@ -79,7 +80,7 @@ class Phase extends Model
return null;
}
$end = $this->actual_end ?? now()->toDateString();
-
+
return $this->planned_end->diffInDays($end, false);
}
@@ -92,31 +93,31 @@ class Phase extends Model
return null;
}
$start = $this->actual_start ?? now()->toDateString();
-
+
return $this->planned_start->diffInDays($start, false);
}
/**
* Planned progress at a given date (linear interpolation)
*/
- public function getPlannedProgressAtAttribute(?\Carbon\Carbon $date = null): float
+ public function getPlannedProgressAtAttribute(?Carbon $date = null): float
{
$date = $date ?? now();
-
+
if (! $this->planned_start || ! $this->planned_end) {
return 0;
}
-
+
if ($date <= $this->planned_start) {
return 0;
}
if ($date >= $this->planned_end) {
return 100;
}
-
+
$totalDays = $this->planned_start->diffInDays($this->planned_end);
$elapsedDays = $this->planned_start->diffInDays($date);
-
+
return round(($elapsedDays / $totalDays) * 100, 2);
}
@@ -127,11 +128,11 @@ class Phase extends Model
{
$pv = $this->planned_progress_at; // Planned Value
$ev = $this->progress_percent; // Earned Value (current progress)
-
+
if ($pv <= 0) {
return null;
}
-
+
return round($ev / $pv, 2);
}
@@ -144,6 +145,7 @@ class Phase extends Model
if ($spi === null) {
return null;
}
+
return $spi >= 0.95;
}
}
diff --git a/app/Models/ProgressSnapshot.php b/app/Models/ProgressSnapshot.php
index 3d91b3f..267d6e6 100644
--- a/app/Models/ProgressSnapshot.php
+++ b/app/Models/ProgressSnapshot.php
@@ -52,6 +52,7 @@ class ProgressSnapshot extends Model
if ($id) {
$query->where('trackable_id', $id);
}
+
return $query;
}
@@ -76,4 +77,4 @@ class ProgressSnapshot extends Model
->get(['snapshot_date', 'progress', 'method'])
->toArray();
}
-}
\ No newline at end of file
+}
diff --git a/app/Models/ProgressUpdate.php b/app/Models/ProgressUpdate.php
index 972745e..1832666 100644
--- a/app/Models/ProgressUpdate.php
+++ b/app/Models/ProgressUpdate.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class ProgressUpdate extends Model
{
protected $fillable = [
- 'uuid', 'phase_id', 'user_id', 'progress_percent', 'comment', 'location', 'client_updated_at'
+ 'uuid', 'phase_id', 'user_id', 'progress_percent', 'comment', 'location', 'client_updated_at',
];
protected $casts = [
@@ -24,4 +24,4 @@ class ProgressUpdate extends Model
{
return $this->belongsTo(User::class);
}
-}
\ No newline at end of file
+}
diff --git a/app/Notifications/FeatureCompletedNotification.php b/app/Notifications/FeatureCompletedNotification.php
index 51db57b..c7608c2 100644
--- a/app/Notifications/FeatureCompletedNotification.php
+++ b/app/Notifications/FeatureCompletedNotification.php
@@ -2,9 +2,9 @@
namespace App\Notifications;
+use App\Models\Feature;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Notification;
-use App\Models\Feature;
class FeatureCompletedNotification extends Notification
{
@@ -20,12 +20,12 @@ class FeatureCompletedNotification extends Notification
public function toArray($notifiable): array
{
return [
- 'type' => 'feature_completed',
- 'feature_id' => $this->feature->id,
- 'project_id' => $this->feature->layer?->phase?->project_id,
+ 'type' => 'feature_completed',
+ 'feature_id' => $this->feature->id,
+ 'project_id' => $this->feature->layer?->phase?->project_id,
'feature_name' => $this->feature->name,
- 'progress' => 100,
- 'message' => "Elemento '{$this->feature->name}' marcado como completado",
+ 'progress' => 100,
+ 'message' => "Elemento '{$this->feature->name}' marcado como completado",
];
}
}
diff --git a/app/Notifications/InspectionCompletedNotification.php b/app/Notifications/InspectionCompletedNotification.php
index b9fb9ed..52b1e67 100644
--- a/app/Notifications/InspectionCompletedNotification.php
+++ b/app/Notifications/InspectionCompletedNotification.php
@@ -2,10 +2,9 @@
namespace App\Notifications;
+use App\Models\Inspection;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Notification;
-use Illuminate\Notifications\Messages\MailMessage;
-use App\Models\Inspection;
class InspectionCompletedNotification extends Notification
{
@@ -21,13 +20,13 @@ class InspectionCompletedNotification extends Notification
public function toArray($notifiable): array
{
return [
- 'type' => 'inspection_completed',
+ 'type' => 'inspection_completed',
'inspection_id' => $this->inspection->id,
- 'project_id' => $this->inspection->project_id,
- 'feature_name' => $this->inspection->feature?->name ?? '—',
+ 'project_id' => $this->inspection->project_id,
+ 'feature_name' => $this->inspection->feature?->name ?? '—',
'template_name' => $this->inspection->template?->name ?? '—',
- 'result' => $this->inspection->result,
- 'message' => "Inspección completada en '{$this->inspection->feature?->name}': " . ($this->inspection->result ?? 'sin resultado'),
+ 'result' => $this->inspection->result,
+ 'message' => "Inspección completada en '{$this->inspection->feature?->name}': ".($this->inspection->result ?? 'sin resultado'),
];
}
}
diff --git a/app/Notifications/InspectionDeletedNotification.php b/app/Notifications/InspectionDeletedNotification.php
index 4710f8c..0515a2c 100644
--- a/app/Notifications/InspectionDeletedNotification.php
+++ b/app/Notifications/InspectionDeletedNotification.php
@@ -2,9 +2,9 @@
namespace App\Notifications;
+use App\Models\Inspection;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Notification;
-use App\Models\Inspection;
class InspectionDeletedNotification extends Notification
{
@@ -20,13 +20,13 @@ class InspectionDeletedNotification extends Notification
public function toArray($notifiable): array
{
return [
- 'type' => 'inspection_deleted',
+ 'type' => 'inspection_deleted',
'inspection_id' => $this->inspection->id,
- 'project_id' => $this->inspection->project_id,
- 'feature_name' => $this->inspection->feature?->name ?? '—',
+ 'project_id' => $this->inspection->project_id,
+ 'feature_name' => $this->inspection->feature?->name ?? '—',
'template_name' => $this->inspection->template?->name ?? '—',
- 'deleted_by' => $this->deletedBy,
- 'message' => "Inspección eliminada en '{$this->inspection->feature?->name}' por {$this->deletedBy}",
+ 'deleted_by' => $this->deletedBy,
+ 'message' => "Inspección eliminada en '{$this->inspection->feature?->name}' por {$this->deletedBy}",
];
}
-}
\ No newline at end of file
+}
diff --git a/app/Notifications/InspectionUpdatedNotification.php b/app/Notifications/InspectionUpdatedNotification.php
index ffcd9c8..e3b9637 100644
--- a/app/Notifications/InspectionUpdatedNotification.php
+++ b/app/Notifications/InspectionUpdatedNotification.php
@@ -2,9 +2,9 @@
namespace App\Notifications;
+use App\Models\Inspection;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Notification;
-use App\Models\Inspection;
class InspectionUpdatedNotification extends Notification
{
@@ -20,14 +20,14 @@ class InspectionUpdatedNotification extends Notification
public function toArray($notifiable): array
{
return [
- 'type' => 'inspection_updated',
+ 'type' => 'inspection_updated',
'inspection_id' => $this->inspection->id,
- 'project_id' => $this->inspection->project_id,
- 'feature_name' => $this->inspection->feature?->name ?? '—',
+ 'project_id' => $this->inspection->project_id,
+ 'feature_name' => $this->inspection->feature?->name ?? '—',
'template_name' => $this->inspection->template?->name ?? '—',
- 'result' => $this->inspection->result,
- 'changes' => $this->changes,
- 'message' => "Inspección actualizada en '{$this->inspection->feature?->name}'",
+ 'result' => $this->inspection->result,
+ 'changes' => $this->changes,
+ 'message' => "Inspección actualizada en '{$this->inspection->feature?->name}'",
];
}
-}
\ No newline at end of file
+}
diff --git a/app/Notifications/IssueAssignedNotification.php b/app/Notifications/IssueAssignedNotification.php
index ed26e35..9a6577a 100644
--- a/app/Notifications/IssueAssignedNotification.php
+++ b/app/Notifications/IssueAssignedNotification.php
@@ -20,11 +20,11 @@ class IssueAssignedNotification extends Notification
public function toArray($notifiable): array
{
return [
- 'type' => 'issue_assigned',
- 'issue_id' => $this->issue->id,
+ 'type' => 'issue_assigned',
+ 'issue_id' => $this->issue->id,
'project_id' => $this->issue->project_id,
- 'priority' => $this->issue->priority,
- 'message' => "Se te ha asignado la incidencia '{$this->issue->title}'",
+ 'priority' => $this->issue->priority,
+ 'message' => "Se te ha asignado la incidencia '{$this->issue->title}'",
];
}
}
diff --git a/app/Notifications/IssueCommentedNotification.php b/app/Notifications/IssueCommentedNotification.php
index 164772f..f72fd0d 100644
--- a/app/Notifications/IssueCommentedNotification.php
+++ b/app/Notifications/IssueCommentedNotification.php
@@ -23,11 +23,11 @@ class IssueCommentedNotification extends Notification
$issue = $this->comment->issue;
return [
- 'type' => 'issue_commented',
- 'issue_id' => $this->comment->issue_id,
+ 'type' => 'issue_commented',
+ 'issue_id' => $this->comment->issue_id,
'project_id' => $issue?->project_id,
- 'author' => $this->comment->user?->name,
- 'message' => "{$this->comment->user?->name} comentó en '{$issue?->title}': " . Str::limit($this->comment->body, 60),
+ 'author' => $this->comment->user?->name,
+ 'message' => "{$this->comment->user?->name} comentó en '{$issue?->title}': ".Str::limit($this->comment->body, 60),
];
}
}
diff --git a/app/Notifications/IssueReportedNotification.php b/app/Notifications/IssueReportedNotification.php
index 74280ca..1fdc208 100644
--- a/app/Notifications/IssueReportedNotification.php
+++ b/app/Notifications/IssueReportedNotification.php
@@ -2,9 +2,9 @@
namespace App\Notifications;
+use App\Models\Issue;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Notification;
-use App\Models\Issue;
class IssueReportedNotification extends Notification
{
@@ -20,12 +20,12 @@ class IssueReportedNotification extends Notification
public function toArray($notifiable): array
{
return [
- 'type' => 'issue_reported',
- 'issue_id' => $this->issue->id,
- 'project_id' => $this->issue->project_id,
+ 'type' => 'issue_reported',
+ 'issue_id' => $this->issue->id,
+ 'project_id' => $this->issue->project_id,
'feature_name' => $this->issue->feature?->name ?? '—',
- 'priority' => $this->issue->priority,
- 'message' => "Nuevo issue '{$this->issue->title}' (prioridad: {$this->issue->priority})",
+ 'priority' => $this->issue->priority,
+ 'message' => "Nuevo issue '{$this->issue->title}' (prioridad: {$this->issue->priority})",
];
}
}
diff --git a/app/Notifications/IssueStatusChangedNotification.php b/app/Notifications/IssueStatusChangedNotification.php
index 61dc309..74d9fd5 100644
--- a/app/Notifications/IssueStatusChangedNotification.php
+++ b/app/Notifications/IssueStatusChangedNotification.php
@@ -20,18 +20,18 @@ class IssueStatusChangedNotification extends Notification
public function toArray($notifiable): array
{
$label = [
- 'open' => 'reabierta',
+ 'open' => 'reabierta',
'in_review' => 'enviada a revisión',
- 'resolved' => 'resuelta',
- 'closed' => 'cerrada',
+ 'resolved' => 'resuelta',
+ 'closed' => 'cerrada',
][$this->status] ?? $this->status;
return [
- 'type' => 'issue_status_changed',
- 'issue_id' => $this->issue->id,
+ 'type' => 'issue_status_changed',
+ 'issue_id' => $this->issue->id,
'project_id' => $this->issue->project_id,
- 'status' => $this->status,
- 'message' => "La incidencia '{$this->issue->title}' ha sido {$label}",
+ 'status' => $this->status,
+ 'message' => "La incidencia '{$this->issue->title}' ha sido {$label}",
];
}
}
diff --git a/app/Notifications/IssueTaskAssignedNotification.php b/app/Notifications/IssueTaskAssignedNotification.php
index 90be82c..43fb98d 100644
--- a/app/Notifications/IssueTaskAssignedNotification.php
+++ b/app/Notifications/IssueTaskAssignedNotification.php
@@ -20,12 +20,12 @@ class IssueTaskAssignedNotification extends Notification
public function toArray($notifiable): array
{
return [
- 'type' => 'issue_task_assigned',
- 'issue_id' => $this->task->issue_id,
- 'task_id' => $this->task->id,
+ 'type' => 'issue_task_assigned',
+ 'issue_id' => $this->task->issue_id,
+ 'task_id' => $this->task->id,
'project_id' => $this->task->issue?->project_id,
- 'due_date' => $this->task->due_date?->toDateString(),
- 'message' => "Se te ha asignado la tarea '{$this->task->title}'",
+ 'due_date' => $this->task->due_date?->toDateString(),
+ 'message' => "Se te ha asignado la tarea '{$this->task->title}'",
];
}
}
diff --git a/app/Notifications/IssueTaskOverdueNotification.php b/app/Notifications/IssueTaskOverdueNotification.php
index f89f60e..e2f39b1 100644
--- a/app/Notifications/IssueTaskOverdueNotification.php
+++ b/app/Notifications/IssueTaskOverdueNotification.php
@@ -20,12 +20,12 @@ class IssueTaskOverdueNotification extends Notification
public function toArray($notifiable): array
{
return [
- 'type' => 'issue_task_overdue',
- 'issue_id' => $this->task->issue_id,
- 'task_id' => $this->task->id,
+ 'type' => 'issue_task_overdue',
+ 'issue_id' => $this->task->issue_id,
+ 'task_id' => $this->task->id,
'project_id' => $this->task->issue?->project_id,
- 'due_date' => $this->task->due_date?->toDateString(),
- 'message' => "Tarea vencida: '{$this->task->title}' (venció el {$this->task->due_date?->format('d/m/Y')})",
+ 'due_date' => $this->task->due_date?->toDateString(),
+ 'message' => "Tarea vencida: '{$this->task->title}' (venció el {$this->task->due_date?->format('d/m/Y')})",
];
}
}
diff --git a/app/Services/ReportGenerator.php b/app/Services/ReportGenerator.php
index a77eb02..850946a 100644
--- a/app/Services/ReportGenerator.php
+++ b/app/Services/ReportGenerator.php
@@ -8,16 +8,15 @@ use App\Models\Inspection;
use App\Models\Issue;
use App\Models\Media;
use App\Models\Phase;
-use App\Models\Project;
use App\Models\ProgressSnapshot;
+use App\Models\Project;
use App\Models\Task;
use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Support\Facades\DB;
class ReportGenerator
{
protected Project $project;
+
protected ReportFilters $filters;
public function __construct(Project $project, ReportFilters $filters)
@@ -82,7 +81,7 @@ class ReportGenerator
->with(['layers.features'])
->get();
- $allFeatures = $phases->flatMap(fn($p) => $p->layers->flatMap(fn($l) => $l->features));
+ $allFeatures = $phases->flatMap(fn ($p) => $p->layers->flatMap(fn ($l) => $l->features));
$completedFeatures = $allFeatures->where('status', 'completed')->count();
$inspectionsQuery = Inspection::where('project_id', $this->project->id);
@@ -136,8 +135,8 @@ class ReportGenerator
->get();
return $phases->map(function ($phase) {
- $phaseFeatures = $phase->layers->flatMap(fn($l) => $l->features);
-
+ $phaseFeatures = $phase->layers->flatMap(fn ($l) => $l->features);
+
return [
'id' => $phase->id,
'name' => $phase->name,
@@ -158,7 +157,7 @@ class ReportGenerator
'is_on_track' => $phase->is_on_track,
'features_count' => $phaseFeatures->count(),
'completed_features' => $phaseFeatures->where('status', 'completed')->count(),
- 'layers' => $phase->layers->map(fn($l) => [
+ 'layers' => $phase->layers->map(fn ($l) => [
'id' => $l->id,
'name' => $l->name,
'features_count' => $l->features->count(),
@@ -169,7 +168,7 @@ class ReportGenerator
protected function buildFeaturesData(): array
{
- $query = Feature::whereHas('layer.phase', fn($q) => $q->where('project_id', $this->project->id))
+ $query = Feature::whereHas('layer.phase', fn ($q) => $q->where('project_id', $this->project->id))
->with(['layer.phase', 'template', 'inspections', 'issues']);
// Apply date filter on feature created_at if date range provided
@@ -179,7 +178,7 @@ class ReportGenerator
return $features->map(function ($feature) {
$lastInspection = $feature->inspections->sortByDesc('created_at')->first();
-
+
return [
'id' => $feature->id,
'name' => $feature->name,
@@ -227,7 +226,7 @@ class ReportGenerator
'date' => $inspection->created_at->format('d/m/Y H:i'),
'status' => $inspection->status,
'result' => $inspection->result,
- 'result_label' => match($inspection->result) {
+ 'result_label' => match ($inspection->result) {
'pass' => 'Aprobada',
'fail' => 'Fallida',
'conditional' => 'Condicional',
@@ -256,7 +255,7 @@ class ReportGenerator
'feature' => $issue->feature?->name ?? '—',
'phase' => $issue->feature?->layer?->phase?->name ?? '—',
'priority' => $issue->priority,
- 'priority_label' => match($issue->priority) {
+ 'priority_label' => match ($issue->priority) {
'low' => 'Baja',
'medium' => 'Media',
'high' => 'Alta',
@@ -264,7 +263,7 @@ class ReportGenerator
default => ucfirst($issue->priority ?? ''),
},
'status' => $issue->status,
- 'status_label' => match($issue->status) {
+ 'status_label' => match ($issue->status) {
'open' => 'Abierta',
'in_review' => 'En revisión',
'closed' => 'Cerrada',
@@ -308,7 +307,7 @@ class ReportGenerator
'actual_hours' => $task->actual_hours,
'progress' => $task->progress,
'is_overdue' => $task->is_overdue,
- 'subtasks' => $task->subtasks->map(fn($st) => [
+ 'subtasks' => $task->subtasks->map(fn ($st) => [
'id' => $st->id,
'title' => $st->title,
'status' => $st->status,
@@ -341,8 +340,10 @@ class ReportGenerator
// Filter by project in PHP (polymorphic complexity)
$filtered = $media->filter(function ($m) {
$mediable = $m->mediable;
- if (!$mediable) return false;
-
+ if (! $mediable) {
+ return false;
+ }
+
if ($mediable instanceof Phase) {
return $mediable->project_id === $this->project->id;
}
@@ -358,6 +359,7 @@ class ReportGenerator
if ($mediable instanceof Task) {
return $mediable->project_id === $this->project->id;
}
+
return false;
});
@@ -398,9 +400,9 @@ class ReportGenerator
'spi' => $phase->spi,
'is_on_track' => $phase->is_on_track,
];
- })->filter(fn($p) => $p['planned_start'] || $p['planned_end'])->toArray();
+ })->filter(fn ($p) => $p['planned_start'] || $p['planned_end'])->toArray();
- $featureDeviations = Feature::whereHas('layer.phase', fn($q) => $q->where('project_id', $this->project->id))
+ $featureDeviations = Feature::whereHas('layer.phase', fn ($q) => $q->where('project_id', $this->project->id))
->whereNotNull('planned_end')
->with(['layer.phase'])
->get()
@@ -428,12 +430,12 @@ class ReportGenerator
'phases' => $phaseDeviations,
'features' => $featureDeviations,
'summary' => [
- 'phases_delayed' => count(array_filter($phaseDeviations, fn($p) => ($p['end_deviation'] ?? 0) > 0)),
- 'phases_early' => count(array_filter($phaseDeviations, fn($p) => ($p['end_deviation'] ?? 0) < 0)),
- 'phases_on_time' => count(array_filter($phaseDeviations, fn($p) => ($p['end_deviation'] ?? 0) === 0)),
- 'features_delayed' => count(array_filter($featureDeviations, fn($f) => ($f['end_deviation'] ?? 0) > 0)),
- 'features_early' => count(array_filter($featureDeviations, fn($f) => ($f['end_deviation'] ?? 0) < 0)),
- 'features_on_time' => count(array_filter($featureDeviations, fn($f) => ($f['end_deviation'] ?? 0) === 0)),
+ 'phases_delayed' => count(array_filter($phaseDeviations, fn ($p) => ($p['end_deviation'] ?? 0) > 0)),
+ 'phases_early' => count(array_filter($phaseDeviations, fn ($p) => ($p['end_deviation'] ?? 0) < 0)),
+ 'phases_on_time' => count(array_filter($phaseDeviations, fn ($p) => ($p['end_deviation'] ?? 0) === 0)),
+ 'features_delayed' => count(array_filter($featureDeviations, fn ($f) => ($f['end_deviation'] ?? 0) > 0)),
+ 'features_early' => count(array_filter($featureDeviations, fn ($f) => ($f['end_deviation'] ?? 0) < 0)),
+ 'features_on_time' => count(array_filter($featureDeviations, fn ($f) => ($f['end_deviation'] ?? 0) === 0)),
],
];
}
@@ -442,7 +444,7 @@ class ReportGenerator
{
// Get snapshots for this project's phases and features
$phaseIds = $this->project->phases->pluck('id')->toArray();
- $featureIds = Feature::whereHas('layer.phase', fn($q) => $q->whereIn('phase_id', $phaseIds))
+ $featureIds = Feature::whereHas('layer.phase', fn ($q) => $q->whereIn('phase_id', $phaseIds))
->pluck('id')->toArray();
$taskIds = Task::where('project_id', $this->project->id)->pluck('id')->toArray();
@@ -475,7 +477,7 @@ class ReportGenerator
foreach ($grouped as $date => $snaps) {
$dates[] = Carbon::parse($date)->format('d/m/Y');
-
+
$phaseSnaps = $snaps->where('trackable_type', Phase::class);
$featureSnaps = $snaps->where('trackable_type', Feature::class);
$taskSnaps = $snaps->where('trackable_type', Task::class);
@@ -523,7 +525,7 @@ class ReportGenerator
protected function getFeatureStatusLabel(string $status): string
{
- return match($status) {
+ return match ($status) {
'planned' => 'Planificado',
'started' => 'Iniciado',
'in_progress' => 'En progreso',
@@ -541,6 +543,7 @@ class ReportGenerator
$bytes /= 1024;
$i++;
}
- return round($bytes, 1) . ' ' . $units[$i];
+
+ return round($bytes, 1).' '.$units[$i];
}
-}
\ No newline at end of file
+}
diff --git a/app/Services/SpatialFileConverter.php b/app/Services/SpatialFileConverter.php
index 6b7d4fe..1699b76 100644
--- a/app/Services/SpatialFileConverter.php
+++ b/app/Services/SpatialFileConverter.php
@@ -15,14 +15,16 @@ class SpatialFileConverter
$geojson = match ($ext) {
'geojson' => self::parseGeoJson($path),
- 'kml' => self::kmlToGeoJson($path),
- 'kmz' => self::kmzToGeoJson($path),
- 'shp' => self::shapefileToGeoJson($path),
- 'zip' => self::handleZip($path),
- default => null,
+ 'kml' => self::kmlToGeoJson($path),
+ 'kmz' => self::kmzToGeoJson($path),
+ 'shp' => self::shapefileToGeoJson($path),
+ 'zip' => self::handleZip($path),
+ default => null,
};
- if (!$geojson) return null;
+ if (! $geojson) {
+ return null;
+ }
return self::postProcess($geojson);
}
@@ -37,15 +39,19 @@ class SpatialFileConverter
foreach ($geojson['features'] ?? [] as $feature) {
- if (!isset($feature['geometry'])) continue;
+ if (! isset($feature['geometry'])) {
+ continue;
+ }
$geometry = self::cleanGeometry($feature['geometry']);
- if (!$geometry) continue;
+ if (! $geometry) {
+ continue;
+ }
$features[] = [
'type' => 'Feature',
'geometry' => $geometry,
- 'properties' => self::normalizeProperties($feature['properties'] ?? [])
+ 'properties' => self::normalizeProperties($feature['properties'] ?? []),
];
}
@@ -53,7 +59,7 @@ class SpatialFileConverter
'type' => 'FeatureCollection',
'features' => $features,
'bbox' => self::calculateBBox($features),
- 'centroid' => self::calculateCentroid($features)
+ 'centroid' => self::calculateCentroid($features),
];
}
@@ -75,13 +81,16 @@ class SpatialFileConverter
private static function cleanGeometry(array $geom): ?array
{
- if (!isset($geom['type'], $geom['coordinates'])) return null;
+ if (! isset($geom['type'], $geom['coordinates'])) {
+ return null;
+ }
if ($geom['type'] === 'Polygon') {
$geom['coordinates'] = array_map(function ($ring) {
if ($ring[0] !== end($ring)) {
$ring[] = $ring[0];
}
+
return $ring;
}, $geom['coordinates']);
}
@@ -101,7 +110,9 @@ class SpatialFileConverter
$coords = array_merge($coords, self::flattenCoords($f['geometry']['coordinates']));
}
- if (empty($coords)) return null;
+ if (empty($coords)) {
+ return null;
+ }
$lons = array_column($coords, 0);
$lats = array_column($coords, 1);
@@ -110,7 +121,7 @@ class SpatialFileConverter
min($lons),
min($lats),
max($lons),
- max($lats)
+ max($lats),
];
}
@@ -126,7 +137,9 @@ class SpatialFileConverter
$coords = array_merge($coords, self::flattenCoords($f['geometry']['coordinates']));
}
- if (empty($coords)) return null;
+ if (empty($coords)) {
+ return null;
+ }
$x = array_sum(array_column($coords, 0)) / count($coords);
$y = array_sum(array_column($coords, 1)) / count($coords);
@@ -139,10 +152,13 @@ class SpatialFileConverter
$result = [];
$iterator = function ($c) use (&$result, &$iterator) {
- if (!is_array($c)) return;
+ if (! is_array($c)) {
+ return;
+ }
if (isset($c[0]) && isset($c[1]) && is_numeric($c[0])) {
$result[] = [$c[0], $c[1]];
+
return;
}
@@ -163,6 +179,7 @@ class SpatialFileConverter
private static function parseGeoJson($path): ?array
{
$data = json_decode(file_get_contents($path), true);
+
return json_last_error() === JSON_ERROR_NONE ? $data : null;
}
@@ -175,18 +192,24 @@ class SpatialFileConverter
libxml_use_internal_errors(true);
$xml = simplexml_load_file($path);
- if (!$xml) return null;
+ if (! $xml) {
+ return null;
+ }
// Namespace-agnostic: usamos local-name() en el XPath para aceptar KMLs
// con cualquier xmlns (opengis 2.2, earth.google 2.1/2.0, o sin xmlns).
$placemarks = $xml->xpath('//*[local-name()="Placemark"]');
- if ($placemarks === false) $placemarks = [];
+ if ($placemarks === false) {
+ $placemarks = [];
+ }
$features = [];
foreach ($placemarks as $pm) {
$geom = self::parseKmlGeometry($pm);
- if (!$geom) continue;
+ if (! $geom) {
+ continue;
+ }
$features[] = [
'type' => 'Feature',
@@ -204,12 +227,15 @@ class SpatialFileConverter
/** Descomprime un KMZ y parsea el .kml interno. */
private static function kmzToGeoJson(string $path): ?array
{
- $zip = new \ZipArchive();
- if ($zip->open($path) !== true) return null;
+ $zip = new \ZipArchive;
+ if ($zip->open($path) !== true) {
+ return null;
+ }
- $tmp = sys_get_temp_dir() . '/kmz_' . uniqid();
+ $tmp = sys_get_temp_dir().'/kmz_'.uniqid();
if (! @mkdir($tmp, 0777, true) && ! is_dir($tmp)) {
$zip->close();
+
return null;
}
$zip->extractTo($tmp);
@@ -228,15 +254,20 @@ class SpatialFileConverter
// Limpieza
self::rrmdir($tmp);
+
return $result;
}
private static function rrmdir(string $dir): void
{
- if (! is_dir($dir)) return;
+ if (! is_dir($dir)) {
+ return;
+ }
foreach (scandir($dir) ?: [] as $item) {
- if ($item === '.' || $item === '..') continue;
- $p = $dir . DIRECTORY_SEPARATOR . $item;
+ if ($item === '.' || $item === '..') {
+ continue;
+ }
+ $p = $dir.DIRECTORY_SEPARATOR.$item;
is_dir($p) ? self::rrmdir($p) : @unlink($p);
}
@rmdir($dir);
@@ -245,38 +276,45 @@ class SpatialFileConverter
/** Devuelve el primer hijo cuyo local-name coincida (sin depender del prefijo). */
private static function kmlChild(\SimpleXMLElement $node, string $name): \SimpleXMLElement|string
{
- $matches = $node->xpath('./*[local-name()="' . $name . '"]');
+ $matches = $node->xpath('./*[local-name()="'.$name.'"]');
+
return $matches ? $matches[0] : '';
}
private static function parseKmlGeometry($pm): ?array
{
// Todos los accesos van por xpath local-name para tolerar cualquier xmlns.
- $find = fn (string $tag) => $pm->xpath('./*[local-name()="' . $tag . '"]');
- $findDeep = fn (\SimpleXMLElement $n, string $tag) => $n->xpath('.//*[local-name()="' . $tag . '"]');
+ $find = fn (string $tag) => $pm->xpath('./*[local-name()="'.$tag.'"]');
+ $findDeep = fn (\SimpleXMLElement $n, string $tag) => $n->xpath('.//*[local-name()="'.$tag.'"]');
if ($multi = $find('MultiGeometry')) {
$geoms = [];
foreach ($multi[0]->children() as $g) {
$parsed = self::parseKmlGeometry($g);
- if ($parsed) $geoms[] = $parsed;
+ if ($parsed) {
+ $geoms[] = $parsed;
+ }
}
+
return ['type' => 'GeometryCollection', 'geometries' => $geoms];
}
if ($point = $find('Point')) {
$coords = self::parseKmlCoords((string) ($findDeep($point[0], 'coordinates')[0] ?? ''));
+
return $coords ? ['type' => 'Point', 'coordinates' => $coords[0]] : null;
}
if ($line = $find('LineString')) {
$coords = self::parseKmlCoords((string) ($findDeep($line[0], 'coordinates')[0] ?? ''));
+
return $coords ? ['type' => 'LineString', 'coordinates' => $coords] : null;
}
if ($poly = $find('Polygon')) {
$outer = $findDeep($poly[0], 'coordinates')[0] ?? '';
$coords = self::parseKmlCoords((string) $outer);
+
return $coords ? ['type' => 'Polygon', 'coordinates' => [$coords]] : null;
}
@@ -289,9 +327,10 @@ class SpatialFileConverter
foreach (preg_split('/\s+/', trim($text)) as $pair) {
$p = explode(',', $pair);
if (count($p) >= 2) {
- $coords[] = [(float)$p[0], (float)$p[1]];
+ $coords[] = [(float) $p[0], (float) $p[1]];
}
}
+
return $coords;
}
@@ -307,16 +346,20 @@ class SpatialFileConverter
$features = [];
while ($record = $reader->fetchRecord()) {
- if ($record->isDeleted()) continue;
+ if ($record->isDeleted()) {
+ continue;
+ }
$geom = json_decode($record->getGeometry()->toGeoJSON(), true);
- if (!$geom) continue;
+ if (! $geom) {
+ continue;
+ }
$features[] = [
'type' => 'Feature',
'geometry' => $geom,
- 'properties' => $record->getDataArray()
+ 'properties' => $record->getDataArray(),
];
}
@@ -324,6 +367,7 @@ class SpatialFileConverter
} catch (\Exception $e) {
Log::error($e->getMessage());
+
return null;
}
}
@@ -334,11 +378,13 @@ class SpatialFileConverter
private static function handleZip($zipPath): ?array
{
- $zip = new \ZipArchive();
+ $zip = new \ZipArchive;
- if ($zip->open($zipPath) !== true) return null;
+ if ($zip->open($zipPath) !== true) {
+ return null;
+ }
- $dir = sys_get_temp_dir() . '/geo_' . uniqid();
+ $dir = sys_get_temp_dir().'/geo_'.uniqid();
mkdir($dir);
$zip->extractTo($dir);
@@ -347,7 +393,7 @@ class SpatialFileConverter
$result = null;
foreach (scandir($dir) as $file) {
- $full = $dir . '/' . $file;
+ $full = $dir.'/'.$file;
$ext = strtolower(pathinfo($file, PATHINFO_EXTENSION));
if ($ext === 'shp') {
@@ -373,4 +419,4 @@ class SpatialFileConverter
}
rmdir($dir);
}
-}
\ No newline at end of file
+}
diff --git a/app/Traits/LogsActivity.php b/app/Traits/LogsActivity.php
index 6299b08..15f4cf9 100644
--- a/app/Traits/LogsActivity.php
+++ b/app/Traits/LogsActivity.php
@@ -2,7 +2,6 @@
namespace App\Traits;
-use Illuminate\Support\Facades\Auth;
use App\Models\ActivityLog;
trait LogsActivity
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 7b8594d..8f63d08 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -1,8 +1,16 @@
withRouting(
@@ -12,32 +20,31 @@ return Application::configure(basePath: dirname(__DIR__))
health: '/up',
)
->withMiddleware(function (Middleware $middleware): void {
- $middleware->appendToGroup('web', \App\Http\Middleware\SetLocale::class);
+ $middleware->appendToGroup('web', SetLocale::class);
// Si APP_URL es https, forzar el scheme percibido en TODAS las peticiones
// (algunos proxies no reenvían X-Forwarded-Proto en todas las rutas, y las
// URLs firmadas —p. ej. /livewire/upload-file— se firman con un scheme y
// se validan con otro → 401). Debe ir ANTES de TrustProxies.
- $middleware->prepend(\App\Http\Middleware\ForceHttpsScheme::class);
+ $middleware->prepend(ForceHttpsScheme::class);
// Confiar en el proxy inverso (OpenResty/Nginx) para leer X-Forwarded-Proto:
// sin esto, tras HTTPS el proxy Laravel genera URLs con http:// y las cookies
// "secure" no viajan → 419 en /livewire/update.
- $middleware->trustProxies(at: '*', headers:
- Illuminate\Http\Request::HEADER_X_FORWARDED_FOR |
- Illuminate\Http\Request::HEADER_X_FORWARDED_HOST |
- Illuminate\Http\Request::HEADER_X_FORWARDED_PORT |
- Illuminate\Http\Request::HEADER_X_FORWARDED_PROTO |
- Illuminate\Http\Request::HEADER_X_FORWARDED_AWS_ELB,
+ $middleware->trustProxies(at: '*', headers: Request::HEADER_X_FORWARDED_FOR |
+ Request::HEADER_X_FORWARDED_HOST |
+ Request::HEADER_X_FORWARDED_PORT |
+ Request::HEADER_X_FORWARDED_PROTO |
+ Request::HEADER_X_FORWARDED_AWS_ELB,
);
// Spatie permission + Sanctum ability middleware aliases
$middleware->alias([
- 'role' => \Spatie\Permission\Middleware\RoleMiddleware::class,
- 'permission' => \Spatie\Permission\Middleware\PermissionMiddleware::class,
- 'role_or_permission' => \Spatie\Permission\Middleware\RoleOrPermissionMiddleware::class,
- 'abilities' => \Laravel\Sanctum\Http\Middleware\CheckAbilities::class,
- 'ability' => \Laravel\Sanctum\Http\Middleware\CheckForAnyAbility::class,
+ 'role' => RoleMiddleware::class,
+ 'permission' => PermissionMiddleware::class,
+ 'role_or_permission' => RoleOrPermissionMiddleware::class,
+ 'abilities' => CheckAbilities::class,
+ 'ability' => CheckForAnyAbility::class,
]);
})
->withExceptions(function (Exceptions $exceptions): void {
diff --git a/bootstrap/providers.php b/bootstrap/providers.php
index 7d50f93..c60700c 100644
--- a/bootstrap/providers.php
+++ b/bootstrap/providers.php
@@ -1,6 +1,9 @@
[
- 'disk' => null,
- 'rules' => ['required', 'file', 'max:51200'], // 50 MB
- 'directory' => null,
- 'middleware' => null,
+ 'disk' => null,
+ 'rules' => ['required', 'file', 'max:51200'], // 50 MB
+ 'directory' => null,
+ 'middleware' => null,
'preview_mimes' => [
'png', 'gif', 'bmp', 'svg', 'wav', 'mp4',
'mov', 'avi', 'wmv', 'mp3', 'm4a',
'jpg', 'jpeg', 'mpga', 'webp', 'wma',
],
'max_upload_time' => 5,
- 'cleanup' => true,
+ 'cleanup' => true,
],
/*
@@ -64,7 +64,7 @@ return [
| Navegación SPA (wire:navigate).
*/
'navigate' => [
- 'show_progress_bar' => true,
+ 'show_progress_bar' => true,
'progress_bar_color' => '#2299dd',
],
diff --git a/database/migrations/2026_04_27_095918_create_projects_table.php b/database/migrations/2026_04_27_095918_create_projects_table.php
index b15d93b..eb413f7 100644
--- a/database/migrations/2026_04_27_095918_create_projects_table.php
+++ b/database/migrations/2026_04_27_095918_create_projects_table.php
@@ -30,4 +30,4 @@ return new class extends Migration
{
Schema::dropIfExists('projects');
}
-};
\ No newline at end of file
+};
diff --git a/database/migrations/2026_04_27_095919_create_phases_table.php b/database/migrations/2026_04_27_095919_create_phases_table.php
index a844d43..3ec2a4f 100644
--- a/database/migrations/2026_04_27_095919_create_phases_table.php
+++ b/database/migrations/2026_04_27_095919_create_phases_table.php
@@ -29,4 +29,4 @@ return new class extends Migration
{
Schema::dropIfExists('phases');
}
-};
\ No newline at end of file
+};
diff --git a/database/migrations/2026_04_27_095920_create_layers_table.php b/database/migrations/2026_04_27_095920_create_layers_table.php
index 4d3f313..02647b4 100644
--- a/database/migrations/2026_04_27_095920_create_layers_table.php
+++ b/database/migrations/2026_04_27_095920_create_layers_table.php
@@ -25,4 +25,4 @@ return new class extends Migration
{
Schema::dropIfExists('layers');
}
-};
\ No newline at end of file
+};
diff --git a/database/migrations/2026_04_27_095921_create_progress_updates_table.php b/database/migrations/2026_04_27_095921_create_progress_updates_table.php
index f0a8aba..0573b2d 100644
--- a/database/migrations/2026_04_27_095921_create_progress_updates_table.php
+++ b/database/migrations/2026_04_27_095921_create_progress_updates_table.php
@@ -25,4 +25,4 @@ return new class extends Migration
{
Schema::dropIfExists('progress_updates');
}
-};
\ No newline at end of file
+};
diff --git a/database/migrations/2026_04_27_095925_create_pending_syncs_table.php b/database/migrations/2026_04_27_095925_create_pending_syncs_table.php
index 0d2ffc1..d9da819 100644
--- a/database/migrations/2026_04_27_095925_create_pending_syncs_table.php
+++ b/database/migrations/2026_04_27_095925_create_pending_syncs_table.php
@@ -22,4 +22,4 @@ return new class extends Migration
{
Schema::dropIfExists('pending_syncs');
}
-};
\ No newline at end of file
+};
diff --git a/database/migrations/2026_04_27_095925_create_project_user_table.php b/database/migrations/2026_04_27_095925_create_project_user_table.php
index 87d8f0d..5fe68a4 100644
--- a/database/migrations/2026_04_27_095925_create_project_user_table.php
+++ b/database/migrations/2026_04_27_095925_create_project_user_table.php
@@ -21,4 +21,4 @@ return new class extends Migration
{
Schema::dropIfExists('project_user');
}
-};
\ No newline at end of file
+};
diff --git a/database/migrations/2026_05_09_210000_create_media_table.php b/database/migrations/2026_05_09_210000_create_media_table.php
index 2893ce8..cefea1c 100644
--- a/database/migrations/2026_05_09_210000_create_media_table.php
+++ b/database/migrations/2026_05_09_210000_create_media_table.php
@@ -30,4 +30,4 @@ return new class extends Migration
{
Schema::dropIfExists('media');
}
-};
\ No newline at end of file
+};
diff --git a/database/migrations/2026_05_13_075321_create_companies_table.php b/database/migrations/2026_05_13_075321_create_companies_table.php
index 0f9350b..fbf962a 100644
--- a/database/migrations/2026_05_13_075321_create_companies_table.php
+++ b/database/migrations/2026_05_13_075321_create_companies_table.php
@@ -36,4 +36,4 @@ return new class extends Migration
{
Schema::dropIfExists('companies');
}
-};
\ No newline at end of file
+};
diff --git a/database/migrations/2026_05_13_075457_create_company_project_table.php b/database/migrations/2026_05_13_075457_create_company_project_table.php
index 91634bf..34b193f 100644
--- a/database/migrations/2026_05_13_075457_create_company_project_table.php
+++ b/database/migrations/2026_05_13_075457_create_company_project_table.php
@@ -30,4 +30,4 @@ return new class extends Migration
{
Schema::dropIfExists('company_project');
}
-};
\ No newline at end of file
+};
diff --git a/database/migrations/2026_06_25_120000_make_inspection_templates_global_with_pivot.php b/database/migrations/2026_06_25_120000_make_inspection_templates_global_with_pivot.php
index f4e7e08..b4578dd 100644
--- a/database/migrations/2026_06_25_120000_make_inspection_templates_global_with_pivot.php
+++ b/database/migrations/2026_06_25_120000_make_inspection_templates_global_with_pivot.php
@@ -32,7 +32,9 @@ return new class extends Migration
foreach ($rows as $r) {
// Evitar duplicados; si el proyecto ya no existe lo ignoramos
$projectExists = DB::table('projects')->where('id', $r->project_id)->exists();
- if (! $projectExists) continue;
+ if (! $projectExists) {
+ continue;
+ }
DB::table('inspection_template_project')->updateOrInsert(
['inspection_template_id' => $r->id, 'project_id' => $r->project_id],
@@ -46,9 +48,15 @@ return new class extends Migration
Schema::table('inspection_templates', function (Blueprint $table) {
// 1) FK primero: si no la dropeamos, MySQL rechaza soltar el índice
// que la sustenta ("needed in a foreign key constraint").
- try { $table->dropForeign(['phase_id']); } catch (\Throwable $e) { /* sqlite sin FKs / ya inexistente */ }
+ try {
+ $table->dropForeign(['phase_id']);
+ } catch (Throwable $e) { /* sqlite sin FKs / ya inexistente */
+ }
// 2) Índice después (nombre por convención de Laravel).
- try { $table->dropIndex('inspection_templates_phase_id_index'); } catch (\Throwable $e) { /* ya no existe */ }
+ try {
+ $table->dropIndex('inspection_templates_phase_id_index');
+ } catch (Throwable $e) { /* ya no existe */
+ }
// 3) Columna al final.
$table->dropColumn('phase_id');
});
diff --git a/database/migrations/2026_07_31_114835_create_tasks_table.php b/database/migrations/2026_07_31_114835_create_tasks_table.php
index 0c02aa9..f903b0a 100644
--- a/database/migrations/2026_07_31_114835_create_tasks_table.php
+++ b/database/migrations/2026_07_31_114835_create_tasks_table.php
@@ -48,4 +48,4 @@ return new class extends Migration
{
Schema::dropIfExists('tasks');
}
-};
\ No newline at end of file
+};
diff --git a/database/migrations/2026_07_31_114906_create_comments_table.php b/database/migrations/2026_07_31_114906_create_comments_table.php
index 456fdaa..7f8f4ab 100644
--- a/database/migrations/2026_07_31_114906_create_comments_table.php
+++ b/database/migrations/2026_07_31_114906_create_comments_table.php
@@ -30,4 +30,4 @@ return new class extends Migration
{
Schema::dropIfExists('comments');
}
-};
\ No newline at end of file
+};
diff --git a/database/migrations/2026_08_24_094858_add_planned_actual_dates_to_phases_table.php b/database/migrations/2026_08_24_094858_add_planned_actual_dates_to_phases_table.php
index aa70937..4513649 100644
--- a/database/migrations/2026_08_24_094858_add_planned_actual_dates_to_phases_table.php
+++ b/database/migrations/2026_08_24_094858_add_planned_actual_dates_to_phases_table.php
@@ -21,4 +21,4 @@ return new class extends Migration
$table->dropColumn(['baseline_start', 'baseline_end']);
});
}
-};
\ No newline at end of file
+};
diff --git a/database/migrations/2026_08_24_094903_add_planned_actual_dates_to_features_table.php b/database/migrations/2026_08_24_094903_add_planned_actual_dates_to_features_table.php
index f012892..2dc5958 100644
--- a/database/migrations/2026_08_24_094903_add_planned_actual_dates_to_features_table.php
+++ b/database/migrations/2026_08_24_094903_add_planned_actual_dates_to_features_table.php
@@ -24,8 +24,8 @@ return new class extends Migration
$table->dropColumn([
'planned_start', 'planned_end',
'actual_start', 'actual_end',
- 'baseline_start', 'baseline_end'
+ 'baseline_start', 'baseline_end',
]);
});
}
-};
\ No newline at end of file
+};
diff --git a/database/migrations/2026_08_24_094906_create_progress_snapshots_table.php b/database/migrations/2026_08_24_094906_create_progress_snapshots_table.php
index 71a9b38..fc125e0 100644
--- a/database/migrations/2026_08_24_094906_create_progress_snapshots_table.php
+++ b/database/migrations/2026_08_24_094906_create_progress_snapshots_table.php
@@ -20,7 +20,7 @@ return new class extends Migration
$table->string('method')->default('manual'); // manual|inspection|task|geometry|hybrid
$table->json('metadata')->nullable(); // {earned_value, planned_value, actual_cost, spi, cpi, ...}
$table->timestamps();
-
+
// Short index name for MySQL 64-char limit
$table->unique(['trackable_type', 'trackable_id', 'snapshot_date'], 'ps_trackable_date_unique');
$table->index(['trackable_type', 'trackable_id', 'snapshot_date'], 'ps_trackable_date_idx');
@@ -32,4 +32,4 @@ return new class extends Migration
{
Schema::dropIfExists('progress_snapshots');
}
-};
\ No newline at end of file
+};
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 9f5e27e..532cbcb 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -22,7 +22,6 @@ class DatabaseSeeder extends Seeder
'email' => 'test@example.com',
]);*/
-
$this->call([
RolesAndPermissionsSeeder::class,
PermissionCatalogSeeder::class,
diff --git a/database/seeders/PermissionCatalogSeeder.php b/database/seeders/PermissionCatalogSeeder.php
index 1896bf8..f1d86de 100644
--- a/database/seeders/PermissionCatalogSeeder.php
+++ b/database/seeders/PermissionCatalogSeeder.php
@@ -19,64 +19,64 @@ class PermissionCatalogSeeder extends Seeder
$catalog = [
'Proyectos' => [
- 'view projects' => 'Ver listado y fichas de proyectos',
- 'create projects' => 'Crear proyectos',
- 'edit projects' => 'Editar datos del proyecto',
- 'delete projects' => 'Eliminar proyectos',
- 'export projects' => 'Exportar proyectos (Excel/PDF)',
+ 'view projects' => 'Ver listado y fichas de proyectos',
+ 'create projects' => 'Crear proyectos',
+ 'edit projects' => 'Editar datos del proyecto',
+ 'delete projects' => 'Eliminar proyectos',
+ 'export projects' => 'Exportar proyectos (Excel/PDF)',
],
'Fases y progreso' => [
- 'view phases' => 'Ver fases del proyecto',
- 'manage phases' => 'Crear, editar, ordenar y eliminar fases',
- 'update progress' => 'Actualizar el porcentaje de progreso',
+ 'view phases' => 'Ver fases del proyecto',
+ 'manage phases' => 'Crear, editar, ordenar y eliminar fases',
+ 'update progress' => 'Actualizar el porcentaje de progreso',
],
'Capas y elementos' => [
- 'view layers' => 'Ver capas y elementos en el mapa',
- 'upload layers' => 'Subir/importar capas',
- 'edit layers' => 'Editar capas y elementos',
- 'delete layers' => 'Eliminar capas/elementos',
+ 'view layers' => 'Ver capas y elementos en el mapa',
+ 'upload layers' => 'Subir/importar capas',
+ 'edit layers' => 'Editar capas y elementos',
+ 'delete layers' => 'Eliminar capas/elementos',
],
'Inspecciones' => [
- 'view inspections' => 'Ver inspecciones e historial',
+ 'view inspections' => 'Ver inspecciones e historial',
'create inspections' => 'Registrar inspecciones',
- 'edit inspections' => 'Editar inspecciones existentes',
+ 'edit inspections' => 'Editar inspecciones existentes',
'delete inspections' => 'Eliminar inspecciones',
- 'manage templates' => 'Gestionar plantillas de inspección',
+ 'manage templates' => 'Gestionar plantillas de inspección',
],
'Incidencias' => [
- 'view issues' => 'Ver incidencias',
- 'create issues' => 'Crear incidencias',
- 'edit issues' => 'Editar, resolver y cerrar incidencias',
- 'delete issues' => 'Eliminar incidencias',
+ 'view issues' => 'Ver incidencias',
+ 'create issues' => 'Crear incidencias',
+ 'edit issues' => 'Editar, resolver y cerrar incidencias',
+ 'delete issues' => 'Eliminar incidencias',
],
'Empresas' => [
- 'view companies' => 'Ver empresas',
- 'create companies' => 'Crear empresas',
- 'edit companies' => 'Editar empresas',
- 'delete companies' => 'Eliminar empresas',
- 'assign companies' => 'Asignar empresas/roles a proyectos',
+ 'view companies' => 'Ver empresas',
+ 'create companies' => 'Crear empresas',
+ 'edit companies' => 'Editar empresas',
+ 'delete companies' => 'Eliminar empresas',
+ 'assign companies' => 'Asignar empresas/roles a proyectos',
],
'Usuarios' => [
- 'view users' => 'Ver usuarios',
- 'create users' => 'Crear usuarios',
- 'edit users' => 'Editar usuarios',
- 'delete users' => 'Eliminar usuarios',
- 'assign users' => 'Asignar usuarios/roles a proyectos',
+ 'view users' => 'Ver usuarios',
+ 'create users' => 'Crear usuarios',
+ 'edit users' => 'Editar usuarios',
+ 'delete users' => 'Eliminar usuarios',
+ 'assign users' => 'Asignar usuarios/roles a proyectos',
],
'Roles' => [
- 'manage roles' => 'Crear/editar/borrar roles y asignar permisos',
+ 'manage roles' => 'Crear/editar/borrar roles y asignar permisos',
],
'Informes' => [
- 'view reports' => 'Ver panel de informes',
- 'export reports' => 'Exportar informes',
+ 'view reports' => 'Ver panel de informes',
+ 'export reports' => 'Exportar informes',
],
'Archivos' => [
- 'view media' => 'Ver archivos/galería',
- 'upload media' => 'Subir archivos',
- 'delete media' => 'Eliminar archivos',
+ 'view media' => 'Ver archivos/galería',
+ 'upload media' => 'Subir archivos',
+ 'delete media' => 'Eliminar archivos',
],
'General' => [
- 'manage all' => 'Súper-admin: acceso total al sistema',
+ 'manage all' => 'Súper-admin: acceso total al sistema',
],
];
diff --git a/database/seeders/ProjectExampleSeeder.php b/database/seeders/ProjectExampleSeeder.php
index 6bbb7f3..17a7c97 100644
--- a/database/seeders/ProjectExampleSeeder.php
+++ b/database/seeders/ProjectExampleSeeder.php
@@ -2,13 +2,14 @@
namespace Database\Seeders;
-use Illuminate\Database\Seeder;
-use App\Models\Project;
-use App\Models\Phase;
-use App\Models\Layer;
use App\Models\Feature;
+use App\Models\Inspection;
use App\Models\InspectionTemplate;
+use App\Models\Layer;
+use App\Models\Phase;
+use App\Models\Project;
use App\Models\User;
+use Illuminate\Database\Seeder;
class ProjectExampleSeeder extends Seeder
{
@@ -16,7 +17,7 @@ class ProjectExampleSeeder extends Seeder
{
// Obtener usuario admin
$admin = User::where('email', 'admin@email.com')->first();
- if (!$admin) {
+ if (! $admin) {
$admin = User::first();
}
@@ -56,7 +57,7 @@ class ProjectExampleSeeder extends Seeder
['name' => 'progress', 'label' => 'Progreso de vertido', 'type' => 'percentage', 'required' => true],
['name' => 'calidad', 'label' => 'Calidad del hormigón', 'type' => 'select', 'options' => 'Excelente,Bueno,Regular,Deficiente', 'required' => true],
['name' => 'observaciones', 'label' => 'Observaciones', 'type' => 'textarea', 'required' => false],
- ]
+ ],
]);
$templateAcero = InspectionTemplate::create([
@@ -65,7 +66,7 @@ class ProjectExampleSeeder extends Seeder
'fields' => [
['name' => 'progress', 'label' => '% de acero colocado', 'type' => 'percentage', 'required' => true],
['name' => 'diametros', 'label' => 'Diámetros verificados', 'type' => 'text', 'required' => false],
- ]
+ ],
]);
// Crear capa (sin geojson_data)
@@ -88,8 +89,8 @@ class ProjectExampleSeeder extends Seeder
[-3.702, 40.415],
[-3.702, 40.418],
[-3.705, 40.418],
- [-3.705, 40.415]
- ]]
+ [-3.705, 40.415],
+ ]],
],
'properties' => ['description' => 'Zapata esquina noroeste'],
'template_id' => $templateHormigon->id,
@@ -107,8 +108,8 @@ class ProjectExampleSeeder extends Seeder
[-3.697, 40.415],
[-3.697, 40.418],
[-3.700, 40.418],
- [-3.700, 40.415]
- ]]
+ [-3.700, 40.415],
+ ]],
],
'properties' => ['description' => 'Zapata lado este'],
'template_id' => $templateAcero->id,
@@ -121,7 +122,7 @@ class ProjectExampleSeeder extends Seeder
'name' => 'Punto de control topográfico',
'geometry' => [
'type' => 'Point',
- 'coordinates' => [-3.703, 40.4165]
+ 'coordinates' => [-3.703, 40.4165],
],
'properties' => ['tipo' => 'estación total'],
'template_id' => null,
@@ -130,7 +131,7 @@ class ProjectExampleSeeder extends Seeder
]);
// (Opcional) Crear una inspección de ejemplo
- \App\Models\Inspection::create([
+ Inspection::create([
'project_id' => $project->id,
'layer_id' => $layer->id,
'feature_id' => $feature1->id,
@@ -139,8 +140,8 @@ class ProjectExampleSeeder extends Seeder
'data' => [
'progress' => 45,
'calidad' => 'Bueno',
- 'observaciones' => 'Vertido completado en un 45%, sin fisuras aparentes.'
+ 'observaciones' => 'Vertido completado en un 45%, sin fisuras aparentes.',
],
]);
}
-}
\ No newline at end of file
+}
diff --git a/lang/es/auth.php b/lang/es/auth.php
index dc1edad..b59c169 100644
--- a/lang/es/auth.php
+++ b/lang/es/auth.php
@@ -2,7 +2,7 @@
return [
- 'failed' => 'Las credenciales introducidas no son válidas.',
+ 'failed' => 'Las credenciales introducidas no son válidas.',
'password' => 'La contraseña indicada es incorrecta.',
'throttle' => 'Demasiados intentos de acceso. Por favor, inténtalo de nuevo en :seconds segundos.',
diff --git a/lang/es/pagination.php b/lang/es/pagination.php
index 5ad61fc..1058ec8 100644
--- a/lang/es/pagination.php
+++ b/lang/es/pagination.php
@@ -3,6 +3,6 @@
return [
'previous' => '« Anterior',
- 'next' => 'Siguiente »',
+ 'next' => 'Siguiente »',
];
diff --git a/lang/es/passwords.php b/lang/es/passwords.php
index 471f67e..4fc1451 100644
--- a/lang/es/passwords.php
+++ b/lang/es/passwords.php
@@ -2,10 +2,10 @@
return [
- 'reset' => 'Tu contraseña ha sido restablecida.',
- 'sent' => 'Te hemos enviado un enlace para restablecer tu contraseña.',
+ 'reset' => 'Tu contraseña ha sido restablecida.',
+ 'sent' => 'Te hemos enviado un enlace para restablecer tu contraseña.',
'throttled' => 'Por favor, espera antes de volver a intentarlo.',
- 'token' => 'Este token de restablecimiento de contraseña no es válido.',
- 'user' => 'No encontramos ningún usuario con esa dirección de correo.',
+ 'token' => 'Este token de restablecimiento de contraseña no es válido.',
+ 'user' => 'No encontramos ningún usuario con esa dirección de correo.',
];
diff --git a/lang/es/validation.php b/lang/es/validation.php
index 00c2fe4..e63768c 100644
--- a/lang/es/validation.php
+++ b/lang/es/validation.php
@@ -2,159 +2,159 @@
return [
- 'accepted' => 'El campo :attribute debe ser aceptado.',
- 'accepted_if' => 'El campo :attribute debe ser aceptado cuando :other es :value.',
- 'active_url' => 'El campo :attribute debe ser una URL válida.',
- 'after' => 'El campo :attribute debe ser una fecha posterior a :date.',
- 'after_or_equal' => 'El campo :attribute debe ser una fecha posterior o igual a :date.',
- 'alpha' => 'El campo :attribute solo debe contener letras.',
- 'alpha_dash' => 'El campo :attribute solo debe contener letras, números, guiones y guiones bajos.',
- 'alpha_num' => 'El campo :attribute solo debe contener letras y números.',
- 'any_of' => 'El campo :attribute no es válido.',
- 'array' => 'El campo :attribute debe ser un array.',
- 'ascii' => 'El campo :attribute solo debe contener caracteres alfanuméricos de un solo byte y símbolos.',
- 'before' => 'El campo :attribute debe ser una fecha anterior a :date.',
- 'before_or_equal' => 'El campo :attribute debe ser una fecha anterior o igual a :date.',
- 'between' => [
- 'array' => 'El campo :attribute debe tener entre :min y :max elementos.',
- 'file' => 'El campo :attribute debe estar entre :min y :max kilobytes.',
+ 'accepted' => 'El campo :attribute debe ser aceptado.',
+ 'accepted_if' => 'El campo :attribute debe ser aceptado cuando :other es :value.',
+ 'active_url' => 'El campo :attribute debe ser una URL válida.',
+ 'after' => 'El campo :attribute debe ser una fecha posterior a :date.',
+ 'after_or_equal' => 'El campo :attribute debe ser una fecha posterior o igual a :date.',
+ 'alpha' => 'El campo :attribute solo debe contener letras.',
+ 'alpha_dash' => 'El campo :attribute solo debe contener letras, números, guiones y guiones bajos.',
+ 'alpha_num' => 'El campo :attribute solo debe contener letras y números.',
+ 'any_of' => 'El campo :attribute no es válido.',
+ 'array' => 'El campo :attribute debe ser un array.',
+ 'ascii' => 'El campo :attribute solo debe contener caracteres alfanuméricos de un solo byte y símbolos.',
+ 'before' => 'El campo :attribute debe ser una fecha anterior a :date.',
+ 'before_or_equal' => 'El campo :attribute debe ser una fecha anterior o igual a :date.',
+ 'between' => [
+ 'array' => 'El campo :attribute debe tener entre :min y :max elementos.',
+ 'file' => 'El campo :attribute debe estar entre :min y :max kilobytes.',
'numeric' => 'El campo :attribute debe estar entre :min y :max.',
- 'string' => 'El campo :attribute debe tener entre :min y :max caracteres.',
+ 'string' => 'El campo :attribute debe tener entre :min y :max caracteres.',
],
- 'boolean' => 'El campo :attribute debe ser verdadero o falso.',
- 'can' => 'El campo :attribute contiene un valor no autorizado.',
- 'confirmed' => 'La confirmación del campo :attribute no coincide.',
- 'contains' => 'Al campo :attribute le falta un valor obligatorio.',
- 'current_password' => 'La contraseña es incorrecta.',
- 'date' => 'El campo :attribute debe ser una fecha válida.',
- 'date_equals' => 'El campo :attribute debe ser una fecha igual a :date.',
- 'date_format' => 'El campo :attribute debe coincidir con el formato :format.',
- 'decimal' => 'El campo :attribute debe tener :decimal decimales.',
- 'declined' => 'El campo :attribute debe ser rechazado.',
- 'declined_if' => 'El campo :attribute debe ser rechazado cuando :other es :value.',
- 'different' => 'El campo :attribute y :other deben ser diferentes.',
- 'digits' => 'El campo :attribute debe tener :digits dígitos.',
- 'digits_between' => 'El campo :attribute debe tener entre :min y :max dígitos.',
- 'dimensions' => 'El campo :attribute tiene dimensiones de imagen inválidas.',
- 'distinct' => 'El campo :attribute tiene un valor duplicado.',
- 'doesnt_contain' => 'El campo :attribute no debe contener ninguno de los siguientes valores: :values.',
- 'doesnt_end_with' => 'El campo :attribute no debe terminar con uno de los siguientes valores: :values.',
- 'doesnt_start_with' => 'El campo :attribute no debe comenzar con uno de los siguientes valores: :values.',
- 'email' => 'El campo :attribute debe ser una dirección de correo válida.',
- 'encoding' => 'El campo :attribute debe estar codificado en :encoding.',
- 'ends_with' => 'El campo :attribute debe terminar con uno de los siguientes valores: :values.',
- 'enum' => 'El :attribute seleccionado no es válido.',
- 'exists' => 'El :attribute seleccionado no es válido.',
- 'extensions' => 'El campo :attribute debe tener una de las siguientes extensiones: :values.',
- 'file' => 'El campo :attribute debe ser un archivo.',
- 'filled' => 'El campo :attribute debe tener un valor.',
- 'gt' => [
- 'array' => 'El campo :attribute debe tener más de :value elementos.',
- 'file' => 'El campo :attribute debe ser mayor que :value kilobytes.',
+ 'boolean' => 'El campo :attribute debe ser verdadero o falso.',
+ 'can' => 'El campo :attribute contiene un valor no autorizado.',
+ 'confirmed' => 'La confirmación del campo :attribute no coincide.',
+ 'contains' => 'Al campo :attribute le falta un valor obligatorio.',
+ 'current_password' => 'La contraseña es incorrecta.',
+ 'date' => 'El campo :attribute debe ser una fecha válida.',
+ 'date_equals' => 'El campo :attribute debe ser una fecha igual a :date.',
+ 'date_format' => 'El campo :attribute debe coincidir con el formato :format.',
+ 'decimal' => 'El campo :attribute debe tener :decimal decimales.',
+ 'declined' => 'El campo :attribute debe ser rechazado.',
+ 'declined_if' => 'El campo :attribute debe ser rechazado cuando :other es :value.',
+ 'different' => 'El campo :attribute y :other deben ser diferentes.',
+ 'digits' => 'El campo :attribute debe tener :digits dígitos.',
+ 'digits_between' => 'El campo :attribute debe tener entre :min y :max dígitos.',
+ 'dimensions' => 'El campo :attribute tiene dimensiones de imagen inválidas.',
+ 'distinct' => 'El campo :attribute tiene un valor duplicado.',
+ 'doesnt_contain' => 'El campo :attribute no debe contener ninguno de los siguientes valores: :values.',
+ 'doesnt_end_with' => 'El campo :attribute no debe terminar con uno de los siguientes valores: :values.',
+ 'doesnt_start_with' => 'El campo :attribute no debe comenzar con uno de los siguientes valores: :values.',
+ 'email' => 'El campo :attribute debe ser una dirección de correo válida.',
+ 'encoding' => 'El campo :attribute debe estar codificado en :encoding.',
+ 'ends_with' => 'El campo :attribute debe terminar con uno de los siguientes valores: :values.',
+ 'enum' => 'El :attribute seleccionado no es válido.',
+ 'exists' => 'El :attribute seleccionado no es válido.',
+ 'extensions' => 'El campo :attribute debe tener una de las siguientes extensiones: :values.',
+ 'file' => 'El campo :attribute debe ser un archivo.',
+ 'filled' => 'El campo :attribute debe tener un valor.',
+ 'gt' => [
+ 'array' => 'El campo :attribute debe tener más de :value elementos.',
+ 'file' => 'El campo :attribute debe ser mayor que :value kilobytes.',
'numeric' => 'El campo :attribute debe ser mayor que :value.',
- 'string' => 'El campo :attribute debe tener más de :value caracteres.',
+ 'string' => 'El campo :attribute debe tener más de :value caracteres.',
],
- 'gte' => [
- 'array' => 'El campo :attribute debe tener :value elementos o más.',
- 'file' => 'El campo :attribute debe ser mayor o igual a :value kilobytes.',
+ 'gte' => [
+ 'array' => 'El campo :attribute debe tener :value elementos o más.',
+ 'file' => 'El campo :attribute debe ser mayor o igual a :value kilobytes.',
'numeric' => 'El campo :attribute debe ser mayor o igual a :value.',
- 'string' => 'El campo :attribute debe tener :value caracteres o más.',
+ 'string' => 'El campo :attribute debe tener :value caracteres o más.',
],
- 'hex_color' => 'El campo :attribute debe ser un color hexadecimal válido.',
- 'image' => 'El campo :attribute debe ser una imagen.',
- 'in' => 'El :attribute seleccionado no es válido.',
- 'in_array' => 'El campo :attribute debe existir en :other.',
- 'in_array_keys' => 'El campo :attribute debe contener al menos una de las siguientes claves: :values.',
- 'integer' => 'El campo :attribute debe ser un número entero.',
- 'ip' => 'El campo :attribute debe ser una dirección IP válida.',
- 'ipv4' => 'El campo :attribute debe ser una dirección IPv4 válida.',
- 'ipv6' => 'El campo :attribute debe ser una dirección IPv6 válida.',
- 'json' => 'El campo :attribute debe ser una cadena JSON válida.',
- 'list' => 'El campo :attribute debe ser una lista.',
- 'lowercase' => 'El campo :attribute debe estar en minúsculas.',
- 'lt' => [
- 'array' => 'El campo :attribute debe tener menos de :value elementos.',
- 'file' => 'El campo :attribute debe ser menor que :value kilobytes.',
+ 'hex_color' => 'El campo :attribute debe ser un color hexadecimal válido.',
+ 'image' => 'El campo :attribute debe ser una imagen.',
+ 'in' => 'El :attribute seleccionado no es válido.',
+ 'in_array' => 'El campo :attribute debe existir en :other.',
+ 'in_array_keys' => 'El campo :attribute debe contener al menos una de las siguientes claves: :values.',
+ 'integer' => 'El campo :attribute debe ser un número entero.',
+ 'ip' => 'El campo :attribute debe ser una dirección IP válida.',
+ 'ipv4' => 'El campo :attribute debe ser una dirección IPv4 válida.',
+ 'ipv6' => 'El campo :attribute debe ser una dirección IPv6 válida.',
+ 'json' => 'El campo :attribute debe ser una cadena JSON válida.',
+ 'list' => 'El campo :attribute debe ser una lista.',
+ 'lowercase' => 'El campo :attribute debe estar en minúsculas.',
+ 'lt' => [
+ 'array' => 'El campo :attribute debe tener menos de :value elementos.',
+ 'file' => 'El campo :attribute debe ser menor que :value kilobytes.',
'numeric' => 'El campo :attribute debe ser menor que :value.',
- 'string' => 'El campo :attribute debe tener menos de :value caracteres.',
+ 'string' => 'El campo :attribute debe tener menos de :value caracteres.',
],
- 'lte' => [
- 'array' => 'El campo :attribute no debe tener más de :value elementos.',
- 'file' => 'El campo :attribute debe ser menor o igual a :value kilobytes.',
+ 'lte' => [
+ 'array' => 'El campo :attribute no debe tener más de :value elementos.',
+ 'file' => 'El campo :attribute debe ser menor o igual a :value kilobytes.',
'numeric' => 'El campo :attribute debe ser menor o igual a :value.',
- 'string' => 'El campo :attribute debe tener :value caracteres o menos.',
+ 'string' => 'El campo :attribute debe tener :value caracteres o menos.',
],
- 'mac_address' => 'El campo :attribute debe ser una dirección MAC válida.',
- 'max' => [
- 'array' => 'El campo :attribute no debe tener más de :max elementos.',
- 'file' => 'El campo :attribute no debe ser mayor que :max kilobytes.',
+ 'mac_address' => 'El campo :attribute debe ser una dirección MAC válida.',
+ 'max' => [
+ 'array' => 'El campo :attribute no debe tener más de :max elementos.',
+ 'file' => 'El campo :attribute no debe ser mayor que :max kilobytes.',
'numeric' => 'El campo :attribute no debe ser mayor que :max.',
- 'string' => 'El campo :attribute no debe tener más de :max caracteres.',
+ 'string' => 'El campo :attribute no debe tener más de :max caracteres.',
],
- 'max_digits' => 'El campo :attribute no debe tener más de :max dígitos.',
- 'mimes' => 'El campo :attribute debe ser un archivo de tipo: :values.',
- 'mimetypes' => 'El campo :attribute debe ser un archivo de tipo: :values.',
- 'min' => [
- 'array' => 'El campo :attribute debe tener al menos :min elementos.',
- 'file' => 'El campo :attribute debe tener al menos :min kilobytes.',
+ 'max_digits' => 'El campo :attribute no debe tener más de :max dígitos.',
+ 'mimes' => 'El campo :attribute debe ser un archivo de tipo: :values.',
+ 'mimetypes' => 'El campo :attribute debe ser un archivo de tipo: :values.',
+ 'min' => [
+ 'array' => 'El campo :attribute debe tener al menos :min elementos.',
+ 'file' => 'El campo :attribute debe tener al menos :min kilobytes.',
'numeric' => 'El campo :attribute debe ser al menos :min.',
- 'string' => 'El campo :attribute debe tener al menos :min caracteres.',
+ 'string' => 'El campo :attribute debe tener al menos :min caracteres.',
],
- 'min_digits' => 'El campo :attribute debe tener al menos :min dígitos.',
- 'missing' => 'El campo :attribute debe estar ausente.',
- 'missing_if' => 'El campo :attribute debe estar ausente cuando :other es :value.',
- 'missing_unless' => 'El campo :attribute debe estar ausente a menos que :other sea :value.',
- 'missing_with' => 'El campo :attribute debe estar ausente cuando :values está presente.',
- 'missing_with_all' => 'El campo :attribute debe estar ausente cuando :values están presentes.',
- 'multiple_of' => 'El campo :attribute debe ser un múltiplo de :value.',
- 'not_in' => 'El :attribute seleccionado no es válido.',
- 'not_regex' => 'El formato del campo :attribute no es válido.',
- 'numeric' => 'El campo :attribute debe ser un número.',
- 'password' => [
- 'letters' => 'El campo :attribute debe contener al menos una letra.',
- 'mixed' => 'El campo :attribute debe contener al menos una letra mayúscula y una minúscula.',
- 'numbers' => 'El campo :attribute debe contener al menos un número.',
- 'symbols' => 'El campo :attribute debe contener al menos un símbolo.',
+ 'min_digits' => 'El campo :attribute debe tener al menos :min dígitos.',
+ 'missing' => 'El campo :attribute debe estar ausente.',
+ 'missing_if' => 'El campo :attribute debe estar ausente cuando :other es :value.',
+ 'missing_unless' => 'El campo :attribute debe estar ausente a menos que :other sea :value.',
+ 'missing_with' => 'El campo :attribute debe estar ausente cuando :values está presente.',
+ 'missing_with_all' => 'El campo :attribute debe estar ausente cuando :values están presentes.',
+ 'multiple_of' => 'El campo :attribute debe ser un múltiplo de :value.',
+ 'not_in' => 'El :attribute seleccionado no es válido.',
+ 'not_regex' => 'El formato del campo :attribute no es válido.',
+ 'numeric' => 'El campo :attribute debe ser un número.',
+ 'password' => [
+ 'letters' => 'El campo :attribute debe contener al menos una letra.',
+ 'mixed' => 'El campo :attribute debe contener al menos una letra mayúscula y una minúscula.',
+ 'numbers' => 'El campo :attribute debe contener al menos un número.',
+ 'symbols' => 'El campo :attribute debe contener al menos un símbolo.',
'uncompromised' => 'El :attribute proporcionado ha aparecido en una filtración de datos. Elige un :attribute diferente.',
],
- 'present' => 'El campo :attribute debe estar presente.',
- 'present_if' => 'El campo :attribute debe estar presente cuando :other es :value.',
- 'present_unless' => 'El campo :attribute debe estar presente a menos que :other sea :value.',
- 'present_with' => 'El campo :attribute debe estar presente cuando :values está presente.',
- 'present_with_all' => 'El campo :attribute debe estar presente cuando :values están presentes.',
- 'prohibited' => 'El campo :attribute está prohibido.',
- 'prohibited_if' => 'El campo :attribute está prohibido cuando :other es :value.',
+ 'present' => 'El campo :attribute debe estar presente.',
+ 'present_if' => 'El campo :attribute debe estar presente cuando :other es :value.',
+ 'present_unless' => 'El campo :attribute debe estar presente a menos que :other sea :value.',
+ 'present_with' => 'El campo :attribute debe estar presente cuando :values está presente.',
+ 'present_with_all' => 'El campo :attribute debe estar presente cuando :values están presentes.',
+ 'prohibited' => 'El campo :attribute está prohibido.',
+ 'prohibited_if' => 'El campo :attribute está prohibido cuando :other es :value.',
'prohibited_if_accepted' => 'El campo :attribute está prohibido cuando :other es aceptado.',
'prohibited_if_declined' => 'El campo :attribute está prohibido cuando :other es rechazado.',
- 'prohibited_unless' => 'El campo :attribute está prohibido a menos que :other esté en :values.',
- 'prohibits' => 'El campo :attribute prohíbe que :other esté presente.',
- 'regex' => 'El formato del campo :attribute no es válido.',
- 'required' => 'El campo :attribute es obligatorio.',
- 'required_array_keys' => 'El campo :attribute debe contener entradas para: :values.',
- 'required_if' => 'El campo :attribute es obligatorio cuando :other es :value.',
+ 'prohibited_unless' => 'El campo :attribute está prohibido a menos que :other esté en :values.',
+ 'prohibits' => 'El campo :attribute prohíbe que :other esté presente.',
+ 'regex' => 'El formato del campo :attribute no es válido.',
+ 'required' => 'El campo :attribute es obligatorio.',
+ 'required_array_keys' => 'El campo :attribute debe contener entradas para: :values.',
+ 'required_if' => 'El campo :attribute es obligatorio cuando :other es :value.',
'required_if_accepted' => 'El campo :attribute es obligatorio cuando :other es aceptado.',
'required_if_declined' => 'El campo :attribute es obligatorio cuando :other es rechazado.',
- 'required_unless' => 'El campo :attribute es obligatorio a menos que :other esté en :values.',
- 'required_with' => 'El campo :attribute es obligatorio cuando :values está presente.',
- 'required_with_all' => 'El campo :attribute es obligatorio cuando :values están presentes.',
- 'required_without' => 'El campo :attribute es obligatorio cuando :values no está presente.',
+ 'required_unless' => 'El campo :attribute es obligatorio a menos que :other esté en :values.',
+ 'required_with' => 'El campo :attribute es obligatorio cuando :values está presente.',
+ 'required_with_all' => 'El campo :attribute es obligatorio cuando :values están presentes.',
+ 'required_without' => 'El campo :attribute es obligatorio cuando :values no está presente.',
'required_without_all' => 'El campo :attribute es obligatorio cuando ninguno de :values está presente.',
- 'same' => 'El campo :attribute debe coincidir con :other.',
- 'size' => [
- 'array' => 'El campo :attribute debe contener :size elementos.',
- 'file' => 'El campo :attribute debe pesar :size kilobytes.',
+ 'same' => 'El campo :attribute debe coincidir con :other.',
+ 'size' => [
+ 'array' => 'El campo :attribute debe contener :size elementos.',
+ 'file' => 'El campo :attribute debe pesar :size kilobytes.',
'numeric' => 'El campo :attribute debe ser :size.',
- 'string' => 'El campo :attribute debe tener :size caracteres.',
+ 'string' => 'El campo :attribute debe tener :size caracteres.',
],
- 'starts_with' => 'El campo :attribute debe comenzar con uno de los siguientes valores: :values.',
- 'string' => 'El campo :attribute debe ser una cadena de texto.',
- 'timezone' => 'El campo :attribute debe ser una zona horaria válida.',
- 'unique' => 'El :attribute ya está en uso.',
- 'uploaded' => 'El campo :attribute no se pudo subir.',
- 'uppercase' => 'El campo :attribute debe estar en mayúsculas.',
- 'url' => 'El campo :attribute debe ser una URL válida.',
- 'ulid' => 'El campo :attribute debe ser un ULID válido.',
- 'uuid' => 'El campo :attribute debe ser un UUID válido.',
+ 'starts_with' => 'El campo :attribute debe comenzar con uno de los siguientes valores: :values.',
+ 'string' => 'El campo :attribute debe ser una cadena de texto.',
+ 'timezone' => 'El campo :attribute debe ser una zona horaria válida.',
+ 'unique' => 'El :attribute ya está en uso.',
+ 'uploaded' => 'El campo :attribute no se pudo subir.',
+ 'uppercase' => 'El campo :attribute debe estar en mayúsculas.',
+ 'url' => 'El campo :attribute debe ser una URL válida.',
+ 'ulid' => 'El campo :attribute debe ser un ULID válido.',
+ 'uuid' => 'El campo :attribute debe ser un UUID válido.',
'custom' => [
'attribute-name' => [
@@ -163,31 +163,31 @@ return [
],
'attributes' => [
- 'name' => 'nombre',
- 'email' => 'correo electrónico',
- 'password' => 'contraseña',
- 'address' => 'dirección',
- 'phone' => 'teléfono',
- 'description' => 'descripción',
- 'start_date' => 'fecha de inicio',
- 'end_date' => 'fecha de fin',
- 'end_date_estimated' => 'fecha estimada de fin',
- 'reference' => 'referencia',
- 'status' => 'estado',
- 'type' => 'tipo',
- 'color' => 'color',
- 'progress_percent' => 'porcentaje de progreso',
- 'tax_id' => 'NIF/CIF',
- 'country' => 'país',
- 'city' => 'ciudad',
- 'latitude' => 'latitud',
- 'longitude' => 'longitud',
- 'logo' => 'logo',
- 'avatar' => 'avatar',
- 'role' => 'rol',
- 'company_id' => 'empresa',
- 'current_password' => 'contraseña actual',
- 'new_password' => 'nueva contraseña',
+ 'name' => 'nombre',
+ 'email' => 'correo electrónico',
+ 'password' => 'contraseña',
+ 'address' => 'dirección',
+ 'phone' => 'teléfono',
+ 'description' => 'descripción',
+ 'start_date' => 'fecha de inicio',
+ 'end_date' => 'fecha de fin',
+ 'end_date_estimated' => 'fecha estimada de fin',
+ 'reference' => 'referencia',
+ 'status' => 'estado',
+ 'type' => 'tipo',
+ 'color' => 'color',
+ 'progress_percent' => 'porcentaje de progreso',
+ 'tax_id' => 'NIF/CIF',
+ 'country' => 'país',
+ 'city' => 'ciudad',
+ 'latitude' => 'latitud',
+ 'longitude' => 'longitud',
+ 'logo' => 'logo',
+ 'avatar' => 'avatar',
+ 'role' => 'rol',
+ 'company_id' => 'empresa',
+ 'current_password' => 'contraseña actual',
+ 'new_password' => 'nueva contraseña',
'new_password_confirmation' => 'confirmación de nueva contraseña',
],
diff --git a/lang/fr/auth.php b/lang/fr/auth.php
index 09d083b..c1a529c 100644
--- a/lang/fr/auth.php
+++ b/lang/fr/auth.php
@@ -17,4 +17,4 @@ return [
'password' => 'Le mot de passe fourni est incorrect.',
'throttle' => 'Trop de tentatives de connexion. Veuillez réessayer dans :seconds secondes.',
-];
\ No newline at end of file
+];
diff --git a/lang/fr/pagination.php b/lang/fr/pagination.php
index 1a0c4c2..8eff374 100644
--- a/lang/fr/pagination.php
+++ b/lang/fr/pagination.php
@@ -16,4 +16,4 @@ return [
'previous' => '« Précédent',
'next' => 'Suivant »',
-];
\ No newline at end of file
+];
diff --git a/lang/fr/passwords.php b/lang/fr/passwords.php
index 7575924..ab83efc 100644
--- a/lang/fr/passwords.php
+++ b/lang/fr/passwords.php
@@ -17,6 +17,6 @@ return [
'sent' => 'Nous vous avons envoyé par e-mail votre lien de réinitialisation de mot de passe.',
'throttled' => 'Veuillez patienter avant de réessayer.',
'token' => 'Ce jeton de réinitialisation de mot de passe est invalide.',
- 'user' => "Nous ne trouvons aucun utilisateur avec cette adresse e-mail.",
+ 'user' => 'Nous ne trouvons aucun utilisateur avec cette adresse e-mail.',
-];
\ No newline at end of file
+];
diff --git a/lang/fr/validation.php b/lang/fr/validation.php
index fe64717..eca6437 100644
--- a/lang/fr/validation.php
+++ b/lang/fr/validation.php
@@ -191,4 +191,4 @@ return [
'new_password_confirmation' => 'confirmation du nouveau mot de passe',
],
-];
\ No newline at end of file
+];
diff --git a/lang/ru/auth.php b/lang/ru/auth.php
index 966a0a0..c9610c6 100644
--- a/lang/ru/auth.php
+++ b/lang/ru/auth.php
@@ -17,4 +17,4 @@ return [
'password' => 'Предоставленный пароль неверен.',
'throttle' => 'Слишком много попыток входа. Пожалуйста, попробуйте снова через :seconds секунд.',
-];
\ No newline at end of file
+];
diff --git a/lang/ru/pagination.php b/lang/ru/pagination.php
index 2cd868d..4dd8db1 100644
--- a/lang/ru/pagination.php
+++ b/lang/ru/pagination.php
@@ -16,4 +16,4 @@ return [
'previous' => '« Предыдущая',
'next' => 'Следующая »',
-];
\ No newline at end of file
+];
diff --git a/lang/ru/passwords.php b/lang/ru/passwords.php
index 23edb6d..4537028 100644
--- a/lang/ru/passwords.php
+++ b/lang/ru/passwords.php
@@ -17,6 +17,6 @@ return [
'sent' => 'Мы отправили ссылку для сброса пароля на вашу электронную почту.',
'throttled' => 'Пожалуйста, подождите перед повторной попыткой.',
'token' => 'Этот токен сброса пароля недействителен.',
- 'user' => "Мы не можем найти пользователя с таким адресом электронной почты.",
+ 'user' => 'Мы не можем найти пользователя с таким адресом электронной почты.',
-];
\ No newline at end of file
+];
diff --git a/lang/ru/validation.php b/lang/ru/validation.php
index f6049e9..3d914c3 100644
--- a/lang/ru/validation.php
+++ b/lang/ru/validation.php
@@ -191,4 +191,4 @@ return [
'new_password_confirmation' => 'подтверждение нового пароля',
],
-];
\ No newline at end of file
+];
diff --git a/resources/utils/countries.php b/resources/utils/countries.php
index d8ee4b7..233c08b 100644
--- a/resources/utils/countries.php
+++ b/resources/utils/countries.php
@@ -1,4 +1,5 @@
'Afganistán',
'AX' => 'Islas Åland',
@@ -249,6 +250,5 @@ $paises = [
'BQ' => 'Bonaire, San Eustaquio y Saba',
'CW' => 'Curazao',
'MF' => 'San Martín (parte francesa)',
- 'SX' => 'San Martín (parte neerlandesa)'
+ 'SX' => 'San Martín (parte neerlandesa)',
];
-?>
\ No newline at end of file
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 1679f1f..0b1364e 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -44,7 +44,11 @@
- {{ $slot }}
+ @isset($slot)
+ {{ $slot }}
+ @else
+ @yield('content')
+ @endisset
diff --git a/resources/views/livewire/projects/project-map.blade.php b/resources/views/livewire/projects/project-map.blade.php
index 90d8b9f..3575027 100644
--- a/resources/views/livewire/projects/project-map.blade.php
+++ b/resources/views/livewire/projects/project-map.blade.php
@@ -741,8 +741,13 @@
// Define selectFeature here so Livewire is guaranteed to be available
window.selectFeature = function(featureId) {
- console.log('selectFeature called with:', featureId);
- Livewire.emit('map-select-feature', { featureId: featureId });
+ console.log('[ProjectMap] selectFeature called with:', featureId, typeof featureId);
+ if (typeof Livewire !== 'undefined' && Livewire.emit) {
+ Livewire.emit('map-select-feature', { featureId: featureId });
+ console.log('[ProjectMap] Livewire.emit executed');
+ } else {
+ console.error('[ProjectMap] Livewire not available or emit not a function');
+ }
};
Livewire.on('layersUpdated', (activeIds) => {
diff --git a/resources/views/livewire/reports/report-builder.blade.php b/resources/views/livewire/reports/report-builder.blade.php
index 4c32395..d9cfe3e 100644
--- a/resources/views/livewire/reports/report-builder.blade.php
+++ b/resources/views/livewire/reports/report-builder.blade.php
@@ -1,6 +1,3 @@
-@extends('layouts.app')
-
-@section('content')