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

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

Nombre Proyecto

+
-
- -
-
-
- -
-
-

Nombre Proyecto

-
-
-
-
-

Descripcion:

-

redaccion de descripcion breve

-
-
-
- +
+
+

Descripcion:

+

redaccion de descripcion breve

+
-
- -
-
-
- -
-
-

Nombre Proyecto

-
-
-
-
-

Descripcion:

-

redaccion de descripcion breve

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

Nombre Proyecto

+
-
- -
-
-
- -
-
-

Nombre Proyecto

-
-
-
-
-

Descripcion:

-

redaccion de descripcion breve

-
-
-
- +
+
+

Descripcion:

+

redaccion de descripcion breve

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

Nombre Proyecto

+
+
+
+
+

Descripcion:

+

redaccion de descripcion breve

+
+
+
+ +
+
+ +
+
+
+ +
+
+

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 @@
    - - -- GitLab From 74ec0f841a869db550215417d58b0b1ef88405b2 Mon Sep 17 00:00:00 2001 From: Axel7755 Date: Mon, 4 Sep 2023 22:18:28 -0600 Subject: [PATCH 009/105] updates backlog --- pages/proyectos/backlog.html | 127 +++++++++++++++++++++++++++++------ 1 file changed, 108 insertions(+), 19 deletions(-) diff --git a/pages/proyectos/backlog.html b/pages/proyectos/backlog.html index ffe15ed..5c18fff 100644 --- a/pages/proyectos/backlog.html +++ b/pages/proyectos/backlog.html @@ -158,7 +158,7 @@
    • + aria-expanded="false" aria-controls="Menu-versions">Menu de Epic
    @@ -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";
    -
    Date: Wed, 11 Oct 2023 17:55:40 -0600 Subject: [PATCH 029/105] creacion de proyectos --- GPL2.sql | 18 ++++---- diagrama base de datos.mwb | Bin 16184 -> 16312 bytes diagrama base de datos.mwb.bak | Bin 16186 -> 16184 bytes images/labsol_logo.png | Bin images/perfilwoman.png | Bin images/proyecto2/2ssd samsung.jpeg | Bin 0 -> 15202 bytes images/user1.png | Bin pages/proyectos.php | 65 ++++++++++++++--------------- php/crearProyecto.php | 56 +++++++++++++++++++++++++ 9 files changed, 97 insertions(+), 42 deletions(-) mode change 100644 => 100755 images/labsol_logo.png mode change 100644 => 100755 images/perfilwoman.png create mode 100644 images/proyecto2/2ssd samsung.jpeg mode change 100644 => 100755 images/user1.png create mode 100644 php/crearProyecto.php diff --git a/GPL2.sql b/GPL2.sql index 3ba0095..64d0f11 100644 --- a/GPL2.sql +++ b/GPL2.sql @@ -1,5 +1,5 @@ -- MySQL Script generated by MySQL Workbench --- lun 02 oct 2023 14:56:01 +-- mié 11 oct 2023 16:43:57 -- Model: New Model Version: 1.0 -- MySQL Workbench Forward Engineering @@ -44,14 +44,14 @@ CREATE TABLE IF NOT EXISTS `labsol2`.`proyecto` ( `nombrePr` VARCHAR(45) NOT NULL, `proyectcol` VARCHAR(85) NOT NULL, `img` LONGTEXT NULL, - `proy_idsolicitante` INT NOT NULL, - PRIMARY KEY (`idproyect`, `proy_idsolicitante`), - INDEX `fk_proyecto_solicitante1_idx` (`proy_idsolicitante` ASC) , + `solicitante_idsolicitante` INT NULL, + PRIMARY KEY (`idproyect`), + INDEX `fk_proyecto_solicitante1_idx` (`solicitante_idsolicitante` ASC) , CONSTRAINT `fk_proyecto_solicitante1` - FOREIGN KEY (`proy_idsolicitante`) + FOREIGN KEY (`solicitante_idsolicitante`) REFERENCES `labsol2`.`solicitante` (`idsolicitante`) - ON DELETE CASCADE - ON UPDATE CASCADE) + ON DELETE SET NULL + ON UPDATE SET NULL) ENGINE = InnoDB; @@ -78,7 +78,7 @@ CREATE TABLE IF NOT EXISTS `labsol2`.`alumno` ( `al_apP` VARCHAR(35) NOT NULL, `al_apM` VARCHAR(35) NULL, `al_correo` VARCHAR(85) NOT NULL, - `al_conthash` VARCHAR(65) NOT NULL, + `al_conthash` VARCHAR(50) NOT NULL, `al_idinstitucion` INT NOT NULL, PRIMARY KEY (`idalumno`, `al_idinstitucion`), INDEX `fk_alumno_institucion1_idx` (`al_idinstitucion` ASC) , @@ -277,7 +277,7 @@ CREATE TABLE IF NOT EXISTS `labsol2`.`administrador` ( `ad_apP` VARCHAR(35) NOT NULL, `ad_apM` VARCHAR(35) NULL, `ad_correo` VARCHAR(85) NOT NULL, - `ad_conthash` VARCHAR(65) NOT NULL, + `ad_conthash` VARCHAR(50) NOT NULL, PRIMARY KEY (`idadministrador`)) ENGINE = InnoDB; diff --git a/diagrama base de datos.mwb b/diagrama base de datos.mwb index 23da5b23b2efd76a76f97bb929dcc3b6b6121d67..6d815f8c97e73e7ed6eecdf6c164373165fd33b3 100644 GIT binary patch delta 15567 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 delta 15467 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 RK2rg|lifZZ0YH=dK0cftkz@b> delta 269 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 literal 0 HcmV?d00001 diff --git a/images/user1.png b/images/user1.png old mode 100644 new mode 100755 diff --git a/pages/proyectos.php b/pages/proyectos.php index 0831015..733efec 100644 --- a/pages/proyectos.php +++ b/pages/proyectos.php @@ -1,6 +1,7 @@ @@ -20,12 +21,10 @@ include "./php/sessionestado.php"; - - - - + + + + @@ -231,50 +230,50 @@ 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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 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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 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"; -
    -
    + +
    +
    Descripcion
    +
    + +
    +
    + +
    - -
    -
    - - -
    + +
    +
    + + +
    + @@ -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";