Merge branch 'feature/gui'

main.py

@@ -61,10 +61,11 @@ def webui_part_problem_status(name=None):
     if (adc2019system.role is not None) and (adc2019system.role.type == 'host'):
         problem = adc2019system.role.get_problem(name)
         workers = adc2019system.role.get_workers()
+        solutions = reversed(sorted(problem.get_solutions().items(), key=lambda x:x[0]))
         if problem is None:
             return abort(404)
         else:
-            return render_template('part_problem_status.html', problem=problem, workers=workers)
+            return render_template('part_problem_status.html', problem=problem, workers=workers, solutions=solutions)
     else:
         return abort(404)
 

static/css/adc2019.css

@@ -92,12 +92,17 @@ body{
     display: inline-block;
 }
 
+#content-right #list-wrapper{
+    height: calc(100vh - 55px);
+    overflow-y: scroll;
+}
+
 #content-right h4#problem-status-title{
     vertical-align: bottom;
     margin-right: 10px;
 }
 
 #content-right #solution-list-container{
-    height: calc(100vh - 55px);
-    overflow-y: scroll;
+    /* height: calc(100vh - 55px); */
+    /* overflow-y: scroll; */
 }

static/css/theme_1562552953227.css

 /* Created with Themestr.app */
-/*! `Custom` Bootstrap 4 theme */@import url(https://cdnjs.cloudflare.com/ajax/libs/ionicons/3.0.0/css/ionicons.min.css);/*! Import Bootstrap 4 variables *//*!
+/*! `Custom` Bootstrap 4 theme */@import url(/static/css/ionicons.min.css);/*! Import Bootstrap 4 variables *//*!
  * Bootstrap v4.3.1 (https://getbootstrap.com/)
  * Copyright 2011-2019 The Bootstrap Authors
  * Copyright 2011-2019 Twitter, Inc.

templates/part_problem_status.html

@@ -11,7 +11,9 @@
     {#% endif %#}
 </div>
 
-<div id="solver-list-container">
+<div id="list-wrapper">
+
+    <div id="solver-list-container">
         <h4>ソルバ一覧</h4>
         <div id="solver-list-table-wrapper">
             <table class="table table-bordered table-sm" id="workers-table">
@@ -43,9 +45,9 @@
                 </tbody>
             </table>
         </div>
-</div>
+    </div>
     
-<div id='solution-list-container'>
+    <div id='solution-list-container'>
         <h4>処理結果一覧</h4>
         <table class="table table-bordered table-striped">
             <thead>
@@ -56,7 +58,7 @@
                 </tr>
             </thead>
             <tbody>
-            {% for k, v in problem.get_solutions().items() %}
+                {% for k, v in solutions %}
                 {% set tr_class = '' %}
                 {% set tr_class = tr_class + ' submit-solution' if k == problem.best_solution else '' %}
                 {% set tr_class = tr_class + ' valid-solution' if v.is_valid_solution() else '' %}
@@ -74,6 +76,8 @@
                 {% endfor %}
             </tbody>
         </table>
+    </div>
+    
 </div>
 
 <div class="modal fade" id="solver-processing-modal" tabindex="-1" role="dialog" aria-labelledby="solver-processing-modal-title" aria-hidden="true">