feat(projects): usuarios/empresas del proyecto como tablas Rappasoft + permiso assign companies
- Permiso 'assign companies' propio (antes empresas reutilizaba 'assign users'); concedido a los roles que ya tenían 'assign users'. - ProjectUsersTable y ProjectCompaniesTable (Rappasoft): búsqueda, filtro por rol, cambio de rol en línea y quitar; gateadas por assign users / assign companies. - ProjectUsers/ProjectCompanies quedan como contenedor (form de asignación) que embebe la tabla y refresca el desplegable vía eventos. - Unificadas confirmaciones (wire:confirm) y notificaciones (dispatch notify). Tests: ProjectAssignmentsTest (4). Suite 69 passing (solo 2 pre-existentes sqlite). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,13 +1,6 @@
|
||||
<div>
|
||||
@if(session()->has('message'))
|
||||
<div class="alert alert-success mb-2 text-sm">{{ session('message') }}</div>
|
||||
@endif
|
||||
@if(session()->has('error'))
|
||||
<div class="alert alert-error mb-2 text-sm">{{ session('error') }}</div>
|
||||
@endif
|
||||
|
||||
{{-- Asignar compañía --}}
|
||||
@can('assign users')
|
||||
{{-- Asignar empresa --}}
|
||||
@can('assign companies')
|
||||
<form wire:submit.prevent="assignCompany" class="flex items-end gap-2 mb-4">
|
||||
<div class="flex-1">
|
||||
<label class="label-text text-xs">{{ __('Companies') }}</label>
|
||||
@@ -17,60 +10,20 @@
|
||||
<option value="{{ $company->id }}">{{ $company->name }} @if($company->tax_id) ({{ $company->tax_id }}) @endif</option>
|
||||
@endforeach
|
||||
</select>
|
||||
@error('selectedCompanyId') <span class="text-error text-xs">{{ $message }}</span> @enderror
|
||||
</div>
|
||||
<div class="w-32">
|
||||
<div class="w-40">
|
||||
<label class="label-text text-xs">{{ __('Role') }}</label>
|
||||
<select wire:model="selectedRole" class="select select-bordered select-sm w-full">
|
||||
<option value="owner">{{ __('Owner') }}</option>
|
||||
<option value="constructor">{{ __('Constructor') }}</option>
|
||||
<option value="subcontractor">{{ __('Subcontractor') }}</option>
|
||||
<option value="consultant">{{ __('Consultant') }}</option>
|
||||
<option value="supplier">{{ __('Supplier') }}</option>
|
||||
<option value="other">{{ __('Other') }}</option>
|
||||
@foreach($roles as $value => $label)
|
||||
<option value="{{ $value }}">{{ $label }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary btn-sm">{{ __('Assign') }}</button>
|
||||
</form>
|
||||
@endcan
|
||||
|
||||
{{-- Lista de compañías asignadas --}}
|
||||
@if($assignedCompanies->isNotEmpty())
|
||||
<div class="space-y-1">
|
||||
@foreach($assignedCompanies as $company)
|
||||
<div class="flex items-center justify-between p-2 border rounded text-sm">
|
||||
<div class="flex items-center gap-2">
|
||||
<span class="w-6 h-6 rounded-full bg-primary text-white flex items-center justify-center text-xs font-bold">
|
||||
{{ strtoupper(substr($company->name, 0, 1)) }}
|
||||
</span>
|
||||
<div>
|
||||
<span class="font-medium">{{ $company->name }}</span>
|
||||
@if($company->tax_id)
|
||||
<span class="text-xs text-gray-400 ml-1">{{ $company->tax_id }}</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-1">
|
||||
@can('assign users')
|
||||
<select wire:change="changeRole({{ $company->id }}, $event.target.value)"
|
||||
class="select select-bordered select-xs">
|
||||
<option value="owner" @selected($company->pivot->role_in_project == 'owner')>{{ __('Owner') }}</option>
|
||||
<option value="constructor" @selected($company->pivot->role_in_project == 'constructor')>{{ __('Constructor') }}</option>
|
||||
<option value="subcontractor" @selected($company->pivot->role_in_project == 'subcontractor')>{{ __('Subcontractor') }}</option>
|
||||
<option value="consultant" @selected($company->pivot->role_in_project == 'consultant')>{{ __('Consultant') }}</option>
|
||||
<option value="supplier" @selected($company->pivot->role_in_project == 'supplier')>{{ __('Supplier') }}</option>
|
||||
<option value="other" @selected($company->pivot->role_in_project == 'other')>{{ __('Other') }}</option>
|
||||
</select>
|
||||
<button wire:click="removeCompany({{ $company->id }})"
|
||||
class="btn btn-xs btn-ghost text-error"
|
||||
onclick="return confirm('{{ __('Remove') }} {{ $company->name }}?')">✕</button>
|
||||
@else
|
||||
<span class="badge badge-sm">{{ ucfirst($company->pivot->role_in_project) }}</span>
|
||||
@endcan
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
@else
|
||||
<p class="text-sm text-gray-400 text-center py-4">{{ __('No companies assigned yet') }}</p>
|
||||
@endif
|
||||
</div>
|
||||
{{-- Tabla Rappasoft de empresas asignadas --}}
|
||||
<livewire:project-companies-table :project-id="$project->id" :key="'project-companies-table-'.$project->id" />
|
||||
</div>
|
||||
|
||||
@@ -1,11 +1,4 @@
|
||||
<div>
|
||||
@if(session()->has('message'))
|
||||
<div class="alert alert-success mb-2 text-sm">{{ session('message') }}</div>
|
||||
@endif
|
||||
@if(session()->has('error'))
|
||||
<div class="alert alert-error mb-2 text-sm">{{ session('error') }}</div>
|
||||
@endif
|
||||
|
||||
{{-- Asignar usuario --}}
|
||||
@can('assign users')
|
||||
<form wire:submit.prevent="assignUser" class="flex items-end gap-2 mb-4">
|
||||
@@ -17,54 +10,20 @@
|
||||
<option value="{{ $u->id }}">{{ $u->name }} ({{ $u->email }})</option>
|
||||
@endforeach
|
||||
</select>
|
||||
@error('selectedUserId') <span class="text-error text-xs">{{ $message }}</span> @enderror
|
||||
</div>
|
||||
<div class="w-32">
|
||||
<div class="w-40">
|
||||
<label class="label-text text-xs">{{ __('Role') }}</label>
|
||||
<select wire:model="selectedRole" class="select select-bordered select-sm w-full">
|
||||
<option value="supervisor">{{ __('Supervisor') }}</option>
|
||||
<option value="consultant">{{ __('Consultant') }}</option>
|
||||
<option value="client">{{ __('Client') }}</option>
|
||||
<option value="viewer">{{ __('Viewer') }}</option>
|
||||
@foreach($roles as $value => $label)
|
||||
<option value="{{ $value }}">{{ $label }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary btn-sm">{{ __('Assign') }}</button>
|
||||
</form>
|
||||
@endcan
|
||||
|
||||
{{-- Lista de usuarios asignados --}}
|
||||
@if($assignedUsers->isNotEmpty())
|
||||
<div class="space-y-1">
|
||||
@foreach($assignedUsers as $user)
|
||||
<div class="flex items-center justify-between p-2 border rounded text-sm">
|
||||
<div class="flex items-center gap-2">
|
||||
<span class="w-6 h-6 rounded-full bg-primary text-white flex items-center justify-center text-xs font-bold">
|
||||
{{ strtoupper(substr($user->name, 0, 1)) }}
|
||||
</span>
|
||||
<div>
|
||||
<span class="font-medium">{{ $user->name }}</span>
|
||||
<span class="text-xs text-gray-400 ml-1">{{ $user->email }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-1">
|
||||
@can('assign users')
|
||||
<select wire:change="changeRole({{ $user->id }}, $event.target.value)"
|
||||
class="select select-bordered select-xs">
|
||||
<option value="supervisor" @selected($user->pivot->role_in_project == 'supervisor')>{{ __('Supervisor') }}</option>
|
||||
<option value="consultant" @selected($user->pivot->role_in_project == 'consultant')>{{ __('Consultant') }}</option>
|
||||
<option value="client" @selected($user->pivot->role_in_project == 'client')>{{ __('Client') }}</option>
|
||||
<option value="viewer" @selected($user->pivot->role_in_project == 'viewer')>{{ __('Viewer') }}</option>
|
||||
</select>
|
||||
<button wire:click="removeUser({{ $user->id }})"
|
||||
class="btn btn-xs btn-ghost text-error"
|
||||
onclick="return confirm('{{ __('Remove') }} {{ $user->name }}?')">✕</button>
|
||||
@else
|
||||
<span class="badge badge-sm">{{ ucfirst($user->pivot->role_in_project) }}</span>
|
||||
@endcan
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
@else
|
||||
<p class="text-sm text-gray-400 text-center py-4">{{ __('No users assigned yet') }}</p>
|
||||
@endif
|
||||
</div>
|
||||
{{-- Tabla Rappasoft de usuarios asignados --}}
|
||||
<livewire:project-users-table :project-id="$project->id" :key="'project-users-table-'.$project->id" />
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user