From 1d5a98f0395773d3492ab821d93f843c49ba28dc Mon Sep 17 00:00:00 2001 From: Alejandro Rosales Date: Fri, 18 Aug 2023 16:12:50 +0000 Subject: [PATCH] Fix: periodo by facultad_id --- import/periodo.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/import/periodo.php b/import/periodo.php index 21ffbc9..39a0d18 100644 --- a/import/periodo.php +++ b/import/periodo.php @@ -1,16 +1,13 @@ - +
array_merge( - $nivel, - ['periodos' => $db->where('nivel_id', $nivel['nivel_id'])->get('periodo_view')] - ), $db->get("nivel") - ); + $niveles = $db->get("nivel"); // collect facultad_id's with facultad from $periodos ?> @@ -30,9 +27,15 @@ query( - 'SELECT * FROM fs_periodo(NULL, :nivel, 4)', - [':nivel' => $nivel['nivel_id']] + $periodos_rs = $db->query('SELECT periodo_id, periodo_nombre FROM PERIODO_VIEW + WHERE + nivel_id = :nivel_id AND + (facultad_id = :facultad_id OR :facultad_id IS NULL) + GROUP BY periodo_id, periodo_nombre', + [ + ':nivel_id' => $nivel['nivel_id'], + ':facultad_id' => $user->facultad['facultad_id'] + ] ); array_walk($periodos_rs, function ($per) { global $user;