Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Data Dashboard - liz casani- maythe infante - brendamesias #66

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open

Data Dashboard - liz casani- maythe infante - brendamesias #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
8386106
obteniendo total de estudiantes por sede y genreacion
brendamesias Nov 27, 2017
ccef9da
estructura báscia html y creción d eliestas deplegables de sedes y ge…
brendamesias Nov 28, 2017
8a9ecf0
comprobacion
Lizncq Nov 28, 2017
d8f5413
Creando variables de las sedes y generaciones en JS
brendamesias Nov 28, 2017
81579df
verificando
brendamesias Nov 28, 2017
83458ea
agregando nuevas variables
brendamesias Nov 28, 2017
533dc2b
creando funcion showListSedes
brendamesias Nov 28, 2017
ba7f5e6
agregando variables estudiantes INACTIVAS(Desertoras)
mythinf Nov 28, 2017
5fc5ef9
agregando variables
brendamesias Nov 28, 2017
c44d67a
calculando el nps
Lizncq Nov 28, 2017
b88fa3d
agregando gráfico total de inactivas
mythinf Nov 28, 2017
0db26e3
creando funcion addVarSede
brendamesias Nov 28, 2017
7f80953
creando funcion addvarcodeSede con for
brendamesias Nov 29, 2017
b950fc3
deleted comments
brendamesias Nov 29, 2017
65d9046
add spaces
Lizncq Nov 29, 2017
0bc6a6d
union de ramas
Lizncq Nov 29, 2017
48b5aa0
creando funciones que me permitan hallar la cantidad de estudiantes d…
brendamesias Nov 29, 2017
dfeb8ca
puntajes de alumnas de todo los Sprints
mythinf Nov 29, 2017
ffa710d
actualizacion funcionalidad
Lizncq Nov 29, 2017
6ce86a3
cambiando estructura html y js
brendamesias Nov 29, 2017
66b6c59
obteniendo total de estudiantes por cualquier sede y cualquier genera…
brendamesias Nov 30, 2017
6bf2da6
creando funcion que guarde la variable generacion al dar click en una…
brendamesias Nov 30, 2017
e46949e
comentando los console.log
brendamesias Nov 30, 2017
21c55c2
maquetado1
mythinf Nov 30, 2017
6983032
agregando div(js/"click") para cuadro estadísticos
mythinf Nov 30, 2017
e9f6110
agregando div(js/"click") para cuadro estadísticos ACTUALIZADO
mythinf Nov 30, 2017
72e9776
agregango header en css
brendamesias Nov 30, 2017
315a220
css
brendamesias Nov 30, 2017
01c1ab2
corrigendo funcionalidad
brendamesias Nov 30, 2017
74d77f6
agregando estilos a los botones
brendamesias Nov 30, 2017
5731689
trayendo cambios en css rama maythe
brendamesias Nov 30, 2017
1e83576
guardando cambios
brendamesias Nov 30, 2017
711af71
uniendo ramas y agregando solucion
Lizncq Nov 30, 2017
57a0e20
actualización de la funcioalidad en js
brendamesias Nov 30, 2017
9d37b80
agregando estilos
brendamesias Nov 30, 2017
0370308
merging with the branch lizcasani
brendamesias Nov 30, 2017
2f28716
subiendo trabajo final
brendamesias Nov 30, 2017
a2307ae
haciendo section students
brendamesias Dec 3, 2017
4883da7
haciendo for que recorra el nombre de las alumnas
brendamesias Dec 3, 2017
b508a5a
corrigendo funciones
brendamesias Dec 3, 2017
0dc1c30
creando funcion para estudiantes activas
brendamesias Dec 3, 2017
f2c72da
agregando carpetas
brendamesias Dec 3, 2017
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
122 changes: 119 additions & 3 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,119 @@
/*
* Estilos de tu proyecto
*/
*{
font-family: 'Armata', sans-serif;
}
header{
width: 100%;
text-align: center;
height: 15%;
}
header img {
width: 20%;
height: 100%;
}
h3{
font-family: 'Source Code Pro', monospace;
font-size: 25px;
display: inline-block;
padding-left: 5%;
}
h3 a{
font-family: 'Source Code Pro';
text-decoration: none;
color: black;
}
h3 a:hover{
color: #FFA500;
font-weight: bolder;
}
.optionsheader h3:hover{
color: #FFA500;
font-weight: bolder;
}
a{
text-decoration: none;
text-align: center;
display: block;
border-radius: 5px;
margin-bottom: 2px;
}
#sede_generation{
cursor: pointer;
margin-left: 5%;
display: block;
background-color: #FFA500;
padding: 10px 10px;
color: #fff;
border-radius: 5px;
border: 0;
font-weight: 600;
margin-bottom: 7px;
}
.sede{
padding: 5px;
width: 90px;
font-size: 18px;
background-color: #727171;
color: #000000;
margin-top: 10px;
margin-bottom: 10px;
}
.sede:hover{
background-color: #FFA500;
}
a .sede{
background-color:#FFA500 ;
}
.hiden {
display: none;
}
.show {
display: block;
}
.generation{
width: 100px;
background-color: #D0D0D0;
font-size: 16px;
}
.container_students{
outline: 1px solid green;
margin: 1%;
display: block;
}
.perfil img{
padding: 1.5%;
outline: 1px solid yellow;
display: inline;
}
.perfil .basic_data_perfil{
position: relative;
padding: 1%;
padding-left: 2%;
outline: 1px solid blue;
display: inline-block;
}
.basic_data_perfil div{
width: 15%;
outline: 1px solid orange;
display: block;
}
.basic_data_perfil div span{
outline: 1px solid red;
display: inline-block;
}
.basic_data_perfil div h2{
font-size: 15px;
outline: 1px solid purple;
display: inline-block;
}
#skills{
text-align: center;
padding: 1%;
outline: 1px solid black;
display: inline-block;
}
.container_students table{
margin-left: 1%;
padding: 2%;
outline: 1px solid blue;
display: inline-block;
}
30 changes: 30 additions & 0 deletions estadistics.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<html>
<head>
<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
<script type="text/javascript">
google.charts.load("current", {packages:["corechart"]});
google.charts.setOnLoadCallback(drawChart);
function drawChart() {
var data = google.visualization.arrayToDataTable([
['Task', 'Hours per Day'],
['Work', activeAqp],
['Eat', inactiveAqp],
]);

var options = {
title: 'My Daily Activities',
is3D: true,
};

var chart = new google.visualization.PieChart(document.getElementById('piechart_3d'));
chart.draw(data, options);
}
</script>
</head>
<body>
<div id="piechart_3d" style="width: 900px; height: 500px;"></div>
<script src="./js/data.js"></script>
<!-- Aquí va tus archivos JS -->
<script src="./js/app.js"></script>
</body>
</html>
35 changes: 35 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,43 @@
<head>
<meta charset="utf-8">
<title>Data Dashboard</title>
<link href="https://fonts.googleapis.com/css?family=Armata|Source+Code+Pro" rel="stylesheet">
<link rel="stylesheet" href="css/main.css">
</head>
<body>
<header>
<img src="assets/images/logo-laboratoria.svg" alt="logo">
</header>

<div class="optionsheader">
<h3><a href="index.html" target="_blank">OVERVIEW</a></h3>
<h3><a href="students.html" target="_blank">STUDENTS</a></h3>
</div>
<button id="sede_generation">NUESTRAS SEDES</button>
<div id="listSedes" class="hiden">
<a href="#" class="sede" data-sede ="AQP">Arequipa</a>
<div class="listGenerations" class="hiden">
<a href="#" class="generation" data-generation ="2016-2">2016-2</a>
<a href="#" class="generation" data-generation ="2017-1">2017-1</a>
</div>
<a href="#" class="sede" data-sede ="CDMX">Mexico</a>
<div class="listGenerations" class="hiden">
<a href="#" class="generation" data-generation ="2017-1">2017-1</a>
<a href="#" class="generation" data-generation ="2017-2">2017-2</a>
</div>
<a href="#" class="sede" data-sede ="LIM">Lima</a>
<div class="listGenerations" class="hiden">
<a href="#" class="generation" data-generation ="2016-2">2016-2</a>
<a href="#" class="generation" data-generation ="2017-1">2017-1</a>
<a href="#" class="generation" data-generation ="2017-2">2017-2</a>
</div>
<a href="#" class="sede" data-sede ="SCL">Chile</a>
<div class="listGenerations" class="hiden">
<a href="#" class="generation" data-generation ="2016-2">2016-2</a>
<a href="#" class="generation" data-generation ="2017-1">2017-1</a>
<a href="#" class="generation" data-generation ="2017-2">2017-2</a>
</div>
</div>

<!-- Base de datos -->
<script src="./js/data.js"></script>
Expand Down
Loading