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.

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

Carolina #87

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c2ee27a
inclui novos arquivos css
PamelaRozolem Jul 13, 2018
2049ba7
Merge pull request #1 from PamelaRozolem/pam
PamelaRozolem Jul 13, 2018
1dedb9b
Sprint 1.0
carolzinhamgonzalez Jul 13, 2018
e588541
Merge pull request #2 from PamelaRozolem/carolina
carolzinhamgonzalez Jul 13, 2018
d7c4a59
blabla
PamelaRozolem Jul 14, 2018
e271441
merge da master
PamelaRozolem Jul 14, 2018
e396994
marger do master
PamelaRozolem Jul 14, 2018
6665b4f
refatorei o grafico qtd alunas por sede e geração
PamelaRozolem Jul 14, 2018
f9aec1a
fiz grafico de desistentes card1
PamelaRozolem Jul 15, 2018
8fb04e7
card2 incompleto
carolzinhamgonzalez Jul 15, 2018
fa9a2c0
card2 pegando dados
carolzinhamgonzalez Jul 15, 2018
f4a68bc
card2
carolzinhamgonzalez Jul 15, 2018
17536d6
adicionado a quantidade de alunas que foram acima da média
PamelaRozolem Jul 15, 2018
3b17714
card2 inicio grafico %
carolzinhamgonzalez Jul 16, 2018
b573ba7
card 2 e 4 faltamdo %
carolzinhamgonzalez Jul 16, 2018
5ac7b12
card 1 completo, iniciando card 3
PamelaRozolem Jul 16, 2018
6ee1a79
card 2, 3 e 4
carolzinhamgonzalez Jul 16, 2018
01cf29a
alteação
PamelaRozolem Jul 16, 2018
e5b610d
Merge branch 'pam' into carolina
PamelaRozolem Jul 16, 2018
53a92bc
Merge pull request #3 from PamelaRozolem/carolina
PamelaRozolem Jul 16, 2018
36efffd
Item 5 iniciado
carolzinhamgonzalez Jul 16, 2018
d469a4c
Grafico item 5
carolzinhamgonzalez Jul 17, 2018
8c35b40
card 5: item 5 e 8
carolzinhamgonzalez Jul 17, 2018
773825f
alterações css
PamelaRozolem Jul 17, 2018
8bb048c
Merge branch 'pam' of https://github.com/PamelaRozolem/data-dashboard…
PamelaRozolem Jul 17, 2018
f9042a4
modificando css
PamelaRozolem Jul 17, 2018
72bc3dc
Merge branch 'carolina' into pam
PamelaRozolem Jul 17, 2018
cba2a48
item 9, erro na linha 572
carolzinhamgonzalez Jul 17, 2018
21e9e6a
bla
PamelaRozolem Jul 17, 2018
8c6bfc8
dados carol
PamelaRozolem Jul 17, 2018
14e451a
item 10
carolzinhamgonzalez Jul 17, 2018
409168e
atualização
PamelaRozolem Jul 18, 2018
bff8c7a
grafico
PamelaRozolem Jul 18, 2018
5804c66
css da pagina toda + botão habilitar
PamelaRozolem Jul 18, 2018
2899a23
inclui uma tela nova page alunas
PamelaRozolem Jul 18, 2018
d3c74c0
dashboard carol pronto
carolzinhamgonzalez Jul 18, 2018
b0fb7f6
Merge branch 'pam' into carolina
carolzinhamgonzalez Jul 18, 2018
308be2f
alteração dos nomes css
carolzinhamgonzalez Jul 18, 2018
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
29 changes: 0 additions & 29 deletions .eslintrc

This file was deleted.

25 changes: 0 additions & 25 deletions README.md

This file was deleted.

45 changes: 45 additions & 0 deletions appAlunas.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8" />
<title>Page Alunas</title>
<link rel="stylesheet" type="text/css" media="screen" href="./css/appAlunas.css" />
<link rel="icon" href="./faviconAlu.png">
</head>

<body class="bodyAlunas">
<section class="topAlunas">
<img src=./assets/images/logo-labo.png>

<div class="bnt">
<select id="sede" onchange="onSelectSede()">
<option value="none">SEDES LABORATÓRIA</option>
<option value="AQP">AREQUIPA</option>
<option value="CDMX">CIDADE DO MÉXICO</option>
<option value="LIM">LIMA</option>
<option value="SCL">SANTIAGO DO CHILE</option>
</select>

<select id="turma" onchange="createSelectTurmaOptions(turmas)">
<option value="none">GERAÇÕES</option>
</select>

<button onchange="alunasAtivasSedeGeracao()">Filtrar</button>
</div>
</section>

<section id="formAlunas">

</section>




<!-- Base de dados -->
<script src="./js/data.js"></script>
<!-- Arquivo js -->
<script src="./js/app2.js"></script>
</body>

</html>
Binary file removed assets/images/bar-graph.png
Binary file not shown.
Binary file removed assets/images/circle-graphic.png
Binary file not shown.
Binary file removed assets/images/graph.png
Binary file not shown.
Binary file added assets/images/logo-labo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
108 changes: 0 additions & 108 deletions assets/images/logo-laboratoria.svg

This file was deleted.

Binary file removed assets/images/rectangular-graphic.png
Binary file not shown.
54 changes: 54 additions & 0 deletions css/appAlunas.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
.topAlunas img{
height: 100px;
width: 340px;
margin-left: 15px;
padding-top: 10px;
}

.topAlunas{
display: flex;
flex-direction: row;
justify-content: space-around;
align-items: center;
background-color: rgb(71, 182, 144);
}

#sede{
height: 30px;
width: auto;
margin-top: 10px;
background-color: rgb(255, 229, 33);
border: none;
border-radius: 10PX;
font-size: 12px;
margin-left: 10px;
}

#turma{
height: 30px;
width: auto;
margin-top: 10px;
background-color: rgb(255, 229, 33);
border: none;
border-radius: 10PX;
font-size: 12px;
margin-left: 10px;
}
.topAlunas button{
height: 30px;
width: auto;
margin-top: 10px;
background-color: rgb(255, 229, 33);
border: none;
border-radius: 10PX;
font-size: 12px;
margin-left: 10px;
}

.bodyAlunas{
font-size: 16px;
margin: 0;
padding: 0;
background-color: rgb(233, 232, 232);
font-family: 'Roboto', sans-serif;
}
Loading