PAAD/paad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.apps.lci.ulsa.mx/PAAD/paad
Some checks are pending
Deploy Pruebas / deploy (push) Waiting to run
Details

Browse Source
This commit is contained in:
Your Name
2024-10-07 19:35:11 +00:00
parent e5715e3b05 3b73423292
commit bc879bbd8e
3 changed files with 1167 additions and 1159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rest/horarios.php
View File

@@ -182,7 +182,7 @@ try{
//claves de carreras en el periodo
$arreglo_claves = array_map(function ($item) {
return $item['clave_carrera'];
return intval($item['clave_carrera']);
}, $carreras_rs);
//print_r($selectedData); exit();
@@ -191,6 +191,9 @@ try{
//Recorre SGU y genera hash
foreach( $selectedData as $row ){
//if ($debug)
// echo trim($row["HoraInicio"]."|".($row["NombreMateria"])."|".(trim($row["ClaveProfesor"])==""?"000000":trim($row["ClaveProfesor"]))."|".$row["IdEspacio"]."|".$per["periodo_id"]."|".$row["Carrera"])."[{$row["ClaveCarrera"]}]|{$row["EsMateriaPorReposicion"]}*";
if(!$row["EsMateriaPorReposicion"]){
$carrera = $row["ClaveCarrera"];
if(is_null($carrera) || empty($carrera))
@@ -245,12 +248,15 @@ try{
//$areacomun = array();
foreach($sguHash as $sgu){
if(in_array($sgu["data"]["ClaveCarrera"] , $arreglo_claves) /*&& !in_array($sgu["data"]["ClaveMateria"], $areacomun)*/){
//print_r($sgu["data"]);
//echo $sgu["data"]["NombreMateria"]. "[".intval($sgu["data"]["ClaveCarrera"])."] =".in_array( intval($sgu["data"]["ClaveCarrera"]) , $arreglo_claves)."     ";
if(in_array( intval($sgu["data"]["ClaveCarrera"]) , $arreglo_claves) /*&& !in_array($sgu["data"]["ClaveMateria"], $areacomun)*/){
$horarios_sgu[] = $sgu;
}
}
//echo "<br><hr><br>";
//print_r($horarios_sgu);exit();
//print_r($horarios_sgu["hash"]);
unset($sguHash);
$elementos_sgu_total = array_merge($elementos_sgu_total, $horarios_sgu);