From 39ded69a913e32f232c1744288235775421f413c Mon Sep 17 00:00:00 2001 From: Alejandro Rosales Date: Tue, 25 Mar 2025 14:50:10 -0600 Subject: [PATCH 1/5] Datos de IDE --- .idea/.gitignore | 8 ++++++++ .idea/dataSources.xml | 13 +++++++++++++ .idea/modules.xml | 8 ++++++++ .idea/paad.iml | 8 ++++++++ .idea/php.xml | 22 ++++++++++++++++++++++ .idea/vcs.xml | 6 ++++++ 6 files changed, 65 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/dataSources.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/paad.iml create mode 100644 .idea/php.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..b4880fe --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,13 @@ + + + + + postgresql + true + Base de datos del PAAD + org.postgresql.Driver + jdbc:postgresql://paad.lci.ulsa.mx:5432/paad + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..b5f1508 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/paad.iml b/.idea/paad.iml new file mode 100644 index 0000000..c956989 --- /dev/null +++ b/.idea/paad.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 0000000..23db715 --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 8bbd6013a2f84b178922a2f4635c36034302bb8b Mon Sep 17 00:00:00 2001 From: Alejandro Rosales Date: Tue, 25 Mar 2025 14:59:11 -0600 Subject: [PATCH 2/5] =?UTF-8?q?Los=20horarios=20menores=20al=20d=C3=ADa=20?= =?UTF-8?q?de=20hoy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- action/action_auditoria.php | 1 + 1 file changed, 1 insertion(+) diff --git a/action/action_auditoria.php b/action/action_auditoria.php index f0a8754..9f4999a 100644 --- a/action/action_auditoria.php +++ b/action/action_auditoria.php @@ -115,6 +115,7 @@ try { LEFT JOIN usuario ON usuario.usuario_id = REGISTRO.supervisor_id JOIN estado_supervisor ON estado_supervisor.estado_supervisor_id = COALESCE(REGISTRO.estado_supervisor_id, 0) WHERE horario.horario_id IN ($HorariosID) + AND (FECHAS.fecha + horario.horario_hora) < NOW() ORDER BY fechas.fecha, horario_hora, REGISTRO.estado_supervisor_id", $fechas ); From 1b14bbaa2ce6fc739ec0532006741447accdfd78 Mon Sep 17 00:00:00 2001 From: Alejandro Rosales Date: Tue, 25 Mar 2025 14:59:44 -0600 Subject: [PATCH 3/5] Arreglar error de las tags cortas --- action/action_auditoria.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action/action_auditoria.php b/action/action_auditoria.php index 9f4999a..6ccdb7b 100644 --- a/action/action_auditoria.php +++ b/action/action_auditoria.php @@ -1,4 +1,4 @@ - Date: Tue, 25 Mar 2025 15:05:29 -0600 Subject: [PATCH 4/5] Acomodo de fechas Se acomodaron las fechas para que no salieran horarios desfasados. --- action/action_auditoria.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action/action_auditoria.php b/action/action_auditoria.php index 6ccdb7b..79b11a4 100644 --- a/action/action_auditoria.php +++ b/action/action_auditoria.php @@ -115,7 +115,7 @@ try { LEFT JOIN usuario ON usuario.usuario_id = REGISTRO.supervisor_id JOIN estado_supervisor ON estado_supervisor.estado_supervisor_id = COALESCE(REGISTRO.estado_supervisor_id, 0) WHERE horario.horario_id IN ($HorariosID) - AND (FECHAS.fecha + horario.horario_hora) < NOW() + AND (FECHAS.fecha + horario.horario_hora) < LEAST(horario.horario_fecha_fin, NOW()) ORDER BY fechas.fecha, horario_hora, REGISTRO.estado_supervisor_id", $fechas ); From 9ac4a2f7d6e0cd738a2a85986371c7e4bcbe33b9 Mon Sep 17 00:00:00 2001 From: Alejandro Rosales Date: Tue, 25 Mar 2025 15:06:01 -0600 Subject: [PATCH 5/5] =?UTF-8?q?Actualizaci=C3=B3n=20de=20versi=C3=B3n=20de?= =?UTF-8?q?=20phpspreadsheet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f7f0902..9675178 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,10 @@ { "require": { "vlucas/phpdotenv": "^5.5", - "phpoffice/phpspreadsheet": "^1.25", + "phpoffice/phpspreadsheet": "3.9.0.0", "seinopsys/postgresql-database-class": "^3.1", "justinrainbow/json-schema": "^5.2", - "econea/nusoap": "^0.9.15" + "econea/nusoap": "^0.9.15", + "ext-pdo": "*" } }