added addAddition function, added negative numbers error

MastersAcademy · Nov 18, 2023 · 426c128 · 426c128
1 parent 2c7d4e9
commit 426c128
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/homeworks/andrii.morozov_AndriiMorozov88/GamesProject/scripts/logic.js b/homeworks/andrii.morozov_AndriiMorozov88/GamesProject/scripts/logic.js
@@ -20,6 +20,12 @@ function getAbsoluteTime() {
     const date = new Date();
     return date.getTime();
 }
+function getAddition(number) {
+    if (number <= 1) {
+        return 'game';
+    }
+    return 'games';
+}
 function showResult() {
     const timeStart = getAbsoluteTime();
     let result;
@@ -56,14 +62,20 @@ function showResult() {
             result = firstNumber ** secondNumber;
             break;
     }
-    resultContainer.innerText = `${result}`;
+    resultContainer.innerText = `${result} ${getAddition(result)}`;
 
     if (result > 100) {
         resultContainer.innerText = 'Error';
         commentContainer.innerText = 'Too many games';
         commentContainer.classList.add('comment-container--error');
         return;
     }
+    if (result < 0) {
+        resultContainer.innerText = 'Error';
+        commentContainer.innerText = 'Negative count of games is not possible';
+        commentContainer.classList.add('comment-container--error');
+        return;
+    }
     resultContainer.classList.add('calculator__result--calc');
     for (let count = 0; count < 10000000; count++);
     const timeFinish = getAbsoluteTime();

diff --git a/homeworks/andrii.morozov_AndriiMorozov88/GamesProject/styles/calculator.css b/homeworks/andrii.morozov_AndriiMorozov88/GamesProject/styles/calculator.css
@@ -33,6 +33,7 @@
   min-width: 100px;
   height: 50px;
   font-size: 20px;
+  padding: 0 5px;
   justify-content: center;
   align-items: center;
   color: #C9C2C2;