From fa33ab65f35b82f945521a54b14901eaec1bb27f Mon Sep 17 00:00:00 2001
From: Kento HASEGAWA <kento.hasegawa@togawa.cs.waseda.ac.jp>
Date: Tue, 14 Aug 2018 16:44:49 +0900
Subject: [PATCH] Fix the client status display in each question status

---
 comm/server/templates/part_client_table.html  |  2 +-
 .../templates/part_question_status.html       | 20 ++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/comm/server/templates/part_client_table.html b/comm/server/templates/part_client_table.html
index d7b2250..6211db7 100644
--- a/comm/server/templates/part_client_table.html
+++ b/comm/server/templates/part_client_table.html
@@ -20,7 +20,7 @@ Viewer Mode
     <tr class="client-status-row" data-cname="{{c[0]}}">
         <td class="client-status-name">
             {% if c|length > 3 %}
-            &nbsp;<img src="static/client-icon/{{c[3]}}" alt="{{c[2]}}" height="30" />
+            <img src="static/client-icon/{{c[3]}}" alt="{{c[2]}}" height="30" />&nbsp;
             {% endif %}
             {{c[0]}}
             {% if c|length > 2 %}
diff --git a/comm/server/templates/part_question_status.html b/comm/server/templates/part_question_status.html
index f669e44..364b16d 100644
--- a/comm/server/templates/part_question_status.html
+++ b/comm/server/templates/part_question_status.html
@@ -1,22 +1,32 @@
 <div class="row">
-    <div class="col-6">
-        <h3>問題 【{{qname}}】</h3>
+    <div class="col-4">
+        <h3> 【{{qname}}】</h3>
         <p>
             <button class="btn btn-primary btn-lg start-button" type="button" data-qname="{{qname}}">Start</button>
         </p>
     </div>
-    <div class="col-6">
+    <div class="col-8">
         <p>処理結果</p>
         <table class="table table-bordered">
             <tr>
-                <th>クライアント</th>
+                <th>Client (Solver)</th>
                 <th>Status</th>
             </tr>
             {% for c in clients %}
+            {% if c[1] == "Solver" %}
             <tr>
-                <td>{{c}}</td>
+                <td>
+                    {% if c|length > 3 %}
+                    <img src="static/client-icon/{{c[3]}}" alt="{{c[2]}}" height="30" />&nbsp;
+                    {% endif %}
+                    {{c[0]}}
+                    {% if c|length > 2 %}
+                    &nbsp;({{c[2]}})
+                    {% endif %}
+                </td>
                 <td></td>
             </tr>
+            {% endif %}
             {% endfor %}
         </table>
     </div>
-- 
2.22.0