Commit da196a86 authored by Axel Tomas Baltierra Hernandez's avatar Axel Tomas Baltierra Hernandez
Browse files

Merge branch 'Axel7755' into testeo

parents 0cc4281c dbd1c88a

pages/proyectos/backlog.php

+3 −6
Original line number Diff line number Diff line
@@ -74,12 +74,9 @@ include "../../php/agregarAlumnoProy.php"; 
                    </li>

                    <div class="collapse" id="Equipo">

                        <ul class="navbar-nav sub-list">

                            <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>

                            </li>

                            <?php

                            include "../../php/verEquipo.php"

                            ?>

                            <li class="nav-item  py-md-1 my-md-1">

                                <a class="nav-link subtittle-p" data-bs-toggle="modal" data-bs-target="#AgregarMiembro"

                                    href=""><i class="bi bi-plus"></i>Agregar Miembro</a>

php/crearProyecto.php

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ if (isset($_POST['cproy'])) { 
            }

            if ($con->query($sqlproy) == true) {



                $sqlEstAl = "SELECT 'idestadoAl' FROM `estadoAl`";

                $sqlEstAl = "SELECT 'idestadoAl' FROM `estadoAl` WHERE estAl_idproyect='$Idres'";

                $resEstAl = $con->query($sqlEstAl);

                if ($resEstAl->num_rows > 0) {

                    while ($rowresEstAl = $resEstAl->fetch_assoc()) {

php/modalCrearIncidencia.php

+11 −4
Original line number Diff line number Diff line
@@ -26,10 +26,17 @@ if ($res->num_rows > 0) { 
                        </div>

                        <div class="mb-3">

                            <label for="t-incidencia" class="form-label">Estado</label>

                            <select class="form-select" aria-label="Default select example" id="t-incidencia">

                                <option selected value="1">Por hacer</option>

                                <option value="2">En progreso</option>

                                <option value="3">Listo</option>

                            <select class="form-select" aria-label="Default select example" id="t-incidencia">';

                            $sqlVerEstAl= "SELECT idestadoAl, estadoAl FROM estadoAl WHERE estAl_idproyect = '$proyecto'";

                            $resVerEstAl = $con->query($sqlVerEstAl);

                            if ($resVerEstAl->num_rows > 0) {

                                while ($rowVerEstAl = $resVerEstAl->fetch_assoc()){



                                    echo'<option value="'.$rowVerEstAl["idestadoAl"].'">'.$rowVerEstAl["estadoAl"].'</option>';

                                    

                                }

                            }

                            echo'

                            </select>

                        </div>

                        <div class="mb-3">

php/verEquipo.php

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?php

require "../../php/conexion.php";



$proyecto = $_GET['proy'];

$sqlVerEquipo = "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'";

$resVerEq = $con->query($sqlVerEquipo);

if ($resVerEq->num_rows > 0) {

    while ($rowVerEq = $resVerEq->fetch_assoc()) {



        if ($rowVerEq["idalumno"] == $_SESSION['ID'] && $_SESSION['Tipo'] == 0) {

           

        } else {

            echo '

            <li class="nav-item  py-md-1 my-md-1">

                <a class="nav-link subtittle-p" href=""><i class="bi bi-person"></i> '.$rowVerEq["nombre"].'</a>

            </li>';

        }



    }

}else{

    echo'

    <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>

    </li>';

}
 
 No newline at end of file