From c322bcb2090dbd21d6e170493b1f8178f1be386a Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Tue, 29 Aug 2023 13:48:04 -0600 Subject: [PATCH 001/105] cambios --- css/backlog.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/backlog.css b/css/backlog.css index 8165e44..e9e9da4 100644 --- a/css/backlog.css +++ b/css/backlog.css @@ -35,4 +35,4 @@ border: none; background: #c4c4c4; -} \ No newline at end of file +} -- GitLab From 6fcf126eeee30fff3e42937b047cdd3b0a92804f Mon Sep 17 00:00:00 2001 From: AlanRicardoCalderonMtz Date: Tue, 29 Aug 2023 14:22:26 -0600 Subject: [PATCH 002/105] Mensaje de prueba --- js/principal.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/principal.js b/js/principal.js index 37cd0f3..f323091 100644 --- a/js/principal.js +++ b/js/principal.js @@ -15,6 +15,7 @@ let toggle = document.querySelector('.toggle'); let navigation = document.querySelector('.navigation'); let main = document.querySelector('.main'); +//Holaa Mundo toggle.onclick = function(){ navigation.classList.toggle('active'); main.classList.toggle('active'); -- GitLab From 74368693dd74f84123fdf692da905036fbed5190 Mon Sep 17 00:00:00 2001 From: AlanRicardoCalderonMtz Date: Tue, 29 Aug 2023 15:43:44 -0600 Subject: [PATCH 003/105] Prueba 2 mensaje --- js/calendar.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/calendar.js b/js/calendar.js index ade2aec..7e43f5d 100644 --- a/js/calendar.js +++ b/js/calendar.js @@ -1,3 +1,5 @@ +//Prueba 2 + const calendar = document.querySelector(".calendar"), date = document.querySelector(".date"), daysContainer = document.querySelector(".days"), -- GitLab From d9026fe31c86709200d363b45aa5aa439cebd24b Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Thu, 31 Aug 2023 20:28:23 -0600 Subject: [PATCH 004/105] actualizado --- pages/proyectos/backlog.html | 50 ++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/pages/proyectos/backlog.html b/pages/proyectos/backlog.html index 2150381..43d1e46 100644 --- a/pages/proyectos/backlog.html +++ b/pages/proyectos/backlog.html @@ -212,8 +212,9 @@
-
@@ -225,6 +226,51 @@ + + -- GitLab From a9a0598cc74cc86a0eebf5ff6ef6b6c783a6797c Mon Sep 17 00:00:00 2001 From: AlanRicardoCalderonMtz Date: Fri, 1 Sep 2023 21:38:34 -0600 Subject: [PATCH 005/105] =?UTF-8?q?Modifique=20dise=C3=B1o=20e=20implement?= =?UTF-8?q?e=20el=20tablero=20con=20su=20respectiva=20funcionalidad=20y=20?= =?UTF-8?q?dise=C3=B1o.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/proyectos.css | 3 + css/style.css | 139 ++++++------ css/tablero.css | 49 +++++ index.html | 55 ++--- js/tablero.js | 20 ++ pages/board.html | 183 +++++++++++++++ pages/proyectos.html | 415 +++++++++++++++++++---------------- pages/proyectos/backlog.html | 21 +- 8 files changed, 582 insertions(+), 303 deletions(-) create mode 100644 css/tablero.css create mode 100644 js/tablero.js create mode 100644 pages/board.html diff --git a/css/proyectos.css b/css/proyectos.css index c05629c..43827e5 100644 --- a/css/proyectos.css +++ b/css/proyectos.css @@ -24,7 +24,10 @@ font-size: 17px; margin-bottom: 4px; } + .tittle-seccion{ + padding-right: 25px; /* Ajusta el valor según el espacio deseado a la derecha */ + padding-left: 10px; padding: 0; color: white; font-size: 19px; diff --git a/css/style.css b/css/style.css index f2449ed..6e176d7 100644 --- a/css/style.css +++ b/css/style.css @@ -1,12 +1,13 @@ @import url('https://fonts.googleapis.com/css2?family=Ubuntu:wght@300;400;500;700&display=swap'); -*{ + +* { margin: 0; padding: 0; box-sizing: border-box; font-family: 'Ubuntu', sans-serif; } -:root{ +:root { --blue: #287bff; --white: #fff; --grey: #f5f5f5; @@ -14,43 +15,44 @@ --black2: #999; } -body{ +body { min-height: 100vh; overflow-x: hidden; } -.container{ +.container_nav { position: relative; width: 100%; } -.navigation{ +.abajo { + margin-bottom: 28vh; +} + +.navigation { position: fixed; + width: 300px; height: 100%; - margin-left: 0; - padding-left: 0; - background: linear-gradient(135deg, #325e9d 0%, #aa7bfa 100%); + background: linear-gradient(135deg, #325e9d 0%, #aa7bfa 100%); + border-left: 10px linear-gradient(135deg, #325e9d 0%, #aa7bfa 100%); transition: 0.5s; overflow: hidden; - width: 60px; } -.navigation.active{ - - width: 300px; - +.navigation.active { + width: 80px; } -.navigation ul{ +.navigation ul { position: absolute; - top: 0; - left: 0; + top: 0px; + left: 5px; margin: 0; - padding: 0; + padding: 5px; width: 100%; } -.navigation ul li{ +.navigation ul li { position: relative; width: 100%; list-style: none; @@ -60,17 +62,17 @@ body{ /* al colocar el cursor se ve en blanco cada fila en el menu */ .navigation ul li:hover, -.navigation ul li.hovered{ +.navigation ul li.hovered { background: var(--white); } /* Espacio de mi lista en el menu */ -.navigation ul li:nth-child(1){ - margin-bottom: 40px; +.navigation ul li:nth-child(1) { + margin-bottom: 50px; pointer-events: none; } -.navigation ul li a{ +.navigation ul li a { position: relative; display: block; width: 100%; @@ -80,11 +82,18 @@ body{ } .navigation ul li:hover a, -.navigation ul li.hovered a{ +.navigation ul li.hovered a { color: var(--blue); } -.navigation ul li a .icon{ +.activo { + background: #2a2f4f; + color: white; + /* codigo extra para ver curba */ + +} + +.navigation ul li a .icon { position: relative; display: block; min-width: 60px; @@ -93,12 +102,12 @@ body{ text-align: center; } -.navigation ul li a .icon ion-icon{ +.navigation ul li a .icon ion-icon { font-size: 1.75em; } -.navigation ul li a .title{ - position: relative; +.navigation ul li a .title { + position: relative; display: block; padding: 0 10px; height: 60px; @@ -109,7 +118,7 @@ body{ /* Curve outside */ .navigation ul li:hover a::before, -.navigation ul li.hovered a::before{ +.navigation ul li.hovered a::before { content: ''; position: absolute; right: 0; @@ -123,7 +132,7 @@ body{ } .navigation ul li:hover a::after, -.navigation ul li.hovered a::after{ +.navigation ul li.hovered a::after { content: ''; position: absolute; right: 0; @@ -137,27 +146,27 @@ body{ } /* User */ -.main.active{ - width: calc(100% - 300px); - left: 300px; +.main.active { + width: calc(100% - 80px); + left: 80px; } -.main{ +.main { position: absolute; - width: calc(100% - 60px); - left: 60px; + width: calc(100% - 300px); + left: 300px; min-height: 100vh; background: var(--white); transition: 0.5s; - + background-color: #325E9D; background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100%25'%3E%3Cdefs%3E%3ClinearGradient id='a' gradientUnits='userSpaceOnUse' x1='0' x2='0' y1='0' y2='100%25' gradientTransform='rotate(230,960,456)'%3E%3Cstop offset='0' stop-color='%23325E9D'/%3E%3Cstop offset='1' stop-color='%23B34A37'/%3E%3C/linearGradient%3E%3Cpattern patternUnits='userSpaceOnUse' id='b' width='451' height='375.8' x='0' y='0' viewBox='0 0 1080 900'%3E%3Cg fill-opacity='0.09'%3E%3Cpolygon fill='%23444' points='90 150 0 300 180 300'/%3E%3Cpolygon points='90 150 180 0 0 0'/%3E%3Cpolygon fill='%23AAA' points='270 150 360 0 180 0'/%3E%3Cpolygon fill='%23DDD' points='450 150 360 300 540 300'/%3E%3Cpolygon fill='%23999' points='450 150 540 0 360 0'/%3E%3Cpolygon points='630 150 540 300 720 300'/%3E%3Cpolygon fill='%23DDD' points='630 150 720 0 540 0'/%3E%3Cpolygon fill='%23444' points='810 150 720 300 900 300'/%3E%3Cpolygon fill='%23FFF' points='810 150 900 0 720 0'/%3E%3Cpolygon fill='%23DDD' points='990 150 900 300 1080 300'/%3E%3Cpolygon fill='%23444' points='990 150 1080 0 900 0'/%3E%3Cpolygon fill='%23DDD' points='90 450 0 600 180 600'/%3E%3Cpolygon points='90 450 180 300 0 300'/%3E%3Cpolygon fill='%23666' points='270 450 180 600 360 600'/%3E%3Cpolygon fill='%23AAA' points='270 450 360 300 180 300'/%3E%3Cpolygon fill='%23DDD' points='450 450 360 600 540 600'/%3E%3Cpolygon fill='%23999' points='450 450 540 300 360 300'/%3E%3Cpolygon fill='%23999' points='630 450 540 600 720 600'/%3E%3Cpolygon fill='%23FFF' points='630 450 720 300 540 300'/%3E%3Cpolygon points='810 450 720 600 900 600'/%3E%3Cpolygon fill='%23DDD' points='810 450 900 300 720 300'/%3E%3Cpolygon fill='%23AAA' points='990 450 900 600 1080 600'/%3E%3Cpolygon fill='%23444' points='990 450 1080 300 900 300'/%3E%3Cpolygon fill='%23222' points='90 750 0 900 180 900'/%3E%3Cpolygon points='270 750 180 900 360 900'/%3E%3Cpolygon fill='%23DDD' points='270 750 360 600 180 600'/%3E%3Cpolygon points='450 750 540 600 360 600'/%3E%3Cpolygon points='630 750 540 900 720 900'/%3E%3Cpolygon fill='%23444' points='630 750 720 600 540 600'/%3E%3Cpolygon fill='%23AAA' points='810 750 720 900 900 900'/%3E%3Cpolygon fill='%23666' points='810 750 900 600 720 600'/%3E%3Cpolygon fill='%23999' points='990 750 900 900 1080 900'/%3E%3Cpolygon fill='%23999' points='180 0 90 150 270 150'/%3E%3Cpolygon fill='%23444' points='360 0 270 150 450 150'/%3E%3Cpolygon fill='%23FFF' points='540 0 450 150 630 150'/%3E%3Cpolygon points='900 0 810 150 990 150'/%3E%3Cpolygon fill='%23222' points='0 300 -90 450 90 450'/%3E%3Cpolygon fill='%23FFF' points='0 300 90 150 -90 150'/%3E%3Cpolygon fill='%23FFF' points='180 300 90 450 270 450'/%3E%3Cpolygon fill='%23666' points='180 300 270 150 90 150'/%3E%3Cpolygon fill='%23222' points='360 300 270 450 450 450'/%3E%3Cpolygon fill='%23FFF' points='360 300 450 150 270 150'/%3E%3Cpolygon fill='%23444' points='540 300 450 450 630 450'/%3E%3Cpolygon fill='%23222' points='540 300 630 150 450 150'/%3E%3Cpolygon fill='%23AAA' points='720 300 630 450 810 450'/%3E%3Cpolygon fill='%23666' points='720 300 810 150 630 150'/%3E%3Cpolygon fill='%23FFF' points='900 300 810 450 990 450'/%3E%3Cpolygon fill='%23999' points='900 300 990 150 810 150'/%3E%3Cpolygon points='0 600 -90 750 90 750'/%3E%3Cpolygon fill='%23666' points='0 600 90 450 -90 450'/%3E%3Cpolygon fill='%23AAA' points='180 600 90 750 270 750'/%3E%3Cpolygon fill='%23444' points='180 600 270 450 90 450'/%3E%3Cpolygon fill='%23444' points='360 600 270 750 450 750'/%3E%3Cpolygon fill='%23999' points='360 600 450 450 270 450'/%3E%3Cpolygon fill='%23666' points='540 600 630 450 450 450'/%3E%3Cpolygon fill='%23222' points='720 600 630 750 810 750'/%3E%3Cpolygon fill='%23FFF' points='900 600 810 750 990 750'/%3E%3Cpolygon fill='%23222' points='900 600 990 450 810 450'/%3E%3Cpolygon fill='%23DDD' points='0 900 90 750 -90 750'/%3E%3Cpolygon fill='%23444' points='180 900 270 750 90 750'/%3E%3Cpolygon fill='%23FFF' points='360 900 450 750 270 750'/%3E%3Cpolygon fill='%23AAA' points='540 900 630 750 450 750'/%3E%3Cpolygon fill='%23FFF' points='720 900 810 750 630 750'/%3E%3Cpolygon fill='%23222' points='900 900 990 750 810 750'/%3E%3Cpolygon fill='%23222' points='1080 300 990 450 1170 450'/%3E%3Cpolygon fill='%23FFF' points='1080 300 1170 150 990 150'/%3E%3Cpolygon points='1080 600 990 750 1170 750'/%3E%3Cpolygon fill='%23666' points='1080 600 1170 450 990 450'/%3E%3Cpolygon fill='%23DDD' points='1080 900 1170 750 990 750'/%3E%3C/g%3E%3C/pattern%3E%3C/defs%3E%3Crect x='0' y='0' fill='url(%23a)' width='100%25' height='100%25'/%3E%3Crect x='0' y='0' fill='url(%23b)' width='100%25' height='100%25'/%3E%3C/svg%3E"); background-attachment: fixed; background-size: cover; } -.topbar{ +.topbar { width: 100%; height: 60px; display: flex; @@ -166,7 +175,7 @@ body{ padding: 0 10px; } -.toggle{ +.toggle { position: relative; width: 60px; height: 60px; @@ -177,18 +186,18 @@ body{ cursor: pointer; } -.search{ +.search { position: relative; width: 400px; margin: 0 10px; } -.search label{ +.search label { position: relative; width: 100%; } -.search label input{ +.search label input { width: 100%; height: 40px; border-radius: 40px; @@ -199,14 +208,14 @@ body{ border: 1px solid var(--black2); } -.search label ion-icon{ +.search label ion-icon { position: absolute; top: 0; left: 10px; font-size: 1.2em; } -.user{ +.user { position: relative; min-width: 40px; height: 40px; @@ -215,7 +224,7 @@ body{ cursor: pointer; } -.user img{ +.user img { position: absolute; top: 0; left: 0; @@ -225,30 +234,30 @@ body{ } /* Calendario chico (muestra el dia) */ -.wrapper{ +.wrapper { width: 440px; background: var(--white); border-radius: 10px; } -.container-cal{ +.container-cal { padding-left: 20px; padding-top: 20px; } -.wrapper header{ +.wrapper header { display: flex; align-items: center; padding: 25px 30px 10px; justify-content: space-between; } -header .current-date{ +header .current-date { font-size: 1.45rem; font-weight: 600; } -header .icons span{ +header .icons span { height: 38px; width: 38px; color: #878787; @@ -260,53 +269,53 @@ header .icons span{ border-radius: 50%; } -header .icons span:hover{ +header .icons span:hover { background: #f2f2f2; } -header .icons span:last-child{ +header .icons span:last-child { margin-right: -10px; } -.calendar{ +.calendar { padding: 20px; } -.calendar ul{ +.calendar ul { display: flex; list-style: none; flex-wrap: wrap; text-align: center; } -.calendar .days{ +.calendar .days { margin-bottom: 20px; } -.calendar .weeks li{ +.calendar .weeks li { font-weight: 500; } -.calendar ul li{ - position: relative; +.calendar ul li { + position: relative; width: calc(100% / 7); } -.calendar .days li{ +.calendar .days li { z-index: 1; cursor: pointer; margin-top: 23px; } -.days li.inactive{ +.days li.inactive { color: #aaa; } -.days li.active{ +.days li.active { color: var(--white); } -.calendar .days li::before{ +.calendar .days li::before { position: absolute; content: ""; height: 35px; @@ -318,15 +327,11 @@ header .icons span:last-child{ transform: translate(-50%, -50%); } -.days li:hover::before{ +.days li:hover::before { background: #f2f2f2; } -.activo{ - background: #2a2f4f; - color: white; -} -.days li.active::before{ +.days li.active::before { background: #9b59b6; } \ No newline at end of file diff --git a/css/tablero.css b/css/tablero.css new file mode 100644 index 0000000..43f11cd --- /dev/null +++ b/css/tablero.css @@ -0,0 +1,49 @@ +p.tittle-board { + padding-right: 10px; + padding-left: 20px; + color: white; + font-size: 20px; + margin-top: 4px; + +} + +.container-board { + width: 100%; + min-height: 100vh; + display: flex; + align-items: center; + justify-content: center; +} + +.paloma { + display: inline-block; /* Para que el icono y el texto estén en línea */ + color: white; /* Cambia el color del icono a blanco */ + font-size: 25px; /* Cambia el tamaño del icono (ajusta el valor según sea necesario) */ + vertical-align: middle; /* Alinea verticalmente el icono y el texto */ + margin-right: 8px; /* Agrega un margen derecho para separar el icono del texto (ajusta el valor según sea necesario) */ + } + +#left, +#right { + width: 300px; + min-height: 400px; + margin: 20px; + border: 2px dashed #fff; +} + +.list { + background: #e91e63; + height: 60px; + margin: 30px; + color: #fff; + display: flex; + align-items: center; + cursor: grab; +} + +.list ion-icon { + width: 35px; + height: 20px; + margin-right: 5px; + margin-left: 1px; +} \ No newline at end of file diff --git a/index.html b/index.html index c66b6ed..8ca7e5f 100644 --- a/index.html +++ b/index.html @@ -23,15 +23,13 @@ -
+
-
-
+
- - - -
- usuario -
-
- -

Proyectos:

+ +
+
+
+ +
+ + + +
+ us +
+
+ + +
+

Proyectos:

-
-
-
- -
-
-
- -
-
-

Nombre Proyecto

-
-
-
-
-

Descripcion:

-

redaccion de descripcion breve

-
-
-
-
+
+ -

Recientes:

-
-
- +
+

Recientes:

+ +
+
+ +
+ +
+
+
+
- +

Nombre Actividad

-
-
-
-
-

Nombre Actividad

-
-
-
-
-

Proyecto

-
-
-
+
+
+
+

Proyecto

- +
+
+
+
+
- - - - - - +
+ + + + + + + \ No newline at end of file diff --git a/pages/proyectos/backlog.html b/pages/proyectos/backlog.html index 43d1e46..ddb2bcc 100644 --- a/pages/proyectos/backlog.html +++ b/pages/proyectos/backlog.html @@ -237,30 +237,35 @@
- +
- +
-- GitLab From 43bf407235126e1b48dfb4a055167692f3aea4e9 Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Sun, 3 Sep 2023 18:28:05 -0600 Subject: [PATCH 006/105] cambios en los links --- index.html | 8 -------- pages/proyectos.html | 8 -------- 2 files changed, 16 deletions(-) diff --git a/index.html b/index.html index 8ca7e5f..edb808d 100644 --- a/index.html +++ b/index.html @@ -46,14 +46,6 @@ Calendario de citas -
  • - - - - - Proyectos - Backlog - -
  • diff --git a/pages/proyectos.html b/pages/proyectos.html index e4321bc..b3eaead 100644 --- a/pages/proyectos.html +++ b/pages/proyectos.html @@ -47,14 +47,6 @@ Calendario de citas
  • -
  • - - - - - Proyectos - Backlog - -
  • -- GitLab From 4c31c824208677e5a2ed9d89c7cdcb30082925c9 Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Sun, 3 Sep 2023 18:28:27 -0600 Subject: [PATCH 007/105] Cambio en links --- index.html | 2 +- pages/board.html | 183 ----------------------------------- pages/proyectos.html | 6 +- pages/proyectos/backlog.html | 94 ++++++++++++++++-- pages/proyectos/board.html | 167 ++++++++++++++++++++++++++++++++ 5 files changed, 259 insertions(+), 193 deletions(-) delete mode 100644 pages/board.html create mode 100644 pages/proyectos/board.html diff --git a/index.html b/index.html index edb808d..e6179f1 100644 --- a/index.html +++ b/index.html @@ -51,7 +51,7 @@ - Proyectos - Tablero + Proyectos
  • diff --git a/pages/board.html b/pages/board.html deleted file mode 100644 index de81eee..0000000 --- a/pages/board.html +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - Tablero - - - - - - - - - - - - - - - - - -
    -
    -
    - -
    - - - -
    - us -
    -
    - - -
    -

    Tablero

    - - - - - -
    - -
    - -

    Por Hacer

    - - - - -
    - - - - - - - - - -
    - - -
    - -
    - - - - - - - - - - - - \ No newline at end of file diff --git a/pages/proyectos.html b/pages/proyectos.html index b3eaead..2659655 100644 --- a/pages/proyectos.html +++ b/pages/proyectos.html @@ -47,12 +47,12 @@ Calendario de citas
  • -
  • - +
  • + - Proyectos - Tablero + Proyectos
  • diff --git a/pages/proyectos/backlog.html b/pages/proyectos/backlog.html index ddb2bcc..db943d2 100644 --- a/pages/proyectos/backlog.html +++ b/pages/proyectos/backlog.html @@ -38,11 +38,11 @@
    @@ -157,7 +157,8 @@
  • -
  • Menu de Epic
  • +
  • @@ -189,7 +190,7 @@
    -
    + + diff --git a/pages/proyectos/board.html b/pages/proyectos/board.html new file mode 100644 index 0000000..156cfdd --- /dev/null +++ b/pages/proyectos/board.html @@ -0,0 +1,167 @@ + + + + + + + + + + + Tablero + + + + + + + + + + + + + + + + +
    + + + + +
    + +
    + + +
    +

    Tablero

    + + + + + +
    + +
    + +

    Por Hacer

    + + + + +
    + + + + + + + + + +
    + + +
    + +
    + + + + + + + + + + + + \ No newline at end of file -- GitLab From e28075e1d80faeff586d5e4a13120d647b9b7991 Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Sun, 3 Sep 2023 18:35:27 -0600 Subject: [PATCH 008/105] minimo --- pages/proyectos/backlog.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/proyectos/backlog.html b/pages/proyectos/backlog.html index db943d2..ffe15ed 100644 --- a/pages/proyectos/backlog.html +++ b/pages/proyectos/backlog.html @@ -315,8 +315,8 @@ @@ -243,19 +243,40 @@
    -
    -
    +
    +
    +
    +
    + +
    +
    + +
    +
    + hola +
    +
    +
    + hola +
    +
    - - +
    diff --git a/php/registroAl.php b/php/registroAl.php index ad6e7c6..f782529 100755 --- a/php/registroAl.php +++ b/php/registroAl.php @@ -11,57 +11,67 @@ if (isset($_POST['mandar'])) { $corr = $_POST['correo']; if (isset($_POST['contraseña'])) { if (isset($_POST['institucion'])) { - $flag = false; - $institucion = $_POST['institucion']; - $sqlins = "SELECT * FROM `institucion` WHERE nombre_oficial = '$institucion' "; - $resi = $con->query($sqlins); - if ($resi->num_rows > 0) { - while ($rowi = $resi->fetch_assoc()) { - $idInstitucion = $rowi["idinstitucion"]; - } - $flag = true; - } else { - $sqlins = "SELECT * FROM `institucion`"; + $sqldup = "SELECT * FROM `solicitante` WHERE so_correo = '$corr'"; + $resup = $con->query($sqldup); + $sqldup1 = "SELECT * FROM `alumno` WHERE al_correo = '$corr'"; + $resup1 = $con->query($sqldup1); + if (!($resup->num_rows > 0) && !($resup1->num_rows > 0)) { + $flag = false; + $institucion = $_POST['institucion']; + $sqlins = "SELECT * FROM `institucion` WHERE nombre_oficial = '$institucion' "; $resi = $con->query($sqlins); if ($resi->num_rows > 0) { while ($rowi = $resi->fetch_assoc()) { - $idInstitucion = ($rowi["idinstitucion"]) + 1; + $idInstitucion = $rowi["idinstitucion"]; } - } else { - $idInstitucion = 1; - } - $sqlinsins = "INSERT INTO `institucion` (idinstitucion, nombre_oficial) VALUES ('$idInstitucion','$institucion')"; - if ($con->query($sqlinsins) == true) { $flag = true; } else { - $flag = false; - echo "

    Error al guardar la institucion de procedencia

    "; + $sqlins = "SELECT * FROM `institucion`"; + $resi = $con->query($sqlins); + if ($resi->num_rows > 0) { + while ($rowi = $resi->fetch_assoc()) { + $idInstitucion = ($rowi["idinstitucion"]) + 1; + } + } else { + $idInstitucion = 1; + } + $sqlinsins = "INSERT INTO `institucion` (idinstitucion, nombre_oficial) VALUES ('$idInstitucion','$institucion')"; + if ($con->query($sqlinsins) == true) { + $flag = true; + } else { + $flag = false; + echo "

    Error al guardar la institucion de procedencia

    "; + } } - } - if ($flag) { - $sql1 = "SELECT * FROM `alumno`"; + if ($flag) { + $sql1 = "SELECT * FROM `alumno`"; - $res = $con->query($sql1); - if ($res->num_rows > 0) { - while ($row = $res->fetch_assoc()) { - $IdUs = ($row["idalumno"]) + 1; + $res = $con->query($sql1); + if ($res->num_rows > 0) { + while ($row = $res->fetch_assoc()) { + $IdUs = ($row["idalumno"]) + 1; + } + } else { + $IdUs = 1; + } + $cont = $_POST['contraseña']; + $conthash = password_hash($cont, PASSWORD_DEFAULT); + $sql = "INSERT INTO `alumno` (`idalumno`, `al_nombre`, `al_apP`, `al_apM`, `al_conthash`, `al_correo`, `al_idinstitucion`)VALUES + ($IdUs,'$usuario','$app','$apm','$conthash','$corr','$idInstitucion')"; + echo $sql; + if ($con->query($sql) == true) { + header("Location:login.php"); + } else { + echo "

    Error al guardar usuario

    "; } - } else { - $IdUs = 1; - } - $cont = $_POST['contraseña']; - $conthash = password_hash($cont, PASSWORD_DEFAULT); - $sql = "INSERT INTO `alumno` (`idalumno`, `al_nombre`, `al_apP`, `al_apM`, `al_conthash`, `al_correo`, `al_idinstitucion`)VALUES - ($IdUs,'$usuario','$app','$apm','$conthash','$corr','$idInstitucion')"; - echo $sql; - if ($con->query($sql) == true) { - header("Location:login.php"); - } else { - echo "

    Error al guardar usuario

    "; - } - $con->close(); + $con->close(); + } + }else{ + echo "

    Error el correo ya existe

    "; } + }else { + echo '

    Error, porfavor llene todos los campos

    '; } } else { echo '

    Error, porfavor llene todos los campos

    '; diff --git a/php/registroSol.php b/php/registroSol.php index df5c1c1..5a718f6 100755 --- a/php/registroSol.php +++ b/php/registroSol.php @@ -10,30 +10,36 @@ if (isset($_POST['mandar'])) { if (isset($_POST['correo'])) { $corr = $_POST['correo']; if (isset($_POST['contraseña'])) { - $sqldup = "SELECT * FROM `solicitante` WHERE "; + $sqldup = "SELECT * FROM `solicitante` WHERE so_correo = '$corr'"; + $resup = $con->query($sqldup); + $sqldup1 = "SELECT * FROM `alumno` WHERE al_correo = '$corr'"; + $resup1 = $con->query($sqldup1); + if (!($resup->num_rows > 0) && !($resup1->num_rows > 0)) { + $sql1 = "SELECT * FROM `solicitante`"; - $sql1 = "SELECT * FROM `solicitante`"; - - $res = $con->query($sql1); - if ($res->num_rows > 0) { - while ($row = $res->fetch_assoc()) { - $IdUs = ($row["idusuarios"]) + 1; + $res = $con->query($sql1); + if ($res->num_rows > 0) { + while ($row = $res->fetch_assoc()) { + $IdUs = ($row["idusuarios"]) + 1; + } + } else { + $IdUs = 1; + } + $cont = $_POST['contraseña']; + $conthash = password_hash($cont, PASSWORD_DEFAULT); + $sql = "INSERT INTO `solicitante` (`idsolicitante`, `so_nombre`, `so_apP`, `so_apM`, `so_conthash`, `so_correo`)VALUES + ($IdUs,'$usuario','$app','$apm','$conthash','$corr')"; + echo $sql; + if ($con->query($sql) == true) { + header("Location:login.php"); + } else { + echo "

    Error al guardar

    "; } - } else { - $IdUs = 1; - } - $cont = $_POST['contraseña']; - $conthash = password_hash($cont, PASSWORD_DEFAULT); - $sql = "INSERT INTO `solicitante` (`idsolicitante`, `so_nombre`, `so_apP`, `so_apM`, `so_conthash`, `so_correo`)VALUES - ($IdUs,'$usuario','$app','$apm','$conthash','$corr')"; - echo $sql; - if ($con->query($sql) == true) { - header("Location:login.php"); - } else { - echo "

    Error al guardar

    "; - } - $con->close(); + $con->close(); + }else{ + echo "

    Error el correo ya existe

    "; + } } else { echo '

    Error, porfavor llene todos los campos

    '; } @@ -50,4 +56,3 @@ if (isset($_POST['mandar'])) { echo '

    Error, porfavor llene todos los campos

    '; } } -?> \ No newline at end of file -- GitLab From 425ab97751bd58194edb5b0afbb32fc3df960e2f Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Tue, 10 Oct 2023 17:36:32 -0600 Subject: [PATCH 025/105] login y cerrar sesion terminado --- php/log.php | 1 - 1 file changed, 1 deletion(-) diff --git a/php/log.php b/php/log.php index 478dd8b..e2d7d68 100755 --- a/php/log.php +++ b/php/log.php @@ -28,5 +28,4 @@ $usuario = $_POST['correo']; } } } - ?> \ No newline at end of file -- GitLab From a0b130328b7cccb86a0647679d1896f72f385f63 Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Tue, 10 Oct 2023 17:36:45 -0600 Subject: [PATCH 026/105] login y cierre de sesion --- css/style.css | 8 ++++ index.php | 20 +++++----- pages/login.php | 14 ++++--- php/log.php | 101 ++++++++++++++++++++++++++++++++++++------------ 4 files changed, 105 insertions(+), 38 deletions(-) diff --git a/css/style.css b/css/style.css index 6e176d7..2f34a90 100644 --- a/css/style.css +++ b/css/style.css @@ -334,4 +334,12 @@ header .icons span:last-child { .days li.active::before { background: #9b59b6; +} + +.bg-transparent{ + border: none; + background: none; + cursor: pointer; + margin: 0; + padding: 0; } \ No newline at end of file diff --git a/index.php b/index.php index d211e83..68660ae 100644 --- a/index.php +++ b/index.php @@ -21,8 +21,7 @@ include "./php/sessionestado.php"; - + @@ -68,7 +67,7 @@ include "./php/sessionestado.php";
  • - + @@ -77,12 +76,15 @@ include "./php/sessionestado.php";
  • - - - - - Salir - +
    +
  • diff --git a/pages/login.php b/pages/login.php index 4ab7c98..10369c7 100644 --- a/pages/login.php +++ b/pages/login.php @@ -1,3 +1,7 @@ +antes

    '; +include "../php/log.php"; +?> @@ -31,16 +35,16 @@
    -
    +

    Inicia sesión

    - - Usuario + + Correo
    - + Contraseña
    @@ -48,7 +52,7 @@ ¿Has olvidado tu contraseña? Regístrarse
    - + diff --git a/php/log.php b/php/log.php index e2d7d68..3401f34 100755 --- a/php/log.php +++ b/php/log.php @@ -1,31 +1,84 @@ query($sql); - if($res->num_rows > 0){ - while($row=$res->fetch_assoc()){ - $ID = $row["idusuarios"]; - $usuario = $row["nombre"]; - //unset($_SESSION ['Contras']) elimina esa bariable de sesion - $_SESSION['ID']=$ID; - $_SESSION['Usuario']=$usuario; - $con->close(); - //echo $_SESSION['Usuario']; - header("Location:./index.php"); - +require "../php/conexion.php"; +if (isset($_POST['mandar'])) { + if (isset($_POST['correo'])) { + $usuario = $_POST['correo']; + if (isset($_POST['password'])) { + $cont = $_POST['password']; + $conthash = password_hash($cont, PASSWORD_DEFAULT); + $sql = "SELECT idalumno, CONCAT(al_nombre,' ',al_apP,' ',al_apM) AS nombre, al_conthash FROM `alumno` WHERE al_correo = '$usuario'"; + //echo $sql; + $res = $con->query($sql); + if ($res->num_rows > 0) { + while ($row = $res->fetch_assoc()) { + $ID = $row["idalumno"]; + $usuario = $row["nombre"]; + $conth = $row["al_conthash"]; + //unset($_SESSION ['Contras']) elimina esa bariable de sesion + if (password_verify($cont, $conth)) { + $_SESSION['ID'] = $ID; + $_SESSION['Usuario'] = $usuario; + $_SESSION['Tipo'] = 1; + $con->close(); + //echo $_SESSION['Usuario']; + header("Location:../index.php"); + } else { + echo "

    Contraseña incorrecta

    "; + } + } + } else { + $sql = "SELECT idsolicitante, CONCAT(so_nombre,' ',so_apP,' ',so_apM) AS nombre, so_conthash FROM `solicitante` WHERE so_correo = '$usuario'"; + //echo $sql; + $res = $con->query($sql); + if ($res->num_rows > 0) { + while ($row = $res->fetch_assoc()) { + $ID = $row["idsolicitante"]; + $usuario = $row["nombre"]; + $conth = $row["so_conthash"]; + //unset($_SESSION ['Contras']) elimina esa bariable de sesion + if (password_verify($cont, $conth)) { + $_SESSION['ID'] = $ID; + $_SESSION['Usuario'] = $usuario; + $_SESSION['Tipo'] = 0; + $con->close(); + //echo $_SESSION['Usuario']; + header("Location:../index.php"); + } + } + } else { + $sql = "SELECT idadministrador, CONCAT(ad_nombre,' ',ad_apP,' ',ad_apM) AS nombre, ad_conthash FROM `administrador` WHERE ad_correo = '$usuario'"; + //echo $sql; + $res = $con->query($sql); + if ($res->num_rows > 0) { + while ($row = $res->fetch_assoc()) { + $ID = $row["idadministrador"]; + $usuario = $row["nombre"]; + $conth = $row["ad_conthash"]; + //unset($_SESSION ['Contras']) elimina esa bariable de sesion + if (password_verify($cont, $conth)) { + $_SESSION['ID'] = $ID; + $_SESSION['Usuario'] = $usuario; + $_SESSION['Tipo'] = 2; + $con->close(); + //echo $_SESSION['Usuario']; + header("Location:../index.php"); + } + } + } else { + echo '

    Usuario no existente

    '; + } + } } - }else{ - echo'

    Usuario no existente

    '; + } else { + + echo '

    Llene los campos

    '; } + } else { + + echo '

    Llene los campos

    '; } } -?> \ No newline at end of file -- GitLab From 8a8df51b57832be5b98f8ff5eb27ee110d202ce3 Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Wed, 11 Oct 2023 15:53:44 -0600 Subject: [PATCH 027/105] sesion --- index.php | 4 ++-- pages/{proyectos.html => proyectos.php} | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) rename pages/{proyectos.html => proyectos.php} (98%) diff --git a/index.php b/index.php index 68660ae..dfe7ef5 100644 --- a/index.php +++ b/index.php @@ -34,7 +34,7 @@ include "./php/sessionestado.php";
  • - + @@ -50,7 +50,7 @@ include "./php/sessionestado.php";
  • - + diff --git a/pages/proyectos.html b/pages/proyectos.php similarity index 98% rename from pages/proyectos.html rename to pages/proyectos.php index 4ecdd0e..1f49af1 100644 --- a/pages/proyectos.html +++ b/pages/proyectos.php @@ -1,3 +1,7 @@ + @@ -33,7 +37,7 @@
  • - + @@ -49,7 +53,7 @@
  • - + -- GitLab From 1ad94341d12c660cd9ae3962440a00b4d702e812 Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Wed, 11 Oct 2023 17:55:25 -0600 Subject: [PATCH 028/105] creacion de proyectos --- pages/proyectos.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/proyectos.php b/pages/proyectos.php index 1f49af1..0831015 100644 --- a/pages/proyectos.php +++ b/pages/proyectos.php @@ -248,7 +248,6 @@ include "./php/sessionestado.php"; -
  • -
  • - - - - - Salir - + +
  • diff --git a/php/sessionestado.php b/php/sessionestado.php index b8e21a2..98fd723 100755 --- a/php/sessionestado.php +++ b/php/sessionestado.php @@ -3,6 +3,6 @@ if(isset($_SESSION['Usuario'])){ }else{ //echo'solo else'; - header("Location:./pages/login.php"); + header("Location: /labsol/pages/login.php"); } ?> \ No newline at end of file -- GitLab From 9b9bb2496a5ab2360cc69da7b5cd7f045f22f55c Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Tue, 27 Feb 2024 13:47:49 -0600 Subject: [PATCH 058/105] discrepancias --- pages/proyectos.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pages/proyectos.php b/pages/proyectos.php index 76493e7..aa416d4 100644 --- a/pages/proyectos.php +++ b/pages/proyectos.php @@ -77,15 +77,12 @@ include "../php/crearProyecto.php";
  • -
    -
    + + + + + Salir +
  • -- GitLab From c552181a977c4acc31796574e902154288919c72 Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Tue, 27 Feb 2024 13:48:10 -0600 Subject: [PATCH 059/105] discrepancias --- pages/proyectos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/proyectos.php b/pages/proyectos.php index aa416d4..98332b7 100644 --- a/pages/proyectos.php +++ b/pages/proyectos.php @@ -1,6 +1,6 @@ -- GitLab From 6fe65bc96a24c4e45c583966f590f1f9c1a45864 Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Tue, 27 Feb 2024 17:20:24 -0600 Subject: [PATCH 060/105] Creacion de estados junto al proyecto --- images/proyecto3/3Borderlands.jpeg | Bin 0 -> 10792 bytes pages/proyectos.php | 2 +- php/crearProyecto.php | 48 ++++++++++++++++++++++++++++- 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 images/proyecto3/3Borderlands.jpeg diff --git a/images/proyecto3/3Borderlands.jpeg b/images/proyecto3/3Borderlands.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..833e28fcc314e041cd013dd6a5068e9d333cce34 GIT binary patch literal 10792 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%0ArMR%mw6O5$@b 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 literal 0 HcmV?d00001 diff --git a/pages/proyectos.php b/pages/proyectos.php index 98332b7..aa416d4 100644 --- a/pages/proyectos.php +++ b/pages/proyectos.php @@ -1,6 +1,6 @@ diff --git a/php/crearProyecto.php b/php/crearProyecto.php index a7e5e3b..69b1558 100644 --- a/php/crearProyecto.php +++ b/php/crearProyecto.php @@ -47,7 +47,53 @@ if (isset($_POST['cproy'])) { VALUES ('$Idres','$proy','$proycom')"; } if ($con->query($sqlproy) == true) { - header("Location:./proyectos.php"); + + $sqlEstAl = "SELECT 'idestadoAl' FROM `estadoAl`"; + $resEstAl = $con->query($sqlEstAl); + if ($resEstAl->num_rows > 0) { + while ($rowresEstAl = $resEstAl->fetch_assoc()) { + $IdresEstAl = ($rowresEstAl["idestadoAl"]) + 1; + } + } else { + $IdresEstAl = 1; + } + + $sqlCrearEstAl1 = "INSERT INTO `estadoAl` (idestadoAl,estadoAl,estAl_idproyect) + VALUES ('$IdresEstAl','Por hacer','$Idres'); "; + $IdresEstAl++; + + $sqlCrearEstAl2 = "INSERT INTO `estadoAl` (idestadoAl,estadoAl,estAl_idproyect) + VALUES ('$IdresEstAl','En curso','$Idres'); "; + $IdresEstAl++; + + $sqlCrearEstAl3 = "INSERT INTO `estadoAl` (idestadoAl,estadoAl,estAl_idproyect) + VALUES ('$IdresEstAl','Listo','$Idres'); "; + + $sqlEst = "SELECT 'idestadoAdm' FROM `estadoAdm`"; + $resEst = $con->query($sqlEstAl); + if ($resEst->num_rows > 0) { + while ($rowresEst = $resEst->fetch_assoc()) { + $IdresEst = ($rowresEst["idestadoAdm"]) + 1; + } + } else { + $IdresEst = 1; + } + + $sqlCrearEstAdm1 = "INSERT INTO `estadoAdm` (idestadoAdm,estadoAd,estAdm_idproyect) + VALUES ('$IdresEst','En revision','$Idres'); "; + $IdresEst++; + + $sqlCrearEstAdm2 = "INSERT INTO `estadoAdm` (idestadoAdm,estadoAd,estAdm_idproyect) + VALUES ('$IdresEst','Completado','$Idres'); "; + $IdresEst++; + + $sqlCrearEst = $sqlCrearEstAl1.$sqlCrearEstAl2.$sqlCrearEstAl3.$sqlCrearEstAdm1.$sqlCrearEstAdm2; + echo $sqlCrearEst; + if ($con->multi_query($sqlCrearEst) == true) { + header("Location:./proyectos.php"); + }else{ + echo "

    Error en la creación de estados

    "; + } }else{ echo "

    Error al guardar

    "; } -- GitLab From bd83127a7e7da925f7c655ab2232517ba525dd78 Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Tue, 27 Feb 2024 17:20:40 -0600 Subject: [PATCH 061/105] imagen nueva --- images/proyecto3/3Borderlands.jpeg | Bin 0 -> 10792 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 images/proyecto3/3Borderlands.jpeg diff --git a/images/proyecto3/3Borderlands.jpeg b/images/proyecto3/3Borderlands.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..833e28fcc314e041cd013dd6a5068e9d333cce34 GIT binary patch literal 10792 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%0ArMR%mw6O5$@b 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 literal 0 HcmV?d00001 -- GitLab From 9d02c7f38ef205b5d25a37ddae5fb015c3f647a0 Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Mon, 4 Mar 2024 19:51:09 -0600 Subject: [PATCH 062/105] creacion instancias pt1 --- js/subincidencias.js | 109 +++++++++++++++++++++++++++++++++++ pages/proyectos/backlog.php | 27 ++++++--- php/modalCrearIncidencia.php | 0 3 files changed, 128 insertions(+), 8 deletions(-) create mode 100644 js/subincidencias.js create mode 100644 php/modalCrearIncidencia.php diff --git a/js/subincidencias.js b/js/subincidencias.js new file mode 100644 index 0000000..2748926 --- /dev/null +++ b/js/subincidencias.js @@ -0,0 +1,109 @@ +//const addBtn = document.querySelector(".add"); + + +function removeInput(){ + this.parentElement.remove(); + i--; +} + +var i=0; +/*function addInput(event){ + event.preventDefault();*/ +function addInput(idSprint){ + const input = document.querySelector(".subincidencias-group"+idSprint); + //preventDefault(); + i++; + const name = document.createElement("input"); + name.type="text"; + name.className="form-control"; + name.placeholder = "Nombre de subincidencia"; + name.name="nombreSub"+i; + + const descripcion = document.createElement("textarea"); + descripcion.cols="45"; + descripcion.rows="10"; + descripcion.className="form-control"; + //descripcion.placeholder = "Digite su cantidad"; + descripcion.name="descrip"+i; + + //add medida + const medida = document.createElement("select"); + medida.type="select"; + medida.name="medida"+i; + + //Opciones en el select + + var opciones = document.createElement("option"); + opciones.value="L" + opciones.text="L" + medida.add(opciones); + var opciones = document.createElement("option"); + opciones.value="ml" + opciones.text="ml" + medida.add(opciones); + var opciones = document.createElement("option"); + opciones.value="Kg" + opciones.text="Kg" + medida.add(opciones); + var opciones = document.createElement("option"); + opciones.value="g" + opciones.text="g" + medida.add(opciones); + var opciones = document.createElement("option"); + opciones.value="mg" + opciones.text="mg" + medida.add(opciones); + var opciones = document.createElement("option"); + opciones.value="tz" + opciones.text="tz" + medida.add(opciones); + var opciones = document.createElement("option"); + opciones.value="pz" + opciones.text="pz" + medida.add(opciones); + var opciones = document.createElement("option"); + opciones.value="paq" + opciones.text="paq" + medida.add(opciones); + + var placeholderOption = document.createElement("option"); + placeholderOption.value=''; + placeholderOption.text="Seleccione una op"; + placeholderOption.disabled=true; + placeholderOption.selected=true; + + + + const btn=document.createElement("a"); + btn.className = "delete"; + btn.innerHTML = "×"; + + btn.addEventListener("click", removeInput); + + const flex=document.createElement("div"); + flex.className="flex"; + + const invi = document.createElement("input");; + + if(!!document.getElementsByName("ning")){ + + invi.type="hidden"; + invi.name="ning"; + invi.value=i; + }else{ + document.removeChild(ning); + invi.type="hidden"; + invi.name="ning"; + invi.value=i; + } + + input.appendChild(flex); + flex.appendChild(name); + flex.appendChild(descripcion); + flex.appendChild(medida); + flex.appendChild(btn); + flex.appendChild(invi); + +} + +//addBtn.addEventListener("click", addInput); \ No newline at end of file diff --git a/pages/proyectos/backlog.php b/pages/proyectos/backlog.php index 235d28c..81dca7f 100644 --- a/pages/proyectos/backlog.php +++ b/pages/proyectos/backlog.php @@ -162,8 +162,9 @@ include "../../php/editarSprints.php"; - + + @@ -293,6 +303,7 @@ include "../../php/editarSprints.php"; + diff --git a/php/modalCrearIncidencia.php b/php/modalCrearIncidencia.php new file mode 100644 index 0000000..e69de29 -- GitLab From e186ef87a2ccf2534665eb72cbcbe74466665f5a Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Wed, 13 Mar 2024 13:56:06 -0600 Subject: [PATCH 063/105] incidencias e integrantes de equipo --- js/subincidencias.js | 49 -------------------------------------------- 1 file changed, 49 deletions(-) diff --git a/js/subincidencias.js b/js/subincidencias.js index 2748926..c035484 100644 --- a/js/subincidencias.js +++ b/js/subincidencias.js @@ -26,54 +26,6 @@ function addInput(idSprint){ //descripcion.placeholder = "Digite su cantidad"; descripcion.name="descrip"+i; - //add medida - const medida = document.createElement("select"); - medida.type="select"; - medida.name="medida"+i; - - //Opciones en el select - - var opciones = document.createElement("option"); - opciones.value="L" - opciones.text="L" - medida.add(opciones); - var opciones = document.createElement("option"); - opciones.value="ml" - opciones.text="ml" - medida.add(opciones); - var opciones = document.createElement("option"); - opciones.value="Kg" - opciones.text="Kg" - medida.add(opciones); - var opciones = document.createElement("option"); - opciones.value="g" - opciones.text="g" - medida.add(opciones); - var opciones = document.createElement("option"); - opciones.value="mg" - opciones.text="mg" - medida.add(opciones); - var opciones = document.createElement("option"); - opciones.value="tz" - opciones.text="tz" - medida.add(opciones); - var opciones = document.createElement("option"); - opciones.value="pz" - opciones.text="pz" - medida.add(opciones); - var opciones = document.createElement("option"); - opciones.value="paq" - opciones.text="paq" - medida.add(opciones); - - var placeholderOption = document.createElement("option"); - placeholderOption.value=''; - placeholderOption.text="Seleccione una op"; - placeholderOption.disabled=true; - placeholderOption.selected=true; - - - const btn=document.createElement("a"); btn.className = "delete"; btn.innerHTML = "×"; @@ -100,7 +52,6 @@ function addInput(idSprint){ input.appendChild(flex); flex.appendChild(name); flex.appendChild(descripcion); - flex.appendChild(medida); flex.appendChild(btn); flex.appendChild(invi); -- GitLab From 5db1f5f14c7c7a804c806cae1dc9f6b3be4be48e Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Wed, 13 Mar 2024 13:56:18 -0600 Subject: [PATCH 064/105] INtegrantes de equipo --- css/backlog.css | 17 +++++ js/subincidencias.js | 7 +- pages/proyectos/backlog.php | 18 ++++- php/modalCrearIncidencia.php | 131 +++++++++++++++++++++++++++++++++++ php/verSprint.php | 2 +- 5 files changed, 172 insertions(+), 3 deletions(-) diff --git a/css/backlog.css b/css/backlog.css index 9750c8e..05831b1 100644 --- a/css/backlog.css +++ b/css/backlog.css @@ -80,4 +80,21 @@ .limpio{ text-decoration: none; color: black; +} +.delete{ + text-decoration: none; + display: inline-block; + background: red; + border-radius: 5px; + color: white; + font-size: 1.5rem; + font-weight: bold; + width: 45px; + height: 30px; + color: white; + margin-left: auto; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; } \ No newline at end of file diff --git a/js/subincidencias.js b/js/subincidencias.js index c035484..bf7e978 100644 --- a/js/subincidencias.js +++ b/js/subincidencias.js @@ -19,6 +19,9 @@ function addInput(idSprint){ name.placeholder = "Nombre de subincidencia"; name.name="nombreSub"+i; + const labelDesc = document.createElement("label"); + labelDesc.textContent="Descripcion"; + const descripcion = document.createElement("textarea"); descripcion.cols="45"; descripcion.rows="10"; @@ -34,6 +37,7 @@ function addInput(idSprint){ const flex=document.createElement("div"); flex.className="flex"; + input.appendChild(flex); const invi = document.createElement("input");; @@ -49,8 +53,9 @@ function addInput(idSprint){ invi.value=i; } - input.appendChild(flex); + flex.appendChild(name); + flex.appendChild(labelDesc); flex.appendChild(descripcion); flex.appendChild(btn); flex.appendChild(invi); diff --git a/pages/proyectos/backlog.php b/pages/proyectos/backlog.php index 81dca7f..f387236 100644 --- a/pages/proyectos/backlog.php +++ b/pages/proyectos/backlog.php @@ -33,7 +33,16 @@ include "../../php/editarSprints.php";