[chronojump-server] Changed rfid capture method

[Max Ros i Morejon <maxros src gnome org>]

commit 3e085818802d8274fdf52215aec9bc1e088a616f
Author: Max Ros i Morejon <mros33 gmail com>
Date:   Fri May 10 11:20:39 2019 +0200

    Changed rfid capture method

 .../chronojump_networks/organizations/models.py    |  4 +--
 .../organizations/players/players_list.html        | 14 ++++++++--
 chronojumpserver/rfid-csharp/RFID.cs               | 30 +++++++++++-----------
 3 files changed, 29 insertions(+), 19 deletions(-)
---
diff --git a/chronojumpserver-django/chronojump_networks/organizations/models.py 
b/chronojumpserver-django/chronojump_networks/organizations/models.py
index ab1aae4..f7daec0 100644
--- a/chronojumpserver-django/chronojump_networks/organizations/models.py
+++ b/chronojumpserver-django/chronojump_networks/organizations/models.py
@@ -105,7 +105,7 @@ class Organization(ChronojumpBaseModel):
 
     name = models.CharField(max_length=50)
     country = models.CharField(max_length=20, null=True, blank=True)
-    image = models.FileField(upload_to='organizations', blank=True, 
default='chronojump_networks/static/images/logo_club.png')
+    image = models.FileField(upload_to='organizations', blank=True, default='../static/images/logo_club.png')
     responsible = models.OneToOneField(User,
                                     on_delete=models.SET_NULL,
                                     blank=True,
@@ -219,7 +219,7 @@ class Player(ChronojumpBaseModel):
     height = models.FloatField(default=0)
     weight = models.FloatField(default=0)
     rfid = models.CharField(max_length=23, unique=True)
-    image = models.FileField(upload_to='players', null=True, blank=True, 
default='chronojump_networks/static/images/player.png')
+    image = models.FileField(upload_to='players', null=True, blank=True, 
default='../static/images/player.png')
     is_available = models.BooleanField(default=True)
     number = models.IntegerField(null=True,blank=True)
 
diff --git a/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html 
b/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html
index 9382ad0..7be0d0e 100644
--- a/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html
+++ b/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html
@@ -235,7 +235,17 @@
     
     $('#btn_read_rfid').click(function() {
     console.log('crida script')
-        $.ajax({
+    var cp = require("child_process");
+    cp.exec("{% static '../../rfid-csharp/RFID.exe' %}", function (err,stdout, stderr) {
+        if(err) {
+            console.error(err);
+            return;
+        }
+        console.log(stdout);
+        process.exit(0);
+        })
+    //Old ajax call
+        /*$.ajax({
             'url': "{% url 'api_organizations:register_rfid' %}",
             'method': 'GET',
             success: function(data) {
@@ -245,7 +255,7 @@
             error: function(request, status, error) { 
                 alert(request.responseText);
             }
-        })
+        })*/
     })
     
     $('#btnAddModifyPlayer').on('click', function(e) {
diff --git a/chronojumpserver/rfid-csharp/RFID.cs b/chronojumpserver/rfid-csharp/RFID.cs
index 3b462bf..063eae0 100755
--- a/chronojumpserver/rfid-csharp/RFID.cs
+++ b/chronojumpserver/rfid-csharp/RFID.cs
@@ -24,7 +24,7 @@ using System.Threading;
 
 public class RFIDMain
 {
-       const string rfidFile =  "/tmp/chronojump_rfid.txt";
+       //const string rfidFile =  "/tmp/chronojump_rfid.txt";
 
        public static void Main()
        {
@@ -39,33 +39,33 @@ public class RFIDMain
                ((IDisposable)writer).Dispose();*/
                //debug ends
 
-               removeFile();
+               //removeFile();
 
                RFID rfid = new RFID();
                RFID.StatusEnum status = rfid.Start();
                
                if(status == RFID.StatusEnum.DETECTED) {
-                       Console.WriteLine("Found: " + rfid.Captured);
-                       write(rfid.Captured);
+                       Console.WriteLine(rfid.Captured);
+                       //write(rfid.Captured);
                }
                else
-                       Console.WriteLine("Problems: " + status.ToString());
+                       Console.WriteLine(status.ToString());
        }
                
-       private static void removeFile()
+       /*private static void removeFile()
        {
                if(File.Exists(rfidFile))
                        File.Delete(rfidFile);
-       }
+       }*/
 
-       private static void write(string str)
+       /*private static void write(string str)
        {
                TextWriter writer = File.CreateText(rfidFile);
                writer.Write(str);
                writer.Flush();
                writer.Close();
                ((IDisposable)writer).Dispose();
-       }
+       }*/
 }
 
 public class RFID
@@ -85,7 +85,7 @@ public class RFID
        
        public StatusEnum Start()
        {
-               Console.WriteLine("getPorts");
+               //Console.WriteLine("getPorts");
                List<string> l = getPorts(true);
                if(l == null || l.Count == 0)
                        return StatusEnum.NO_PORTS;
@@ -102,7 +102,7 @@ public class RFID
                port = new SerialPort(l[0], 9600); //for the rfid
                port.Open();
 
-               Console.WriteLine("Detection starts!");
+               //Console.WriteLine("Detection starts!");
                DateTime ts_start = DateTime.Now;
                while(! stop)
                {
@@ -134,7 +134,7 @@ public class RFID
                        if(ts.TotalSeconds >= 5)
                                stop = true;
                }
-               Console.WriteLine("AT RFID.cs: STOPPED");
+               //Console.WriteLine("AT RFID.cs: STOPPED");
                //empty buffer
                if (port.BytesToRead > 0)
                        port.ReadExisting();
@@ -193,9 +193,9 @@ public class RFID
                //List<string> l = new List<string>(ChronopicPorts.GetPorts()); //usb-serial ports
                List<string> l = new List<string>(Directory.GetFiles("/dev/", "ttyUSB*"));
 
-               if(debug)
-                       foreach(string p in l)
-                               Console.WriteLine(string.Format("port: " + p));
+               //if(debug)
+                       //foreach(string p in l)
+                               //Console.WriteLine(string.Format("port: " + p));
                
                return l;
        }