-
Notifications
You must be signed in to change notification settings - Fork 329
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
Branch mio #27
Open
joaquinrodini
wants to merge
8
commits into
r-argentina-programa:master
Choose a base branch
from
joaquinrodini:branch-mio
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Branch mio #27
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
66316c0
Cambia el source del script
joaquinrodini f248d45
Hace la otra parte de la tarea del nivel 3
joaquinrodini ac9acf3
Hace la ultima parte de la tarea
joaquinrodini cf9997d
Hace formulario de salario mensual
joaquinrodini 410f5d0
formatea
joaquinrodini d69e6ac
crea formulario en html
joaquinrodini 72fe6e2
intenta hacer la funcion en js
joaquinrodini 1e74295
hace cambios
joaquinrodini File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<head> | ||
<meta charset="utf-8"> | ||
<title>pagina de tarea 5 clase 2</title> | ||
</head> | ||
<body> | ||
<main> | ||
<form> | ||
<center> | ||
<fieldset style="background-color: orange; width: 350px"> | ||
<center> | ||
<label>Horas</label> | ||
<input type="number" id="horas" style="width: 60px"> | ||
<br> | ||
<br> | ||
<label>Minutos</label> | ||
<input type="number" id="minutos" style="width: 60px"> | ||
<br> | ||
<br> | ||
<label>Segundos</label> | ||
<input type="number" id="segundos" style="width: 60px"> | ||
<br> | ||
<br> | ||
<button id="calcular-tiempo" style="height: 30px; width: 150px;">Calcular tiempo total</button> | ||
<input type="reset" id="reset" value="Limpiar" style="height: 30px; width: 55px"> | ||
<br> | ||
<br> | ||
<br> | ||
<label>Tiempo total:</label> | ||
<strong>xx:xx:xx</strong> | ||
</fieldset> | ||
</center> | ||
</form> | ||
</main> | ||
<script type="text/javascript" src="mi-tarea-clase-5-2.js"></script> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
console.log('Hola'); | ||
|
||
const $calcularTiempo = document.querySelector('#calcular-tiempo'); | ||
|
||
$calcularTiempo.onclick = function(){ | ||
const horas = document.querySelector('#horas').value; | ||
const minutos = document.querySelector('#minutos').value; | ||
const segundos = document.querySelector('#segundos').value; | ||
|
||
const tiempo = document.querySelector('strong'); | ||
tiempo.textContent = `${horas} hora/s, ${minutos} minuto/s y ${segundos} segundo/s`; | ||
|
||
return false; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<head> | ||
<meta charset="utf-8"> | ||
<title>Ejercicio 3 de clase 5</title> | ||
</head> | ||
<body> | ||
<ul> | ||
<li>4</li> | ||
<li>12</li> | ||
<li>16</li> | ||
<li>4</li> | ||
<li>2</li> | ||
</ul> | ||
|
||
<em>El promedio es...</em> | ||
<br> | ||
<br> | ||
<em>El número más pequeño es...</em> | ||
<br> | ||
<br> | ||
<em>El número más grande es...</em> | ||
<br> | ||
<br> | ||
<em>El número más frecuente es...</em> | ||
<br> | ||
<br> | ||
<input type="button" id="ver" value="Ver" style="width: 60px; height: 30px"> | ||
|
||
<script type="text/javascript" src="mi-tarea-clase-5-3.js"></script> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
|
||
const lista = document.querySelectorAll('li') | ||
const $ver = document.querySelector('#ver') | ||
|
||
$ver.onclick = function(){ | ||
const promedio = | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Acá te comiste algo, no? |
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<head> | ||
<meta charset="utf-8"> | ||
<title>Pagina de tarea 5 ejercicio 1</title> | ||
</head> | ||
<body> | ||
<header> | ||
</header> | ||
|
||
<main> | ||
<form> | ||
<fieldset style="background-color: lightblue"> | ||
<center> <br> | ||
<legend> <h1> Bienvenido! </h1> </legend> | ||
</center> | ||
<br> | ||
<label>Los campos con (*) son obligatorios</label> | ||
<br> | ||
<br> | ||
<label>Primer nombre*</label><br> | ||
<input type="text" name="primerNombre" id="primer-nombre" style="width: 200px"> | ||
<br> | ||
<br> | ||
<label>Segundo nombre</label><br> | ||
<input type="text" name="segundoNombre" id="segundo-nombre" style="width: 200px"> | ||
<br> | ||
<br> | ||
<label>Apellido/s *</label><br> | ||
<input type="text" name="apellido" id="apellido" style="width: 200px"> | ||
<br> | ||
<br> | ||
<label>Edad *</label><br> | ||
<input type="number" name="edad" id="edad" style="width: 50px"> | ||
<br> | ||
<br> | ||
<br> | ||
<button id="entrar" style="width: 80px; height: 30px;">Entrar</button> | ||
<input type="reset" name="reset" value="Limpiar" style="width: 80px; height: 30px;"> | ||
<br> | ||
<br> | ||
<label>Tus datos son:</label><br> | ||
<input type="text" name="datosFinales" id="datos-finales" style="width: 500px; height: 50px;" disabled> | ||
</fieldset> | ||
</form> | ||
</main> | ||
<footer> | ||
</footer> | ||
<script type="text/javascript" src="mi-tarea-clase-5.js"></script> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
console.log('hola'); | ||
console.log(document.querySelector('h1').textContent); | ||
|
||
|
||
const $entrar = document.querySelector('#entrar'); | ||
|
||
$entrar.onclick = function(){ | ||
const primerNombre = document.querySelector('#primer-nombre').value; | ||
const segundoNombre = document.querySelector('#segundo-nombre').value; | ||
const apellido = document.querySelector('#apellido').value; | ||
const edad = Number(document.querySelector('#edad').value); | ||
|
||
|
||
document.querySelector('#datos-finales').value = `Tu nombre es ${primerNombre}, tu segundo nombre es ${segundoNombre}, | ||
tu apellido es ${apellido} y tu edad es ${edad}`; | ||
|
||
return false; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Esta función debería calcular la sumatoria de las horas, minutos y segundos de varios videos, no de sólo 1.