From 37b51cdfbc6057e77ea0f10762a2e81887930274 Mon Sep 17 00:00:00 2001
From: "Heekyoung, Oh" <heekyoung.oh@samsung.com>
Date: Wed, 5 Apr 2017 18:16:10 +0900
Subject: [PATCH] [TIC-Web] Update Log View

- When Inprogressing,
- The Log View Updated, in realtime

Change-Id: Id61ce230f7e1ae8a2d06b9992980f7ec06dc5417
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
---
 public/src/css/style.css             | 13 ++++++-------
 public/src/js/page/job.js            |  2 +-
 public/src/js/util.js                | 13 ++++++++-----
 public/src/js/widget/JobLog.js       | 11 ++++++++++-
 public/src/js/widget/JobTableItem.js |  2 +-
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/public/src/css/style.css b/public/src/css/style.css
index 975c395..e247f60 100644
--- a/public/src/css/style.css
+++ b/public/src/css/style.css
@@ -507,9 +507,9 @@ tr.extended_job_table_row:hover td {
     border-bottom-width: thin;
 }
 .log-view-content-close {
-    margin-right: 7px;
-    margin-top: -7px;
-    font-size: 20px;
+    margin-right: 10px;
+    margin-top: 0px;
+    font-size: 21px;
 }
 .log-view-content-header-title {
     margin-left: 10px;
@@ -531,12 +531,11 @@ tr.extended_job_table_row:hover td {
     white-space: pre-line;
 }
 a.log-view-content-download {
-    color: cadetblue;
     float: right;
-    margin-right: 40px;
-    margin-top: -20px;
+    margin-right: 50px;
+    margin-top: -30px;
     cursor: pointer;
-    font-size: 11px;
+    font-size: 1.5em;
     font-weight: bold;
 }
 
diff --git a/public/src/js/page/job.js b/public/src/js/page/job.js
index 81572bd..9377954 100644
--- a/public/src/js/page/job.js
+++ b/public/src/js/page/job.js
@@ -187,7 +187,7 @@ define([
     function _initSocket() {
         function _btnLogBlink (jobId, bBlink) {
             var btnLogSelector, btnLogElem;
-            btnLogSelector = '#tic-job-list #extended_job_table_row_' + jobId + ' .btnbiglog';
+            btnLogSelector = '#tic-job-list #job_table_row_' + jobId + ' .btnbiglog';
             btnLogElem = $(btnLogSelector);
             if (!btnLogElem.hasClass('btnlogactive')) {
                 if (bBlink) {
diff --git a/public/src/js/util.js b/public/src/js/util.js
index f128119..0b7f21d 100644
--- a/public/src/js/util.js
+++ b/public/src/js/util.js
@@ -9,7 +9,7 @@ define([
     var config = null;
 
     function showBigLogView(btn) {
-        var linkid, linkurl, logViewTop, logViewLeft, logViewWidth, logViewHeight;
+        var linkid, linkurl, logViewTop, logViewLeft, logViewWidth, logViewHeight, targetId;
 
         if (config === null) {
             getAppConfig();
@@ -18,7 +18,8 @@ define([
         function readLog(linkid) {
             POST(config.EVENT.JOB.JOB_READ_LOG + linkid)
             .then(function (line) {
-                 $('#log-view-content-body').append(line);
+                 $('#' + targetId).append(line);
+                 $('#log-view-content').show();
             });
         }
 
@@ -47,11 +48,13 @@ define([
 
         // show
         $('#log-view-content-body').empty();
-        $('#log-view-content-download').attr('href', linkurl);
-        $('#log-view-content').show();
+        targetId = 'extended_log_job_' + linkid;
+        $('#log-view-content-body').append('<div id="' + targetId + '"></div>');
 
-        // read
+        $('#log-view-content-download').attr('href', linkurl);
         readLog(linkid);
+
+        // $('#log-view-content').show();
     }
 
     function setAnimateScroll() {
diff --git a/public/src/js/widget/JobLog.js b/public/src/js/widget/JobLog.js
index 5ad60c3..fb20829 100644
--- a/public/src/js/widget/JobLog.js
+++ b/public/src/js/widget/JobLog.js
@@ -21,11 +21,13 @@ define([
     };
 
     JobLog.prototype.init = function () {
-        var logViewId, logViewElem;
+        var logViewId, logViewElem, logViewBigId, logViewBigElem;
 
         this.template = _.template(strLog)({
             log: this.msg
         });
+
+        // table extended row
         logViewId = 'extended_job_table_row_' + this.jobId;
         logViewElem = $('[id='+logViewId+'] > td > div');
         logViewElem.append(this.template);
@@ -33,6 +35,13 @@ define([
             scrollTop: logViewElem.prop('scrollHeight')
         }, 0);
 
+        // big log view
+        logViewBigId = 'extended_log_job_' + this.jobId;
+        logViewBigElem = $('#' + logViewBigId);
+        logViewBigElem.append(this.template);
+        logViewBigElem.parent().animate({
+            scrollTop: logViewBigElem.prop('scrollHeight')
+        }, 0);
     };
 
     JobLog.prototype.getTemplate = function () {
diff --git a/public/src/js/widget/JobTableItem.js b/public/src/js/widget/JobTableItem.js
index 518ac7f..2de71d3 100644
--- a/public/src/js/widget/JobTableItem.js
+++ b/public/src/js/widget/JobTableItem.js
@@ -31,7 +31,7 @@ define([
             '<td><%= jobUptime %></td>',
             '<td><a class="tic-job-list-btn btncancel <%= classJobCancel %>" data-jobid="<%= jobNum %>" title="Cancel">Cancel</a></td>',
             '<td><a class="tic-job-list-btn <%= classJobKsPath %>" href="<%= jobKsPath %>" title="Kickstarter File">KS</a></td>',
-            '<td><a class="tic-job-list-btn btnbiglog" href="<%= jobLogPath %>" title="Log">Log</a></td>',
+            '<td><a class="tic-job-list-btn btnbiglog btnbiglogex" data-link="<%= jobLogPath %>" data-jobid="<%= jobNum %>" title="Log">Log</a></td>',
         '</tr>',
         '<tr id="extended_job_table_row_<%= jobNum %>" class="extended_job_table_row">',
             '<td colspan="10" class="extended_job_table_container">',
-- 
2.7.4