From 73e7ace49469c9101eaa2484d2261fdec0a276b8 Mon Sep 17 00:00:00 2001 From: Kavyapriya Date: Mon, 27 Feb 2023 08:30:57 +0530 Subject: [PATCH 1/4] 11.Calculator Submitting for review --- 11.Calculator/index.html | 12 ++++++++++++ 11.Calculator/index.js | 31 +++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 11.Calculator/index.html create mode 100644 11.Calculator/index.js diff --git a/11.Calculator/index.html b/11.Calculator/index.html new file mode 100644 index 0000000..8678f26 --- /dev/null +++ b/11.Calculator/index.html @@ -0,0 +1,12 @@ + + + + + + + Calculator + + + + + \ No newline at end of file diff --git a/11.Calculator/index.js b/11.Calculator/index.js new file mode 100644 index 0000000..9f95fcb --- /dev/null +++ b/11.Calculator/index.js @@ -0,0 +1,31 @@ +Calculator= { + isValid : function (value1, value2) {return typeof value1=='number' && typeof value2=='number'; }, + + addition : function (value1, value2){ + if (this.isValid(value1, value2)==true) return value1+ value2; + else console.log("Enter 2 valid numbers"); }, + + subtraction : function (value1, value2){ + if (this.isValid(value1, value2)==true) return value1- value2; + else console.log("Enter 2 valid numbers");}, + + multiplication : function (value1, value2){ + if (this.isValid(value1, value2)==true) return value1* value2; + else console.log("Enter 2 valid numbers");}, + + division : function (value1, value2){ + if (this.isValid(value1, value2)==true) return value1/ value2; + else console.log("Enter 2 valid numbers");} + +} + +number1 = 20; +number2 = 10; + +console.log("CALCULATOR"); + + +console.log(Calculator.addition(number1, number2)); +console.log(Calculator.subtraction(number1, number2)); +console.log(Calculator.multiplication(number1, number2)); +console.log(Calculator.division(number1, number2)); From 39daba1feb85455bd2deace189650d65029f5fcc Mon Sep 17 00:00:00 2001 From: Kavinprasath Date: Mon, 27 Feb 2023 12:27:30 +0530 Subject: [PATCH 2/4] review comments --- 11.Calculator/index.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/11.Calculator/index.js b/11.Calculator/index.js index 9f95fcb..ec488b4 100644 --- a/11.Calculator/index.js +++ b/11.Calculator/index.js @@ -1,3 +1,15 @@ +// need to add comments for the code +// add comments for functions using +/** + * function description + * @param value1 + * @return + */ +// need correct indentation for the code +// boolean value can be directly used for a conditon if(value){//code}else{//code} +// print the entered numbers and the calculation done for the numbers in console + + Calculator= { isValid : function (value1, value2) {return typeof value1=='number' && typeof value2=='number'; }, From f58593cb26562c71cf44af26b7959d282976030a Mon Sep 17 00:00:00 2001 From: KavyapriyaJG <125632123+KavyapriyaJG@users.noreply.github.com> Date: Mon, 27 Feb 2023 13:08:25 +0530 Subject: [PATCH 3/4] Corrected Review comments --- 11.Calculator/index.js | 91 ++++++++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 29 deletions(-) diff --git a/11.Calculator/index.js b/11.Calculator/index.js index ec488b4..2b072c2 100644 --- a/11.Calculator/index.js +++ b/11.Calculator/index.js @@ -1,33 +1,66 @@ -// need to add comments for the code -// add comments for functions using -/** - * function description - * @param value1 - * @return - */ -// need correct indentation for the code -// boolean value can be directly used for a conditon if(value){//code}else{//code} -// print the entered numbers and the calculation done for the numbers in console - - +//=========== OBJECT - CALCULATOR ================ Calculator= { - isValid : function (value1, value2) {return typeof value1=='number' && typeof value2=='number'; }, + isValid : /** + * Type checking - for checking both parameters are of type number + * @param number value1 + * @param number value2 + * @return boolean + **/ + function (value1, value2) { + return typeof value1=='number' && typeof value2=='number'; + }, - addition : function (value1, value2){ - if (this.isValid(value1, value2)==true) return value1+ value2; - else console.log("Enter 2 valid numbers"); }, + addition : /** + * Adds two numbers + * @param number value1 + * @param number value2 + * @return number + **/ + function (value1, value2){ + if (this.isValid(value1, value2)) + return value1+ value2; + else + console.log("Enter 2 valid numbers"); + }, - subtraction : function (value1, value2){ - if (this.isValid(value1, value2)==true) return value1- value2; - else console.log("Enter 2 valid numbers");}, + subtraction : /** + * Subtracts two numbers + * @param number value1 + * @param number value2 + * @return number + **/ + function (value1, value2){ + if (this.isValid(value1, value2)) + return value1- value2; + else + console.log("Enter 2 valid numbers"); + }, - multiplication : function (value1, value2){ - if (this.isValid(value1, value2)==true) return value1* value2; - else console.log("Enter 2 valid numbers");}, + multiplication : /** + * Multiplies two numbers + * @param number value1 + * @param number value2 + * @return number + **/ + function (value1, value2){ + if (this.isValid(value1, value2)) + return value1* value2; + else + console.log("Enter 2 valid numbers"); + }, - division : function (value1, value2){ - if (this.isValid(value1, value2)==true) return value1/ value2; - else console.log("Enter 2 valid numbers");} + division : /** + * Divides two numbers + * @param number value1 + * @param number value2 + * @return number + **/ + function (value1, value2){ + if (this.isValid(value1, value2)) + return value1/ value2; + else + console.log("Enter 2 valid numbers"); + } } @@ -37,7 +70,7 @@ number2 = 10; console.log("CALCULATOR"); -console.log(Calculator.addition(number1, number2)); -console.log(Calculator.subtraction(number1, number2)); -console.log(Calculator.multiplication(number1, number2)); -console.log(Calculator.division(number1, number2)); +console.log(number1 + " + " + number2 + " = " + Calculator.addition(number1, number2) + "\n"); +console.log(number1 + " - " + number2 + " = " + Calculator.subtraction(number1, number2) + "\n"); +console.log(number1 + " * " + number2 + " = " + Calculator.multiplication(number1, number2) + "\n"); +console.log(number1 + " / " + number2 + " = " + Calculator.division(number1, number2) + "\n"); From 6096771652e6418547ca03c706796ecf8039974e Mon Sep 17 00:00:00 2001 From: Kavyapriya Date: Mon, 27 Feb 2023 14:06:36 +0530 Subject: [PATCH 4/4] Updated index.js Function Comments --- 11.Calculator/index.js | 105 +++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 52 deletions(-) diff --git a/11.Calculator/index.js b/11.Calculator/index.js index 2b072c2..88d1a4f 100644 --- a/11.Calculator/index.js +++ b/11.Calculator/index.js @@ -1,66 +1,66 @@ //=========== OBJECT - CALCULATOR ================ Calculator= { - isValid : /** - * Type checking - for checking both parameters are of type number - * @param number value1 - * @param number value2 - * @return boolean - **/ - function (value1, value2) { + /** + * Type checking - for checking both parameters are of type number + * @param number value1 + * @param number value2 + * @return boolean + **/ + isValid : function (value1, value2) { return typeof value1=='number' && typeof value2=='number'; - }, + }, - addition : /** - * Adds two numbers - * @param number value1 - * @param number value2 - * @return number - **/ - function (value1, value2){ + /** + * Adds two numbers + * @param number value1 + * @param number value2 + * @return number + **/ + addition : function (value1, value2){ if (this.isValid(value1, value2)) return value1+ value2; else console.log("Enter 2 valid numbers"); - }, - - subtraction : /** - * Subtracts two numbers - * @param number value1 - * @param number value2 - * @return number - **/ - function (value1, value2){ - if (this.isValid(value1, value2)) - return value1- value2; - else - console.log("Enter 2 valid numbers"); + }, + + /** + * Subtracts two numbers + * @param number value1 + * @param number value2 + * @return number + **/ + subtraction : function (value1, value2){ + if (this.isValid(value1, value2)) + return value1- value2; + else + console.log("Enter 2 valid numbers"); }, - multiplication : /** - * Multiplies two numbers - * @param number value1 - * @param number value2 - * @return number - **/ - function (value1, value2){ - if (this.isValid(value1, value2)) - return value1* value2; - else - console.log("Enter 2 valid numbers"); - }, + /** + * Multiplies two numbers + * @param number value1 + * @param number value2 + * @return number + **/ + multiplication : function (value1, value2){ + if (this.isValid(value1, value2)) + return value1* value2; + else + console.log("Enter 2 valid numbers"); + }, - division : /** - * Divides two numbers - * @param number value1 - * @param number value2 - * @return number - **/ - function (value1, value2){ + /** + * Divides two numbers + * @param number value1 + * @param number value2 + * @return number + **/ + division : function (value1, value2){ if (this.isValid(value1, value2)) return value1/ value2; else console.log("Enter 2 valid numbers"); - } + } } @@ -70,7 +70,8 @@ number2 = 10; console.log("CALCULATOR"); -console.log(number1 + " + " + number2 + " = " + Calculator.addition(number1, number2) + "\n"); -console.log(number1 + " - " + number2 + " = " + Calculator.subtraction(number1, number2) + "\n"); -console.log(number1 + " * " + number2 + " = " + Calculator.multiplication(number1, number2) + "\n"); -console.log(number1 + " / " + number2 + " = " + Calculator.division(number1, number2) + "\n"); +console.log(number1 + " + " + number2 + " = " + Calculator.addition(number1, number2)); +console.log(number1 + " - " + number2 + " = " + Calculator.subtraction(number1, number2)); +console.log(number1 + " * " + number2 + " = " + Calculator.multiplication(number1, number2)); +console.log(number1 + " / " + number2 + " = " + Calculator.division(number1, number2)); +