[TIC-Web] fix the image creation enable/disable status and job log status

- check the package list and mic status
- fix the job log color

Change-Id: Ia3f300acab361ffb21e87ecb911521bdb85b302c
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

diff --git a/public/src/css/style.css b/public/src/css/style.css
index 6197c17..3d5c599 100644 (file)
--- a/public/src/css/style.css
+++ b/public/src/css/style.css
@@ -235,7 +235,7 @@ tr.extended_job_table_row:hover {
     background-color: rgba(13, 19, 14, 0.71);
 }
 tr.extended_job_table_row:hover td {
-    background-color: transparent;
+    background-color: rgba(13, 19, 14, 0.71);
 }
 
 .tic-job-table {

diff --git a/public/src/js/page/job.js b/public/src/js/page/job.js
index 8c654ac..9e00774 100644 (file)
--- a/public/src/js/page/job.js
+++ b/public/src/js/page/job.js
@@ -184,21 +184,7 @@ define([
             .then(_updateView);
     }
 
-    function _initSocket(socket) {
-        // assign
-        client = socket;
-
-        /**
-         * whether can using mic or not
-         *
-         * AppConfig.EVENT.SOCKET.MIC_AVAILABLE_FROM = 'ws/mic/available/from'
-         * AppConfig.EVENT.SOCKET.MIC_AVAILABLE_TO = 'ws/mic/available/to'
-         */
-        client.emit(AppConfig.EVENT.SOCKET.MIC_AVAILABLE_FROM);
-        client.on(AppConfig.EVENT.SOCKET.MIC_AVAILABLE_TO, function (data) {
-            $('#tic-package-create').toggleClass('disabled', !data);
-        });
-
+    function _initSocket() {
         /**
          * when running on mic
          *
@@ -403,7 +389,7 @@ define([
             AppConfig = config;
 
             client = Util.getWebSocket();
-            _initSocket(client);
+            _initSocket();
         });
     }
 

diff --git a/public/src/js/page/package.js b/public/src/js/page/package.js
index a130bda..9bf202a 100644 (file)
--- a/public/src/js/page/package.js
+++ b/public/src/js/page/package.js
@@ -20,6 +20,7 @@ define([
     'use strict';
 
     var logger = Logger('package.js');
+    var socket;
 
     var $tree = $('#tic-package-left-col-tree');
     var defaultFilters = [];
@@ -859,11 +860,8 @@ define([
             packageList.html(_.orderBy(_.map(list, 'name')).join('<br>'));
         }
 
-        if (count === 0) {
-            $('#tic-package-create').toggleClass('disabled', true);
-        } else {
-            Util.getWebSocket().emit(AppConfig.EVENT.SOCKET.MIC_AVAILABLE_FROM);
-        }
+        // check mic status to image creation
+        socket.emit(AppConfig.EVENT.SOCKET.MIC_AVAILABLE_FROM);
     }
 
     /**
@@ -1227,10 +1225,22 @@ define([
         // Patch: Bootstrap dropdown menu not working (not dropping down when clicked)
         // $('.dropdown-toggle').dropdown();
 
-        // appConfig
-        Util.getAppConfig().then(function (data) {
-            AppConfig = data;
+        Util.getAppConfig()
+        .then(function (config) {
+            AppConfig = config;
+
+            socket = Util.getWebSocket();
+
+            // Image Creation Button status
+            socket.on(AppConfig.EVENT.SOCKET.MIC_AVAILABLE_TO, function (isAvailable) {
+                if (isAvailable && _.size(_getChecked()) > 0) {
+                    $('#tic-package-create').toggleClass('disabled', false);
+                } else {
+                    $('#tic-package-create').toggleClass('disabled', true);
+                }
+            });
         });
+
     }
 
     init();