Skip to content
Snippets Groups Projects
Commit 2ba80146 authored by Patrick Jentsch's avatar Patrick Jentsch
Browse files

Some prework for files from database update

parent bafa522e
No related branches found
No related tags found
No related merge requests found
...@@ -274,7 +274,8 @@ class JobInput(db.Model): ...@@ -274,7 +274,8 @@ class JobInput(db.Model):
def to_dict(self): def to_dict(self):
return {'id': self.id, return {'id': self.id,
'filename': self.filename, 'filename': self.filename,
'job_id': self.job_id} 'job_id': self.job_id,
'results': [result.to_dict() for result in self.results]}
class JobResult(db.Model): class JobResult(db.Model):
......
...@@ -50,14 +50,45 @@ ...@@ -50,14 +50,45 @@
serviceArgsElement.value = this.job.service_args; serviceArgsElement.value = this.job.service_args;
serviceVersionElement = document.getElementById("service-version"); serviceVersionElement = document.getElementById("service-version");
serviceVersionElement.value = this.job.service_version; serviceVersionElement.value = this.job.service_version;
statusColor = JobList.STATUS_COLORS[this.job.status] statusColor = JobList.STATUS_COLORS[this.job.status] || JobList.STATUS_COLORS['default'];
|| JobList.STATUS_COLORS['default'];
statusElement = document.getElementById("status"); statusElement = document.getElementById("status");
statusElement.classList.add(statusColor); statusElement.classList.add(statusColor);
statusElement.innerHTML = this.job.status; statusElement.innerHTML = this.job.status;
titleElement = document.getElementById("title"); titleElement = document.getElementById("title");
titleElement.innerHTML = this.job.title; titleElement.innerHTML = this.job.title;
var downloadIconElement, fileElement, filesElement, input, inputDownloadElement, inputElement, result, resultDownloadElement, resultsElement;
filesElement = document.getElementById("files");
downloadIconElement = document.createElement("i");
downloadIconElement.classList.add("material-icons", "left");
downloadIconElement.innerText = "file_download";
for (input of this.job.inputs) {
fileElement = document.createElement("tr");
inputDownloadElement = document.createElement("a");
inputDownloadElement.classList.add("waves-effect", "waves-light", "btn-small");
inputDownloadElement.href = `/jobs/${this.job.id}/download?file=${input.filename}`;
inputDownloadElement.innerText = input.filename;
inputDownloadElement.appendChild(downloadIconElement.cloneNode(true));
inputElement = document.createElement("td");
inputElement.id = `input-${input.id}`;
inputElement.appendChild(inputDownloadElement);
resultsElement = document.createElement("td");
resultsElement.id = `results-${input.id}`;
// add_results(input);
for (result of input.results) {
resultDownloadElement = document.createElement("a");
resultDownloadElement.classList.add("waves-effect", "waves-light", "btn-small");
resultDownloadElement.href = `/jobs/${this.job.id}/download?file=output/${input.filename}/${result.filename}`;
resultDownloadElement.innerText = result.filename.split(".").slice(-1)[0];
resultDownloadElement.appendChild(downloadIconElement.cloneNode(true));
resultsElement.appendChild(resultDownloadElement);
}
fileElement.appendChild(inputElement);
fileElement.appendChild(resultsElement);
filesElement.appendChild(fileElement);
}
M.updateTextFields(); M.updateTextFields();
} }
...@@ -68,8 +99,17 @@ ...@@ -68,8 +99,17 @@
for (operation of patch) { for (operation of patch) {
/* "/jobId/valueName" -> ["jobId", "valueName"] */ /* "/jobId/valueName" -> ["jobId", "valueName"] */
pathArray = operation.path.split("/").slice(1); pathArray = operation.path.split("/").slice(1);
console.log(operation);
console.log(pathArray);
if (pathArray[0] != this.jobId) {continue;} if (pathArray[0] != this.jobId) {continue;}
switch(operation.op) { switch(operation.op) {
case "add":
switch(pathArray[1]) {
case "input":
break;
}
break;
case "delete": case "delete":
location.reload(); location.reload();
break; break;
...@@ -198,6 +238,17 @@ ...@@ -198,6 +238,17 @@
</div> </div>
<span class="card-title">Files</span> <span class="card-title">Files</span>
<table>
<thead>
<tr>
<th style="width: 50%;">Inputs</th>
<th style="width: 50%;">Results</th>
</tr>
</thead>
<tbody id="files"></tbody>
</table>
<span class="card-title">Files old</span>
<table> <table>
<thead> <thead>
<tr> <tr>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment