Enhange look

This commit is contained in:
2023-06-10 00:10:34 +02:00
parent 9c43e2721a
commit 854815b5bb
2 changed files with 46 additions and 20 deletions

View File

@@ -19,7 +19,11 @@ def ranking():
def handle_client(message): def handle_client(message):
current_app.logger.info(message) current_app.logger.info(message)
if message.get("action") == "ReadyToRock!": if message.get("action") == "ReadyToRock!":
get_benchmark(message.get("score"), excel=message.get("excel", False)) get_benchmark(
score=message.get("score"),
excel=message.get("excel", False),
html=message.get("html", False),
)
current_app.socket.emit("server", {"message": "Ready!", "percentage": 0}) current_app.socket.emit("server", {"message": "Ready!", "percentage": 0})
@@ -33,7 +37,7 @@ def send_message(message, percentage, status="Ok", payload={}):
current_app.socket.emit("server", output) current_app.socket.emit("server", output)
def get_benchmark(score, excel=False): def get_benchmark(score, excel=False, html=False):
def move_exreport(): def move_exreport():
src = os.path.join( src = os.path.join(
current_user.benchmark.folder, "exreport", "exreport_output" current_user.benchmark.folder, "exreport", "exreport_output"
@@ -43,19 +47,25 @@ def get_benchmark(score, excel=False):
) )
shutil.copytree(src, dst, dirs_exist_ok=True) shutil.copytree(src, dst, dirs_exist_ok=True)
benchmark = Benchmark(score=score, visualize=True) def progress(step):
values = [0, 20, 40, 60, 80]
if excel:
values = [0, 40, 60, 80, 100]
return values[step]
benchmark = Benchmark(score=score, visualize=html)
send_message("Start", 0) send_message("Start", 0)
try: try:
send_message("Generating ranking...", 0) send_message("Generating ranking...", 0)
benchmark.compile_results() benchmark.compile_results()
send_message("Saving results...", 20 if excel else 40) send_message("Saving results...", progress(1))
benchmark.save_results() benchmark.save_results()
send_message("Generating report...", 40 if excel else 60) send_message("Generating report...", progress(2))
benchmark.report(tex_output=False) benchmark.report(tex_output=False)
send_message("Generating exreport...", 60 if excel else 80) send_message("Generating exreport...", progress(3))
benchmark.exreport() benchmark.exreport()
if excel: if excel:
send_message("Generating excel...", 80) send_message("Generating excel...", progress(4))
benchmark.excel() benchmark.excel()
except ValueError as e: except ValueError as e:
send_message( send_message(

View File

@@ -15,10 +15,14 @@
<option value="f1-weighted">f1-weighted</option> <option value="f1-weighted">f1-weighted</option>
<option value="roc-auc-ovr">roc-auc-ovr</option> <option value="roc-auc-ovr">roc-auc-ovr</option>
</select> </select>
<input id="excel" type="checkbox" name="excel"> <div class="form-check">
Generate Excel <input class="form-check-input" type="checkbox" value="" id="excel">
<input id="html" type="checkbox" name="html"> <label class="form-check-label" for="flexCheckDefault">Generate Excel</label>
Generate Html </div>
<div class="form-check">
<input class="form-check-input" type="checkbox" value="" id="html">
<label class="form-check-label" for="flexCheckChecked">Generate HTML</label>
</div>
</div> </div>
<button type="button" <button type="button"
class="btn btn-primary" class="btn btn-primary"
@@ -74,13 +78,7 @@
{{ super() }} {{ super() }}
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
$(document).ready(function () { $(document).ready(function () {
$("#submit").click(function () {
$("#submit").attr("disabled", true);
$("#submit").val("Generating...");
$("#score").attr("disabled", true);
$("#excel").attr("disabled", true);
$('.progress').removeAttr("hidden");
});
$("#excel").change(function () { $("#excel").change(function () {
if (!$("#excel").is(":checked") && !$("#html").is(":checked")) { if (!$("#excel").is(":checked") && !$("#html").is(":checked")) {
$("#submit").attr("disabled", true); $("#submit").attr("disabled", true);
@@ -120,9 +118,11 @@
$("#excel").attr("onclick",action); $("#excel").attr("onclick",action);
$("#excel_button").removeAttr("hidden"); $("#excel_button").removeAttr("hidden");
} }
$("#html_button").attr("onclick", "window.open('"+msg.payload.html +"', '_blank')"); if ($("#html").is(":checked")) {
$("#html_button").attr("onclick", "window.open('"+msg.payload.html +"', '_blank')");
$("#html_button").removeAttr("hidden");
}
$("#button_container").removeAttr("hidden"); $("#button_container").removeAttr("hidden");
$("#html_button").removeAttr("hidden");
update_bar = false; update_bar = false;
} }
if (msg.status=="Error") { if (msg.status=="Error") {
@@ -140,5 +140,21 @@
$("#status-alert").removeAttr("hidden"); $("#status-alert").removeAttr("hidden");
$(".progress").removeAttr("hidden"); $(".progress").removeAttr("hidden");
} }
function send() {
var data= {
action: "ReadyToRock!",
score: document.getElementById('score').value,
excel: document.getElementById('excel').checked,
html: document.getElementById('html').checked
};
$("#score").attr("disabled", true);
$("#excel").attr("disabled", true);
$("#html").attr("disabled", true);
socket.emit('client', data);
$("#status").removeAttr("hidden");
$("#status-alert").removeAttr("hidden");
$(".progress").removeAttr("hidden");
$("#submit").attr("hidden", true);
}
</script> </script>
{% endblock %} {% endblock %}