diff --git a/comm/server/main.py b/comm/server/main.py index 8827217f4e154237d2d685d5ed6a754e4e8abbce..845e070b8c2e9e7ee2b8bc0732d45acc7a3a8c30 100644 --- a/comm/server/main.py +++ b/comm/server/main.py @@ -185,7 +185,7 @@ def start(): else: # Format check #cmd = "/usr/bin/python /home/pi/conmgr/adc2017/server/nlcheck.py --input {} --target {}".format(probpath, outpath) - cmd = "/usr/bin/python /home/pi/adc2017/conmgr/adc2017/server/nlcheck.py --input {} --target {}".format(probpath, outpath) + cmd = "/usr/bin/python /home/pi/adc2018/conmgr/adc2018/server/nlcheck.py --input {} --target {}".format(probpath, outpath) print("`{}`".format(cmd)) subprocess.call(cmd.strip().split(" ")) @@ -318,7 +318,6 @@ def main(args): if __name__ == "__main__": parser = argparse.ArgumentParser(description="PYNQ control panel.") - parser.add_argument("--no-gui", action="store_false", dest="gui", default=True, help="No GUI") parser.add_argument("-c", "--client", action="store", type=str, default=None, required=True, help="Client list.") parser.add_argument("-q", "--question", action="store", type=str, default="./problems", help="Path to the question folder.") parser.add_argument("-o", "--out", action="store", type=str, default="./answers", help="Path to the output folder.") @@ -328,9 +327,6 @@ if __name__ == "__main__": args = vars(parser.parse_args()) app_args = args - if args["gui"]: - if args["debug"]: - app.debug = True - app.run(host='0.0.0.0', threaded=True) - else: - main(args) + if args["debug"]: + app.debug = True + app.run(host='0.0.0.0', threaded=True) diff --git a/comm/server/static/css/pynq-manager.css b/comm/server/static/css/pynq-manager.css index 82aa991dc667542f035b00b4f3e8cdba4ea2cc9b..a909fe9c4bae24fec6dcf98f643d25250e0d2571 100644 --- a/comm/server/static/css/pynq-manager.css +++ b/comm/server/static/css/pynq-manager.css @@ -5,12 +5,12 @@ html, body{ overflow: hidden; } body{ - margin-top: 20px; + padding-top: 10px; } /* scrollbar settings */ ::-webkit-scrollbar{ - width: 30px; + width: 25px; border: 1px solid rgba(0, 0, 50, .2); } ::-webkit-scrollbar-thumb{ @@ -18,7 +18,7 @@ body{ } #question-table-wrapper{ - height: 350px; + height: 300px; overflow-y: scroll; overflow-x: hidden; } @@ -42,7 +42,7 @@ body{ } #client-control-pane{ - height: 350px; + height: 330px; overflow: scroll; } @@ -50,3 +50,7 @@ body{ #client-control-pane table td{ width: 50%; } + +#question-control-pane h3{ + display: inline-block; +} diff --git a/comm/server/static/js/pynq-manager.js b/comm/server/static/js/pynq-manager.js index 49631f20ce2268c8726374884e6190c47b18f435..5bd3a9116d0b250c31d92fffb590c9726b834cef 100644 --- a/comm/server/static/js/pynq-manager.js +++ b/comm/server/static/js/pynq-manager.js @@ -97,12 +97,6 @@ $(function(){ $("#question-table-wrapper").find("#question-table").remove(); $("#question-table-wrapper").html(d); - $(".show-question-status-button").click(function(){ - var qname = $(this).data("qname"); - show_question_status(qname); - return false; - }); - $(".question-row td").click(function(){ var $tr = $(this).parent("tr.question-row"); $(".question-row").removeClass("q-selected"); diff --git a/comm/server/templates/index.html b/comm/server/templates/index.html index dc6412ee7559e75965f0c591393acbbe8f446317..ea6802291df850455a9d292f39a14090ab3435c4 100644 --- a/comm/server/templates/index.html +++ b/comm/server/templates/index.html @@ -15,20 +15,18 @@
-
-

問題一覧

-

クライアント状況

+
-
- +
+

問題一覧

  + クライアント状況
-

Loading...

-
+

Loading...

diff --git a/comm/server/templates/part_question_table.html b/comm/server/templates/part_question_table.html index ebe9e0f408e06248e6329fb5485ff378e9b8cd6f..5b8d1f5fd961ca98efa2452f6df1c79b924430e7 100644 --- a/comm/server/templates/part_question_table.html +++ b/comm/server/templates/part_question_table.html @@ -1,10 +1,9 @@ - + - - + {% for k, v in questions.items() %} @@ -12,9 +11,6 @@ - {% endfor %}
ファイル名File Name Size Lineステータス操作Status
{{v.board_size}} {{v.line_num}} {{v.status}} - 選択 -