From 31fde0ad1b4f40de396a9b9be526d81637b3262c Mon Sep 17 00:00:00 2001
From: Szymon Obst <s478993@labs.wmi.amu.edu.pl>
Date: Mon, 18 Dec 2023 18:42:10 +0100
Subject: [PATCH] =?UTF-8?q?po=C5=82aczaenie=20bE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/components/Hero.jsx                   |  21 +++++++++++++-----
 .../modele/__pycache__/modele.cpython-310.pyc | Bin 757 -> 737 bytes
 app/src/flask-server/server.py                |  10 ++++-----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/src/components/Hero.jsx b/app/src/components/Hero.jsx
index f74b786..992f7ef 100644
--- a/app/src/components/Hero.jsx
+++ b/app/src/components/Hero.jsx
@@ -19,6 +19,9 @@ const Hero = () => {
   let number_of_defenders = 0;
   let number_of_strikers = 0;
 
+  let shooterX = 0;
+  let shooterY = 0;
+
   // zmienne globalne bedace danymi wejsciowymi do modelu
 
 
@@ -60,14 +63,16 @@ const Hero = () => {
       if (ball) {
           var x = ball.style.left;
           var y = ball.style.top;
-          var query = "http://localhost:5000/LRegresion" + x + "&" + y
-          
+          var query = "http://localhost:5000/LRegresion" + shooterX + "&" + shooterY
           fetch(query).then(
+            res=> res.json() 
+          ).then(
             data => {
-            setData(data) 
-            console.log(data)
+              setData(data)
+              console.log(data)
             }
-            )
+          )
+          alert(data.response)    
       } else {
           alert('Piłka nie jest obecnie na boisku.');
       }
@@ -75,17 +80,23 @@ const Hero = () => {
 
   /* Funkcja dodająca listener do boiska*/
   function boiskoListener(){
+
       var x = event.clientX - footballField.getBoundingClientRect().left;
       var y = event.clientY - footballField.getBoundingClientRect().top;
+      shooterX = (x * 105)/600
+      shooterY = ((400 - y) * 69)/ 400
+
       // Przypadek kiedy zaznaczamy strzelca
       if(active_bbt == "bbt1"){
         var existingBall = document.querySelector('.football');
+
         if (!existingBall) {
             var ball = document.createElement('div');
             ball.className = 'football';
             ball.style.left = x + 'px';
             ball.style.top = y + 'px';
             footballField.appendChild(ball);
+
         } else {
             alert('Możesz dodać tylko jedną piłkę!');
         }
diff --git a/app/src/flask-server/modele/__pycache__/modele.cpython-310.pyc b/app/src/flask-server/modele/__pycache__/modele.cpython-310.pyc
index a50d4e94ea720a3ba31786136580081a84dbb1ff..df36aa97b03fa6b782342ed60d54180d6fba5c01 100644
GIT binary patch
delta 89
zcmey$`jC|?pO=@50SMyCHgf%7RJ_HSo1c=J6U7=4pO;#`lA%ZxDEG_B%PPhtwK%&Z
dzhJUCQx2o}<RwfBqT)a)usjkWHu)x#3;=ih7a0Hm

delta 133
zcmaFJ`jwR{pO=@50SFeRY~=dEXd1<uo1c=J6U7=4pO;#`lA%ZhDEBMO*(xTqIJKxa
z#y2=K#wE2lyClCLCb%TA#5un-Ib*UiQx2op<Oxg)hGIbFU_D5LC{XMchYir+(wtN~
RMj)@44M^}Xa4_;P0{|iqA&US2

diff --git a/app/src/flask-server/server.py b/app/src/flask-server/server.py
index 1f46d43..2952555 100644
--- a/app/src/flask-server/server.py
+++ b/app/src/flask-server/server.py
@@ -15,12 +15,12 @@ def members():
 
 @app.route("/LRegresion<x>&<y>")
 def LRegresion(x,y):
-    
-    x = int(x[0:2])
-    y = int(y[0:2])
 
-    response = LogisticRegression_predict_proba(9.23, -2.24, 9.5, 13.67, 13, 3, 0, 1, 0)
-    return {"response":[str(response),"proces"]}
+    x = round(x,2)
+    y = round(y,2)
+
+    response = LogisticRegression_predict_proba(x, y, 9.5, 13.67, 13, 3, 0, 1, 0)
+    return {"response":[str(response)]}
 
 # uruchomienie serwera
 if __name__ == "__main__":