Moving towards a useful demo

Mark Gibbs · Mark Gibbs · commit de94dcff7f26 · 2018-06-18T14:03:58.000-07:00
diff --git a/demo/demo/consumers.py b/demo/demo/consumers.py
@@ -2,32 +2,59 @@
 
 import json
 
+ALL_CONSUMERS = []
+
 class MessageConsumer(WebsocketConsumer):
+    def __init__(self, *args, **kwargs):
+        super(MessageConsumer, self).__init__(*args, **kwargs)
+        global ALL_CONSUMERS
+        ALL_CONSUMERS.append(self)
 
     def connect(self):
         self.accept()
 
     def disconnect(self, close_code):
-        pass
+        ac = []
+        global ALL_CONSUMERS
+        for c in ALL_CONSUMERS:
+            if c != self:
+                ac.append(c)
+        ALL_CONSUMERS = ac
 
     def send_to_widgets(self, channel_name, label, value):
-        self.send(json.dumps({'channel_name':channel_name,
+        message = json.dumps({'channel_name':channel_name,
                               'label':label,
-                              'value':value}))
+                              'value':value})
+        global ALL_CONSUMERS
+
+        for c in ALL_CONSUMERS:
+            c.send(message)
+
     def receive(self, text_data):
-        print("Got incoming")
         message = json.loads(text_data)
-        print(text_data)
-        self.send(json.dumps({'message':"Thanks for [%s]"%text_data}))
-        self.send(json.dumps({'original_message':message}))
 
-        # TODO if type is connection_triplet then store and/or update the info
-        # TODO else do something appropriate with the message
+        message_type = message.get('type','unknown_type')
+
+        if message_type == 'connection_triplet':
+
+            channel_name = message.get('channel_name',"UNNAMED_CHANNEL")
+            uid = message.get('uid',"0000-0000")
+            label = message.get('label','DEFAULT$LABEL')
+
+            # For now, send the uid as value. This essentially 'resets' the value
+            # each time the periodic connection announcement is made
+            self.send_to_widgets(channel_name=channel_name,
+                                 label=label,
+                                 value=uid)
+        else:
+            # Not a periodic control message, so do something useful
+            # For now, this is just pushing to all other consumers indiscrimnately
 
-        channel_name = message.get('channel_name',"UNNAMED_CHANNEL")
-        uid = message.get('uid',"0000-0000")
-        label = message.get('label','DEFAULT$LABEL')
+            channel_name = message.get('channel_name',"UNNAMED_CHANNEL")
+            uid = message.get('uid',"0000-0000")
+            value = message.get('value',{'source_uid':uid})
+            label = message.get('label','DEFAULT$LABEL')
 
-        self.send_to_widgets(channel_name=channel_name,
-                             label=label,
-                             value=uid)
+            self.send_to_widgets(channel_name=channel_name,
+                                 label=label,
+                                 value=value)
diff --git a/demo/demo/plotly_apps.py b/demo/demo/plotly_apps.py
@@ -64,7 +64,7 @@ def callback_c(*args,**kwargs):
              uid="need_to_generate_this"),
     dpd.Pipe(id="also_dynamic",
              value="Alternator 456",
-             label="rotational energy",
+             label="momentum",
              channel_name="test_widget_channel",
              uid="and_this_one"),
     dpd.DPDirectComponent(id="direct"),
@@ -78,6 +78,8 @@ def callback_c(*args,**kwargs):
     dash.dependencies.Output('output-three','children'),
     [dash.dependencies.Input('dynamic','value'),
      dash.dependencies.Input('dynamic','label'),
+     dash.dependencies.Input('also_dynamic','value'),
+     dash.dependencies.Input('dropdown-one','value'),
      ])
 def callback_a3(*args, **kwargs):
     da = kwargs['dash_app']
diff --git a/demo/demo/templates/index.html b/demo/demo/templates/index.html
@@ -1,8 +1,16 @@
 <!DOCTYPE HTML>
 <html>
-{%load plotly_dash%}
-<title>Simple stuff</title>
+  <head>
+    {%load plotly_dash%}
+    <title>Simple stuff</title>
+  </head>
 <body>
+  <div>
+    <p>Navigational links :
+      <a href="{%url "home"%}">Main Page</a>
+      <a href="{%url "second"%}">Second Page</a>
+    </p>
+  </div>
   <div>
     Content here
     {%plotly_app slug="simpleexample-1" ratio=0.2 %}
@@ -16,9 +24,13 @@
     {%plotly_app name="Ex2"%}
   </div>
   <div>
-    Content here
+    WS Content here
     {%plotly_app name="Connected"%}
   </div>
+  <div>
+    WS Content here
+    {%plotly_app slug="connected-9"%}
+  </div>
 </body>
 {%plotly_message_pipe%}
 </html>
diff --git a/demo/demo/urls.py b/demo/demo/urls.py
@@ -22,7 +22,8 @@
 import demo.plotly_apps
 
 urlpatterns = [
-    path('', TemplateView.as_view(template_name='index.html')),
+    path('', TemplateView.as_view(template_name='index.html'), name="home"),
+    path('second_page', TemplateView.as_view(template_name='second_page.html'), name="second"),
     path('admin/', admin.site.urls),
     path('django_plotly_dash/', include('django_plotly_dash.urls')),
 ]

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@`
`22`	`22`	`import demo.plotly_apps`
`23`	`23`
`24`	`24`	`urlpatterns = [`
`25`		`- path('', TemplateView.as_view(template_name='index.html')),`
	`25`	`+ path('', TemplateView.as_view(template_name='index.html'), name="home"),`
	`26`	`+ path('second_page', TemplateView.as_view(template_name='second_page.html'), name="second"),`
`26`	`27`	`path('admin/', admin.site.urls),`
`27`	`28`	`path('django_plotly_dash/', include('django_plotly_dash.urls')),`
`28`	`29`	`]`