From a4c73f4e418c7fe4df5882780f54772fe470e261 Mon Sep 17 00:00:00 2001
From: Kento HASEGAWA <kento.hasegawa@togawa.cs.waseda.ac.jp>
Date: Wed, 14 Aug 2019 00:16:03 +0900
Subject: [PATCH] Improve UI

---
 main.py                     | 1 -
 roles/host.py               | 9 +++++----
 static/js/adc2019-viewer.js | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/main.py b/main.py
index b220747..c96b8cf 100644
--- a/main.py
+++ b/main.py
@@ -40,7 +40,6 @@ def webui_parte_workers():
 def webui_part_request_status(request_id=None):
     if (adc2019system.role is not None) and (adc2019system.role.type == 'host'):
         request_status = adc2019system.role.get_request_status(float(request_id))
-        print(request_status)
         return render_template('part_request_status.html', status=request_status)
     else:
         return abort(404)
diff --git a/roles/host.py b/roles/host.py
index 0471074..c87aee2 100644
--- a/roles/host.py
+++ b/roles/host.py
@@ -189,7 +189,7 @@ class Worker(object):
         self.host = params['host']
         self.role = params['role']
         self.params = params
-        self.status = 'Setting up'
+        self.status = 'Ready'
 
         self.configure()
     
@@ -220,7 +220,6 @@ class Request(object):
         self.timeout = timeout
     
         self.request_id = time.time()
-
         self.broadcast_time = None
 
         self.response = dict()
@@ -267,13 +266,15 @@ class Request(object):
             progress_time = (time.time() - self.broadcast_time) / self.timeout * 100
             progress = min(100, max(progress_problem, progress_time))
         
-        worker_list = self.worker_manager.get_workers().keys()
         worker_status = dict()
         for v in all_workers:
             if v in self.response:
                 worker_status[v] = self.response[v]['status']
             else:
-                worker_status[v] = 'Waiting for response'
+                if self.worker_manager.workers[v].status == 'Not connected':
+                    worker_status[v] = 'Not connected'
+                else:
+                    worker_status[v] = 'Waiting for response'
 
         return {
             'status': status,
diff --git a/static/js/adc2019-viewer.js b/static/js/adc2019-viewer.js
index f991fd0..1860822 100644
--- a/static/js/adc2019-viewer.js
+++ b/static/js/adc2019-viewer.js
@@ -129,7 +129,6 @@ class ADC2019BoardViewer {
             .attr("stroke", "#d00")
             .attr("stroke-width", 2);
 
-
         let colors = d3.schemeCategory10
 
         // Reference 
@@ -175,7 +174,7 @@ class ADC2019BoardViewer {
 
         var cellContainer = itemContainer.append('g')
             .attr('class', 'cellContainer')
-            .attr('data-color', (d, i) => colors[i])
+            .attr('data-color', (d, i) => colors[i % colors.length])
             .attr('x', 0)
             .attr('y', 0)
 
@@ -240,7 +239,7 @@ class ADC2019BoardViewer {
 
         var lineContainer = lineItemContainer.append('g')
             .attr('class', 'lineContainer')
-            .attr('data-color', (d, i) => lineColors[i]);
+            .attr('data-color', (d, i) => lineColors[i % lineColors.length]);
 
         lineContainer.selectAll('g')
             .data((d) => d)
-- 
2.22.0