diff --git a/app/Config/Filters.php b/app/Config/Filters.php index ad09df8..36b7f3e 100644 --- a/app/Config/Filters.php +++ b/app/Config/Filters.php @@ -78,7 +78,7 @@ class Filters extends BaseConfig * @var array */ public $filters = [ - 'inicio' => ['before' => ['/', '/horas']], + 'inicio' => ['before' => ['/',]], 'formulario_inicial' => ['before' => ['registro/']] ]; } diff --git a/app/Controllers/Prestador.php b/app/Controllers/Prestador.php index b2afb7d..beff9c6 100644 --- a/app/Controllers/Prestador.php +++ b/app/Controllers/Prestador.php @@ -63,6 +63,9 @@ class Prestador extends BaseController $data['id'] = user()->rh_prestador_solicitud_id; } + // Poner status de revisión (0) + $data['status'] = 0; + // Validar datos if (!$prestadorModel->save($data)) { return redirect()->back()->withInput()->with('errors', $prestadorModel->errors()); diff --git a/app/Filters/FormularioInicialFilter.php b/app/Filters/FormularioInicialFilter.php index bc662fa..c6004fa 100644 --- a/app/Filters/FormularioInicialFilter.php +++ b/app/Filters/FormularioInicialFilter.php @@ -22,7 +22,7 @@ class FormularioInicialFilter implements FilterInterface { // Usuario ya contestó el formulario y fue aprobado if (user()->idprestador) { - return redirect('/'); + return redirect()->route('home'); } } diff --git a/app/Filters/InicioFilter.php b/app/Filters/InicioFilter.php index 8a1afc5..ad08fa0 100644 --- a/app/Filters/InicioFilter.php +++ b/app/Filters/InicioFilter.php @@ -2,6 +2,7 @@ namespace App\Filters; +use App\Models\PrestadorSolicitudModel; use App\Models\UserModel; use CodeIgniter\Filters\FilterInterface; use CodeIgniter\HTTP\RequestInterface; @@ -29,8 +30,14 @@ class InicioFilter implements FilterInterface return redirect('registro'); } - // Ya registró sus datos, está pendiente la aprobación de RH - return \Config\Services::response()->setBody(view('Prestador/success')); + // Ya registr� sus datos, est� pendiente la aprobaci�n de RH + + // Ver status de la solicitud + $status = model(PrestadorSolicitudModel::class)->find(user()->rh_prestador_solicitud_id)['status']; + if ($status == 0) // aún no ha sido aprobada + return \Config\Services::response()->setBody(view('Prestador/success')); + else if ($status == 2) + return \Config\Services::response()->setBody(view('Prestador/registroNoAprobado')); } } diff --git a/app/Models/PrestadorSolicitudModel.php b/app/Models/PrestadorSolicitudModel.php index 0b56a1d..f20f9f1 100644 --- a/app/Models/PrestadorSolicitudModel.php +++ b/app/Models/PrestadorSolicitudModel.php @@ -60,7 +60,7 @@ class PrestadorSolicitudModel extends Model return $this ->where('status', 0) ->orWhere('status', 2) - ->orderBy('id ASC, status DESC') + ->orderBy('status ASC, id ASC') ->findAll(); } return $this->where('id', $id)->first(); diff --git a/app/Views/Admin/solicitudes.php b/app/Views/Admin/solicitudes.php index 9633eef..5dac0e0 100644 --- a/app/Views/Admin/solicitudes.php +++ b/app/Views/Admin/solicitudes.php @@ -21,7 +21,7 @@
-