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

GPL2.sql

+4 −4

Original line number	Diff line number	Diff line
		@@ -178,14 +178,14 @@ CREATE TABLE IF NOT EXISTS `labsol2`.`tarea` (
		`idtarea` INT NOT NULL,
		`tarea` VARCHAR(45) NOT NULL,
		`descripcion` LONGTEXT NULL,
		`prioridad` VARCHAR(6) NULL,
		`prioridad` VARCHAR(8) NULL,
		`tarea_idtarea` INT NULL,
		`estadoAdm_idestadoAdm` INT NULL,
		`estadoAl_idestadoAl` INT NULL,
		`sprint_idsprint` INT NOT NULL,
		`ta_spr_idproyect` INT NOT NULL,
		`notificador` INT NOT NULL,
		PRIMARY KEY (`idtarea`, `tarea_idtarea`),
		PRIMARY KEY (`idtarea`),
		INDEX `fk_tarea_tarea1_idx` (`tarea_idtarea` ASC) ,
		INDEX `fk_tarea_estadoAdm1_idx` (`estadoAdm_idestadoAdm` ASC) ,
		INDEX `fk_tarea_estadoAl1_idx` (`estadoAl_idestadoAl` ASC) ,
		@@ -208,8 +208,8 @@ CREATE TABLE IF NOT EXISTS `labsol2`.`tarea` (
		CONSTRAINT `fk_tarea_sprint1`
		FOREIGN KEY (`sprint_idsprint` , `ta_spr_idproyect`)
		REFERENCES `labsol2`.`sprint` (`idsprint` , `spr_idproyect`)
		ON DELETE NO ACTION
		ON UPDATE NO ACTION)
		ON DELETE CASCADE
		ON UPDATE CASCADE)
		ENGINE = InnoDB;

php/guardarIncidencia.php

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		<?php
		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['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;
		}
		} else {
		$idSprint = 1;
		}
		}
		}
		}
		}
		}
		}
		}
		}
		No newline at end of file

php/modalCrearIncidencia.php

+13 −13

Original line number	Diff line number	Diff line
		@@ -21,12 +21,12 @@ if ($res->num_rows > 0) {

		<div class="mb-3">
		<label for="exampleInputEmail1" class="form-label">Nombre de incidencia</label>
		<input type="text" class="form-control" id="exampleInputEmail1" aria-describedby="emailHelp"
		<input type="text" class="form-control" name="nomIncidencia" id="exampleInputEmail1" aria-describedby="emailHelp"
		placeholder="Nombre de incidencia">
		</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">';
		<select class="form-select" name="estAlIncidencia" 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) {
		@@ -41,7 +41,7 @@ if ($res->num_rows > 0) {
		</div>
		<div class="mb-3">
		<label for="exampleInputEmail1" class="form-label">Descripcion</label>
		<textarea name="DesSprint1" id="" cols="45" rows="10"></textarea>
		<textarea name="DesIncidencia" id="" cols="45" rows="10"></textarea>
		</div>
		<div class="subincidencias-group'.$row["idsprint"].'">

		@@ -52,7 +52,7 @@ if ($res->num_rows > 0) {
		</button>
		</div>
		<div class="mb-3">
		<label for="t-incidencia" class="form-label">Informador</label>
		<label for="t-incidencia" name="InformadorIncidencia" class="form-label">Informador</label>
		<select class="form-select" 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'";
		@@ -75,7 +75,7 @@ if ($res->num_rows > 0) {
		</div>
		<div class="mb-3">
		<label for="t-incidencia" class="form-label">Responsable</label>
		<select class="form-select" aria-label="Default select example" id="t-incidencia">';
		<select class="form-select" name="responsableIncidencia" 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);
		@@ -97,17 +97,17 @@ if ($res->num_rows > 0) {
		</div>
		<div class="mb-3">
		<label for="t-incidencia" class="form-label">Prioridad</label>
		<select class="form-select" aria-label="Default select example" id="t-incidencia">
		<option value="1">Muy alta</option>
		<option value="2">Alta</option>
		<option selected value="3">Media</option>
		<option value="1">baja</option>
		<option value="2">Muy baja</option>
		<select class="form-select" name="prioriIncidencia" aria-label="Default select example" id="t-incidencia">
		<option>Urgente</option>
		<option>Alta</option>
		<option selected>Media</option>
		<option>Baja</option>
		<option>Muy baja</option>
		</select>
		</div>
		<div class="mb-3">
		<label for="t-incidencia" class="form-label">Sprint</label>
		<select class="form-select" aria-label="Default select example" id="t-incidencia">';
		<select class="form-select" name="sprintIcidencidencia" aria-label="Default select example" id="t-incidencia">';
		$sqlVerSrpintsSubIn = "SELECT * FROM sprint WHERE spr_idproyect = '$proyecto'";
		$resSubIn = $con->query($sqlVerSrpintsSubIn);
		if ($resSubIn->num_rows > 0) {
		@@ -127,7 +127,7 @@ if ($res->num_rows > 0) {

		</div>
		<div class="modal-footer">
		<button type="sumbmit" class="btn btn-primary">Crear</button>
		<button type="sumbmit" name="crearIncidencia" class="btn btn-primary">Crear</button>
		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancelar</button>
		</div>
		</form>