From f148022adf6c5b92317df672c4a0dbb499897045 Mon Sep 17 00:00:00 2001 From: Justin Haas Date: Wed, 24 May 2017 21:16:40 -0400 Subject: [PATCH 1/2] finished everything but the random4 --- .idea/Java2JavaScript-Lab-1.iml | 9 + .idea/inspectionProfiles/Project_Default.xml | 5 + .idea/misc.xml | 139 +++++++++++ .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/workspace.xml | 230 +++++++++++++++++++ index.html | 22 +- js/script.js | 133 ++++++++++- 8 files changed, 540 insertions(+), 12 deletions(-) create mode 100644 .idea/Java2JavaScript-Lab-1.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/Java2JavaScript-Lab-1.iml b/.idea/Java2JavaScript-Lab-1.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/Java2JavaScript-Lab-1.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..8d66637 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..47047cd --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + false + false + + + + + + + + + + + + Android + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.8 + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..20aab25 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..dc542ab --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,230 @@ + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1495656100464 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/index.html b/index.html index b16c318..5cb91dc 100644 --- a/index.html +++ b/index.html @@ -20,16 +20,18 @@

Loops Exercises

diff --git a/js/script.js b/js/script.js index ba8cf69..50744df 100644 --- a/js/script.js +++ b/js/script.js @@ -2,6 +2,135 @@ var display = document.getElementById("display"); -function yourFunctionName (){ - display.innerHTML = "hello"; +function oneToTen (){ + var firstHeader = "oneToTen()" + var filledString = "" + for(var i = 1; i<11; i++){ + filledString += '

' + i + '

' + } + display.innerHTML = firstHeader + filledString } + +function oddNumbers(){ + var firstHeader = "oddNumbers()" + var filledString = "" + for(var i = 1; i<20; i++){ + if(i % 2 != 0 ){ + filledString += '

' + i + '
' + '' + '

' + } + display.innerHTML = firstHeader + filledString +} + +function random(){ + var firstHeader = "random()" + var filledString = "" + + for (var i = 1; i <= 4; i++) { + var num = Math.floor((Math.random() * 100) + 1) + if (i < 4) { + filledString = filledString + toString(num) + '
' + } else { + filledString = filledString + toString(num) + } + + } + display.innerHTML = firstHeader + filledString + } + +function evenNumbers() { + var firstHeader = "evenNumbers()" + var filledString = "" + for(var i = 1; i < 20; i++) { + if(i%2 === 0) { + filledString += '

' + i + '
' + '' + '") + for (var j = 1; j <= 6; j++) { + tableSquaresString += "|" + num = i * j + tableSquaresString += ("\xa0" + num) + if (num <= 9) { + tableSquaresString += "\xa0\xa0" + } + else if (num < 10) { + tableSquaresString += "\xa0" + } + } + tableSquaresString += "|" + } + display.innerHTML = firstHeader + tableSquaresString + } From 2b0b7b3ae8e10a4bd11f07ba1ac4e4753efe230d Mon Sep 17 00:00:00 2001 From: Justin Haas Date: Wed, 24 May 2017 22:15:49 -0400 Subject: [PATCH 2/2] finished random4 --- js/script.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/js/script.js b/js/script.js index 50744df..9f5136e 100644 --- a/js/script.js +++ b/js/script.js @@ -32,20 +32,11 @@ function squares() { } function random(){ - var firstHeader = "random()" - var filledString = "" - - for (var i = 1; i <= 4; i++) { - var num = Math.floor((Math.random() * 100) + 1) - if (i < 4) { - filledString = filledString + toString(num) + '
' - } else { - filledString = filledString + toString(num) - } - - } - display.innerHTML = firstHeader + filledString + display.innerHTML += "random()" + for (var i = 1; i <= 4; i++) { + display.innerHTML += "
" + Math.floor(Math.random()*(i*10)) } +} function evenNumbers() { var firstHeader = "evenNumbers()"