Commit e88ac812 authored by Kento HASEGAWA's avatar Kento HASEGAWA
Browse files

Merge branch 'feature/gui'

parents 07b70bb9 6fe69911

main.py

+2 −1
Changes for main.py: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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

+7 −2
Changes for static/css/adc2019.css: 7 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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/ionicons.min.css

0 → 100644
+12 −0

File added.

Preview size limit exceeded, changes collapsed.

static/css/theme_1562552953227.css

+1 −1
Changes for static/css/theme_1562552953227.css: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
/* 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

+5 −1
Changes for templates/part_problem_status.html: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
    {#% endif %#}

</div>



<div id="list-wrapper">



    <div id="solver-list-container">

        <h4>ソルバ一覧</h4>

        <div id="solver-list-table-wrapper">
@@ -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 '' %}
@@ -76,6 +78,8 @@ 
        </table>

    </div>

    

</div>



<div class="modal fade" id="solver-processing-modal" tabindex="-1" role="dialog" aria-labelledby="solver-processing-modal-title" aria-hidden="true">

    <div class="modal-dialog modal-dialog-centered modal-lg" role="document">

        <div class="modal-content">