From 9bea4ddecf8366c8e6739be2ffb12a502b630fd2 Mon Sep 17 00:00:00 2001
From: Newnius <newnius.cn@gmail.com>
Date: Thu, 16 May 2019 13:48:30 +0800
Subject: [PATCH] update

---
 modals.php    |  4 ++--
 static/job.js | 30 ++++++++++++++++++++++++++++--
 ucenter.php   |  1 +
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/modals.php b/modals.php
index 8cb7d37..4b0a32a 100755
--- a/modals.php
+++ b/modals.php
@@ -160,14 +160,14 @@
 								</div>
 							</div>
 							<div class="col-md-2">
-								<label>GPU Number</label>
+								<label>GPU Number (Available: 4)</label>
 								<div class="form-group">
 									<input type="number" class="form-control task-gpu-num" step="1" min="1" value="1"
 									       placeholder="number of GPU cards required" required/>
 								</div>
 							</div>
 							<div class="col-md-2">
-								<label>GPU Memory</label>
+								<label>GPU Memory(Left:N GB)</label>
 								<div class="form-group">
 									<input type="number" class="form-control task-gpu-mem" step="1024" min="1024"
 									       value="4096" placeholder="MB" required/>
diff --git a/static/job.js b/static/job.js
index f44f4b9..833f023 100755
--- a/static/job.js
+++ b/static/job.js
@@ -198,7 +198,7 @@ var statusFormatter = function (status) {
 	status = parseInt(status);
 	switch (status) {
 		case 0:
-			return '<span class="text-normal">Created</span>';
+			return '<span class="text-normal">Submitted</span>';
 		case 1:
 			return '<span class="text-normal">Starting</span>';
 		case 2:
@@ -337,7 +337,7 @@ function load_job_status(name) {
 			valign: 'middle'
 		}, {
 			field: 'operate',
-			title: 'Operate',
+			title: 'Logs',
 			align: 'center',
 			events: jobStatusOperateEvents,
 			formatter: jobStatusOperateFormatter
@@ -360,6 +360,7 @@ function jobStatusResponseHandler(res) {
 function jobStatusOperateFormatter(value, row, index) {
 	var div = '<div class="btn-group" role="group" aria-label="...">';
 	div += '<button class="btn btn-default logs"><i class="glyphicon glyphicon-eye-open"></i>&nbsp;</button>';
+	div += '<button class="btn btn-default download"><i class="glyphicon glyphicon-download-alt"></i>&nbsp;</button>';
 	div += '</div>';
 	return div;
 }
@@ -390,5 +391,30 @@ window.jobStatusOperateEvents = {
 			$("#modal-msg").modal('show');
 			$('#table-job').bootstrapTable("refresh");
 		});
+	},
+	'click .download': function (e, value, row, index) {
+		var job = getParameterByName('name');
+		var task = row.id;
+
+		var ajax = $.ajax({
+			url: "service?action=task_logs",
+			type: 'GET',
+			data: {
+				job: job,
+				task: task
+			}
+		});
+		ajax.done(function (res) {
+			if (res["errno"] !== 0) {
+				$("#modal-msg-content").html(res["msg"]);
+				$("#modal-msg").modal('show');
+			}
+			download(res['msg'], job + '_' + task + '.txt', "text/plain");
+		});
+		ajax.fail(function (jqXHR, textStatus) {
+			$("#modal-msg-content").html("Request failed : " + jqXHR.statusText);
+			$("#modal-msg").modal('show');
+			$('#table-job').bootstrapTable("refresh");
+		});
 	}
 };
\ No newline at end of file
diff --git a/ucenter.php b/ucenter.php
index 7385478..9bcc2e2 100755
--- a/ucenter.php
+++ b/ucenter.php
@@ -260,6 +260,7 @@ foreach ($entries as $entry) {
 <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.12.1/dist/extensions/export/bootstrap-table-export.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.10.1/tableExport.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/chart.js@2.8.0"></script>
+<script src="https://cdn.jsdelivr.net/npm/downloadjs@1.4.7/download.min.js"></script>
 
 <script src="static/workspace.js"></script>
 <script src="static/job.js"></script>