[fix] disable file upload if empty file

This commit is contained in:
Wu Han 2021-01-07 17:08:22 +00:00
parent 1816d390ce
commit 1137b03d7c
3 changed files with 21 additions and 161 deletions

View File

@ -88,122 +88,6 @@
<div id="leaderboard"> <div id="leaderboard">
<!-- <section class="section" id="section0">
<div class="slide">
<div class="container">
<div class="row text-center">
<div class="col-12">
<div class="display-3 mb-5">Leaderboard</div>
</div>
</div>
<div class="row">
<table class="table">
<thead class="thead-dark">
<tr>
<th scope="col">#</th>
<th scope="col">ulysses16.tsp</th>
<th scope="colthead-dark">a280.tsp</th>
<th scope="col">pcb442.tsp</th>
<th scope="col">dsj1000.tsp</th>
</tr>
</thead>
<tbody>
<tr>
<th scope="row">1</th>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
</tr>
<tr>
<th scope="row">2</th>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
</tr>
<tr>
<th scope="row">3</th>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
</tr>
<tr>
<th scope="row">4</th>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
</tr>
<tr>
<th scope="row">5</th>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
</tr>
<tr>
<th scope="row">6</th>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
</tr>
<tr>
<th scope="row">7</th>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
</tr>
<tr>
<th scope="row">8</th>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
</tr>
<tr>
<th scope="row">9</th>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
</tr>
<tr>
<th scope="row">10</th>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
<td>Inf</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</section> -->
<section id="tabs" class="section project-tab" id="section0"> <section id="tabs" class="section project-tab" id="section0">
<div class="slide"> <div class="slide">
<div class="container"> <div class="container">

View File

@ -103,35 +103,11 @@ $( document ).ready( () => {
maxFileCount: 1, maxFileCount: 1,
allowedFileExtensions: ["py"] allowedFileExtensions: ["py"]
}); });
$('#uploadfile').on('filecleared', function(event) {
var url = window.location; $('#btnSubmit').prop('disabled', true);
// GET REQUEST
$("#btnGetFiles").click( (event) => {
event.preventDefault();
ajaxGet();
}); });
// DO GET var url = window.location;
function ajaxGet(){
$.ajax({
type : "GET",
url : "/api/files/getall",
success: (data) => {
// clear old data
$("#listFiles").html("");
// render list of files
$("#listFiles").append('<ul>');
$.each(data, (index, filename) => {
$("#listFiles").append('<li><a href=' + url + 'api/files/' + filename +'>' + filename + '</a></li>');
});
$("#listFiles").append('</ul>');
},
error : (err) => {
$("#listFiles").html(err.responseText);
}
});
}
// Upload File // Upload File
$('#uploadfile').change(function(e){ $('#uploadfile').change(function(e){

View File

@ -47,43 +47,43 @@ socket.on('leaderboard', (obj) => {
$(".leaderboard-table").find("tr:not(:first):not(:last)").remove(); $(".leaderboard-table").find("tr:not(:first):not(:last)").remove();
if(obj.ulysses16.length != 0) { if(obj.ulysses16.length != 0) {
obj.ulysses16.forEach(element => { obj.ulysses16.forEach(element => {
$('#ulysses16-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>') $('#ulysses16-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness.toFixed(2) + '</td><td>' + element.desc + '</td></tr>')
}); });
$('#ulysses16_best').text(obj.ulysses16[0].fitness); $('#ulysses16_best').text(obj.ulysses16[0].fitness.toFixed(2));
} }
if(obj.att48.length != 0 ) { if(obj.att48.length != 0 ) {
obj.att48.forEach(element => { obj.att48.forEach(element => {
$('#att48-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>') $('#att48-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness.toFixed(2) + '</td><td>' + element.desc + '</td></tr>')
}); });
$('#att48_best').text(obj.att48[0].fitness); $('#att48_best').text(obj.att48[0].fitness.toFixed(2));
} }
if (obj.st70.length != 0) { if (obj.st70.length != 0) {
obj.st70.forEach(element => { obj.st70.forEach(element => {
$('#st70-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>') $('#st70-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness.toFixed(2) + '</td><td>' + element.desc + '</td></tr>')
}); });
$('#st70_best').text(obj.st70[0].fitness); $('#st70_best').text(obj.st70[0].fitness.toFixed(2));
} }
if (obj.a280.length != 0) { if (obj.a280.length != 0) {
obj.a280.forEach(element => { obj.a280.forEach(element => {
$('#a280-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>') $('#a280-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness.toFixed(2) + '</td><td>' + element.desc + '</td></tr>')
}); });
$('#a280_best').text(obj.a280[0].fitness); $('#a280_best').text(obj.a280[0].fitness.toFixed(2));
} }
if(obj.pcb442.length != 0) { if(obj.pcb442.length != 0) {
$('#pcb442_best').text(obj.pcb442[0].fitness);
obj.pcb442.forEach(element => { obj.pcb442.forEach(element => {
$('#pcb442-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>') $('#pcb442-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness.toFixed(2) + '</td><td>' + element.desc + '</td></tr>')
}); });
$('#pcb442_best').text(obj.pcb442[0].fitness.toFixed(2));
} }
if(obj.dsj1000.length != 0) { if(obj.dsj1000.length != 0) {
obj.dsj1000.forEach(element => { obj.dsj1000.forEach(element => {
$('#dsj1000-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>') $('#dsj1000-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness.toFixed(2) + '</td><td>' + element.desc + '</td></tr>')
}); });
$('#dsj1000_best').text(obj.dsj1000[0].fitness); $('#dsj1000_best').text(obj.dsj1000[0].fitness.toFixed(2));
} }
}); });
@ -105,42 +105,42 @@ socket.on('result', (res) => {
res.forEach(e => { res.forEach(e => {
if(e.name === "ulysses16.txt") { if(e.name === "ulysses16.txt") {
my_res.ulysses16.fitness = e.fitness my_res.ulysses16.fitness = e.fitness
$("#ulysses16_your").text(e.fitness); $("#ulysses16_your").text(e.fitness.toFixed(2));
if(e.fitness > 0) { if(e.fitness > 0) {
enable_btn($('#ulysses16_submit')) enable_btn($('#ulysses16_submit'))
} }
} }
if(e.name === "att48.txt") { if(e.name === "att48.txt") {
my_res.att48.fitness = e.fitness my_res.att48.fitness = e.fitness
$("#att48_your").text(e.fitness); $("#att48_your").text(e.fitness.toFixed(2));
if(e.fitness > 0) { if(e.fitness > 0) {
enable_btn($('#att48_submit')) enable_btn($('#att48_submit'))
} }
} }
if(e.name === "st70.txt") { if(e.name === "st70.txt") {
my_res.st70.fitness = e.fitness my_res.st70.fitness = e.fitness
$("#st70_your").text(e.fitness) $("#st70_your").text(e.fitness.toFixed(2))
if(e.fitness > 0) { if(e.fitness > 0) {
enable_btn($('#st70_submit')) enable_btn($('#st70_submit'))
} }
} }
if(e.name === "a280.txt") { if(e.name === "a280.txt") {
my_res.a280.fitness = e.fitness my_res.a280.fitness = e.fitness
$("#a280_your").text(e.fitness) $("#a280_your").text(e.fitness.toFixed(2))
if(e.fitness > 0) { if(e.fitness > 0) {
enable_btn($('#a280_submit')) enable_btn($('#a280_submit'))
} }
} }
if(e.name === "pcb442.txt") { if(e.name === "pcb442.txt") {
my_res.pcb442.fitness = e.fitness my_res.pcb442.fitness = e.fitness
$("#pcb442_your").text(e.fitness) $("#pcb442_your").text(e.fitness.toFixed(2))
if(e.fitness > 0) { if(e.fitness > 0) {
enable_btn($('#pcb442_submit')) enable_btn($('#pcb442_submit'))
} }
} }
if(e.name === "dsj1000.txt") { if(e.name === "dsj1000.txt") {
my_res.dsj1000.fitness = e.fitness my_res.dsj1000.fitness = e.fitness
$("#dsj1000_your").text(e.fitness) $("#dsj1000_your").text(e.fitness.toFixed(2))
if(e.fitness > 0) { if(e.fitness > 0) {
enable_btn($('#dsj1000_submit')) enable_btn($('#dsj1000_submit'))
} }