Merge branch 'Axel7755' into testeo (fd0d20a0) · Commits · Axel Tomas Baltierra Hernandez / labsol

pages/proyectos/backlog.php

+12 −4

Original line number	Diff line number	Diff line
		@@ -8,6 +8,8 @@ include "../../php/estadoSprint.php";
		include "../../php/editarSprints.php";
		include "../../php/agregarAlumnoProy.php";
		include "../../php/eliminarMiemProy.php";
		include "../../php/guardarIncidencia.php";
		require "../../php/conexion.php";
		?>
		<!doctype html>
		<html lang="en">
		@@ -63,12 +65,18 @@ include "../../php/eliminarMiemProy.php";
		<div class="collapse show" id="Planificación">
		<ul class="navbar-nav sub-list">
		<li class="nav-item py-md-1 my-md-1 active">
		<a class="nav-link subtittle-p" href="./backlog.html"><i
		class="bi bi-menu-button-wide px-2"></i>Backlog</a>
		<?php
		echo'
		<a class="nav-link subtittle-p" href="./backlog.php?proy='.$proyecto.'"><i
		class="bi bi-menu-button-wide px-2"></i>Backlog</a>';
		?>
		</li>
		<li class="nav-item py-md-1 my-md-1">
		<a class="nav-link subtittle-p" href="./board.html"><i
		class="bi bi-layout-three-columns px-2"></i>Tablero</a>
		<?php
		echo'
		<a class="nav-link subtittle-p" href="./board.php?proy='.$proyecto.'"><i
		class="bi bi-layout-three-columns px-2"></i>Tablero</a>';
		?>
		</li>
		</ul>
		</div>

pages/proyectos/board.html→pages/proyectos/board.php

+109 −9

Original line number	Diff line number	Diff line
		<?php
		session_start();
		include "../../php/sessionestado.php";
		include "../../php/agregarAlumnoProy.php";
		include "../../php/eliminarMiemProy.php";
		//echo"antes";

		require "../../php/conexion.php";
		?>
		<!doctype html>
		<html lang="es">

		@@ -35,7 +44,17 @@
		<!--Menu lateral-->
		<section class="offcanvas offcanvas-start menu-design" id="menu-desp" tabindex="-1">
		<div class="offcanvas-header" data-bs-theme="dark">
		<h5 class="tittle-seccion">Nombre Proyecto</h5>
		<?php
		$proyecto = $_GET['proy'];
		$sqlNproy = "SELECT nombrePr FROM `proyecto` WHERE idproyect = '$proyecto'";
		//echo"$sqlNproy";
		$rest = $con->query($sqlNproy);
		if ($rest->num_rows > 0) {
		while ($rowt = $rest->fetch_assoc()) {
		echo '<h5 class="tittle-seccion">' . $rowt["nombrePr"] . '</h5>';
		}
		}
		?>
		<button class="btn-close" type="button" aria-label="Close" data-bs-dismiss="offcanvas"></button>
		</div>
		<div class="offcanvas-body">
		@@ -54,12 +73,18 @@
		<div class="collapse show" id="Planificación">
		<ul class="navbar-nav sub-list">
		<li class="nav-item py-md-1 my-md-1">
		<a class="nav-link subtittle-p" href="./backlog.html"><i
		class="bi bi-menu-button-wide px-2"></i>Backlog</a>
		<?php
		echo'
		<a class="nav-link subtittle-p" href="./backlog.php?proy='.$proyecto.'"><i
		class="bi bi-menu-button-wide px-2"></i>Backlog</a>';
		?>
		</li>
		<li class="nav-item py-md-1 my-md-1 active">
		<a class="nav-link subtittle-p" href="./board.html"><i
		class="bi bi-layout-three-columns px-2"></i>Tablero</a>
		<?php
		echo'
		<a class="nav-link subtittle-p" href="./board.php?proy='.$proyecto.'"><i
		class="bi bi-layout-three-columns px-2"></i>Tablero</a>';
		?>
		</li>
		</ul>
		</div>
		@@ -71,11 +96,12 @@
		</li>
		<div class="collapse" id="Equipo">
		<ul class="navbar-nav sub-list">
		<?php
		include "../../php/verEquipo.php"
		?>
		<li class="nav-item py-md-1 my-md-1">
		<a class="nav-link subtittle-p" href=""><i class="bi bi-person"></i>Miembro 1</a>
		</li>
		<li class="nav-item py-md-1 my-md-1">
		<a class="nav-link subtittle-p" href=""><i class="bi bi-person"></i>Miembro 2</a>
		<a class="nav-link subtittle-p" data-bs-toggle="modal" data-bs-target="#AgregarMiembro"
		href=""><i class="bi bi-plus"></i>Agregar Miembro</a>
		</li>
		</ul>
		</div>
		@@ -140,6 +166,80 @@
		</div>
		</div>

		<!-- Modal agregar alumno -->
		<div class="modal fade" id="AgregarMiembro" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1"
		aria-labelledby="staticBackdropLabel" aria-hidden="true">
		<div class="modal-dialog">
		<div class="modal-content">
		<div class="modal-header">
		<h5 class="modal-title" id="staticBackdropLabel">Agregar miembro al proyecto</h5>
		<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
		</div>
		<div class="modal-body">
		<form method="POST">

		<table class='table table-striped border = "1" ' id="table1">
		<thead>
		<tr>
		<th>Nombre</th>
		<th>Correo</th>
		<th>Check</th>
		</tr>
		</thead>
		<tbody>
		<?php

		include "../../php/verAlumnos.php";
		?>
		</tbody>
		</table>

		<div class="form-actions d-flex justify-content-end">
		<button type="submit" class="btn btn-success" name="agregarAlumnos">Agregar</button>
		</div>
		</form>
		</div>
		</div>
		</div>
		</div>

		<!-- Modal eliminar miembro -->
		<div class="modal fade" id="EliminarMiembro" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1"
		aria-labelledby="staticBackdropLabel" aria-hidden="true">
		<div class="modal-dialog">
		<div class="modal-content">
		<div class="modal-header">
		<h5 class="modal-title" id="staticBackdropLabel">Agregar miembro al proyecto</h5>
		<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
		</div>
		<div class="modal-body">
		<form method="POST">

		<table class='table table-striped border = "1" ' id="table1">
		<thead>
		<tr>
		<th>Nombre</th>
		<th>Correo</th>
		<th>Check</th>
		</tr>
		</thead>
		<tbody>
		<?php

		include "../../php/verMiembros.php";
		?>
		</tbody>
		</table>

		<div class="form-actions d-flex justify-content-end">
		<button type="submit" class="btn btn-success" name="eliminarMiembros">Eliminar</button>
		</div>
		</form>
		</div>
		</div>
		</div>
		</div>

		</body>

		<!-- Scripts de iconos 'ionicons' -->

php/guardarIncidencia.php

+27 −8

Original line number	Diff line number	Diff line
		@@ -3,19 +3,38 @@ require "../../php/conexion.php";
		if (isset($_POST['crearIncidencia'])) {
		if (isset($_POST['nomIncidencia'])) {
		if (isset($_POST['estAlIncidencia'])) {
		if (isset($_POST['DesIncidencia'])) {
		if (isset($_POST['InformadorIncidencia'])) {
		if (isset($_POST['desIncidencia'])) {
		if (isset($_POST['informadorIncidencia'])) {
		if (isset($_POST['responsableIncidencia'])) {
		if (isset($_POST['prioriIncidencia'])) {
		if (isset($_POST['sprintIcidencidencia'])) {
		$sqlidIncidencia = "SELECT idsprint FROM `sprint` WHERE spr_idproyect = '$proyecto'";
		$res = $con->query($sqlid);
		if ($res->num_rows > 0) {
		while ($row = $res->fetch_assoc()) {
		$idSprint = ($row["idsprint"]) + 1;
		$sqlidIncidencia = "SELECT idtarea FROM `tarea`";
		$resInc = $con->query($sqlidIncidencia);
		if ($resInc->num_rows > 0) {
		while ($rowInc = $resInc->fetch_assoc()) {
		$idInc = ($rowInc["idtarea"]) + 1;
		}
		} else {
		$idSprint = 1;
		$idInc = 1;
		}

		$proyecto = $_GET['proy'];
		$nomInc=$_POST['nomIncidencia'];
		$estAlInc=$_POST['estAlIncidencia'];
		$DesInc=$_POST['desIncidencia'];
		$InfoInc=$_POST['informadorIncidencia'];
		$RespInc=$_POST['responsableIncidencia'];
		$prioInc=$_POST['prioriIncidencia'];
		$sprintInc=$_POST['sprintIcidencidencia'];

		$sqlCrearInc="INSERT INTO `tarea`
		(idtarea, tarea, descripcion, prioridad, estadoAl_idestadoAl, sprint_idsprint, ta_spr_idproyect, notificador)
		VALUES ('$idInc', '$nomInc', '$DesInc', '$prioInc', '$estAlInc', '$sprintInc', '$proyecto', '$InfoInc')";
		//echo $sqlCrearInc;
		if ($con->query($sqlCrearInc) == true) {

		} else {
		echo "<br><p style='color: rgb(136, 1, 1);'>Error al guardar</p>";
		}
		}
		}

php/modalCrearIncidencia.php

+4 −4

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ if ($res->num_rows > 0) {
		<h5 class="modal-title" id="staticBackdropLabel">Crear incidencia</h5>
		<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
		</div>
		<form>
		<form method="post">
		<div class="modal-body">

		<div class="mb-3">
		@@ -41,7 +41,7 @@ if ($res->num_rows > 0) {
		</div>
		<div class="mb-3">
		<label for="exampleInputEmail1" class="form-label">Descripcion</label>
		<textarea name="DesIncidencia" id="" cols="45" rows="10"></textarea>
		<textarea name="desIncidencia" id="" cols="45" rows="10"></textarea>
		</div>
		<div class="subincidencias-group'.$row["idsprint"].'">

		@@ -52,8 +52,8 @@ if ($res->num_rows > 0) {
		</button>
		</div>
		<div class="mb-3">
		<label for="t-incidencia" name="InformadorIncidencia" class="form-label">Informador</label>
		<select class="form-select" aria-label="Default select example" id="t-incidencia">';
		<label for="t-incidencia" class="form-label">Informador</label>
		<select class="form-select" name="informadorIncidencia" aria-label="Default select example" id="t-incidencia">';
		$sqlVerUsuarios= "SELECT idalumno, CONCAT(al_nombre,' ',al_apP,' ',al_apM) as nombre
		FROM alumno al JOIN proyecto_alumno proy ON(proy.pa_idalumno = al.idalumno) WHERE proy.pa_idproyect = '$proyecto'";
		$resVerUs = $con->query($sqlVerUsuarios);