diff --git a/resources/js/script.js b/resources/js/script.js
index ed9e0a9..446f500 100644
--- a/resources/js/script.js
+++ b/resources/js/script.js
@@ -103,35 +103,11 @@ $( document ).ready( () => {
maxFileCount: 1,
allowedFileExtensions: ["py"]
});
-
- var url = window.location;
-
- // GET REQUEST
- $("#btnGetFiles").click( (event) => {
- event.preventDefault();
- ajaxGet();
+ $('#uploadfile').on('filecleared', function(event) {
+ $('#btnSubmit').prop('disabled', true);
});
- // DO GET
- function ajaxGet(){
- $.ajax({
- type : "GET",
- url : "/api/files/getall",
- success: (data) => {
- // clear old data
- $("#listFiles").html("");
- // render list of files
- $("#listFiles").append('
');
- $.each(data, (index, filename) => {
- $("#listFiles").append('- ' + filename + '
');
- });
- $("#listFiles").append('
');
- },
- error : (err) => {
- $("#listFiles").html(err.responseText);
- }
- });
- }
+ var url = window.location;
// Upload File
$('#uploadfile').change(function(e){
diff --git a/resources/js/socket_script.js b/resources/js/socket_script.js
index 01d1f1e..1a37c2b 100644
--- a/resources/js/socket_script.js
+++ b/resources/js/socket_script.js
@@ -47,43 +47,43 @@ socket.on('leaderboard', (obj) => {
$(".leaderboard-table").find("tr:not(:first):not(:last)").remove();
if(obj.ulysses16.length != 0) {
obj.ulysses16.forEach(element => {
- $('#ulysses16-last').before('
| ' + element.name + ' | ' + element.fitness + ' | ' + element.desc + ' |
')
+ $('#ulysses16-last').before('
| ' + element.name + ' | ' + element.fitness.toFixed(2) + ' | ' + element.desc + ' |
')
});
- $('#ulysses16_best').text(obj.ulysses16[0].fitness);
+ $('#ulysses16_best').text(obj.ulysses16[0].fitness.toFixed(2));
}
if(obj.att48.length != 0 ) {
obj.att48.forEach(element => {
- $('#att48-last').before('
| ' + element.name + ' | ' + element.fitness + ' | ' + element.desc + ' |
')
+ $('#att48-last').before('
| ' + element.name + ' | ' + element.fitness.toFixed(2) + ' | ' + element.desc + ' |
')
});
- $('#att48_best').text(obj.att48[0].fitness);
+ $('#att48_best').text(obj.att48[0].fitness.toFixed(2));
}
if (obj.st70.length != 0) {
obj.st70.forEach(element => {
- $('#st70-last').before('
| ' + element.name + ' | ' + element.fitness + ' | ' + element.desc + ' |
')
+ $('#st70-last').before('
| ' + element.name + ' | ' + element.fitness.toFixed(2) + ' | ' + element.desc + ' |
')
});
- $('#st70_best').text(obj.st70[0].fitness);
+ $('#st70_best').text(obj.st70[0].fitness.toFixed(2));
}
if (obj.a280.length != 0) {
obj.a280.forEach(element => {
- $('#a280-last').before('
| ' + element.name + ' | ' + element.fitness + ' | ' + element.desc + ' |
')
+ $('#a280-last').before('
| ' + element.name + ' | ' + element.fitness.toFixed(2) + ' | ' + element.desc + ' |
')
});
- $('#a280_best').text(obj.a280[0].fitness);
+ $('#a280_best').text(obj.a280[0].fitness.toFixed(2));
}
if(obj.pcb442.length != 0) {
- $('#pcb442_best').text(obj.pcb442[0].fitness);
obj.pcb442.forEach(element => {
- $('#pcb442-last').before('
| ' + element.name + ' | ' + element.fitness + ' | ' + element.desc + ' |
')
+ $('#pcb442-last').before('
| ' + element.name + ' | ' + element.fitness.toFixed(2) + ' | ' + element.desc + ' |
')
});
+ $('#pcb442_best').text(obj.pcb442[0].fitness.toFixed(2));
}
if(obj.dsj1000.length != 0) {
obj.dsj1000.forEach(element => {
- $('#dsj1000-last').before('
| ' + element.name + ' | ' + element.fitness + ' | ' + element.desc + ' |
')
+ $('#dsj1000-last').before('
| ' + element.name + ' | ' + element.fitness.toFixed(2) + ' | ' + element.desc + ' |
')
});
- $('#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 => {
if(e.name === "ulysses16.txt") {
my_res.ulysses16.fitness = e.fitness
- $("#ulysses16_your").text(e.fitness);
+ $("#ulysses16_your").text(e.fitness.toFixed(2));
if(e.fitness > 0) {
enable_btn($('#ulysses16_submit'))
}
}
if(e.name === "att48.txt") {
my_res.att48.fitness = e.fitness
- $("#att48_your").text(e.fitness);
+ $("#att48_your").text(e.fitness.toFixed(2));
if(e.fitness > 0) {
enable_btn($('#att48_submit'))
}
}
if(e.name === "st70.txt") {
my_res.st70.fitness = e.fitness
- $("#st70_your").text(e.fitness)
+ $("#st70_your").text(e.fitness.toFixed(2))
if(e.fitness > 0) {
enable_btn($('#st70_submit'))
}
}
if(e.name === "a280.txt") {
my_res.a280.fitness = e.fitness
- $("#a280_your").text(e.fitness)
+ $("#a280_your").text(e.fitness.toFixed(2))
if(e.fitness > 0) {
enable_btn($('#a280_submit'))
}
}
if(e.name === "pcb442.txt") {
my_res.pcb442.fitness = e.fitness
- $("#pcb442_your").text(e.fitness)
+ $("#pcb442_your").text(e.fitness.toFixed(2))
if(e.fitness > 0) {
enable_btn($('#pcb442_submit'))
}
}
if(e.name === "dsj1000.txt") {
my_res.dsj1000.fitness = e.fitness
- $("#dsj1000_your").text(e.fitness)
+ $("#dsj1000_your").text(e.fitness.toFixed(2))
if(e.fitness > 0) {
enable_btn($('#dsj1000_submit'))
}