From fc969154b8f3d2ba79f06204e86b76fe4acb72e2 Mon Sep 17 00:00:00 2001 From: melissayauri Date: Tue, 28 Nov 2017 14:54:14 -0500 Subject: [PATCH 01/22] incorporando primera seccion --- index.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/index.html b/index.html index 8930fa03..66ed73bd 100644 --- a/index.html +++ b/index.html @@ -5,6 +5,10 @@ Data Dashboard +
+

melisaa

+
+ From c25ca95557d0a152a8202278eddc65dc969ccb5a Mon Sep 17 00:00:00 2001 From: marielacp Date: Tue, 28 Nov 2017 14:54:52 -0500 Subject: [PATCH 02/22] =?UTF-8?q?a=C3=B1adiendo=20seccion2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 8930fa03..92361a9a 100644 --- a/index.html +++ b/index.html @@ -5,8 +5,13 @@ Data Dashboard - - +
+
    +
  • Espero
    • +
  • Que salgaaaaaaaaaaaaaaaaa
    • +
+
+ From f1c53ecfeded1f0a9cc755166de2f9fb8ee4a09c Mon Sep 17 00:00:00 2001 From: marielacp Date: Tue, 28 Nov 2017 15:12:38 -0500 Subject: [PATCH 03/22] =?UTF-8?q?a=C3=B1adiendo=202da=20actualizacion=20se?= =?UTF-8?q?ccion2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.html b/index.html index 92361a9a..bdf01057 100644 --- a/index.html +++ b/index.html @@ -10,6 +10,9 @@
  • Espero
  • Que salgaaaaaaaaaaaaaaaaa
    • +
      +
    • saliooo
      • +
    From 8d358f4d7ee6103b2cfc9a53bafd914d18a0373f Mon Sep 17 00:00:00 2001 From: marielacp Date: Tue, 28 Nov 2017 15:16:54 -0500 Subject: [PATCH 04/22] 2do cambios seccion2 --- index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.html b/index.html index ac2a1cb7..827580bb 100644 --- a/index.html +++ b/index.html @@ -13,6 +13,9 @@
  • Espero
  • Que salgaaaaaaaaaaaaaaaaa
    • +
      +
    • saliooo
      • +
    From 2063dd971bb8d2d40ac053fa1e8d75534cf683da Mon Sep 17 00:00:00 2001 From: marielacp Date: Wed, 29 Nov 2017 16:28:31 -0500 Subject: [PATCH 05/22] =?UTF-8?q?a=C3=B1adiendo=20actualizaciones=20seccio?= =?UTF-8?q?n2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/logoLab.png | Bin 0 -> 8110 bytes css/main.css | 23 ++++++++++ index.html | 19 +++----- js/app.js | 94 ++++++++++++++++++++++++++++++++++++-- 4 files changed, 118 insertions(+), 18 deletions(-) create mode 100644 assets/images/logoLab.png diff --git a/assets/images/logoLab.png b/assets/images/logoLab.png new file mode 100644 index 0000000000000000000000000000000000000000..c9c06f7ad9a7655a98d96e7e0b2e0ae1adcf3ed2 GIT binary patch literal 8110 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 HdD#B|Q%Fg8 literal 0 HcmV?d00001 diff --git a/css/main.css b/css/main.css index 6355c827..25dd3dad 100644 --- a/css/main.css +++ b/css/main.css @@ -1,3 +1,26 @@ /* * Estilos de tu proyecto */ + + *{ + margin: 0; + padding: 0; + } + +#seccion2 { +display: inline-block; +background-color: rgb(203, 203, 238); +width: 100%; +height: 200px; + +} + +.activas{ +position: absolute; +left: 5%; +display: inline-block; +width: 100px; +height: 100px; +background-color: red; +} + diff --git a/index.html b/index.html index 827580bb..b5ded330 100644 --- a/index.html +++ b/index.html @@ -3,23 +3,16 @@ Data Dashboard + -
    -

    melisaa

    -
    - -
      -
    • Espero
      • -
    • Que salgaaaaaaaaaaaaaaaaa
      • -
    -
      -
    • saliooo
      • -
    +
    +
    +
    - + - + diff --git a/js/app.js b/js/app.js index 895ae2dd..91929d86 100644 --- a/js/app.js +++ b/js/app.js @@ -1,6 +1,90 @@ -/* - * Funcionalidad de tu producto - */ -// Puedes hacer uso de la base de datos a través de la variable `data` -console.log(data); +window.addEventListener('load', function () { +var cont = document.getElementById('contenedor'); +var contAlumnas = document.getElementById('alumnas'); +var count = 0; + + var active1 = data.AQP["2016-2"]["students"]; +for (var i = 0; i Date: Wed, 29 Nov 2017 16:42:50 -0500 Subject: [PATCH 06/22] =?UTF-8?q?a=C3=B1adiendo=20funcionalidad=20filtro2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/app.js | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 5 deletions(-) diff --git a/js/app.js b/js/app.js index 895ae2dd..81f2e1a0 100644 --- a/js/app.js +++ b/js/app.js @@ -1,6 +1,90 @@ -/* - * Funcionalidad de tu producto - */ -// Puedes hacer uso de la base de datos a través de la variable `data` -console.log(data); +window.addEventListener('load', function () { + var cont = document.getElementById('contenedor'); + var contAlumnas = document.getElementById('alumnas'); + var count = 0; + + var active1 = data.AQP["2016-2"]["students"]; + for (var i = 0; i < active1.length; i++) { + if (active1[i].active === false) { + count++; + } + }; + var active2 = data.AQP["2017-1"]["students"]; + for (var i = 0; i < active2.length; i++) { + if (active2[i].active === false) { + count++; + } + }; + var active3 = data.CDMX["2017-1"]["students"]; + for (var i = 0; i < active3.length; i++) { + if (active3[i].active === false) { + count++; + } + }; + var active4 = data.CDMX["2017-1"]["students"]; + for (var i = 0; i < active4.length; i++) { + if (active4[i].active === false) { + count++; + } + }; + var active5 = data.LIM["2016-2"]["students"]; + for (var i = 0; i < active5.length; i++) { + if (active5[i].active === false) { + count++; + } + }; + var active6 = data.LIM["2017-1"]["students"]; + for (var i = 0; i < active6.length; i++) { + if (active6[i].active === false) { + count++; + } + }; + var active7 = data.LIM["2017-2"]["students"]; + for (var i = 0; i < active7.length; i++) { + if (active7[i].active === false) { + count++; + } + }; + var active8 = data.SCL["2016-2"]["students"]; + for (var i = 0; i < active8.length; i++) { + if (active8[i].active === false) { + count++; + } + }; + var active9 = data.SCL["2017-1"]["students"]; + for (var i = 0; i < active9.length; i++) { + if (active9[i].active === false) { + count++; + } + }; + var active10 = data.SCL["2017-2"]["students"]; + for (var i = 0; i < active10.length; i++) { + if (active10[i].active === false) { + count++; + // var cuadro = document.createElement('p'); + // cuadro.textContent=count; + // contAlumnas.appendChild(cuadro); + } + }; + var aqp2016 = data.AQP["2016-2"].students.length; //1 + var aqp2017 = data.AQP["2017-1"].students.length;//2 + var cdmx20171 = data.CDMX["2017-1"].students.length;//3 + var cdmx20172 = data.CDMX["2017-2"].students.length;//4 + var lim20162 = data.LIM["2016-2"].students.length;//5 + var lim20171 = data.LIM["2017-1"].students.length;//6 + var lim20172 = data.LIM["2017-2"].students.length;//7 + var scl20162 = data.SCL["2016-2"].students.length;//8 + var scl20171 = data.SCL["2017-1"].students.length;//9 + var scl20172 = data.SCL["2017-2"].students.length;//10 + var contAlumnasRet = document.createElement('div'); + contAlumnasRet.classList = 'activas'; + var txtdates = document.createElement('H3'); + txtdates.textContent = 'Desercion Total'; + var dates = document.createElement('H1'); + dates.textContent = ((count * 100) / (aqp2016 + aqp2017 + cdmx20171 + cdmx20172 + lim20162 + lim20171 + lim20172 + scl20162 + scl20171 + scl20172)).toFixed(2) + '% '; + contAlumnasRet.appendChild(txtdates); + contAlumnasRet.appendChild(dates); + cont.appendChild(contAlumnasRet); + +}); From 0521b6328e4b5cf92f0a17fd37e2a9d83e53bdb2 Mon Sep 17 00:00:00 2001 From: melissayauri Date: Wed, 29 Nov 2017 17:48:05 -0500 Subject: [PATCH 07/22] incorporando el total de estudiantes por generacion --- css/main.css | 23 ++++++++++++++--- index.html | 27 +++++++++++++++++--- js/app.js | 70 +++++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 111 insertions(+), 9 deletions(-) diff --git a/css/main.css b/css/main.css index 6355c827..56d5f644 100644 --- a/css/main.css +++ b/css/main.css @@ -1,3 +1,20 @@ -/* - * Estilos de tu proyecto - */ +header{ + +} + +header img{ + width: 20%; +} + +.selectors{ + background-color: #e1e1e1; + height: 70px; +} + +#selection{ + border: none; + margin-left: 100px; + margin-top: 10px; + height: 30px; + width: 160px; +} diff --git a/index.html b/index.html index 66ed73bd..1d364083 100644 --- a/index.html +++ b/index.html @@ -3,13 +3,34 @@ Data Dashboard + -
    -

    melisaa

    -
    +
    + +
    +
    + +
    +
    +
    diff --git a/js/app.js b/js/app.js index 895ae2dd..df583631 100644 --- a/js/app.js +++ b/js/app.js @@ -1,6 +1,70 @@ -/* - * Funcionalidad de tu producto - */ +window.addEventListener('load', function() { + var selection = document.getElementById('selection'); + var container = document.getElementById('container'); + selection.addEventListener('change', showsGeneration); + var sedeArequipa = data.AQP; + var count = 0; + + function showsGeneration(event) { + /* sede arequipa*/ + if (selection.value === 'AQP-2016-2') { + var generationAqp1 = data.AQP['2016-2']['students']; + for (var i = 0; i < generationAqp1.length; i++) { + if (generationAqp1[i].active === true) { + count++; + container.innerHTML = count; + } + } + } + if (selection.value === 'AQP-2017-1') { + var generationAqp2 = data.AQP['2017-1']['students']; + for (var i = 0; i < generationAqp2.length; i++) { + if (generationAqp2[i].active === true) { + count++; + container.innerHTML = count; + } + } + } + /* por cada generacion de mexico*/ + if (selection.value === 'CDMX-2017-1') { + var generationCdmx1 = data.CDMX['2017-1']['students']; + for (var i = 0; i < generationCdmx1.length; i++) { + if (generationCdmx1[i].active === true) { + count++; + container.innerHTML = count; + } + } + } + if (selection.value === 'CDMX-2017-2') { + var generationCdmx2 = data.CDMX['2017-2']['students']; + for (var i = 0; i < generationCdmx2.length; i++) { + if (generationCdmx2[i].active === true) { + count++; + container.innerHTML = count; + } + } + } + if (selection.value === 'LIM-2016-2') { + var generationLim1 = data.LIM['2016-2']['students']; + for (var i = 0; i < generationLim1.length; i++) { + if (generationLim1[i].active === true) { + count++; + container.innerHTML = count; + } + } + } + if (selection.value === 'LIM-2017-1') { + var generationLim2 = data.LIM['2017-1']['students']; + for (var i = 0; i < generationLim2.length; i++) { + if (generationLim2[i].active === true) { + count++; + container.innerHTML = count; + } + } + } + } + }); + // Puedes hacer uso de la base de datos a través de la variable `data` console.log(data); From 514b52426d1cd67a34b67ee2b82a67cc8a926d3f Mon Sep 17 00:00:00 2001 From: melissayauri Date: Wed, 29 Nov 2017 18:01:57 -0500 Subject: [PATCH 08/22] incorporando filtro de alumnas por generacion-sede --- css/main.css | 22 ------------- index.html | 4 --- js/app.js | 88 ---------------------------------------------------- 3 files changed, 114 deletions(-) diff --git a/css/main.css b/css/main.css index 9f553c7d..5bf19118 100644 --- a/css/main.css +++ b/css/main.css @@ -23,25 +23,3 @@ header img{ /* * Estilos de tu proyecto */ - - *{ - margin: 0; - padding: 0; - } - -#seccion2 { -display: inline-block; -background-color: rgb(203, 203, 238); -width: 100%; -height: 200px; - -} - -.activas{ -position: absolute; -left: 5%; -display: inline-block; -width: 100px; -height: 100px; -background-color: red; -} diff --git a/index.html b/index.html index a2926801..af5df1cc 100644 --- a/index.html +++ b/index.html @@ -34,10 +34,6 @@ -
    -
    -
    -
    diff --git a/js/app.js b/js/app.js index 9ab5f600..c36553a1 100644 --- a/js/app.js +++ b/js/app.js @@ -65,91 +65,3 @@ window.addEventListener('load', function() { } } }); - -var cont = document.getElementById('contenedor'); -var contAlumnas = document.getElementById('alumnas'); -var count = 0; - - var active1 = data.AQP["2016-2"]["students"]; -for (var i = 0; i Date: Wed, 29 Nov 2017 18:18:49 -0500 Subject: [PATCH 09/22] =?UTF-8?q?a=C3=B1adiendo=20actualziaciones=20imagen?= =?UTF-8?q?es=203erfiltro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/main.css | 32 ++++++++++++++++++++++++ index.html | 45 ++++++++++++++++++++-------------- js/app.js | 69 +++++++++++++++++++++++++++++++++++----------------- 3 files changed, 106 insertions(+), 40 deletions(-) diff --git a/css/main.css b/css/main.css index 6355c827..69f16148 100644 --- a/css/main.css +++ b/css/main.css @@ -1,3 +1,35 @@ + /* * Estilos de tu proyecto */ + +* { + margin: 0; + padding: 0; +} + +#section2 { + display: inline-block; + background-color: rgb(203, 203, 238); + width: 100%; + height: 200px; +} + +.active { + position: absolute; + left: 5%; + display: inline-block; + width: 100px; + height: 100px; +} +.sprint{ + position: absolute; + left: 25%; + display: inline-block; + width: 100%; + height: 100px; +} +.grafic{ +width: 300px; +height: auto; +} \ No newline at end of file diff --git a/index.html b/index.html index bdf01057..5046617f 100644 --- a/index.html +++ b/index.html @@ -1,22 +1,31 @@ - - - Data Dashboard - - -
    -
      -
    • Espero
      • -
    • Que salgaaaaaaaaaaaaaaaaa
      • -
    -
      -
    • saliooo
      • -
    + + + + Data Dashboard + + + + +
    +
    +
    +
    +
    +
    + + + +
    + +
    - - - - - + + + + + + + diff --git a/js/app.js b/js/app.js index 81f2e1a0..47923cfd 100644 --- a/js/app.js +++ b/js/app.js @@ -1,7 +1,6 @@ - window.addEventListener('load', function () { - var cont = document.getElementById('contenedor'); - var contAlumnas = document.getElementById('alumnas'); + var cont = document.getElementById('container'); + var contStudents = document.getElementById('students'); var count = 0; var active1 = data.AQP["2016-2"]["students"]; @@ -62,29 +61,55 @@ window.addEventListener('load', function () { for (var i = 0; i < active10.length; i++) { if (active10[i].active === false) { count++; - // var cuadro = document.createElement('p'); - // cuadro.textContent=count; - // contAlumnas.appendChild(cuadro); - } + } }; - var aqp2016 = data.AQP["2016-2"].students.length; //1 - var aqp2017 = data.AQP["2017-1"].students.length;//2 - var cdmx20171 = data.CDMX["2017-1"].students.length;//3 - var cdmx20172 = data.CDMX["2017-2"].students.length;//4 - var lim20162 = data.LIM["2016-2"].students.length;//5 - var lim20171 = data.LIM["2017-1"].students.length;//6 - var lim20172 = data.LIM["2017-2"].students.length;//7 - var scl20162 = data.SCL["2016-2"].students.length;//8 - var scl20171 = data.SCL["2017-1"].students.length;//9 - var scl20172 = data.SCL["2017-2"].students.length;//10 - var contAlumnasRet = document.createElement('div'); - contAlumnasRet.classList = 'activas'; + var aqp2016 = data.AQP["2016-2"].students.length; + var aqp2017 = data.AQP["2017-1"].students.length; + var cdmx20171 = data.CDMX["2017-1"].students.length; + var cdmx20172 = data.CDMX["2017-2"].students.length; + var lim20162 = data.LIM["2016-2"].students.length; + var lim20171 = data.LIM["2017-1"].students.length; + var lim20172 = data.LIM["2017-2"].students.length; + var scl20162 = data.SCL["2016-2"].students.length; + var scl20171 = data.SCL["2017-1"].students.length; + var scl20172 = data.SCL["2017-2"].students.length; + var contStudentsRet = document.createElement('div'); + contStudentsRet.classList = 'active'; var txtdates = document.createElement('H3'); txtdates.textContent = 'Desercion Total'; var dates = document.createElement('H1'); dates.textContent = ((count * 100) / (aqp2016 + aqp2017 + cdmx20171 + cdmx20172 + lim20162 + lim20171 + lim20172 + scl20162 + scl20171 + scl20172)).toFixed(2) + '% '; - contAlumnasRet.appendChild(txtdates); - contAlumnasRet.appendChild(dates); - cont.appendChild(contAlumnasRet); + contStudentsRet.appendChild(txtdates); + contStudentsRet.appendChild(dates); + cont.appendChild(contStudentsRet); + + +//3er filtro + // var actual = data.AQP["2016-2"]["students"]; + + for (var i = 0; i < active1.length; i++) { + for (var j = 0; j < active1[i]['sprints'].length; j++) { + var sprintNote = active1[i]['sprints'][j]['score']['tech'] + active1[i]['sprints'][j]['score']['hse']; + //console.log(notas); + countSprints=0; + if (sprintNote >= 2330) { + countSprints++; + var notesprom = sprintNote; + var name = active1[i]['name']; + var sprint = active1[i]['sprints'][j]['number']; + console.log(notesprom + name + sprint); + //creando variables + + var contFilter3 = document.createElement('div'); + contFilter3.classList = 'sprint'; + var sectionFilter3 = document.createElement('section'); + var optionFilter3 = document.createElement('textarea'); + optionFilter3.textContent= name + sprint; + contFilter3.appendChild(optionFilter3); + cont.appendChild(contFilter3); + + } + } + }; }); From cb12520b0b041e8fc31fc22d8120cc547130e2c7 Mon Sep 17 00:00:00 2001 From: melissayauri Date: Thu, 30 Nov 2017 04:31:08 -0500 Subject: [PATCH 10/22] mejorando el filtro para el total de alumnas por sede y generacion --- css/main.css | 76 +++++++++++++++++++++++++++++----- index.html | 74 +++++++++++++++++++++++----------- js/app.js | 112 ++++++++++++++++++++++----------------------------- 3 files changed, 167 insertions(+), 95 deletions(-) diff --git a/css/main.css b/css/main.css index 5bf19118..8852f3ec 100644 --- a/css/main.css +++ b/css/main.css @@ -1,24 +1,82 @@ +*{ -header{ + margin:0; +} + header{ + height: 100px; + width: 90%; + } + img{ + width: 20%; + margin: auto; + display: block; + } +.bars{ +float: right; +font-size: 40px; +/*outline: 1px solid red;*/ +position: relative; +top:-80px; + } +ul{ + list-style: none; } -header img{ - width: 20%; +.disabled-menu{ +display: none; } -.selectors{ - background-color: #e1e1e1; - height: 70px; + +.enabled-menu{ +display: block; } -#selection{ +.section-gray{ +/*outline:1px solid red;*/ +height: 80px; +background-color: #e2e4e6; +} +.selections{ border: none; + background-color: #e2e4e6; margin-left: 100px; margin-top: 10px; - height: 30px; - width: 160px; + font-size: 20px; +} +.container-subtitle{ + overflow: auto; + margin-left: 80px; + margin-top: 20px; +} +.subtitle{ + float: left; + margin-left: 20px; +} +.results{ + background-color: #f7f7f7; + /*outline:1px solid red;*/ + height: 900px; } +.container{ +margin-left: 80px; +} +.container .box{ + outline:1px solid red; + height: 300px; + width: 300px; + background-color: #ffffff; + float: left; + margin-left: 30px; + margin-top: 30px; +} + +#total-students{ + height: 70px; + width: 120px; + background-color: #e2e4e6; +} + /* * Estilos de tu proyecto diff --git a/index.html b/index.html index af5df1cc..dcfe004a 100644 --- a/index.html +++ b/index.html @@ -3,35 +3,63 @@ Data Dashboard - + + -
    - -
    + +
    + + +
    + +
    + +
    +

    OVERVIEW

    +

    OVERVIEW

    +

    OVERVIEW

    +
    +
    -
    - -
    -
    +
    +
    +
    +

    Enrollement

    +
    +

    # de studiantes inscritos

    +
    +
    +
    +
    +
    + +
    +
    + diff --git a/js/app.js b/js/app.js index c36553a1..19d94873 100644 --- a/js/app.js +++ b/js/app.js @@ -1,67 +1,53 @@ - window.addEventListener('load', function() { + /* funcion para mostrar las alumas por sede-generacion*/ var selection = document.getElementById('selection'); - var container = document.getElementById('container'); - selection.addEventListener('change', showsGeneration); - var sedeArequipa = data.AQP; - var count = 0; + var containerStudents = document.getElementById('total-students'); + selection.addEventListener('change', showGenerations); + function showGenerations() { + /* seleccionando cada option de lista despegable*/ + var options = selection.value; + /* se convierte a un array para obtener la data de sede y generaciones*/ + var array = options.split('-');/* [lima,2017,2]*/ + console.log(array); + /* obteniendo la generacion*/ + var array1 = array.splice(1, 2); + console.log(array1); + /* uniendo los dos elementos de la generacion*/ + var generation = array1[0] + '-' + array1[1]; + /* obteniendo la sede*/ + var site = array.splice(0, 1); + console.log(site); + /* obteniendo datos por sede-generacion*/ + var siteGeneration = data[site][generation]; + console.log(siteGeneration); + /* creando un texto*/ + var totalStudents = siteGeneration.students.length; + containerStudents.innerHTML = '# de studiantes inscritos' + '
    ' + totalStudents; - function showsGeneration(event) { - /* sede arequipa*/ - if (selection.value === 'AQP-2016-2') { - var generationAqp1 = data.AQP['2016-2']['students']; - for (var i = 0; i < generationAqp1.length; i++) { - if (generationAqp1[i].active === true) { - count++; - container.innerHTML = count; - } - } - } - if (selection.value === 'AQP-2017-1') { - var generationAqp2 = data.AQP['2017-1']['students']; - for (var i = 0; i < generationAqp2.length; i++) { - if (generationAqp2[i].active === true) { - count++; - container.innerHTML = count; - } - } - } - /* por cada generacion de mexico*/ - if (selection.value === 'CDMX-2017-1') { - var generationCdmx1 = data.CDMX['2017-1']['students']; - for (var i = 0; i < generationCdmx1.length; i++) { - if (generationCdmx1[i].active === true) { - count++; - container.innerHTML = count; - } - } - } - if (selection.value === 'CDMX-2017-2') { - var generationCdmx2 = data.CDMX['2017-2']['students']; - for (var i = 0; i < generationCdmx2.length; i++) { - if (generationCdmx2[i].active === true) { - count++; - container.innerHTML = count; - } - } - } - if (selection.value === 'LIM-2016-2') { - var generationLim1 = data.LIM['2016-2']['students']; - for (var i = 0; i < generationLim1.length; i++) { - if (generationLim1[i].active === true) { - count++; - container.innerHTML = count; - } - } - } - if (selection.value === 'LIM-2017-1') { - var generationLim2 = data.LIM['2017-1']['students']; - for (var i = 0; i < generationLim2.length; i++) { - if (generationLim2[i].active === true) { - count++; - container.innerHTML = count; - } - } - } } - }); + + + + + + + + + /*menu derecho*/ +var bars = document.getElementById('bars'); +bars.addEventListener('click', showMenu); +function showMenu() { +var options = document.getElementById('options-menu'); +if(options.classList.contains('disabled-menu')){ + options.classList.remove('disabled-menu'); + options.classList.add('enabled-menu'); +} +else{ + options.classList.remove('enabled-menu'); + options.classList.add('disabled-menu'); +} +} +bars.addEventListener('click', showMenu); +// Puedes hacer uso de la base de datos a través de la variable `data` +console.log(data); +}); From 10ffe4f22cfd9cb1f942c036dfd6e7cacb3f968c Mon Sep 17 00:00:00 2001 From: melissayauri Date: Thu, 30 Nov 2017 05:45:49 -0500 Subject: [PATCH 11/22] incorporando el filtro para el nps --- css/main.css | 9 ++++++++- index.html | 6 ++++++ js/app.js | 23 +++++++++++++++-------- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/css/main.css b/css/main.css index 8852f3ec..f92ba6bb 100644 --- a/css/main.css +++ b/css/main.css @@ -77,7 +77,14 @@ margin-left: 80px; background-color: #e2e4e6; } - +/*estilo a las cajas de la seccion nps*/ +.total-nps, .seccion-nps { + height: 70px; + width: 120px; + background-color: #e2e4e6; + float: left; + margin-left: 20px; +} /* * Estilos de tu proyecto */ diff --git a/index.html b/index.html index dcfe004a..aa0d422a 100644 --- a/index.html +++ b/index.html @@ -55,7 +55,13 @@

    Enrollement

    +

    NPS

    +
    +

    % NPS

    +
    +
    +
    diff --git a/js/app.js b/js/app.js index 19d94873..4f0728a7 100644 --- a/js/app.js +++ b/js/app.js @@ -2,6 +2,7 @@ window.addEventListener('load', function() { /* funcion para mostrar las alumas por sede-generacion*/ var selection = document.getElementById('selection'); var containerStudents = document.getElementById('total-students'); + var totalNps = document.getElementById('total-nps'); selection.addEventListener('change', showGenerations); function showGenerations() { /* seleccionando cada option de lista despegable*/ @@ -23,17 +24,23 @@ window.addEventListener('load', function() { /* creando un texto*/ var totalStudents = siteGeneration.students.length; containerStudents.innerHTML = '# de studiantes inscritos' + '
    ' + totalStudents; - + /* analizando el NPS*/ + var result = 0; + for (i = 0; i < siteGeneration.ratings.length;i++) { + var promoters = siteGeneration.ratings[i].nps.promoters; + var passive = siteGeneration.ratings[i].nps.passive; + var detractors = siteGeneration.ratings[i].nps.detractors; + result = result + (promoters - detractors); + /* console.log(result)*/ + var percentage = parseInt(((result / siteGeneration.ratings.length) * 100) / 100) + '%'; + /* console.log(percentage);*/ + } + /*incorporando el porcentaje del nps*/ + totalNps.textContent = percentage; } - - - - - - - /*menu derecho*/ +/*menu derecho*/ var bars = document.getElementById('bars'); bars.addEventListener('click', showMenu); function showMenu() { From 5dca7e1a2f1c3425202b9fafa7161ca06b355d94 Mon Sep 17 00:00:00 2001 From: marielacp Date: Thu, 30 Nov 2017 14:49:04 -0500 Subject: [PATCH 12/22] =?UTF-8?q?a=C3=B1adiendo=20actualizaciones?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/main.css | 43 ++++++++-- index.html | 18 ++++- js/app.js | 222 ++++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 248 insertions(+), 35 deletions(-) diff --git a/css/main.css b/css/main.css index 69f16148..9237fe50 100644 --- a/css/main.css +++ b/css/main.css @@ -1,13 +1,23 @@ - -/* - * Estilos de tu proyecto - */ - * { margin: 0; padding: 0; } +header img{ + width: 20%; +} + +.selectors{ + background-color: #e1e1e1; + height: 70px; +} +#selection{ + border: none; + margin-left: 100px; + margin-top: 10px; + height: 30px; + width: 160px; +} #section2 { display: inline-block; background-color: rgb(203, 203, 238); @@ -32,4 +42,27 @@ .grafic{ width: 300px; height: auto; +} +/*3era pregunta*/ +.points{ +position: absolute; +left:25%; +width: 50px; +height: 50px; +background-color: red; +} + +.pointsListEstudents{ +position: absolute; +left:45%; +width: 100px; +height: 50px; +background-color: red; +} +.pointsEstudentsPrc { + position: absolute; + left: 65%; + width: 100px; + height: 50px; + background-color: red; } \ No newline at end of file diff --git a/index.html b/index.html index 5046617f..6a987148 100644 --- a/index.html +++ b/index.html @@ -8,10 +8,25 @@ -
    +
    + +

    Points

    + +
    @@ -19,7 +34,6 @@
    -
    diff --git a/js/app.js b/js/app.js index 47923cfd..57ceffe1 100644 --- a/js/app.js +++ b/js/app.js @@ -1,4 +1,10 @@ -window.addEventListener('load', function () { +//window.addEventListener('load', function() { + +var selectPoints = document.getElementById('studentsPoints'); +selectPoints.addEventListener('click', showPoints); + + +//almacenando porcentaje de los estudiantes var cont = document.getElementById('container'); var contStudents = document.getElementById('students'); var count = 0; @@ -61,9 +67,9 @@ window.addEventListener('load', function () { for (var i = 0; i < active10.length; i++) { if (active10[i].active === false) { count++; - } + } }; - var aqp2016 = data.AQP["2016-2"].students.length; + var aqp2016 = data.AQP["2016-2"].students.length; var aqp2017 = data.AQP["2017-1"].students.length; var cdmx20171 = data.CDMX["2017-1"].students.length; var cdmx20172 = data.CDMX["2017-2"].students.length; @@ -86,30 +92,190 @@ window.addEventListener('load', function () { //3er filtro - // var actual = data.AQP["2016-2"]["students"]; - - for (var i = 0; i < active1.length; i++) { - for (var j = 0; j < active1[i]['sprints'].length; j++) { - var sprintNote = active1[i]['sprints'][j]['score']['tech'] + active1[i]['sprints'][j]['score']['hse']; - //console.log(notas); - countSprints=0; +// var actual = data.AQP["2016-2"]["students"]; + + +function showPoints() { + var countSprints = 0; + if (selectPoints.value === 'arequipa162') { + for (var i = 0; i < active1.length; i++) { + for (var j = 0; j < active1[i]['sprints'].length; j++) { + // var sprintNote = active1[i]['sprints'][j]['score']['tech'] + active1[i]['sprints'][j]['score']['hse']; + if (active1[i]['sprints'][j]['score']['tech'] >= 1260 && active1[i]['sprints'][j]['score']['hse'] >= 840) { + countSprints++; + var contPoints = document.createElement('textarea'); + contPoints.classList = 'points'; + contPoints.textContent = countSprints; + contStudents.appendChild(contPoints); + + contPoints.addEventListener('click', function(){ + if(contPoints.value){ + for (var i = 0; i < active1.length; i++) { + for (var j = 0; j < active1[i]['sprints'].length; j++) { + if (active1[i]['sprints'][j]['score']['tech'] >= 1260 && active1[i]['sprints'][j]['score']['hse'] >= 840) { + countSprints++; + var listStudentsPoints = document.createElement('textarea'); + listStudentsPoints.classList = 'pointsListEstudents'; + listStudentsPoints.textContent = (countSprints/100); + contStudents.appendChild(listStudentsPoints); + }; + }; + }; + + }; + }); + + } + } + } + countSprints = ''; + } + if (selectPoints.value === 'arequipa171') { + for (var i = 0; i < active2.length; i++) { + for (var j = 0; j < active2[i]['sprints'].length; j++) { + var sprintNote = active2[i]['sprints'][j]['score']['tech'] + active2[i]['sprints'][j]['score']['hse']; + if (sprintNote >= 2330) { + countSprints++; + var contPoints = document.createElement('textarea'); + contPoints.classList = 'points'; + contPoints.textContent = countSprints; + contStudents.appendChild(contPoints); + } + } + } + countSprints = ''; + } +if (selectPoints.value === 'mexico171') { + for (var i = 0; i < active3.length; i++) { + for (var j = 0; j < active3[i]['sprints'].length; j++) { + var sprintNote = active3[i]['sprints'][j]['score']['tech'] + active3[i]['sprints'][j]['score']['hse']; if (sprintNote >= 2330) { countSprints++; - var notesprom = sprintNote; - var name = active1[i]['name']; - var sprint = active1[i]['sprints'][j]['number']; - console.log(notesprom + name + sprint); - //creando variables - - var contFilter3 = document.createElement('div'); - contFilter3.classList = 'sprint'; - var sectionFilter3 = document.createElement('section'); - var optionFilter3 = document.createElement('textarea'); - optionFilter3.textContent= name + sprint; - contFilter3.appendChild(optionFilter3); - cont.appendChild(contFilter3); - - } - } - }; -}); + var contPoints = document.createElement('textarea'); + contPoints.classList = 'points'; + contPoints.textContent = countSprints; + contStudents.appendChild(contPoints); + } + } + } + countSprints = ''; +} + if (selectPoints.value === 'mexico172') { + for (var i = 0; i < active4.length; i++) { + for (var j = 0; j < active4[i]['sprints'].length; j++) { + var sprintNote = active4[i]['sprints'][j]['score']['tech'] + active4[i]['sprints'][j]['score']['hse']; + if (sprintNote >= 2330) { + countSprints++; + var contPoints = document.createElement('textarea'); + contPoints.classList = 'points'; + contPoints.textContent = countSprints; + contStudents.appendChild(contPoints); + } + } + } + countSprints = ''; + } + if (selectPoints.value === 'lima162') { + for (var i = 0; i < active5.length; i++) { + for (var j = 0; j < active5[i]['sprints'].length; j++) { + var sprintNote = active5[i]['sprints'][j]['score']['tech'] + active5[i]['sprints'][j]['score']['hse']; + if (sprintNote >= 2330) { + countSprints++; + var contPoints = document.createElement('textarea'); + contPoints.classList = 'points'; + contPoints.textContent = countSprints; + contStudents.appendChild(contPoints); + } + } + } + countSprints = ''; + } + if (selectPoints.value === 'lima171') { + for (var i = 0; i < active6.length; i++) { + for (var j = 0; j < active6[i]['sprints'].length; j++) { + var sprintNote = active6[i]['sprints'][j]['score']['tech'] + active6[i]['sprints'][j]['score']['hse']; + if (sprintNote >= 2330) { + countSprints++; + var contPoints = document.createElement('textarea'); + contPoints.classList = 'points'; + contPoints.textContent = countSprints; + contStudents.appendChild(contPoints); + } + } + } + countSprints = ''; + } + if (selectPoints.value === 'lima172') { + for (var i = 0; i < active7.length; i++) { + for (var j = 0; j < active7[i]['sprints'].length; j++) { + var sprintNote = active7[i]['sprints'][j]['score']['tech'] + active7[i]['sprints'][j]['score']['hse']; + if (sprintNote >= 2330) { + countSprints++; + var contPoints = document.createElement('textarea'); + contPoints.classList = 'points'; + contPoints.textContent = countSprints; + contStudents.appendChild(contPoints); + } + } + } + countSprints = ''; + } + if (selectPoints.value === 'chile171') { + for (var i = 0; i < active8.length; i++) { + for (var j = 0; j < active8[i]['sprints'].length; j++) { + var sprintNote = active8[i]['sprints'][j]['score']['tech'] + active8[i]['sprints'][j]['score']['hse']; + if (sprintNote >= 2330) { + countSprints++; + var contPoints = document.createElement('textarea'); + contPoints.classList = 'points'; + contPoints.textContent = countSprints; + contStudents.appendChild(contPoints); + } + } + } + countSprints = ''; + } + if (selectPoints.value === 'chile172') { + for (var i = 0; i < active9.length; i++) { + for (var j = 0; j < active9[i]['sprints'].length; j++) { + var sprintNote = active9[i]['sprints'][j]['score']['tech'] + active9[i]['sprints'][j]['score']['hse']; + if (sprintNote >= 2330) { + countSprints++; + var contPoints = document.createElement('textarea'); + contPoints.classList = 'points'; + contPoints.textContent = countSprints; + contStudents.appendChild(contPoints); + } + } + } + countSprints = ''; + } + + + + + + + + + + + + + + + + + + + + + +}; +//}); + + + + + + From 04466aff65421662da6796d87c7610dea9c9a000 Mon Sep 17 00:00:00 2001 From: melissayauri Date: Thu, 30 Nov 2017 14:49:27 -0500 Subject: [PATCH 13/22] mejorando la guia de estilo --- css/main.css | 2 +- index.html | 12 +++++++++++- js/app.js | 47 ++++++++++++++++++++++++----------------------- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/css/main.css b/css/main.css index f92ba6bb..d57ab590 100644 --- a/css/main.css +++ b/css/main.css @@ -6,7 +6,7 @@ height: 100px; width: 90%; } - img{ + header img{ width: 20%; margin: auto; display: block; diff --git a/index.html b/index.html index aa0d422a..8d694c3a 100644 --- a/index.html +++ b/index.html @@ -50,6 +50,7 @@

    Enrollement

    # de studiantes inscritos

    +
    @@ -59,9 +60,18 @@

    NPS

    % NPS

    -
    +
    +

    % Individual

    + +
    +
    +

    Student Satisfaction

    +
    +

    # de studiantes inscritos

    +
    +
    diff --git a/js/app.js b/js/app.js index 4f0728a7..1bf38823 100644 --- a/js/app.js +++ b/js/app.js @@ -4,7 +4,7 @@ window.addEventListener('load', function() { var containerStudents = document.getElementById('total-students'); var totalNps = document.getElementById('total-nps'); selection.addEventListener('change', showGenerations); - function showGenerations() { + function showGenerations(event) { /* seleccionando cada option de lista despegable*/ var options = selection.value; /* se convierte a un array para obtener la data de sede y generaciones*/ @@ -21,40 +21,41 @@ window.addEventListener('load', function() { /* obteniendo datos por sede-generacion*/ var siteGeneration = data[site][generation]; console.log(siteGeneration); - /* creando un texto*/ + /* analizando el total de estudiantes*/ var totalStudents = siteGeneration.students.length; containerStudents.innerHTML = '# de studiantes inscritos' + '
    ' + totalStudents; /* analizando el NPS*/ var result = 0; + /* recorriendo el elemento ratings para obtner el nps*/ for (i = 0; i < siteGeneration.ratings.length;i++) { var promoters = siteGeneration.ratings[i].nps.promoters; var passive = siteGeneration.ratings[i].nps.passive; var detractors = siteGeneration.ratings[i].nps.detractors; result = result + (promoters - detractors); /* console.log(result)*/ - var percentage = parseInt(((result / siteGeneration.ratings.length) * 100) / 100) + '%'; + var percentage = ((result / siteGeneration.ratings.length) * 100) / 100 ; + /* considerando solo dos decimales */ + percentage.toFixed(2) + ' % '; /* console.log(percentage);*/ } - /*incorporando el porcentaje del nps*/ - totalNps.textContent = percentage; + /* incorporando el porcentaje del nps*/ + totalNps.innerHTML = '% NPS' + '
    ' + percentage ; + /*analizando el */ } - -/*menu derecho*/ -var bars = document.getElementById('bars'); -bars.addEventListener('click', showMenu); -function showMenu() { -var options = document.getElementById('options-menu'); -if(options.classList.contains('disabled-menu')){ - options.classList.remove('disabled-menu'); - options.classList.add('enabled-menu'); -} -else{ - options.classList.remove('enabled-menu'); - options.classList.add('disabled-menu'); -} -} -bars.addEventListener('click', showMenu); -// Puedes hacer uso de la base de datos a través de la variable `data` -console.log(data); + /* menu derecho*/ + var bars = document.getElementById('bars'); + bars.addEventListener('click', showMenu); + function showMenu(event) { + var options = document.getElementById('options-menu'); + if (options.classList.contains('disabled-menu')) { + options.classList.remove('disabled-menu'); + options.classList.add('enabled-menu'); + } else { + options.classList.remove('enabled-menu'); + options.classList.add('disabled-menu'); + } + } + bars.addEventListener('click', showMenu); + console.log(data); }); From 90990cd3935830b3780c2e5adba175fc30fed791 Mon Sep 17 00:00:00 2001 From: melissayauri Date: Thu, 30 Nov 2017 16:56:42 -0500 Subject: [PATCH 14/22] incorporando item satifaccion de estudiantes --- css/main.css | 5 +++-- index.html | 6 +++--- js/app.js | 40 +++++++++++++++++++++++++++++----------- 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/css/main.css b/css/main.css index d57ab590..621bbd7f 100644 --- a/css/main.css +++ b/css/main.css @@ -71,14 +71,15 @@ margin-left: 80px; margin-top: 30px; } -#total-students{ +.total-students{ height: 70px; width: 120px; background-color: #e2e4e6; + float: left; } /*estilo a las cajas de la seccion nps*/ -.total-nps, .seccion-nps { +.total-nps, .seccion-nps, .satisfaction-nps { height: 70px; width: 120px; background-color: #e2e4e6; diff --git a/index.html b/index.html index 8d694c3a..ce93d471 100644 --- a/index.html +++ b/index.html @@ -47,7 +47,7 @@

    Enrollement

    -
    +

    # de studiantes inscritos

    @@ -68,8 +68,8 @@

    NPS

    Student Satisfaction

    -
    -

    # de studiantes inscritos

    +
    +

    % de estudiantes satisfechos

    diff --git a/js/app.js b/js/app.js index 1bf38823..a056ca54 100644 --- a/js/app.js +++ b/js/app.js @@ -3,13 +3,14 @@ window.addEventListener('load', function() { var selection = document.getElementById('selection'); var containerStudents = document.getElementById('total-students'); var totalNps = document.getElementById('total-nps'); + var satisfaction = document.getElementById('satisfaction'); selection.addEventListener('change', showGenerations); function showGenerations(event) { /* seleccionando cada option de lista despegable*/ var options = selection.value; /* se convierte a un array para obtener la data de sede y generaciones*/ var array = options.split('-');/* [lima,2017,2]*/ - console.log(array); + /* console.log(array);*/ /* obteniendo la generacion*/ var array1 = array.splice(1, 2); console.log(array1); @@ -17,30 +18,47 @@ window.addEventListener('load', function() { var generation = array1[0] + '-' + array1[1]; /* obteniendo la sede*/ var site = array.splice(0, 1); - console.log(site); + /* console.log(site);*/ /* obteniendo datos por sede-generacion*/ var siteGeneration = data[site][generation]; - console.log(siteGeneration); + /* console.log(siteGeneration);*/ /* analizando el total de estudiantes*/ var totalStudents = siteGeneration.students.length; containerStudents.innerHTML = '# de studiantes inscritos' + '
    ' + totalStudents; /* analizando el NPS*/ - var result = 0; + var nps = 0; /* recorriendo el elemento ratings para obtner el nps*/ for (i = 0; i < siteGeneration.ratings.length;i++) { var promoters = siteGeneration.ratings[i].nps.promoters; + var percentagePromotrs = (promoters / siteGeneration.ratings.length) * 100 / 100; var passive = siteGeneration.ratings[i].nps.passive; + var percentagePassive = (passive / siteGeneration.ratings.length) * 100 / 100; var detractors = siteGeneration.ratings[i].nps.detractors; - result = result + (promoters - detractors); + var percentageDetractors = (detractors / siteGeneration.ratings.length) * 100 / 100; + nps = nps + (promoters - detractors); /* console.log(result)*/ - var percentage = ((result / siteGeneration.ratings.length) * 100) / 100 ; - /* considerando solo dos decimales */ - percentage.toFixed(2) + ' % '; - /* console.log(percentage);*/ + /* resultado del porcentaje del nps*/ + var percentageNps = Math.round(((nps / siteGeneration.ratings.length) * 100) / 100) + ' \n' + '%'; } /* incorporando el porcentaje del nps*/ - totalNps.innerHTML = '% NPS' + '
    ' + percentage ; - /*analizando el */ + totalNps.innerHTML = '% NPS' + '
    ' + percentageNps ; + /* analizando el nivel de satifaccion de la estudiantes*/ + /* resultado de satisgacción*/ + var satisfactionResult = 0; + /* recorriendo el elemento ratings*/ + for (var j = 0; j < siteGeneration.ratings.length; j++) { + /* analizando el elemento ratings-student-cumple*/ + var satisfactionCumple = siteGeneration.ratings[j]['student']['cumple']; + /* console.log(satisfactionCumple);*/ + /* analizando el elemento ratings-student-supera*/ + var satisfactionSupera = siteGeneration.ratings[j]['student']['supera']; + satisfactionResult = satisfactionResult + (satisfactionCumple + satisfactionSupera); + } + /* porcentaje de satisfaciión*/ + var percentageSatisfaction = Math.round(satisfactionResult / siteGeneration.ratings.length) * 100 / 100 + '%'; + /* percentageSatisfaction.toFixed(1);*/ + /* console.log(percentageSatisfaction);*/ + satisfaction.innerHTML = ' % de estudiantes satisfechos' + '
    ' + percentageSatisfaction; } /* menu derecho*/ From 0260b2ea11883fa6763e6e700cdeda9d22395fad Mon Sep 17 00:00:00 2001 From: melissayauri Date: Thu, 30 Nov 2017 17:17:18 -0500 Subject: [PATCH 15/22] incoporando README --- README.md | 49 +++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index e9b59c4c..1faf7bf9 100644 --- a/README.md +++ b/README.md @@ -5,21 +5,34 @@ * **Unidad:** _Producto final_ *** - -## Flujo de trabajo - -1. Debes realizar un [**fork**](https://gist.github.com/ivandevp/1de47ae69a5e139a6622d78c882e1f74) - de este repositorio. - -2. Luego deberás **clonar** tu fork en tu máquina. Recuerda que el comando a usar - es `git clone` y su estructura normalmente se ve así: - - ```bash - git clone https://github.com//freelancer.git - ``` - -3. Cuando hayas terminado tu producto, envía un Pull Request a este repositorio - (puedes solicitar apoyo de tus profes para este paso). - -> Nota: No olvides que es una buena práctica describir tu proyecto en este -> archivo `README.md` y también desplegar tu web a Github Pages :smiley:. +## Autoras: Mariela Cerna- Melissa Yauri +## Objetivo + +Realizar una herramienta web denominada **Dashboard** que permita que los Training Managers revisen el desempeño de los estudiantes,de modo que ellos visualizen los datos de manera fácil y rápidamente.Los items que se debe de tomar en cuenta son: +* El total de estudiantes presentes por sede y generación. +* El porcentaje de deserción de estudiantes. +* La cantidad de estudiantes que superan la meta de puntos en promedio de todos los sprints cursados. La meta de puntos es 70% del total de puntos en HSE y en tech. +* El porcentaje que representa el dato anterior en relación al total de estudiantes. +* El Net Promoter Score (NPS) promedio de los sprints cursados. El NPS se calcula en base a la encuesta que las estudiantes responden al respecto de la recomendación que darían de Laboratoria, bajo la siguiente fórmula: + * [Promoters] = [Respuestas 9 o 10] / [Total respuestas] * 100 + * [Passive] = [Respuestas 7 u 8] / [Total respuestas] * 100 + * [Detractors] = [Respuestas entre 1 y 6] / [Total respuestas] * 100 + * [NPS] = [Promoters] - [Detractors] + +* La cantidad y el porcentaje que representa el total de estudiantes que superan la meta de puntos técnicos en promedio y por sprint. +* La cantidad y el porcentaje que representa el total de estudiantes que superan la meta de puntos de HSE en promedio y por sprint. +* El porcentaje de estudiantes satisfechas con la experiencia de Laboratoria. +* La puntuación promedio de las profesores. +* La puntuación promedio de las jedi masters. + +La heramienta debe de ser de la siguiente forma: +[Dashboard](https://marvelapp.com/104ejifg/screen/33742285) + +# Adicional +* Tener un botón que permita indicar que una estudiante ha salido del Bootcamp y alterar los totales afectados por este cambio. +* Utilizar Google Charts para desarrollar estos gráficos, pero no es la única que se puede usar + +## Herramientas Utilizadas +* Css +* HTML +* Javascript From 23e32482e0591eaed6e6e0c15dce3554672a9009 Mon Sep 17 00:00:00 2001 From: melissayauri Date: Thu, 30 Nov 2017 17:24:12 -0500 Subject: [PATCH 16/22] incoporando el archivo README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1faf7bf9..6c028827 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Realizar una herramienta web denominada **Dashboard** que permita que los Traini * La puntuación promedio de las profesores. * La puntuación promedio de las jedi masters. -La heramienta debe de ser de la siguiente forma: +La heramienta debe de ser de la siguiente forma presente: [Dashboard](https://marvelapp.com/104ejifg/screen/33742285) # Adicional From 174622a4613f7602b2999e1805147ed95d3212b3 Mon Sep 17 00:00:00 2001 From: melissayauri Date: Thu, 30 Nov 2017 17:26:56 -0500 Subject: [PATCH 17/22] incoporando el archivo README actualizado --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 6c028827..30f7f194 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,5 @@ # Data Dashboard -* **Track:** _Common Core_ -* **Curso:** _Creando tu primer sitio web interactivo_ -* **Unidad:** _Producto final_ - *** ## Autoras: Mariela Cerna- Melissa Yauri ## Objetivo From 0e303ed14b2b8b9cb6c6d6a6ff8335d1d0148f0a Mon Sep 17 00:00:00 2001 From: melissayauri Date: Thu, 30 Nov 2017 17:42:54 -0500 Subject: [PATCH 18/22] incoporando comentarios --- css/main.css | 10 +++++----- index.html | 21 ++++++++++----------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/css/main.css b/css/main.css index 621bbd7f..b19a986f 100644 --- a/css/main.css +++ b/css/main.css @@ -37,6 +37,7 @@ display: block; height: 80px; background-color: #e2e4e6; } +/*selectores sede-generacion*/ .selections{ border: none; background-color: #e2e4e6; @@ -62,7 +63,9 @@ background-color: #e2e4e6; margin-left: 80px; } .container .box{ - outline:1px solid red; + /*outline:1px solid red;*/ + border: 1px solid black; + border-radius: 7px; height: 300px; width: 300px; background-color: #ffffff; @@ -70,7 +73,7 @@ margin-left: 80px; margin-left: 30px; margin-top: 30px; } - +/*estilo a la caja total de estudiantes*/ .total-students{ height: 70px; width: 120px; @@ -86,6 +89,3 @@ margin-left: 80px; float: left; margin-left: 20px; } -/* - * Estilos de tu proyecto - */ diff --git a/index.html b/index.html index ce93d471..f6ea5437 100644 --- a/index.html +++ b/index.html @@ -20,6 +20,7 @@
    +