javier/Nexora
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

añadir nuevas funcionalidades

Browse Source
This commit is contained in:
Javier Braña
2025-04-30 20:56:28 +02:00
parent 883daf32ed
commit 655ea60d6b
71 changed files with 3836 additions and 1158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
app/Http/Controllers/DocumentCommentController.php Normal file
View File

@@ -0,0 +1,82 @@
<?php
namespace App\Http\Controllers;
use App\Models\Document;
use App\Models\DocumentComment;
use Illuminate\Http\Request;
class DocumentCommentController extends Controller
{
/**
* Display a listing of the resource.
*/
public function index()
{
//
}
/**
* Show the form for creating a new resource.
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*/
public function store(Request $request, Document $document)
{
$request->validate([
'content' => 'required|string|max:1000',
'page' => 'required|integer|min:1',
'x' => 'required|numeric|between:0,1',
'y' => 'required|numeric|between:0,1'
]);
$document->comments()->create([
'user_id' => auth()->id(),
'content' => $request->content,
'page' => $request->page,
'x' => $request->x,
'y' => $request->y,
'parent_id' => $request->parent_id
]);
return back();
}
/**
* Display the specified resource.
*/
public function show(DocumentComment $documentComment)
{
//
}
/**
* Show the form for editing the specified resource.
*/
public function edit(DocumentComment $documentComment)
{
//
}
/**
* Update the specified resource in storage.
*/
public function update(Request $request, DocumentComment $documentComment)
{
//
}
/**
* Remove the specified resource from storage.
*/
public function destroy(DocumentComment $documentComment)
{
//
}
}

18
app/Http/Controllers/DocumentController.php
View File

@@ -6,9 +6,13 @@ use App\Jobs\ProcessDocumentOCR;
use App\Models\Document;
use App\Models\Project;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
class DocumentController extends Controller
{
public $comments=[];
/**
* Display a listing of the resource.
*/
@@ -56,7 +60,19 @@ class DocumentController extends Controller
*/
public function show(Document $document)
{
//
$this->authorize('view', $document); // Si usas políticas
if (!Storage::exists($document->file_path)) {
abort(404);
}
$document->url = Storage::url($document->file_path);
return view('documents.show', [
'document' => $document,
'versions' => $document->versions()->latest()->get(),
'comments' => $this->comments,
]);
}
/**

39
app/Http/Controllers/ProjectController.php
View File

@@ -17,12 +17,16 @@ class ProjectController extends Controller
*/
public function index()
{
$projects = Project::withCount('documents')
->whereHas('users', function($query) {
$projects = auth()->user()->hasRole('admin')
? Project::get() // Todos los proyectos para admin
: auth()->user()->projects()->latest()->get(); // Solo proyectos asignados
/*
$projects = Project::whereHas('users', function($query) {
$query->where('user_id', auth()->id());
})
->filter(['search' => request('search')])
->paginate(9);
->paginate(9);*/
return view('projects.index', compact('projects'));
}
@@ -47,24 +51,24 @@ class ProjectController extends Controller
{
$validated = $request->validate([
'name' => 'required|string|max:255',
'description' => 'required|string',
'status' => 'required|in:active,inactive',
'team' => 'sometimes|array',
'team.*' => 'exists:users,id',
'description' => 'nullable|string',
'status' => 'required|in:Activo,Inactivo',
//'team' => 'sometimes|array',
//'team.*' => 'exists:users,id',
'project_image' => 'nullable|image|mimes:jpeg,png,jpg,gif|max:2048',
'address' => 'nullable|string|max:255',
'province' => 'nullable|string|max:100',
'country' => 'nullable|string|size:2',
//'country' => 'nullable|string|size:2',
'postal_code' => 'nullable|string|max:10',
'latitude' => 'required|numeric|between:-90,90',
'longitude' => 'required|numeric|between:-180,180',
'icon' => 'nullable|in:'.implode(',', config('project.icons')),
//'icon' => 'nullable|in:'.implode(',', config('project.icons')),
'start_date' => 'nullable|date',
'deadline' => 'nullable|date|after:start_date',
'categories' => 'array|exists:categories,id',
'categories' => 'nullable|array|exists:categories,id',
//'categories' => 'required|array',
'categories.*' => 'exists:categories,id',
'documents.*' => 'file|max:5120|mimes:pdf,docx,xlsx,jpg,png'
//'categories.*' => 'exists:categories,id',
//'documents.*' => 'file|max:5120|mimes:pdf,docx,xlsx,jpg,png'
]);
@@ -89,6 +93,7 @@ class ProjectController extends Controller
}
// Manejar documentos adjuntos
/*
if($request->hasFile('documents')) {
foreach ($request->file('documents') as $file) {
$project->documents()->create([
@@ -96,14 +101,12 @@ class ProjectController extends Controller
'original_name' => $file->getClientOriginalName()
]);
}
}
}*/
return redirect()->route('projects.show', $project)
->with('success', 'Proyecto creado exitosamente');
return redirect()->route('projects.show', $project)->with('success', 'Proyecto creado exitosamente');
} catch (\Exception $e) {
return back()->withInput()
->with('error', 'Error al crear el proyecto: ' . $e->getMessage());
return back()->withInput()->with('error', 'Error al crear el proyecto: ' . $e->getMessage());
}
}
@@ -112,7 +115,7 @@ class ProjectController extends Controller
*/
public function show(Project $project)
{
$this->authorize('view', $project); // Si usas políticas
//$this->authorize('view', $project); // Si usas políticas
$project->load(['categories', 'documents']);
return view('projects.show', [

235
app/Http/Controllers/UserController.php
View File

@@ -5,7 +5,14 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Models\User;
use Illuminate\Support\Facades\Hash;
use App\Http\Requests\UpdateUserRequest;
use App\Rules\PasswordRule;
use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use Illuminate\Validation\Rule;
use Illuminate\Validation\Rules\Password;
use Illuminate\Validation\ValidationException;
use Spatie\Permission\Models\Permission;
use Spatie\Permission\Models\Role;
class UserController extends Controller
@@ -13,7 +20,7 @@ class UserController extends Controller
public function index()
{
$this->authorize('viewAny', User::class);
$users = User::with('roles')->paginate(10);
$users = User::paginate(10);
return view('users.index', compact('users'));
}
@@ -27,24 +34,62 @@ class UserController extends Controller
public function store(Request $request)
{
$this->authorize('create', User::class);
$data = $request->validate([
'name' => 'required|string|max:255',
'email' => 'required|email|unique:users',
'password' => 'required|min:8|confirmed',
'roles' => 'array'
]);
$user = User::create([
'name' => $data['name'],
'email' => $data['email'],
'password' => Hash::make($data['password'])
]);
$user->syncRoles($data['roles'] ?? []);
return redirect()->route('users.index')
->with('success', 'Usuario creado exitosamente');
try {
// Validación de datos
$validated = $request->validate([
'title' => 'nullable|string|max:10',
'first_name' => 'required|string|max:50',
'last_name' => 'required|string|max:50',
'username' => 'required|string|unique:users|max:30',
'password' => ['required',
new PasswordRule(
minLength: 12,
requireUppercase: true,
requireNumeric: true,
requireSpecialCharacter: true,
//uncompromised: true, // Verificar contra Have I Been Pwned
//requireLetters: true
),
Password::defaults()->mixedCase()->numbers()->symbols()
->uncompromised(3) // Número mínimo de apariciones en brechas
],
'start_date' => 'nullable|date',
'end_date' => 'nullable|date|after_or_equal:start_date',
'email' => 'required|email|unique:users',
'phone' => 'nullable|string|max:20',
'address' => 'nullable|string|max:255',
'profile_photo_path' => 'nullable|string' // Ruta de la imagen subida por Livewire
]);
// Creación del usuario
$user = User::create([
'title' => $validated['title'],
'first_name' => $validated['first_name'],
'last_name' => $validated['last_name'],
'username' => $validated['username'],
'password' => Hash::make($validated['password']),
'email' => $validated['email'],
'phone' => $validated['phone'],
'address' => $validated['address'],
'access_start' => $validated['start_date'],
'access_end' => $validated['end_date'],
'is_active' => true,
'profile_photo_path' => $validated['profile_photo_path'] ?? null
]);
if ($request->hasFile('image_path')) {
$path = $request->file('image_path')->store('public/photos');
$user->profile_photo_path = basename($path);
$user->save();
}
// Asignación de roles (opcional, usando Spatie Permissions)
// $user->assignRole('user');
return redirect()->route('users.index')->with('success', 'Usuario creado exitosamente.')->with('temp_password', $validated['password']);;
} catch (\Exception $e) {
return back()->withInput()->with('error', 'Error al crear el usuario: ' . $e->getMessage());
}
}
public function edit(User $user)
@@ -52,17 +97,110 @@ class UserController extends Controller
$this->authorize('update', $user);
$roles = Role::all();
$userRoles = $user->roles->pluck('id')->toArray();
return view('users.edit', compact('user', 'roles', 'userRoles'));
return view('users.create', compact('user', 'roles', 'userRoles'));
}
public function update(UpdateUserRequest $request, User $user)
public function update(Request $request, User $user)
{
$user->update($request->validated());
$user->syncRoles($request->roles);
return redirect()->route('users.index')
->with('success', 'Usuario actualizado correctamente');
try {
// Validación de datos
$validated = $request->validate([
'title' => 'nullable|string|max:10',
'first_name' => 'required|string|max:50',
'last_name' => 'required|string|max:50',
'username' => [
'required',
'string',
'max:30',
Rule::unique('users')->ignore($user->id)
],
'password' => [
'nullable',
Password::min(12)
->mixedCase()
->numbers()
->symbols()
->uncompromised(3)
],
'start_date' => 'nullable|date',
'end_date' => 'nullable|date|after_or_equal:start_date',
'email' => [
'required',
'email',
Rule::unique('users')->ignore($user->id)
],
'phone' => 'nullable|string|max:20',
'address' => 'nullable|string|max:255',
'profile_photo_path' => 'nullable|string', // Añadido para la ruta de la imagen
//'is_active' => 'nullable|boolean' // Añadido para el estado activo
]);
// Preparar datos para actualización
$updateData = [
'title' => $validated['title'],
'first_name' => $validated['first_name'],
'last_name' => $validated['last_name'],
'username' => $validated['username'],
'email' => $validated['email'],
'phone' => $validated['phone'],
'address' => $validated['address'],
'access_start' => $validated['start_date'],
'access_end' => $validated['end_date'],
'is_active' => $validated['is_active'] ?? false,
'profile_photo_path' => $validated['profile_photo_path'] ?? $user->profile_photo_path
];
// Actualizar contraseña solo si se proporciona
if (!empty($validated['password'])) {
$updateData['password'] = Hash::make($validated['password']);
}
// Eliminar imagen anterior si se está actualizando
if (isset($validated['profile_photo_path']) && $user->profile_photo_path) {
Storage::disk('public')->delete($user->profile_photo_path);
}
// Actualizar el usuario
$user->update($updateData);
// Redireccionar con mensaje de éxito
return redirect()->route('users.show', $user)
->with('success', 'Usuario actualizado exitosamente');
} catch (ValidationException $e) {
return redirect()->back()->withErrors($e->validator)->withInput();
} catch (QueryException $e) {
$errorCode = $e->errorInfo[1];
$errorMessage = 'Error al actualizar el usuario: ';
if ($errorCode == 1062) {
$errorMessage .= 'El nombre de usuario o correo electrónico ya está en uso';
} else {
$errorMessage .= 'Error en la base de datos';
}
Log::error("Error actualizando usuario ID {$user->id}: " . $e->getMessage());
return redirect()->back()->with('error', $errorMessage)->withInput();
} catch (\Exception $e) {
Log::error("Error general actualizando usuario ID {$user->id}: " . $e->getMessage());
return redirect()->back()->with('error', 'Ocurrió un error inesperado al actualizar el usuario')->withInput();
}
}
public function show(User $user)
{
$previousUser = User::where('id', '<', $user->id)->latest('id')->first();
$nextUser = User::where('id', '>', $user->id)->oldest('id')->first();
$permissionGroups = $this->getPermissionGroups($user);
return view('users.show', [
'user' => $user,
'previousUser' => $previousUser,
'nextUser' => $nextUser,
'permissionGroups' => $permissionGroups,
]);
}
public function updatePassword(Request $request, User $user)
@@ -94,4 +232,45 @@ class UserController extends Controller
return redirect()->route('users.index')
->with('success', 'Usuario eliminado correctamente');
}
private function getPermissionGroups(User $user)
{
// Obtener todos los permisos disponibles
$allPermissions = Permission::all();
// Agrupar permisos por tipo (asumiendo que los nombres siguen el formato "tipo.acción")
$grouped = $allPermissions->groupBy(function ($permission) {
return explode('.', $permission->name)[0]; // Extrae "user" de "user.create"
});
// Formatear para la vista
$groups = [];
foreach ($grouped as $groupName => $permissions) {
$groups[$groupName] = [
'name' => ucfirst($groupName),
'permissions' => $permissions->map(function ($permission) use ($user) {
return [
'id' => $permission->id,
'name' => $permission->name,
'description' => $this->getPermissionDescription($permission->name),
'enabled' => $user->hasPermissionTo($permission)
];
})
];
}
return $groups;
}
private function getPermissionDescription($permissionName)
{
$descriptions = [
'user.create' => 'Crear nuevos usuarios',
'user.edit' => 'Editar usuarios existentes',
'document.view' => 'Ver documentos',
// Agrega más descripciones según necesites
];
return $descriptions[$permissionName] ?? str_replace('.', ' ', $permissionName);
}
}