This commit is contained in:
2023-08-17 18:04:58 +00:00
parent 8b580895b6
commit dd8351a840
11 changed files with 85 additions and 57 deletions

3
.gitignore vendored
View File

@@ -13,4 +13,5 @@ composer.phar
/export/
/include/.env
*/.env
*/.env
/log/*

View File

@@ -20,12 +20,6 @@
<body>
<?
$justificadores = array(
'Root',
'Secretario Académico',
'Vicerrectoría',
);
$redirect = $_SERVER['PHP_SELF'];
include "import/html_header.php";
global $user;

View File

@@ -17,7 +17,7 @@ class LogAsistencias
// die ruta
$this->month = date("m");
$this->year = date("Y");
$this->dir = ($ruta ?? '') . "log/";
$this->dir = "log/";
$this->updateFilename();
}

View File

@@ -57,7 +57,7 @@ class Login
private static function validaUsuario($user, $pass): bool
{
file_put_contents('php://stderr', $user);
if ($user == 'ad017045' and $pass == "admin")
if (in_array($user, ['ad017045', 'ad009273']) and $pass == "admin")
return true;
$client = new nusoap_client('http://200.13.89.2/validacion.php?wsdl', 'wsdl');

View File

@@ -187,12 +187,6 @@ const store = reactive({
*/
const filters = Object.keys(store.filters).filter((filtro) => store.filters[filtro] || store.filters[filtro]?.length > 0);
/*
store.current
page: 1,
maxPages: 10,
perPage: 10,
*/
return this.data.filter((registro) => {
return filters.every((filtro) => {
switch (filtro) {
@@ -224,11 +218,10 @@ const store = reactive({
const bloque = store.bloques_horario.data.find((bloque) => bloque.id === store.filters[filtro]);
return registro.horario_hora < bloque.hora_fin && registro.horario_fin > bloque.hora_inicio;
default: {
if (store.filters.sin_registro && !registro.registro_fecha_supervisor)
return true;
else if (store.filters.sin_registro)
return false;
return true;
if (store.filters.sin_registro)
return !registro.registro_fecha_supervisor;
else
return registro.registro_fecha_supervisor;
}
}
});

View File

@@ -157,3 +157,54 @@
2023-08-16 12:59:06||1||Consultar horario||Alejandro Rosales
2023-08-16 12:59:08||1||Consultar horario||Alejandro Rosales
2023-08-16 12:59:09||1||Consultar horario||Alejandro Rosales
2023-08-17 10:38:51||1||Usuarios||Alejandro Rosales
2023-08-17 10:38:52||1||Usuarios||Alejandro Rosales
2023-08-17 10:38:54||1||Usuarios||Alejandro Rosales
2023-08-17 10:41:26||1||Usuarios||Alejandro Rosales
2023-08-17 10:41:30||1||Usuarios||Alejandro Rosales
2023-08-17 10:41:32||1||Permisos||Alejandro Rosales
2023-08-17 10:41:37||1||Avisos||Alejandro Rosales
2023-08-17 10:41:41||1||Materias||Alejandro Rosales
2023-08-17 10:41:44||1||Profesores||Alejandro Rosales
2023-08-17 10:41:49||1||Usuarios||Alejandro Rosales
2023-08-17 11:16:33||1||Usuarios||Alejandro Rosales
2023-08-17 11:16:37||1||Usuarios||Alejandro Rosales
2023-08-17 11:17:17||1||Usuarios||Alejandro Rosales
2023-08-17 11:17:19||1||Usuarios||Alejandro Rosales
2023-08-17 11:17:46||1||Usuarios||Alejandro Rosales
2023-08-17 11:17:50||1||Usuarios||Alejandro Rosales
2023-08-17 11:21:52||1||Usuarios||Alejandro Rosales
2023-08-17 11:27:13||1||Usuarios||Alejandro Rosales
2023-08-17 11:27:20||1||Usuarios||Alejandro Rosales
2023-08-17 11:27:31||1||Usuarios||Alejandro Rosales
2023-08-17 11:27:44||1||Usuarios||Alejandro Rosales
2023-08-17 11:29:09||1||Usuarios||Alejandro Rosales
2023-08-17 11:29:13||1||Usuarios||Alejandro Rosales
2023-08-17 11:29:33||1||Usuarios||Alejandro Rosales
2023-08-17 11:29:38||1||Usuarios||Alejandro Rosales
2023-08-17 11:29:41||1||Usuarios||Alejandro Rosales
2023-08-17 11:30:35||1||Usuarios||Alejandro Rosales
2023-08-17 11:30:37||1||Usuarios||Alejandro Rosales
2023-08-17 11:30:38||1||Usuarios||Alejandro Rosales
2023-08-17 11:31:18||1||Usuarios||Alejandro Rosales
2023-08-17 11:31:25||1||Usuarios||Alejandro Rosales
2023-08-17 11:37:29||1||Usuarios||Alejandro Rosales
2023-08-17 11:37:38||1||Usuarios||Alejandro Rosales
2023-08-17 11:38:00||1||Usuarios||Alejandro Rosales
2023-08-17 11:38:16||1||Usuarios||Alejandro Rosales
2023-08-17 11:38:18||1||Usuarios||Alejandro Rosales
2023-08-17 11:41:11||1||Usuarios||Alejandro Rosales
2023-08-17 11:41:46||1||Usuarios||Alejandro Rosales
2023-08-17 11:41:57||1||Usuarios||Alejandro Rosales
2023-08-17 11:43:19||1||Usuarios||Alejandro Rosales
2023-08-17 11:52:47||1||Usuarios||Alejandro Rosales
2023-08-17 11:52:53||1||Usuarios||Alejandro Rosales
2023-08-17 11:56:06||1||Usuarios||Alejandro Rosales
2023-08-17 11:56:36||1||Usuarios||Alejandro Rosales
2023-08-17 11:56:40||1||Usuarios||Alejandro Rosales
2023-08-17 11:56:58||1||Usuarios||Alejandro Rosales
2023-08-17 11:57:12||1||Usuarios||Alejandro Rosales
2023-08-17 11:57:19||1||Usuarios||Alejandro Rosales
2023-08-17 11:57:19||1||Usuarios||Alejandro Rosales
2023-08-17 11:57:22||1||Usuarios||Alejandro Rosales
2023-08-17 11:57:24||1||Usuarios||Alejandro Rosales

View File

@@ -42,7 +42,7 @@ curl_setopt_array($curl, [
CURLOPT_CUSTOMREQUEST => "POST",
CURLOPT_POSTFIELDS => json_encode($params),
CURLOPT_HTTPHEADER => [
"token: e12e2dde0e95a32e274328fd274e07d53f127630c211d838efffacd3cafc4f14edf3f3de6a649eb23f98edf6a1863a008f60e78a316d4dec996b79aeea161a0c",
"token: 64293fb86c06e45331ab9963822762f77b9c403ca949adcc31286d550e902fff202e4c69d1574b2082ecf0b3a28b6cfd4d88b3a7d2c2ab7d329666b9a527fb1b",
"username: SGU_APSA_AUD_ASIST",
"Content-Type: application/json"
],

View File

@@ -12,7 +12,7 @@ curl_setopt_array($curl, [
CURLOPT_RETURNTRANSFER => true,
CURLOPT_POSTFIELDS => "",
CURLOPT_HTTPHEADER => [
"token: 5b892845736a29b5846073be0a11f0fc87113648aae1e8279830c4bc05f585eba13e0b1b4f0c42a12d694bb8091d23f7564b15f3141768dfa6ed2aa709864986",
"token: 64293fb86c06e45331ab9963822762f77b9c403ca949adcc31286d550e902fff202e4c69d1574b2082ecf0b3a28b6cfd4d88b3a7d2c2ab7d329666b9a527fb1b",
"username: SGU_APSA_AUD_ASIST"
],
]);

View File

@@ -14,7 +14,7 @@ curl_setopt_array($curl, [
CURLOPT_RETURNTRANSFER => true,
CURLOPT_POSTFIELDS => "",
CURLOPT_HTTPHEADER => [
"token: 5b892845736a29b5846073be0a11f0fc87113648aae1e8279830c4bc05f585eba13e0b1b4f0c42a12d694bb8091d23f7564b15f3141768dfa6ed2aa709864986",
"token: 64293fb86c06e45331ab9963822762f77b9c403ca949adcc31286d550e902fff202e4c69d1574b2082ecf0b3a28b6cfd4d88b3a7d2c2ab7d329666b9a527fb1b",
"username: SGU_APSA_AUD_ASIST"
],
]);

View File

@@ -264,12 +264,6 @@ const store = reactive({
*/
const filters = Object.keys(store.filters).filter((filtro) => store.filters[filtro] || store.filters[filtro]?.length > 0)
/*
store.current
page: 1,
maxPages: 10,
perPage: 10,
*/
return this.data.filter((registro: Registro) => {
return filters.every((filtro) => {
switch (filtro) {
@@ -299,9 +293,8 @@ const store = reactive({
const bloque = store.bloques_horario.data.find((bloque: Bloque_Horario) => bloque.id === store.filters[filtro]) as Bloque_Horario;
return registro.horario_hora < bloque.hora_fin && registro.horario_fin > bloque.hora_inicio;
default: {
if (store.filters.sin_registro && !registro.registro_fecha_supervisor) return true
else if (store.filters.sin_registro) return false
return true
if (store.filters.sin_registro) return !registro.registro_fecha_supervisor
else return registro.registro_fecha_supervisor
}
}
})

View File

@@ -13,7 +13,7 @@ if (!$user->admin && $user->acceso == 'n') {
} else {
$user->print_to_log('Usuarios');
}
$fac = $user->facultad['facultad_id'] ?? -1;
$fac = $user->facultad['facultad_id'] ?? null;
if ($user->admin) {
$fac = null;
}
@@ -42,14 +42,14 @@ if ($user->admin) {
if (isset($_POST["desc"])) {
$desc = $_POST["desc"];
$filter_desc = trim(filter_input(INPUT_POST, "desc", FILTER_SANITIZE_STRING, array('flags' => FILTER_FLAG_STRIP_LOW)));
$filter_desc = htmlspecialchars($desc, ENT_QUOTES, 'UTF-8');
} else {
$desc = NULL;
}
if (isset($_POST["clave"])) {
$clave = $_POST["clave"];
$filter_clave = trim(filter_input(INPUT_POST, "clave", FILTER_SANITIZE_STRING, array('flags' => FILTER_FLAG_STRIP_LOW)));
$filter_clave = htmlspecialchars($clave, ENT_QUOTES, 'UTF-8');
} else {
$clave = NULL;
}
@@ -57,7 +57,7 @@ if ($user->admin) {
if (isset($_POST["rol"])) {
if ($_POST['rol'] != "") {
$rol = $_POST["rol"];
$filter_rol = trim(filter_input(INPUT_POST, "rol", FILTER_SANITIZE_STRING, array('flags' => FILTER_FLAG_STRIP_LOW)));
$filter_rol = htmlspecialchars($rol, ENT_QUOTES, 'UTF-8');
} else {
$rol = NULL;
}
@@ -67,13 +67,12 @@ if ($user->admin) {
if (isset($_POST["mnombre"])) {
$desc = $_POST["mnombre"];
$filter_desc = trim(filter_input(INPUT_POST, "mnombre", FILTER_SANITIZE_STRING, array('flags' => FILTER_FLAG_STRIP_LOW)));
$filter_desc = htmlspecialchars($desc, ENT_QUOTES, 'UTF-8');
}
if (isset($_POST["mclave"])) {
$clave = $_POST["mclave"];
$filter_clave = trim(filter_input(INPUT_POST, "mclave", FILTER_SANITIZE_STRING, array('flags' => FILTER_FLAG_STRIP_LOW)));
$filter_clave = htmlspecialchars($clave, ENT_QUOTES, 'UTF-8');
}
$fs_usuarios = query(
"SELECT * FROM fs_usuarios(:facultad, :nombre, :clave, :rol)",
array(
@@ -84,11 +83,9 @@ if ($user->admin) {
),
false
);
$fs_roles = query(
"SELECT * FROM rol ORDER BY rol_titulo",
null,
false
);
$fs_roles = $db
->orderBy('rol_titulo', 'asc')
->get("rol");
if ($user->admin) {
$fs_facultades = $db
->orderBy('facultad_nombre', 'asc')
@@ -112,7 +109,7 @@ if ($user->admin) {
<div class="form-box">
<div class="form-group row">
<label for="filter_desc" class="col-4 col-form-label">Nombre</label>
<div class="col-8 col-sm-4">
<div class="col-8">
<input id="filter_desc" name="desc" type="text" class="form-control" <?php if (isset($filter_desc)) {
echo 'value="' . $filter_desc . '"';
} ?>>
@@ -123,7 +120,7 @@ if ($user->admin) {
</div>
<div class="form-group row">
<label for="filter_clave" class="col-4 col-form-label">Clave</label>
<div class="col-8 col-sm-4">
<div class="col-8">
<input id="filter_clave" name="clave" type="text" class="form-control" <?php if (isset($filter_desc)) {
echo 'value="' . $filter_clave . '"';
@@ -135,7 +132,7 @@ if ($user->admin) {
</div>
<div class="form-group row">
<lab el for="filter_rol" class="col-4 col-form-label">Rol</label>
<div class="col-8 col-sm-4">
<div class="col-8">
<div class="datalist datalist-select mb-1 w-100">
<div class="datalist-input">Mostrar todas</div>
<span class="ing-buscar icono"></span>
@@ -285,7 +282,6 @@ if ($user->admin) {
<div class="datalist-input">Mostrar todas</div>
<span class="ing-buscar icono"></span>
<ul style="display:none">
<?php foreach ($fs_roles as $rol) { ?>
<li data-id="<?= $rol['rol_id'] ?>" class="pl-4"><?= $rol['rol_titulo'] ?>
</li>
@@ -329,7 +325,7 @@ if ($user->admin) {
</div>
</div>
<script src="js/jquery.min.js"></script>
<script s rc="js/bootstrap/bootstrap.min.js"></script>
<script src="js/bootstrap/bootstrap.min.js"></script>
<script src="js/datalist.js"></script>
<?php
require_once 'js/messages.php';
@@ -344,15 +340,15 @@ if ($user->admin) {
function valida_campos() {
var error = false;
if ($("#mclave").val() == " ") {
if ($("#mclave").val() == "") {
$("#mclave").addClass("is-invalid");
$("#mclave-error").html("Campo obligatorio");
error = true;
} else {
$("#mclave").removeClass("i s-invalid");
}
if ($("#mclave").val()[0] == " ") {
$("#m c lave").addClass("is-invalid");
if ($("#mclave").val()[0] == "") {
$("#mclave").addClass("is-invalid");
$("#mclave-error").html("No puede tener espacios al inicio");
error = true;
}
@@ -363,12 +359,12 @@ if ($user->admin) {
} else {
$("#mnombre").removeClass("is-invalid");
}
if ($("#mnombre").val()[0] == " ") {
if ($("#mnombre").val()[0] == "") {
$("#mnombre").addClass("is-invalid");
$("#mnombre-error").html("No puede tener espacios al inicio");
error = true;
}
if ($("#mcorreo").val()[0] == " ") {
if ($("#mcorreo").val()[0] == "") {
$("#mcorreo").addClass("is-invalid");
$("#mcorreo-error")
error = true;
@@ -387,7 +383,7 @@ if ($user->admin) {
var button = $(event.relatedTarget);
var tipo = button.data('tipo');
var modal = $(this);
setDatalistFirst('#mrol');
setDatalistFirst('#mrol');
<?php if ($user->admin) { ?>
setDatalistFirst("#dlfacultad");
<?php } ?>
@@ -417,7 +413,7 @@ if ($user->admin) {
type: "post",
dataType: "json",
data: { usuario: id },
success: function(result) {
success: function (result) {
console.log(result);
$('#id').val(result['us uario_id']);
$('#mfacultad').val(result['facultad_id']);
@@ -438,7 +434,7 @@ if ($user->admin) {
function valida_filtro() {
var error = false;
if ($('#filter_desc').val()[0] == " ") {
if ($('#filter_desc').val()[0] == "") {
$('#filter_desc').addClass("is-invalid");
$('#desc-error').html("No puede tener espacios al inicio");