From 62074b0a741f44da0029cc57d720f74a429e01e9 Mon Sep 17 00:00:00 2001 From: Randall Crame Date: Thu, 19 Jan 2017 23:13:54 -0500 Subject: [PATCH 1/2] JavaScript Loops --- index.html | 20 +++++------ js/script.js | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 104 insertions(+), 12 deletions(-) diff --git a/index.html b/index.html index b16c318..45353df 100644 --- a/index.html +++ b/index.html @@ -20,16 +20,16 @@

Loops Exercises

diff --git a/js/script.js b/js/script.js index ba8cf69..4d299d7 100644 --- a/js/script.js +++ b/js/script.js @@ -2,6 +2,98 @@ var display = document.getElementById("display"); -function yourFunctionName (){ - display.innerHTML = "hello"; +function oneToTen(){ + display.innerHTML = "oneToTen()
***Output***
" + for (var i = 1; i <= 10; i++) { + display.innerHTML += i+'
' + } +} + +function oddNumbers(){ + display.innerHTML = "oddNumbers()
***Output***
" + for (var i = 1; i < 20; i+=2) { + display.innerHTML += i+'
' + } +} + +function squares(){ + display.innerHTML = "squares()
***Output***
" + for (var i = 1; i*i <= 100; i++) { + display.innerHTML += (i*i)+'
' + } +} + +function oneToTen(){ + display.innerHTML = "oneToTen()
***Output***
" + for (var i = 1; i <= 10; i++) { + display.innerHTML += i+'
' + } +} + +function random4(){ + display.innerHTML = "random4()
***Output***
" + for (var i = 1; i <= 4; i++) { + display.innerHTML += Math.floor(Math.random() * 100) + 1 +'
' + } +} + +function even(n){ + display.innerHTML = "even()
***Output***
" + for (var i = 2; i < n; i+=2) { + display.innerHTML += i +'
' + } +} + +function powers(n){ + display.innerHTML = "powers("+n+")
***Output***
" + for (var i = 1; i <= n; i++) { + display.innerHTML += Math.pow(2,i) + '
' + } +} + +function areWeThereYet(){ + do{ + display.innerHTML += "Arewethereyet?
" + answer = prompt("Are we there yet?", "Well are we?") + display.innerHTML += answer + '
' + } while(answer!=="Yes") + display.innerHTML += "Good!" +} + +function triangle(){ + display.innerHTML = "triangle()
***Output***
" + for (var i = 0; i < 5; i++) { + for (var j = 0; j <= i; j++){ + display.innerHTML += "*" + } + display.innerHTML += "
" + } +} + +function tableSquare(){ + display.innerHTML = "tableSquare()
***Output***
A4x4tablesquare
" + for (var i = 1; i <= 4; i++) { + for (var j = 1; j <= 4; j++){ + if ((i*j)<10){ + display.innerHTML += "|  "+(i*j) + } else { + display.innerHTML += "|"+(i*j) + } + } + display.innerHTML += "|
" + } +} + +function tableSquares(n){ + display.innerHTML = "tableSquare()
***Output***
A"+n+"x"+n+"tablesquare
" + for (var i = 1; i <= n; i++) { + for (var j = 1; j <= n; j++){ + if ((i*j)<10){ + display.innerHTML += "|  "+(i*j) + } else { + display.innerHTML += "|"+(i*j) + } + } + display.innerHTML += "|
" + } } From 18db1c5fb1e15d6e0190fd6e4dc7b8772614cf46 Mon Sep 17 00:00:00 2001 From: Randall Crame Date: Fri, 20 Jan 2017 14:16:27 -0500 Subject: [PATCH 2/2] created class Print and modified other functions --- js/script.js | 114 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 81 insertions(+), 33 deletions(-) diff --git a/js/script.js b/js/script.js index 4d299d7..5263fcc 100644 --- a/js/script.js +++ b/js/script.js @@ -2,98 +2,146 @@ var display = document.getElementById("display"); + + +class Print { + constructor(){ + this.container = "" + } + + clearContainer(){ + this.container = "" + return this + } + createTitle(title){ + this.container += title+"
***Output***
" + return this + } + + add(content){ + this.container += content + return this + } + + addBreak(){ + this.container +="
" + return this + } + + getDetails(){ + return this.container + } + +} + +var print = new Print() + function oneToTen(){ - display.innerHTML = "oneToTen()
***Output***
" + print.clearContainer().createTitle("oneToTen()") for (var i = 1; i <= 10; i++) { - display.innerHTML += i+'
' + print.add(i).addBreak() } + display.innerHTML = print.getDetails() } function oddNumbers(){ - display.innerHTML = "oddNumbers()
***Output***
" + print.clearContainer() + print.createTitle("oddNumbers()") for (var i = 1; i < 20; i+=2) { - display.innerHTML += i+'
' + print.add(i).addBreak() } + display.innerHTML = print.getDetails() } + function squares(){ - display.innerHTML = "squares()
***Output***
" + print.clearContainer() + print.createTitle("squares()") for (var i = 1; i*i <= 100; i++) { - display.innerHTML += (i*i)+'
' - } -} - -function oneToTen(){ - display.innerHTML = "oneToTen()
***Output***
" - for (var i = 1; i <= 10; i++) { - display.innerHTML += i+'
' + print.add(i*i).addBreak() } + display.innerHTML = print.getDetails() } function random4(){ - display.innerHTML = "random4()
***Output***
" + print.clearContainer() + print.createTitle("random4()") for (var i = 1; i <= 4; i++) { - display.innerHTML += Math.floor(Math.random() * 100) + 1 +'
' + print.add(Math.floor(Math.random() * 100) + 1).addBreak() } + display.innerHTML = print.getDetails() } + function even(n){ - display.innerHTML = "even()
***Output***
" + print.clearContainer() + print.createTitle("even()") for (var i = 2; i < n; i+=2) { - display.innerHTML += i +'
' + print.add(i).addBreak() } + display.innerHTML= print.getDetails() } function powers(n){ - display.innerHTML = "powers("+n+")
***Output***
" + print.clearContainer() + print.createTitle("powers("+n+")") for (var i = 1; i <= n; i++) { - display.innerHTML += Math.pow(2,i) + '
' + print.add(Math.pow(2,i)).addBreak() } + display.innerHTML = print.getDetails() } function areWeThereYet(){ + print.clearContainer() do{ - display.innerHTML += "Arewethereyet?
" + print.add("Arewethereyet?").addBreak() answer = prompt("Are we there yet?", "Well are we?") - display.innerHTML += answer + '
' + print.add(answer).addBreak() } while(answer!=="Yes") - display.innerHTML += "Good!" + print.add("Good!") + display.innerHTML = print.getDetails() } function triangle(){ - display.innerHTML = "triangle()
***Output***
" + print.clearContainer() + print.createTitle("triangle()") for (var i = 0; i < 5; i++) { for (var j = 0; j <= i; j++){ - display.innerHTML += "*" + print.add("*") } - display.innerHTML += "
" + print.addBreak() } + display.innerHTML = print.getDetails() } function tableSquare(){ - display.innerHTML = "tableSquare()
***Output***
A4x4tablesquare
" + print.clearContainer() + print.createTitle("tableSquare()").add("A4x4tablesquare").addBreak() for (var i = 1; i <= 4; i++) { for (var j = 1; j <= 4; j++){ if ((i*j)<10){ - display.innerHTML += "|  "+(i*j) + print.add("|  "+(i*j)) } else { - display.innerHTML += "|"+(i*j) + print.add("|"+(i*j)) } } - display.innerHTML += "|
" + print.add("|").addBreak() } + display.innerHTML = print.getDetails() } function tableSquares(n){ - display.innerHTML = "tableSquare()
***Output***
A"+n+"x"+n+"tablesquare
" + print.clearContainer() + print.createTitle("tableSquare()").add("A"+n+"x"+n+"tablesquare").addBreak() for (var i = 1; i <= n; i++) { for (var j = 1; j <= n; j++){ if ((i*j)<10){ - display.innerHTML += "|  "+(i*j) + print.add("|  "+(i*j)) } else { - display.innerHTML += "|"+(i*j) + print.add("|"+(i*j)) } } - display.innerHTML += "|
" + print.add("|").addBreak() } + display.innerHTML = print.getDetails() }