From 2679bdde9a3f39302e4b396f231efa7faf9a482d Mon Sep 17 00:00:00 2001 From: YaninaMR Date: Thu, 30 Nov 2017 18:14:38 -0500 Subject: [PATCH 1/6] adding project --- README.md | 26 +--- css/main.css | 145 +++++++++++++++++- index.html | 149 +++++++++++++++++- js/app.js | 419 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 715 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index e9b59c4c..eb7344e1 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,11 @@ -# Data Dashboard - -* **Track:** _Common Core_ -* **Curso:** _Creando tu primer sitio web interactivo_ -* **Unidad:** _Producto final_ +# Data Dashboard *** -## 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 - ``` +## integrantes: +Laura Velarde +Yanina Mercado -3. Cuando hayas terminado tu producto, envía un Pull Request a este repositorio - (puedes solicitar apoyo de tus profes para este paso). +En este repositorio trabajamos los [commits master] (https://github.com/YaninaMR/dashboard-team) + [gh-pages] (https://yaninamr.github.io/dashboard-team/) -> 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:. diff --git a/css/main.css b/css/main.css index 6355c827..417a51d0 100644 --- a/css/main.css +++ b/css/main.css @@ -1,3 +1,142 @@ -/* - * Estilos de tu proyecto - */ +/* Estilos de tu proyecto */ +body{ + box-sizing: border-box; + padding: 0; + margin: 0; + font-family: 'Montserrat', sans-serif; +} +/* styles for header */ +header{ + display: inline-block; + width: 100%; + text-align: center; + position: relative; +} + +main { + width: 80%; + position: relative; + left: 10%; + background: #E1E5DE; + padding: 10px; +} +.principal { + width: 28%; + display: inline-block; + background: #fff; + padding: 10px; + margin: 10px; +} + + +figure { + display: inline-block; + width: 190px; + height: 40px; +} + +.icon{ + position: absolute; + top: 20px; + right:50px; + font-size: 40px; + color: #F1C40F; + +} + +/* styles for nav */ +nav{ + width: 80%; + text-align: center; + background: lightgray; + position: relative; + left: 10%; + padding: 10px; +} + +nav select{ + font-family: 'Montserrat', sans-serif; + font-weight: 700; + outline: none; + width: 108px; + margin: 10px; + padding: 10px; + border: 0; + border-radius: 15px; +} +nav select option{ + outline: none; + width: 100px; + padding: 10px; + margin: 10px; + border: 0; + border-radius: 15px; +} + +nav ul{ + list-style: none; +} + +nav ul li{ + display: inline-block; + padding: 7px 7px 0 7px; + margin: 10px 10px 0 10px; +} + +nav ul li:hover{ + border-bottom: 7px solid #F1C40F; +} + +nav ul li a{ + text-decoration: none; + font-weight: 700; + color: #000; +} +.tech-skills select , .life-skills select{ + font-family: 'Montserrat', sans-serif; + font-weight: 700; + outline: none; + width: 108px; + margin: 10px; + padding: 10px; + border: 0; + border-radius: 15px; +} + + +h3#current-student::after { + content: ''; + display: block; + border-bottom: 4px solid #ffc107; + height: 4px; + width: 100px; +} + +.student-dropout { + background-color: #ffc107; + color:red; + font-size: 18px; + padding: 5px; + border-radius: 10px; +} +.total-student-active{ + color: blue; + font-size: 20px; + font-weight: 100px; + +} +.student-data{ +cursor: pointer; +} + +.square{ + width: 200px; + height: 30px; + display: block; + text-align: center; + background: #fff; + color: #20F10F; + padding: 10px; + margin: 10px; +} + diff --git a/index.html b/index.html index 8930fa03..994e5849 100644 --- a/index.html +++ b/index.html @@ -3,12 +3,159 @@ Data Dashboard + + + + + +
+
+ logo +
+
+ +
+
+ +
+ +
+ +
+
+
+
+

ENROLLMENT

+
+

120

+ + +

# STUDENTS CURRENTLY ENROLLED

+
+
+

20%

+

% DROPOUT

+

+
+
+
+
+

105

+

# STUDENTS THAT MEET THE TARGET

+
+
+

78% Δ

+

% OF TOTAL(135)

+
+
+
+

NET PROMOTER SCORE

+
+

78% Δ

+

% CUMULATIVE NPS

+
+
+

60 % Promoters

+

30 % Passive

+

10 % Detractors

+
+
+
+ +
+
+

TECH SKILLS

+ +
+
+

ACHIEVEMENT

+
+

105

+

# STUDENTS THAT MEET THE TARGET

+
+
+

78% Δ

+

% OF TOTAL(135)

+
+ +
+ + +
+
+

LIFE SKILLS

+ +
+
+

ACHIEVEMENT

+
+

105

+

# STUDENTS THAT MEET THE TARGET

+
+
+

78% Δ

+

% OF TOTAL(135)

+
+ +
+ +
+ + + +
+ +
- + diff --git a/js/app.js b/js/app.js index 895ae2dd..62477af6 100644 --- a/js/app.js +++ b/js/app.js @@ -2,5 +2,424 @@ * Funcionalidad de tu producto */ +// ------*por sede lima y sus generaciones*------ +/* console.log(data); +var siteGener = document.getElementById("select-lima"); +// otra manera con clases + +var currentStudent = document.getElementById("current-student"); +var percentDropoutStudent = document.getElementById("percentage-dropout-student"); + +//var arrSiteLim = siteGener.options[0].value; +siteGener.addEventListener('change', showStadistic); +function showStadistic(e){ +for (var r = 0 ; r < siteGener.options.length ; r++ ) { +// ul para mostrar container-student-dropout +var containerStudentDropout = document.getElementById('container-student-dropout'); +if (e.target.value === siteGener.options[r].value){ //sitesGener[0].options[r].value + var arrdatak = Object.keys(data); +// arrdatak - ["AQP", "CDMX", "LIM", "SCL"] +for (var i = 0 ; i < arrdatak.length ; i++) { + if (arrdatak[i] === 'LIM') { //(arrdatak[i] === 'LIM') + var seats = data[arrdatak[i]]; // sedes + // console.log(seats); + var arrdatakg = Object.keys(data[arrdatak[i]]); + // console.log(arrdatakg + " tamaño " + arrdatakg.length); + sumSede = 0; + for (var j = 0 ; j < arrdatakg.length ; j++) { + // console.log(arrdatakg[j]); + if(arrdatakg[j] === siteGener.options[r].value){ + // console.log('Generación:' + arrdatakg[j]); + var arrdatakgs = Object.keys(data[arrdatak[i]][arrdatakg[j]]); + //console.log(arrdatakgs[0]); + var sedegen = data[arrdatak[i]][arrdatakg[j]][arrdatakgs[0]].length; + sumSede = sumSede + sedegen; + // array de las estudiantes: + var arrdatakgsi = data[arrdatak[i]][arrdatakg[j]][arrdatakgs[0]]; + count = 0 ; + for(var k = 0 ; k < arrdatakgsi.length ; k++){ + //console.log(arrdatakgsi[k]); + var arrdatakgsid = Object.keys(arrdatakgsi[k]) + // console.log(arrdatakgsid[2]); + + if (arrdatakgsi[k][arrdatakgsid[2]] === false){ + //console.log(arrdatakgsi[k][arrdatakgsid[2]]); + count= count + 1; + } + + } + + alert('sede :' + arrdatak[i] + '\n' + 'total de estudiantes:' + sumSede + '\n' + 'desertoras: ' + count + '\n' + 'Generación:' + arrdatakg[j] + '\n' + 'Porcentaje de desertoras: ' + (count/sumSede)*100+'%' ); + // creando span de student dropout + + containerStudentDropout.firstElementChild.classList.add('student-dropout'); + containerStudentDropout.firstElementChild.textContent = count; + containerStudentDropout.firstElementChild.nextElementSibling.textContent = "# DROPOUT STUDENTS"; + + currentStudent.textContent = sumSede; + percentDropoutStudent.textContent = ((count/sumSede)*100).toFixed(2)+'%' + // console.log('desertoras: ' + count); + } + + } +// console.log('sede :' + arrdatak[i] + '\n' + 'total de estudiantes:' + sumSede + '\n' + 'desertoras: ' + count + '\n' + 'Generación:' + arrdatakg[j] ); + } +} + +} + + } + +} */ + + +// -----------------------------------------* extracto a usar pra lima 2017 i--------------- +var arrdatak = Object.keys(data); +// arrdatak - ["AQP", "CDMX", "LIM", "SCL"] +for (var i = 0 ; i < arrdatak.length ; i++) { + if (arrdatak[i] === 'LIM') { + var seats = data[arrdatak[i]]; // sedes + // console.log(seats); + var arrdatakg = Object.keys(data[arrdatak[i]]); + // console.log(arrdatakg + " tamaño " + arrdatakg.length); + sumSede = 0; + for (var j = 0 ; j < arrdatakg.length ; j++) { + // console.log(arrdatakg[j]); + if (arrdatakg[j] === '2017-1') { + // console.log('Generación:' + arrdatakg[j]); + var arrdatakgs = Object.keys(data[arrdatak[i]][arrdatakg[j]]); + // console.log(arrdatakgs[0]); + var sedegen = data[arrdatak[i]][arrdatakg[j]][arrdatakgs[0]].length; + sumSede = sumSede + sedegen; + // array de las estudiantes: + var arrdatakgsi = data[arrdatak[i]][arrdatakg[j]][arrdatakgs[0]]; + count = 0 ; + for (var k = 0 ; k < arrdatakgsi.length ; k++) { + // console.log(arrdatakgsi[k]); + var arrdatakgsid = Object.keys(arrdatakgsi[k]); + // console.log(arrdatakgsid[2]); + + if (arrdatakgsi[k][arrdatakgsid[2]] === false) { + // console.log(arrdatakgsi[k][arrdatakgsid[2]]); + count = count + 1; + } + } + console.log('sede :' + arrdatak[i] + '\n' + 'total de estudiantes:' + sumSede + '\n' + 'desertoras: ' + count + '\n' + 'Generación:' + arrdatakg[j] + '\n' + 'Porcentaje de desertoras: ' + (count / sumSede) * 100 + '%'); + + // console.log('desertoras: ' + count); + } + } + // console.log('sede :' + arrdatak[i] + '\n' + 'total de estudiantes:' + sumSede + '\n' + 'desertoras: ' + count + '\n' + 'Generación:' + arrdatakg[j] ); + } +} + + +// -----------------------------* seleccion de total de alumnas y deserción por sede ----------------------------------- +// El total de estudiantes presentes por sede + +var siteCheck = document.getElementsByClassName('sede'); +for (var r = 0; r < siteCheck.length; r++) { + siteCheck[r].addEventListener('click', showSedes); + + /* +siteCheck[0].addEventListener('click', checkAddress); +function checkAddress(e) + { if (e.target.checked == true) + {alert("a"); + } + }*/ + function showSedes(e) { + // alert( e.target.value); + if (e.target.checked === true) { + var arrdatak = Object.keys(data); + // arrdatak - ["AQP", "CDMX", "LIM", "SCL"] + for (var i = 0 ; i < arrdatak.length ; i++) { + if (arrdatak[i] === e.target.value) { + var seats = data[arrdatak[i]]; // sedes + // console.log(seats); - generaciones 2017-1 + var arrdatakg = Object.keys(data[arrdatak[i]]); + // console.log(arrdatakg + " tamaño " + arrdatakg.length); + sumSede = 0; sumCount = 0 ; + for (var j = 0 ; j < arrdatakg.length ; j++) { + var arrdatakgs = Object.keys(data[arrdatak[i]][arrdatakg[j]]); + // console.log(arrdatakgs[0]); + var sedegen = data[arrdatak[i]][arrdatakg[j]][arrdatakgs[0]].length; + sumSede = sumSede + sedegen; + var arrdatakgsi = data[arrdatak[i]][arrdatakg[j]][arrdatakgs[0]]; + + count = 0 ; + for (var k = 0 ; k < arrdatakgsi.length ; k++) { + // console.log(arrdatakgsi[k]); + var arrdatakgsid = Object.keys(arrdatakgsi[k]); + // console.log(arrdatakgsid[2]); + + if (arrdatakgsi[k][arrdatakgsid[2]] === false) { + // console.log(arrdatakgsi[k][arrdatakgsid[2]]); + count = count + 1; + } + } + sumCount = sumCount + count; + // console.log("desertados : " + count); + } + + var containerTotalStudent = document.getElementById('container-total-student'); + containerTotalStudent.children[0].textContent = 'Sede : '; + containerTotalStudent.children[1].textContent = arrdatak[i]; + containerTotalStudent.children[4].textContent = ' | Total Enroll: '; + containerTotalStudent.children[5].textContent = sumSede; + containerTotalStudent.children[6].textContent = ' | Dropout Total: '; + containerTotalStudent.children[7].textContent = sumCount; + // containerTotalStudent.children[2].textContent = 'DROPOUT TOTAL: ' + sumCount; + // console.log('sede :' + arrdatak[i] + 'total de estudiantes:' + + 'desertores : ' + sumCount); + } + } + } + } +} + + +// -------------------------------prueba de los generacion y sedes*------------------------------------------------ // Puedes hacer uso de la base de datos a través de la variable `data` console.log(data); + + +// var siteGener = document.getElementById("select-lima"); +// otra manera con clases +var sitesCheck = document.getElementsByClassName('sede'); + +// elementos donde mostrar +var currentStudent = document.getElementById('current-student'); +var percentDropoutStudent = document.getElementById('percentage-dropout-student'); + + +for (var r = 0; r < sitesCheck.length; r++) { + sitesCheck[r].addEventListener('click', showSedesxgene); + + function showSedesxgene(event) { + if (event.target.checked === true) { + var sitesGener = document.getElementsByClassName('sede-lab'); + for (var c = 0 ; c < sitesGener.length; c++) { + sitesGener[c].addEventListener('change', showStadistic); + + // var arrSiteLim = siteGener.options[0].value; siteGener.addEventListener('change', showStadistic); + // sitesGener[0].addEventListener('change', showStadistic); + function showStadistic(e) { + // alert("estoy en :" + event.target.value); + for (var r = 0 ; r < e.target.options.length ; r++) { + // ul para mostrar container-student-dropout + var containerStudentDropout = document.getElementById('container-student-dropout'); + if (e.target.value === e.target.options[r].value) { // sitesGener[0].options[r].value //siteGener.options[r].value + var arrdatak = Object.keys(data); + // arrdatak - ["AQP", "CDMX", "LIM", "SCL"] + for (var i = 0 ; i < arrdatak.length ; i++) { + if (arrdatak[i] === event.target.value) { // ******(arrdatak[i] === 'LIM') + var seats = data[arrdatak[i]]; // sedes + // console.log(seats); + var arrdatakg = Object.keys(data[arrdatak[i]]); + // console.log(arrdatakg + " tamaño " + arrdatakg.length); + sumSede = 0; + for (var j = 0 ; j < arrdatakg.length ; j++) { + // console.log(arrdatakg[j]); + if (arrdatakg[j] === e.target.options[r].value) { // siteGener.options[r].value + // console.log('Generación:' + arrdatakg[j]); + var arrdatakgs = Object.keys(data[arrdatak[i]][arrdatakg[j]]); + // console.log(arrdatakgs[0]); + var sedegen = data[arrdatak[i]][arrdatakg[j]][arrdatakgs[0]].length; + sumSede = sumSede + sedegen; + // array de las estudiantes: + var arrdatakgsi = data[arrdatak[i]][arrdatakg[j]][arrdatakgs[0]]; + count = 0 ; + for (var k = 0 ; k < arrdatakgsi.length ; k++) { + // console.log(arrdatakgsi[k]); + var arrdatakgsid = Object.keys(arrdatakgsi[k]); + // console.log(arrdatakgsid[2]); + if (arrdatakgsi[k][arrdatakgsid[2]] === false) { + // console.log(arrdatakgsi[k][arrdatakgsid[2]]); + count = count + 1; + } + } + + // alert('sede :' + arrdatak[i] + '\n' + 'total de estudiantes:' + sumSede + '\n' + 'desertoras: ' + count + '\n' + 'Generación:' + arrdatakg[j] + '\n' + 'Porcentaje de desertoras: ' + (count/sumSede)*100+'%' ); + // creando span de student dropout + var containerTotalStudent = document.getElementById('container-total-student'); + containerTotalStudent.children[2].textContent = ' | Generación: ' + '\t'; + containerTotalStudent.children[3].textContent = arrdatakg[j]; + // + containerStudentDropout.firstElementChild.classList.add('student-dropout'); + containerStudentDropout.firstElementChild.textContent = count ; + containerStudentDropout.firstElementChild.nextElementSibling.textContent = '# Dropout Students'; + + currentStudent.textContent = sumSede; + percentDropoutStudent.textContent = ((count / sumSede) * 100).toFixed(2) + '%'; + // console.log('desertoras: ' + count); + } + // alert('sede :' + arrdatak[i] + '\n' + 'total de estudiantes:' + sumSede + '\n' + 'desertoras: ' + count + '\n' + 'Generación:' + arrdatakg[j] + '\n' + 'Porcentaje de desertoras: ' + (count/sumSede)*100+'%' ); + } + // console.log('sede :' + arrdatak[i] + '\n' + 'total de estudiantes:' + sumSede + '\n' + 'desertoras: ' + count + '\n' + 'Generación:' + arrdatakg[j] ); + } + } + } + } + } + } + } + } +} + + +// ----------------------------------*Funcion para mostrar cantidad de tech skill------------------------------------------- + +var techSkillSelect = document.getElementById('select-sprint'); + +techSkillSelect.addEventListener('change', showTechSkills); + +function showTechSkills(e) { + var textSedeSelected = document.getElementById('sedeSelect').textContent; + var textGenerSelected = document.getElementById('generSelect').textContent; + if (textSedeSelected && textGenerSelected) { + for (var r = 0 ; r < e.target.options.length ; r++) { + if (e.target.value === e.target.options[r].value) { + var s = data[textSedeSelected][textGenerSelected]['students']; + var count = 0, activeStudents = 0 ; + for (var i = 0 ; i < s.length; i++) { + if (s[i]['active'] === true) { + activeStudents++; + var st = s[i]; + // validar si el sprint de la sede y generacion existe + // sprint existente + + if (st['sprints'][parseInt(e.target.value)] === undefined) { + count = -1; + } else { + if (parseInt(st['sprints'][parseInt(e.target.value)]['score']['tech']) > 1260) { + count = count + 1 ; + console.log(parseInt(st['sprints'][parseInt(e.target.value)]['score']['tech'])); + } + } + } + } + } + } + // halla cantidad por sprint + if (count == -1) { + alert('este sprint no se realizó, por favor escoga otro'); + } else { + document.getElementById('count-student-target').textContent = count; + document.getElementById('percentage-target-student').textContent = ((count / activeStudents) * 100).toFixed(2) + '%'; + document.getElementById('total-student-active').textContent = '% OF TOTAL(' + activeStudents + ')'; + document.getElementById('total-student-active').classList.add('total-student-active'); + // alert("activos" +activeStudents+ "cantidad" + count + "value del select: " + (parseInt(e.target.value)+1) + "value de la opcion select: "); + } + } else { + alert('Por favor seleccione una Sede y su generación'); + } +} +/* + var sitesGener = document.getElementsByClassName("sede-lab"); // recorre todos los selects + for(var c = 0 ; c < sitesGener.length; c++) { + sitesGener[c].addEventListener('change', showStadistic); + + //var arrSiteLim = siteGener.options[0].value; siteGener.addEventListener('change', showStadistic); + // sitesGener[0].addEventListener('change', showStadistic);// select lima + function showStadistic(e){ + // alert("estoy en :" + event.target.value); + for (var r = 0 ; r < e.target.options.length ; r++ ) { + // ul para mostrar container-student-dropout + var containerStudentDropout = document.getElementById('container-student-dropout'); + if (e.target.value === e.target.options[r].value){ //sitesGener[0].options[r].value //siteGener.options[r].value + var arrdatak = Object.keys(data); + */ +// -----------------------------function para mostrar HSE Skills ----------------------------------------------- + +var hseSkillSelect = document.getElementById('select-sprint-hse'); + +hseSkillSelect.addEventListener('change', showHseSkills); + +function showHseSkills(e) { + var textSedeSelected = document.getElementById('sedeSelect').textContent; + var textGenerSelected = document.getElementById('generSelect').textContent; + if (textSedeSelected && textGenerSelected) { + for (var r = 0 ; r < e.target.options.length ; r++) { + if (e.target.value === e.target.options[r].value) { + var s = data[textSedeSelected][textGenerSelected]['students']; + var count = 0, activeStudents = 0 ; + for (var i = 0 ; i < s.length; i++) { + if (s[i]['active'] === true) { + activeStudents++; + var st = s[i]; + // validar si el sprint de la sede y generacion existe + // sprint existente + + if (st['sprints'][parseInt(e.target.value)] === undefined) { + count = -1; + } else { + if (parseInt(st['sprints'][parseInt(e.target.value)]['score']['hse']) > 840) { + count = count + 1 ; + console.log(parseInt(st['sprints'][parseInt(e.target.value)]['score']['hse'])); + } + } + } + } + } + } + // halla cantidad por sprint + if (count == -1) { + alert('este sprint no se realizó, por favor escoga otro'); + } else { + document.getElementById('student-target-hse').textContent = count; + document.getElementById('percentage-target-hse').textContent = ((count / activeStudents) * 100).toFixed(2) + '%'; + document.getElementById('total-hse-active').textContent = '% OF TOTAL(' + activeStudents + ')'; + document.getElementById('total-hse-active').classList.add('total-student-active'); + // alert("activos" +activeStudents+ "cantidad" + count + "value del select: " + (parseInt(e.target.value)+1) + "value de la opcion select: "); + } + } else { + alert('Por favor seleccione una Sede y su generación'); + } +} +// ---------------------------------------mostrar puntaje estudiantes por sede y generación------------------------------------------------------ +var studentsData = document.getElementById('students'); +studentsData.addEventListener('click', showStudentData); +function showStudentData(e) { + var textSedeSelected = document.getElementById('sedeSelect').textContent; + var textGenerSelected = document.getElementById('generSelect').textContent; + var sa = data[textSedeSelected][textGenerSelected]['students']; + for (var j = 0;j < sa.length;j++) { + if (sa[j]['active'] === true) { + // var ss = data[textSedeSelected][textGenerSelected]["students"][j]["sprints"]; + var ss = sa[j]['sprints']; + var sumSprintTotal = 0, sumSprintTotalH = 0; + for (var i = 0 ; i < ss.length ;i++) { + var scoreTech = ss[i]['score']['tech']; + var scoreHse = ss[i]['score']['hse']; + sumSprintTotal = sumSprintTotal + scoreTech; + sumSprintTotalH = sumSprintTotalH + scoreHse; + } + // console.log((((sumSprintTotal/4)/1800)*100).toFixed(2)); + porcentajeTech = (((sumSprintTotal / ss.length) / 1800) * 100).toFixed(2); + porcentajeHse = (((sumSprintTotalH / ss.length) / 1800) * 100).toFixed(2); + } + var sectionStudents = document.getElementById('studentsData'); + var divStudent = document.createElement('div'); + // Student Name + var name = document.createElement('h2'); + var textName = document.createTextNode(sa[j]['name']); + name.appendChild(textName); + divStudent.appendChild(name); + // porcentajeTech + var sporcentajeTech = document.createElement('h4'); + var textTech = document.createTextNode(' Tech Skills' + porcentajeTech + '% '); + sporcentajeTech.appendChild(textTech); + sporcentajeTech.classList.add('square'); + divStudent.appendChild(sporcentajeTech); + // PorcentajeHSe + var sporcentajeHse = document.createElement('h4'); + var textHse = document.createTextNode('| Life Skills: ' + porcentajeHse + '% | '); + sporcentajeHse.appendChild(textHse); + sporcentajeHse.classList.add('square'); + divStudent.appendChild(sporcentajeHse); + sectionStudents.appendChild(divStudent); + console.log(sa[j]['name'] + 'porcentaje de sprint tech: ' + porcentajeTech + 'Porcentaje de sprint hse: ' + porcentajeHse); + } +} + + From 635594bb678fed526c68c857f21df34bbe2ac2ca Mon Sep 17 00:00:00 2001 From: YaninaMR <32310462+YaninaMR@users.noreply.github.com> Date: Thu, 30 Nov 2017 18:26:48 -0500 Subject: [PATCH 2/6] add if --- js/app.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/js/app.js b/js/app.js index 62477af6..dc23c407 100644 --- a/js/app.js +++ b/js/app.js @@ -383,6 +383,7 @@ function showStudentData(e) { var textSedeSelected = document.getElementById('sedeSelect').textContent; var textGenerSelected = document.getElementById('generSelect').textContent; var sa = data[textSedeSelected][textGenerSelected]['students']; +if (textSedeSelected && textGenerSelected) { // add if for (var j = 0;j < sa.length;j++) { if (sa[j]['active'] === true) { // var ss = data[textSedeSelected][textGenerSelected]["students"][j]["sprints"]; @@ -420,6 +421,13 @@ function showStudentData(e) { sectionStudents.appendChild(divStudent); console.log(sa[j]['name'] + 'porcentaje de sprint tech: ' + porcentajeTech + 'Porcentaje de sprint hse: ' + porcentajeHse); } + +} else { + alert('Por favor seleccione una Sede y su generación'); + } +//} else { + // alert('Por favor seleccione una Sede y su generación'); + // } } From 433d53cc2f2d20df03747b23d6993817ca62c0ab Mon Sep 17 00:00:00 2001 From: YaninaMR <32310462+YaninaMR@users.noreply.github.com> Date: Sat, 2 Dec 2017 18:49:19 -0500 Subject: [PATCH 3/6] add if --- js/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/app.js b/js/app.js index dc23c407..445fa94a 100644 --- a/js/app.js +++ b/js/app.js @@ -382,8 +382,8 @@ studentsData.addEventListener('click', showStudentData); function showStudentData(e) { var textSedeSelected = document.getElementById('sedeSelect').textContent; var textGenerSelected = document.getElementById('generSelect').textContent; - var sa = data[textSedeSelected][textGenerSelected]['students']; -if (textSedeSelected && textGenerSelected) { // add if +if (textSedeSelected && textGenerSelected) { // add if + var sa = data[textSedeSelected][textGenerSelected]['students']; for (var j = 0;j < sa.length;j++) { if (sa[j]['active'] === true) { // var ss = data[textSedeSelected][textGenerSelected]["students"][j]["sprints"]; From 587c7041d3626982fc60dfaf17bd24e425711c5b Mon Sep 17 00:00:00 2001 From: YaninaMR Date: Sun, 3 Dec 2017 15:54:44 -0500 Subject: [PATCH 4/6] add attribute --- index.html | 2 +- js/app.js | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 994e5849..57c3816c 100644 --- a/index.html +++ b/index.html @@ -50,7 +50,7 @@ diff --git a/js/app.js b/js/app.js index 445fa94a..a3e2b4a0 100644 --- a/js/app.js +++ b/js/app.js @@ -383,6 +383,7 @@ function showStudentData(e) { var textSedeSelected = document.getElementById('sedeSelect').textContent; var textGenerSelected = document.getElementById('generSelect').textContent; if (textSedeSelected && textGenerSelected) { // add if + e.target.setAttribute('href','#studentsData'); var sa = data[textSedeSelected][textGenerSelected]['students']; for (var j = 0;j < sa.length;j++) { if (sa[j]['active'] === true) { @@ -425,9 +426,7 @@ if (textSedeSelected && textGenerSelected) { // add if } else { alert('Por favor seleccione una Sede y su generación'); } -//} else { - // alert('Por favor seleccione una Sede y su generación'); - // } + } From 2bc0c694a6cda969a400b92940037f77cf157a1a Mon Sep 17 00:00:00 2001 From: YaninaMR Date: Sun, 3 Dec 2017 16:58:56 -0500 Subject: [PATCH 5/6] add href --- index.html | 2 +- js/app.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 994e5849..57c3816c 100644 --- a/index.html +++ b/index.html @@ -50,7 +50,7 @@ diff --git a/js/app.js b/js/app.js index 445fa94a..ffd57511 100644 --- a/js/app.js +++ b/js/app.js @@ -383,6 +383,7 @@ function showStudentData(e) { var textSedeSelected = document.getElementById('sedeSelect').textContent; var textGenerSelected = document.getElementById('generSelect').textContent; if (textSedeSelected && textGenerSelected) { // add if + e.target.setAttribute('href','#studentsData'); var sa = data[textSedeSelected][textGenerSelected]['students']; for (var j = 0;j < sa.length;j++) { if (sa[j]['active'] === true) { From edc836bf87da7b320e7ac6a7c3cccbbd7a222a55 Mon Sep 17 00:00:00 2001 From: YaninaMR Date: Sun, 3 Dec 2017 17:07:25 -0500 Subject: [PATCH 6/6] add href students --- js/app.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/js/app.js b/js/app.js index 8bb2f740..a3e2b4a0 100644 --- a/js/app.js +++ b/js/app.js @@ -383,11 +383,7 @@ function showStudentData(e) { var textSedeSelected = document.getElementById('sedeSelect').textContent; var textGenerSelected = document.getElementById('generSelect').textContent; if (textSedeSelected && textGenerSelected) { // add if -<<<<<<< HEAD - e.target.setAttribute('href','#studentsData'); -======= e.target.setAttribute('href','#studentsData'); ->>>>>>> 587c7041d3626982fc60dfaf17bd24e425711c5b var sa = data[textSedeSelected][textGenerSelected]['students']; for (var j = 0;j < sa.length;j++) { if (sa[j]['active'] === true) {