My changes

This commit is contained in:
Cloud User
2024-03-06 18:11:42 -06:00
45 changed files with 4876 additions and 272 deletions

View File

@@ -407,10 +407,18 @@ if(!is_null($user->periodo_id)){
<div class="datalist-input">Salón</div>
<span class="ing-buscar icono"></span>
<ul style="display:none">
<<<<<<< HEAD
<li data-id="1">Salón</li>
<li data-id="2">Sala de cómputo</li>
<li data-id="3">Salón/Taller de la facultad</li>
<li data-id="4">Virtual</li>
=======
<?php
$tipoaula_rs = $db->query('select * from tipoaula t order by t.tipoaula_id ');
foreach($tipoaula_rs as $ta){ ?>
<li data-id="<?php echo $ta["tipoaula_id"];?>"><?php echo $ta["tipoaula_nombre"];?></li>
<?php } ?>
>>>>>>> 7688f1aac1824c234bc5f19b154e9ad1f4808d4f
</ul>
<input type="hidden" id="aula" name="aula" value="1">
</div>
@@ -461,12 +469,26 @@ if(!is_null($user->periodo_id)){
</div>
</div>
<<<<<<< HEAD
<div class="form-group row mt-3">
=======
<div class="form-group row mt-3" id="submitGroup">
>>>>>>> 7688f1aac1824c234bc5f19b154e9ad1f4808d4f
<div class="offset-4 col-8">
<button type="submit" class="btn btn-outline-primary materia-block" id="submitBtn" data-tipo="1"><?php echo $ICO["aceptar"];?> Guardar</button>
<button type="reset" class="btn btn-outline-danger" data-dismiss="modal"><?php echo $ICO["cancelar"];?> Cancelar</button>
</div>
</div>
<<<<<<< HEAD
=======
<div class="form-group row mt-3" id="loadingGroup" style="display:none">
<div class="col-12 text-center">
<div class="spinner-border text-primary" role="status">
<span class="sr-only">Loading...</span>
</div>
</div>
</div>
>>>>>>> 7688f1aac1824c234bc5f19b154e9ad1f4808d4f
</form>
</div>
</div>
@@ -761,6 +783,13 @@ if(!is_null($user->periodo_id)){
}else{
$('#formaModal').prop("action", "./action/reposicion_insert.php");
}
<<<<<<< HEAD
=======
if(!error){
$("#loadingGroup").show();
$("#submitGroup").hide();
}
>>>>>>> 7688f1aac1824c234bc5f19b154e9ad1f4808d4f
return !error;
}
@@ -947,6 +976,12 @@ if(!is_null($user->periodo_id)){
var button = $(event.relatedTarget); // Button that triggered the modal
var tipo = button.data('tipo'); // 1 alta, 2 edicion
var modal = $(this);
<<<<<<< HEAD
=======
$("#loadingGroup").hide();
$("#submitGroup").show();
>>>>>>> 7688f1aac1824c234bc5f19b154e9ad1f4808d4f
$("#modal .is-invalid").removeClass("is-invalid");
//$(this).find(".form-control:first-child").focus();