From 907e2889c89b469cf468958636d0214aa02169f8 Mon Sep 17 00:00:00 2001
From: student <skrabanek@odbornaskola.cz>
Date: Thu, 20 Oct 2022 13:02:54 +0200
Subject: [PATCH] Final

---
 src/components/CalcComp.vue | 87 ++++++++++++++++++++++++++++---------
 1 file changed, 66 insertions(+), 21 deletions(-)

diff --git a/src/components/CalcComp.vue b/src/components/CalcComp.vue
index 31e63a9..892a0ac 100644
--- a/src/components/CalcComp.vue
+++ b/src/components/CalcComp.vue
@@ -1,25 +1,25 @@
 <template>
     <div class="calculator">
         <div class="display">{{current || '0'}}</div>
-        <div class="btn">C</div>
-        <div class="btn">+/-</div>
-        <div class="btn">%</div>
-        <div class="btn">/</div>
+        <div class="btn operator" @click="clear">C</div>
+        <div class="btn operator">+/-</div>
+        <div class="btn operator" @click="procent">%</div>
+        <div class="btn operator" @click="divide">/</div>
         <div class="btn" @click="append(7)">7</div>
         <div class="btn" @click="append(8)">8</div>
         <div class="btn" @click="append(9)">9</div>
-        <div class="btn">*</div>
-        <div class="btn">4</div>
-        <div class="btn">5</div>
-        <div class="btn">6</div>
-        <div class="btn">-</div>
-        <div class="btn">1</div>
-        <div class="btn">2</div>
-        <div class="btn">3</div>
-        <div class="btn" @click="add">+</div>
-        <div class="btn">0</div>
-        <div class="btn">.</div>
-        <div class="btn" @click="equal">=</div>
+        <div class="btn operator" @click="times">*</div>
+        <div class="btn" @click="append(4)">4</div>
+        <div class="btn" @click="append(5)">5</div>
+        <div class="btn" @click="append(6)">6</div>
+        <div class="btn operator" @click="minus">-</div>
+        <div class="btn" @click="append(1)">1</div>
+        <div class="btn" @click="append(2)">2</div>
+        <div class="btn" @click="append(3)">3</div>
+        <div class="btn operator" @click="add">+</div>
+        <div class="btn nula" @click="append(0)">0</div>
+        <div class="btn ">.</div>
+        <div class="btn operator" @click="equal">=</div>
     </div>
 </template>
 
@@ -29,24 +29,60 @@ export default{
         return{
             current: '',
             previous: null,
-            operator: null
+            operator: null,
+            operatorClicked: false
         }
     },
     methods:{
+        // vedlejší metody
+        //vyčičtění
+        clear() {
+            this.current = "";
+        },
+        //přídaní čísla
        append(number) {
-        this.current += number;
+        if (this.operatorClicked)
+        {
+            this.current="";
+            this.operatorClicked= false;
+        }
+        this.current= `${this.current}${number}`;
        },
+       //ošetření vstupu
        setPrevious(){
         this.previous = this.current;
-        this.current = '';
+        this.operatorClicked = true;
        },
+       //Jednotlive operace
+       //sčítání
        add() {
         this.operator = (a,b) => a + b;
         this.setPrevious();
        },
+       //Odčítání
+       minus(){
+        this.operator = (a,b) => a - b;
+        this.setPrevious();
+       },
+       //Dělení
+       divide(){
+        this.operator = (a,b) => a / b;
+        this.setPrevious();
+       },
+       //Násobení
+       times() {
+        this.operator = (a,b) => a * b;
+        this.setPrevious();
+       },
+       //Procento
+       procent() {
+        this.current = this.current / 100;
+       },
+       //VÝSLEDEK
        equal() {
-        this.current = this.operator(parseFloat(this.current),parseFloat(this.previous));
-       }
+        this.current = this.operator(parseFloat(this.previous),parseFloat(this.current));
+       this.previous = null;
+    }
     }
 }
 </script>
@@ -70,4 +106,13 @@ background-color: lightgray;
 border: 1px solid gray;
 }
 
+.nula {
+    grid-column: 1/3;
+}
+
+.operator {
+    background-color: orange;
+    color: whitesmoke;
+}
+
 </style>
\ No newline at end of file