Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
196 commits
Select commit Hold shift + click to select a range
2d2f36f
hola
Rosamile Oct 4, 2023
43d1a07
Botones de la pagina y pagina principal
Rosamile Oct 5, 2023
ddea4fc
Merge pull request #2 from Rosamile/feature-rosa-1
Rosamile Oct 5, 2023
e9c3939
Se actualizó data set y se creo carpeta de style1
Rosamile Oct 10, 2023
58855ad
Merge branch 'feature-rosa-1' of https://github.com/Rosamile/DEV012-d…
Rosamile Oct 10, 2023
6b41fc7
Merge pull request #3 from Rosamile/feature-rosa-1
Rosamile Oct 10, 2023
593be7a
Merge pull request #4 from Rosamile/feature-rosa-1
Rosamile Oct 10, 2023
aa34725
Update Data2
Misswtson Oct 11, 2023
5cf00a4
Merge pull request #5 from Misswtson/emma1
Rosamile Oct 11, 2023
913b013
se crea caja de variables para mostrar tarjetas
Rosamile Oct 12, 2023
8db5391
Merge pull request #6 from Rosamile/feature-rosa-1
Rosamile Oct 12, 2023
196068c
Se muestran tarjetas una a una con la data
Rosamile Oct 12, 2023
85b4075
Merge pull request #7 from Rosamile/feature-rosa-1
Rosamile Oct 12, 2023
6034687
se modifica data set, data funtion dejando actualizadas las funciones…
Rosamile Oct 13, 2023
68843f3
Merge pull request #8 from Rosamile/feature-rosa-1
Rosamile Oct 13, 2023
07840b3
Cambios Nuevos
Misswtson Oct 17, 2023
a7ec7c0
Merge branch 'main' into emma1
Rosamile Oct 17, 2023
d405b57
Merge pull request #9 from Misswtson/emma1
Rosamile Oct 17, 2023
a65fda7
se modifica main y evento de ordenar
Rosamile Oct 17, 2023
e73f037
Merge pull request #10 from Rosamile/feature-rosa-1
Rosamile Oct 17, 2023
7d0642f
Se modifica indexhtml, view.js y stylecss
Rosamile Oct 18, 2023
c8f11bb
Merge branch 'main' into feature-rosa-1
Rosamile Oct 18, 2023
b081114
Merge pull request #11 from Rosamile/feature-rosa-1
Rosamile Oct 18, 2023
f1248ca
Update en datafunction, dataset y mainjs
Misswtson Oct 18, 2023
45736b8
Merge branch 'main' into emma1
Misswtson Oct 18, 2023
18d814d
Merge pull request #12 from Misswtson/emma1
Misswtson Oct 18, 2023
64ac232
Updates
Misswtson Oct 18, 2023
5638a0e
Merge pull request #13 from Misswtson/emma1
Misswtson Oct 18, 2023
9dde200
estilos
Rosamile Oct 18, 2023
1268cee
Merge branch 'main' into feature-rosa-1
Rosamile Oct 18, 2023
b0324ff
Merge pull request #14 from Rosamile/feature-rosa-1
Rosamile Oct 18, 2023
73ddcc5
se modifica dataset, css y view
Rosamile Oct 18, 2023
bf683f0
Merge pull request #15 from Rosamile/feature-rosa-1
Rosamile Oct 18, 2023
e449cf8
Se modifican estilos de las tarjetas en css y se agregan contenedores…
Rosamile Oct 18, 2023
4e6e8b1
Merge pull request #16 from Rosamile/feature-rosa-1
Rosamile Oct 18, 2023
0036c75
Cambios Emma
Misswtson Oct 19, 2023
9fbf993
Merge branch 'main' into emma1
Rosamile Oct 19, 2023
a98ae21
Merge pull request #17 from Misswtson/emma1
Rosamile Oct 19, 2023
2fdc77c
Merge pull request #1 from Misswtson/main
Rosamile Oct 19, 2023
6b80ebe
se actualiza view, data set, data funtion html y data funtion
Rosamile Oct 19, 2023
c6fac5d
Merge pull request #18 from Rosamile/feature-rosa-1
Rosamile Oct 19, 2023
9947d24
Cambios por error
Misswtson Oct 19, 2023
4b6c1f5
Cambio por error
Misswtson Oct 19, 2023
892a418
Cambios Emma
Misswtson Oct 19, 2023
e87bb8c
Cambios por error
Misswtson Oct 20, 2023
9da2495
Merge branch 'main' into emma1
Misswtson Oct 20, 2023
7abe673
Merge pull request #19 from Misswtson/emma1
Misswtson Oct 20, 2023
87483d4
se modifica index y view
Rosamile Oct 20, 2023
af0c71b
Merge branch 'main' into feature-rosa-1
Rosamile Oct 20, 2023
f0b4dbc
Merge pull request #20 from Rosamile/feature-rosa-1
Rosamile Oct 20, 2023
72b0bb9
se acomodan el view y el estilo en css
Rosamile Oct 20, 2023
bd1619d
se actualizan estilos y los li del view
Rosamile Oct 20, 2023
1c2d5c4
Merge pull request #21 from Rosamile/feature-rosa-1
Rosamile Oct 20, 2023
d42e8e0
se corrigieron conflictos en main en el index.html
Rosamile Oct 23, 2023
96b7002
Merge pull request #22 from Rosamile/feature-rosa-1
Rosamile Oct 23, 2023
452f953
Cambios en dataset, datafutnion, index, main y view
Misswtson Oct 23, 2023
79596c7
test
Misswtson Oct 23, 2023
ffaab95
Merge branch 'main' into emma1
Misswtson Oct 23, 2023
ab08184
Merge pull request #23 from Misswtson/emma1
Misswtson Oct 23, 2023
495571d
Se modifica el ordenamiento con su respectivo evento
Rosamile Oct 23, 2023
aff86c0
Merge pull request #2 from Rosamile/feature-rosa-1
Rosamile Oct 23, 2023
76b3c0a
Merge branch 'main' into main
Rosamile Oct 23, 2023
bc7c031
Merge pull request #24 from Rosamile/main
Rosamile Oct 23, 2023
7462332
Se reversa a l día 20-10-23 por duplicidad en los datos
Rosamile Oct 23, 2023
582d488
Se resuelven conflictos en indexhtml y css
Rosamile Oct 23, 2023
9b0f67c
Merge pull request #25 from Rosamile/main
Rosamile Oct 23, 2023
6b836ae
Se actualizan dataset, view, main, index html
Rosamile Oct 23, 2023
c2406fe
se modifica dataset, index html, main, data funtion
Rosamile Oct 23, 2023
f5e922b
Merge pull request #26 from Rosamile/rosaV2
Rosamile Oct 23, 2023
f27dd10
Cambios en dataset, datafuntion,index,main y view
Misswtson Oct 23, 2023
45eb11d
Merge branch 'main' into emma1
Misswtson Oct 23, 2023
5648dfc
Merge pull request #27 from Misswtson/emma1
Misswtson Oct 23, 2023
deef2cf
se modifica select de ordenado
Rosamile Oct 23, 2023
4616af8
Merge pull request #28 from Rosamile/rosaV2
Rosamile Oct 23, 2023
985113c
se modifica css
Rosamile Oct 23, 2023
ba93314
Merge pull request #29 from Rosamile/rosaV2
Rosamile Oct 23, 2023
25a7c2b
modificaciones en todas las ramas
Misswtson Oct 24, 2023
d6d0633
Merge pull request #30 from Misswtson/emma1
Misswtson Oct 24, 2023
6589383
commit pendiente de espacios
Rosamile Oct 24, 2023
a893ea1
Merge branch 'main' into rosaV2
Rosamile Oct 24, 2023
28be17e
Merge pull request #31 from Rosamile/rosaV2
Rosamile Oct 24, 2023
e0dc33f
se resuelven conflictos
Rosamile Oct 24, 2023
7bd8b5f
conflicto con main
Rosamile Oct 24, 2023
6a1d8ef
se resulven conflictos
Rosamile Oct 24, 2023
21ef470
Cambios directos en rama main
Misswtson Oct 24, 2023
6138c3c
Modificaciones en OH
Misswtson Oct 24, 2023
87a6d19
Merge pull request #32 from Misswtson/emma1
Misswtson Oct 24, 2023
0e3eef5
Merge branch 'main' of https://github.com/Rosamile/DEV012-dataverse i…
Rosamile Oct 24, 2023
533c306
Modificaciones en todas las ramas
Misswtson Oct 25, 2023
c93f531
Merge pull request #33 from Misswtson/emma1
Misswtson Oct 25, 2023
72d1aa6
Modificaciones en css
Misswtson Oct 25, 2023
76bf65d
Merge pull request #34 from Misswtson/emma1
Misswtson Oct 25, 2023
8f729a2
se revisar ciclos for para corregir errores de test
Rosamile Oct 25, 2023
c88d56d
Merge branch 'main' into rosaV2
Rosamile Oct 25, 2023
298b9ab
Merge pull request #35 from Rosamile/rosaV2
Rosamile Oct 25, 2023
54e7933
se corrigen conflictos
Rosamile Oct 25, 2023
582c483
se resuelven confllictos
Rosamile Oct 25, 2023
0638646
corrección data set y errores en espacios
Rosamile Oct 25, 2023
66b7ee6
Merge pull request #36 from Rosamile/rosaV2
Rosamile Oct 25, 2023
9ae29c6
Cambio por equivocación en index
Misswtson Oct 25, 2023
729af92
Merge branch 'main' into emma1
Misswtson Oct 25, 2023
81d243e
Merge pull request #37 from Misswtson/emma1
Misswtson Oct 25, 2023
3b1a050
se structura codigo de estadistica y se crea input de filtro por año,…
Rosamile Oct 26, 2023
7bc0683
Merge pull request #38 from Rosamile/rosaV2
Rosamile Oct 26, 2023
b07efea
se modifica estadistica y filtro por año, se crea animación en css
Rosamile Oct 27, 2023
07e5d65
Merge pull request #39 from Rosamile/rosaV2
Rosamile Oct 27, 2023
70ec7a5
se modifica botón poniendole una animación
Rosamile Oct 30, 2023
8da49f6
Merge pull request #40 from Rosamile/rosaV2
Rosamile Oct 30, 2023
508fdd2
Modificaciones en todas los files
Misswtson Oct 30, 2023
d19acc2
Merge branch 'main' into emma1
Misswtson Oct 30, 2023
7f9152c
Merge pull request #41 from Misswtson/emma1
Misswtson Oct 30, 2023
5fb2d1f
Merge branch 'main' of https://github.com/Rosamile/DEV012-dataverse i…
Rosamile Oct 30, 2023
8d31239
Ya se ven los cambios
Misswtson Oct 30, 2023
aca695e
Merge pull request #42 from Misswtson/emma1
Misswtson Oct 30, 2023
044f9ee
Merge branch 'main' into rosaV2
Rosamile Oct 30, 2023
41ae7aa
Merge pull request #43 from Rosamile/rosaV2
Rosamile Oct 30, 2023
b386c9c
cambios nuevos
Misswtson Oct 31, 2023
3cb9105
Merge pull request #44 from Misswtson/emma1
Misswtson Oct 31, 2023
a2d72eb
Modificaciones en Pruebas unitarias y data para realizarlas
Misswtson Oct 31, 2023
a64d2b7
Merge pull request #45 from Misswtson/emma1
Misswtson Oct 31, 2023
1e12967
se modifica css
Rosamile Oct 31, 2023
2e52745
Merge pull request #46 from Rosamile/rosaV2
Rosamile Oct 31, 2023
63f3a34
Modificaciones: Css, Dataset
Misswtson Oct 31, 2023
a37a264
Merge pull request #47 from Misswtson/emma1
Misswtson Oct 31, 2023
b700ed5
Modificación de espacios en html
Misswtson Oct 31, 2023
fbfd458
Merge pull request #48 from Misswtson/emma1
Misswtson Oct 31, 2023
9cf7b80
se crea función de filtro agrupado
Rosamile Nov 1, 2023
8800c8d
Merge branch 'main' into rosaV2
Rosamile Nov 2, 2023
ec4865f
se crea filtro agrupado y test unitarios
Rosamile Nov 2, 2023
d59b9ec
Merge branch 'rosaV2' of https://github.com/Rosamile/DEV012-dataverse…
Rosamile Nov 2, 2023
2194b3b
Merge pull request #49 from Rosamile/rosaV2
Rosamile Nov 2, 2023
d2568e5
Merge pull request #3 from Misswtson/main
Rosamile Nov 2, 2023
487ebcd
Modificaciones en css - media query - responsive mobile only
Misswtson Nov 2, 2023
b1ea6df
Merge branch 'main' into emma1
Misswtson Nov 2, 2023
672baf2
Merge pull request #50 from Misswtson/emma1
Misswtson Nov 2, 2023
3815dc8
Modificaciones en test unitarios y ccs
Misswtson Nov 7, 2023
28fc6c7
Merge pull request #51 from Misswtson/emma1
Misswtson Nov 7, 2023
4cdf412
Merge branch 'Misswtson:main' into main
Rosamile Nov 7, 2023
0f05ef2
se modifica agrupamiento del ordenado
Rosamile Nov 7, 2023
d933dbb
Merge pull request #52 from Rosamile/rosaV2
Rosamile Nov 7, 2023
129a15e
se corrigen filtros y test
Rosamile Nov 7, 2023
b3da16b
Merge pull request #53 from Rosamile/rosaV2
Rosamile Nov 7, 2023
6662737
Modificaciones por falla en test
Misswtson Nov 7, 2023
ce619d6
Merge branch 'main' into emma1
Misswtson Nov 7, 2023
2040f0f
Merge pull request #54 from Misswtson/emma1
Misswtson Nov 7, 2023
875efe9
Modificaciones en Test Unitarios por fallas, se corriguen dos, pero q…
Misswtson Nov 8, 2023
3e2e0e1
Merge pull request #55 from Misswtson/emma1
Misswtson Nov 8, 2023
3393bd4
se corrigen errores de test y se incliye estadistica
Rosamile Nov 8, 2023
a6078c6
Merge pull request #56 from Rosamile/rosaV2
Rosamile Nov 8, 2023
8d0da41
se corrigen pruebas unitarias
Rosamile Nov 8, 2023
1e647cb
Merge branch 'Misswtson:main' into rosaV2
Rosamile Nov 8, 2023
a5ec71b
Merge pull request #57 from Rosamile/rosaV2
Rosamile Nov 8, 2023
0757b58
se crea test unitario para estadistica
Rosamile Nov 8, 2023
d071066
Merge branch 'rosaV2' of https://github.com/Rosamile/DEV012-dataverse…
Rosamile Nov 8, 2023
7db423b
Merge pull request #58 from Rosamile/rosaV2
Rosamile Nov 8, 2023
698abb9
Creación de nuevos test, faltaría uno, pouno me da error
Misswtson Nov 8, 2023
09668d6
Nuevas modificaciones en test
Misswtson Nov 8, 2023
31d797f
Merge pull request #59 from Misswtson/emma1
Misswtson Nov 8, 2023
b009bf4
se crea test de crear elementos en pantalla
Rosamile Nov 9, 2023
c3f81cc
Merge branch 'main' into rosaV2
Rosamile Nov 9, 2023
4e45e61
Merge pull request #60 from Rosamile/rosaV2
Rosamile Nov 9, 2023
772c524
Se actualiza el readme
Rosamile Nov 9, 2023
de69443
Merge branch 'rosaV2' of https://github.com/Rosamile/DEV012-dataverse…
Rosamile Nov 9, 2023
6e0ae63
Merge pull request #61 from Rosamile/rosaV2
Rosamile Nov 9, 2023
02c0298
Modificaciones en Test, agregue nuevos, pero aún no sube el porcentaj…
Misswtson Nov 9, 2023
236371c
Merge branch 'main' into emma1
Misswtson Nov 9, 2023
e657fef
Merge pull request #62 from Misswtson/emma1
Misswtson Nov 9, 2023
a962991
Update README.md
Rosamile Nov 9, 2023
38f4f78
Modificación del test de crear elementos
Rosamile Nov 9, 2023
1132444
Merge branch 'main' into rosaV2
Rosamile Nov 9, 2023
1b26c14
Merge pull request #63 from Rosamile/rosaV2
Rosamile Nov 9, 2023
3e5fae6
Merge branch 'main' of https://github.com/Rosamile/DEV012-dataverse i…
Rosamile Nov 9, 2023
ed4679e
Merge branch 'rosaV2' of https://github.com/Rosamile/DEV012-dataverse…
Rosamile Nov 9, 2023
92f309e
Merge branch 'Misswtson:main' into main
Rosamile Nov 9, 2023
4b6a6c5
se actualiza test
Rosamile Nov 9, 2023
e1038fa
Merge branch 'rosaV2' of https://github.com/Rosamile/DEV012-dataverse…
Rosamile Nov 9, 2023
8c03224
Merge pull request #64 from Rosamile/rosaV2
Rosamile Nov 9, 2023
0ec8303
se guardan cambios
Rosamile Nov 9, 2023
26bf89c
Merge branch 'Misswtson:main' into main
Rosamile Nov 9, 2023
7eea13a
Merge branch 'Misswtson:main' into rosaV2
Rosamile Nov 9, 2023
6070f7c
Merge pull request #65 from Rosamile/rosaV2
Rosamile Nov 9, 2023
2d73d50
Merge branch 'main' of https://github.com/Rosamile/DEV012-dataverse i…
Rosamile Nov 9, 2023
4bb483f
Merge branch 'rosaV2' of https://github.com/Rosamile/DEV012-dataverse…
Rosamile Nov 9, 2023
6b1646d
Merge branch 'Misswtson:main' into rosaV2
Rosamile Nov 9, 2023
f5d2301
Merge branch 'Misswtson:main' into main
Rosamile Nov 9, 2023
f242981
Merge pull request #66 from Rosamile/main
Rosamile Nov 9, 2023
084ce6d
Merge branch 'Misswtson:main' into rosaV2
Rosamile Nov 9, 2023
ca653e6
Merge pull request #67 from Rosamile/rosaV2
Rosamile Nov 9, 2023
66a134a
se actualiza data function en el reduce
Rosamile Nov 9, 2023
92e9ef0
Merge pull request #68 from Rosamile/rosaV2
Rosamile Nov 9, 2023
b4358a2
Se modifica main para estadistica
Rosamile Nov 9, 2023
cac7ed0
Merge branch 'Misswtson:main' into rosaV2
Rosamile Nov 9, 2023
f1b660f
Merge pull request #69 from Rosamile/rosaV2
Rosamile Nov 9, 2023
9fe77b5
Modificacioón en readme y css responsive
Misswtson Nov 10, 2023
b0036db
Merge pull request #70 from Misswtson/emma1
Misswtson Nov 10, 2023
b9eed28
Cambios readme
Misswtson Nov 10, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
993 changes: 54 additions & 939 deletions README.md

Large diffs are not rendered by default.

67 changes: 43 additions & 24 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"htmlhint": "htmlhint src/*.html test/*.html",
"eslint": "eslint --ext .js src/ test/",
"pretest": "npm run eslint && npm run htmlhint",
"test": "jest --verbose --coverage test/*.spec.js",
"test": "jest --verbose --coverage test/dataFunctions.spec.js",
"test:e2e": "playwright test",
"test:oas": "jest --verbose tests-read-only/oa/",
"pretest:oas-html": "npm run pretest",
Expand All @@ -33,7 +33,7 @@
"eslint": "^8.3.0",
"gh-pages": "^3.1.0",
"htmlhint": "^1.0.0",
"jest": "^27.0.1",
"jest": "^27.5.1",
"jsdom": "^22.1.0",
"opener": "^1.5.1",
"serve": "^14.2.1"
Expand All @@ -48,5 +48,8 @@
},
"jest": {
"testEnvironment": "jsdom"
},
"dependencies": {
"chart.js": "^4.4.0"
}
}
}
Loading