Make fish enable/disable state more robust

2 files changed, 31 insertions, 22 deletions

diff --git a/webapp/app/templates/index.html b/webapp/app/templates/index.html
index 7c09f50..bba0579 100644
--- a/webapp/app/templates/index.html
+++ b/webapp/app/templates/index.html
@@ -125,21 +125,16 @@
                 c.render($('#creatures'));
             });
             
-            socket.on('enable image', function(msg) {
-                console.log('enable image');
-                // to be tested
-                var name = msg.name;
-                var myImgElement = $("#" + name);
-                myImgElement.removeClass('img-disable');
-                
-            });
-            
-            socket.on('disable image', function(msg) {
-                console.log('disable image');
-                // to be tested
-                var name = msg.name;
-                var myImgElement = $("#" + name);
-                myImgElement.addClass('img-disable');
+            socket.on('fish state', function(msg) {
+                for( var key in msg ) {
+                    var myImgElement = $("#" + key);
+                    if( msg[key] ) {
+                        myImgElement.removeClass('img-disable');
+                    } else {
+                        myImgElement.addClass('img-disable');
+                    }
+                }
+
             });
 
             socket.on('disconnect', function() {
@@ -147,6 +142,9 @@
             });
 
             socket.emit('ready');
+            setInterval(function() {
+                socket.emit('ready');
+            }, 5000);
         });
 
         function clickImg(element) {
diff --git a/webapp/app/views.py b/webapp/app/views.py
index b03f6ab..a13bf12 100644
--- a/webapp/app/views.py
+++ b/webapp/app/views.py
@@ -28,23 +28,34 @@ def message(sid, data):
 
 @sio.on('ready', namespace='/spawn')
 def ready(sid):
-    print("got ready message from ", sid)
-    for event in received_events:
-        print "sending missed event", event
-        sio.emit(event[0], event[1], room=sid, namespace='/spawn')
+    sio.emit('fish state', fish_state, room=sid, namespace='/spawn')
 
 @sio.on('disconnect', namespace='/spawn')
 def disconnect(sid):
     print('disconnect', sid)
     connections.remove(sid)
 
+fish_state = {
+        'jellyfish': 0,
+        'dolphin': 0,
+        'boat': 0,
+        'nemo': 0,
+        'dory': 0,
+        'whale': 0,
+        'eel': 0,
+        'stingray': 0,
+        'shark': 0
+}
 
-received_events = []
 def recv_events():
     while True:
         event = recv_queue.get()
-        sio.emit(event[0], event[1], namespace='/spawn')
-        received_events.append(event)
+        if event[0] == 'enable image':
+            fish_state[event[1]['name']] = 1
+        elif event[0] == 'disable image':
+            fish_state[event[1]['name']] = 0
+
+        sio.emit('fish state', fish_state, namespace='/spawn')
 
 
 thread = sio.start_background_task(recv_events)