Change english comment

abvw/html/index.html

@@ -23,7 +23,7 @@
     <script src="/abvw/js/operationList/operationList.js?__UPDATEID__"></script>
     <script src="/abvw/js/topPage/topPage.js?__UPDATEID__"></script>
     <script src="/abvw/js/dashboardSetting/check-dashboard-setting.js?__UPDATEID__"></script>
-    <script src="/abvw/js/dashboard/check-dashboard.js?__UPDATEID__"></script>
+    <script src="/abvw/js/dashboard/dashboard.js?__UPDATEID__"></script>
     <script src="/abvw/common/js/footer.js?__UPDATEID__"></script>
     <script src="/abvw/common/js/app.js?__UPDATEID__" defer></script>
 

abvw/js/dashboard/check-dashboard.js

-var CHK_Dashboard = {};
-
-CHK_Dashboard.pickupItems = [
-    {id: 'newReport', href: "javascript:CHK_Dashboard.goPickup('newReport');", count: 0, enabled: true, img: {src: 'img/icon_new.svg'}, msg: 'newRegistrationTitle'},
-    {id: 'continousWork', href: "javascript:CHK_Dashboard.goPickup('continousWork');", count: 0, enabled: true, img: {src: 'img/icon_proccess.svg'}, msg: 'continousWorkTitle'},
-    {id: 'reportWarning', href: "javascript:CHK_Dashboard.goPickup('reportWarning');", count: 0, enabled: true, img: {src: 'img/icon_alert.svg'}, msg: 'reportWarningTitle'},
-];
-CHK_Dashboard.communicationItems = [
-    {id: 'messageList', href: "javascript:CHK_Dashboard.goMessageList();", count: 0, enabled: true, img: {src: 'img/icon_message_lsit.svg'}, msg: 'messageListTitle'},
-    {id: 'sendMessage', href: "javascript:CHK.sendAppCommand('goSendMessage');", count: 0, enabled: true, img: {src: 'img/icon_send_message.svg'}, msg: 'sendMessageTitle'},
-    {id: 'distanceSupport', href: "javascript:CHK.sendAppCommand('goDistanceSupport');", count: 0, enabled: true, img: {src: 'img/icon_remote.svg'}, msg: 'distanceSupportTitle'},
-    {id: 'chat', href: "javascript:CHK.sendAppCommand('goChat');", count: 0, enabled: false, img: {src: 'img/icon_chat.svg'}, msg: 'chatTitle'},
-];
-
-//CHK_Dashboard.pickupItemsに設定した情報をhtmlに表示する
-CHK_Dashboard.initPickups = function() {
-    $("#pickupItems").empty();
-    CHK_Dashboard.pickupItems.forEach(function(item) {
-        if (item.enabled == true) {
-            var html = CHK_Dashboard.initHtmlItem(item);
-            $("#pickupItems").append(html);
-        }
-    });
-    //pickup empty
-    if ($("#pickupItems").children().length > 0) {
-        $("#pickupHeader").removeClass('d-none');
-    } else {
-        $("#pickupHeader").addClass('d-none');
-    }
-}
-
-//CHK_Dashboard.communicationItemsに設定した情報をhtmlに表示する
-CHK_Dashboard.initCommunications = function() {
-    $("#communicationItems").empty();
-    CHK_Dashboard.communicationItems.forEach(function(item) {
-        if (item.enabled == true) {
-            var html = CHK_Dashboard.initHtmlItem(item);
-            $("#communicationItems").append(html);
-        }
-    });
-}
-
-//設定されている情報からhtmlを表示する
-CHK_Dashboard.initHtmlItem = function(item) {
-    var countText = '' + item.count;
-    if (item.count >= 100) {
-        countText = '99+';
-    }
-    var countDClass = '';
-    if (typeof item.count == 'undefined' || item.count < 1) {
-        countDClass = ' d-none';
-    }
-    var countSpan = '<span class="count fs-7' + countDClass + '">' + countText + '</span>';
-    var html = $('<div class="item" id="' + item.id + '">'
-                + '<a href="' + item.href + '" class="d-block text-dark text-decoration-none mb-1 p-3">'
-                + '<img src="' + item.img.src + '">'
-                + '<div class="fs-8 multi-lang" data-msg="' + item.msg + '">' + getMsg(item.msg) + '</div>'
-                + countSpan
-                + '</a>'
-                + '</div>');
-    return html;
-}
-
-//ダッシュボード画面の初期表示
-CHK_Dashboard.init = function() {
-    CHK_Dashboard.updateDataPickups();
-    CHK_Dashboard.initPickups();
-    CHK_Dashboard.updateDataCommunications();
-    CHK_Dashboard.initCommunications();
-}
-
-//変数として設定しているガジェットに初期表示で取得したデータを設定
-CHK_Dashboard.updateDataPickups = function() {
-    CHK_Dashboard.pickupItems.forEach(function(item) {
-        let enabled = CHK.dashboardSetting[item.id];
-        if (enabled == true || enabled == false) {
-            item.enabled = enabled;
-        }
-        item.count = 0;
-        if (CHK.dashboardBatch[item.id]) {
-            item.count = CHK.dashboardBatch[item.id];
-        }
-    });
-}
-
-//変数として設定しているコミュニケーションに初期表示で取得したデータを設定
-CHK_Dashboard.updateDataCommunications = function() {
-    CHK_Dashboard.communicationItems.forEach(function(item) {
-        if (item.id == 'messageList') {
-            item.count = 0;
-            if (typeof CHK.pushMessageList !== 'undefined') {
-                //読んでいないメッセージがあればカウントを +1
-                CHK.pushMessageList.forEach(function(message) {
-                    if (!message.readingFlg) {
-                        item.count += 1;
-                    }
-                });
-            }
-        } else if (item.id == 'chat') {
-            item.enabled = CHK.isChat;
-        }
-    });
-}
-
-//ガジェット画面に移動
-CHK_Dashboard.goPickup = function(pickupId) {
-    CHK.goUrlWithCurrentParams('pickup.html', {pickupActive: pickupId});
-}
-
-//コミュニケーション画面に移動
-CHK_Dashboard.goMessageList = function() {
-    CHK.goUrlWithCurrentParams('message-list.html', {});
-}
\ No newline at end of file

abvw/js/dashboard/dashboard.js

+/**
+ * Dashboard js in dashboard.html
+ * @since cms:1.4.3.2&1.4.3.3 web:1.0
+ */
 var DASHBOARD = {};
 
+// pickup dashboard configuration
 DASHBOARD.pickupItems = [
     {id: 'newReport', href: "javascript:DASHBOARD.goPickup('newReport');", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_new.svg'}, msg: 'newRegistrationTitle', defaultMessage:'New report'},
     {id: 'continousWork', href: "javascript:DASHBOARD.goPickup('continousWork');", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_proccess.svg'}, msg: 'continousWorkTitle' , defaultMessage:'Continuous Work'},
     {id: 'reportWarning', href: "javascript:DASHBOARD.goPickup('reportWarning');", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_alert.svg'}, msg: 'reportWarningTitle' , defaultMessage:'Warning report'},
 ];
+
+// comunication dashboard configuration
 DASHBOARD.communicationItems = [
     {id: 'messageList', href: "javascript:DASHBOARD.goMessageList();", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_message_list.svg'}, msg: 'messageListTitle' , defaultMessage:'Message list'},
     {id: 'sendMessage', href: "javascript:DASHBOARD.goSendMessage();", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_send_message.svg'}, msg: 'sendMessageTitle' , defaultMessage:'Message'},
@@ -12,19 +19,18 @@ DASHBOARD.communicationItems = [
     {id: 'chat', href: "javascript:DASHBOARD.goChat();", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_chat.svg'}, msg: 'chatTitle' , defaultMessage:'Chat'},
 ];
 
-
+// Default dashboard setting data
 DASHBOARD.defaultDashboard = {
-    newReport: 12,
-    continousWork: 100,
-    reportWarning: 13,
-    pushMesage: 7,
+    newReport: 0,
+    continousWork: 0,
+    reportWarning: 0,
+    pushMesage: 0,
 }
 
 DASHBOARD.baseApiUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + 'topScreen/';
 DASHBOARD.getDataApiUrl = DashboardSetting.baseApiUrl + 'getAllData';
 
 // Call api get data 
-
 DASHBOARD.getDashboardData = function (callback) {
     let param = {
         sid: COMMON.getSid(),
@@ -42,7 +48,7 @@ DASHBOARD.getDashboardData = function (callback) {
 };
 
 
-//CHK_Dashboard.pickupItemsに設定した情報をhtmlに表示する
+//Initialization dashboard pickup items html
 DASHBOARD.initPickups = function() {
     $("#pickupItems").empty();
     DASHBOARD.pickupItems.forEach(function(item) {
@@ -59,30 +65,30 @@ DASHBOARD.initPickups = function() {
     }
 }
 
-//CHK_Dashboard.communicationItemsに設定した情報をhtmlに表示する
+//Initialization dashboard communication items html
 DASHBOARD.initCommunications = function() {
     $("#communicationItems").empty();
     DASHBOARD.communicationItems.forEach(function(item) {
         if (item.enabled == true) {
-            var html = DASHBOARD.initHtmlItem(item);
+            const html = DASHBOARD.initHtmlItem(item);
             $("#communicationItems").append(html);
         }
     });
 }
 
-//設定されている情報からhtmlを表示する
+// Initialization dashboard items html 
 DASHBOARD.initHtmlItem = function(item) {
-    var countText = '' + item.count;
+    let countText = '' + item.count;
     if (item.count >= 100) {
         countText = '99+';
     }
-    var countDClass = '';
-    var countSpan = ''
+    let countDClass = '';
+    let countSpan = ''
     if (typeof item.count != 'undefined' && item.count > 0) {
         countDClass = ' ';
         countSpan = '<span class="fs-8 circle-tag-danger' + countDClass + '">' + countText + '</span>';
     }
-    var html = $('<li class="card mb-2 position-relative" id="' + item.id + '">'
+    let html = $('<li class="card mb-2 position-relative" id="' + item.id + '">'
                 + '<a href="' + item.href + '" class="d-block text-dark text-decoration-none mb-1 p-3 text-center">'
                 + '<div class="bg-lightblue p-2 d-inline-block rounded-circle mb-3">'
                 + '<img src="' + item.img.src + '" alt="' +  DASHBOARD.getMsg(item.msg, item.defaultMessage) +'" class="img-fluid"> </div>'
@@ -93,7 +99,7 @@ DASHBOARD.initHtmlItem = function(item) {
     return html;
 }
 
-//ダッシュボード画面の初期表示
+// Initialization dashboard screen
 DASHBOARD.init = function() {
     DashboardSetting.getSettingData(function (settings) {
         DASHBOARD.getDashboardData(function (dataDashboard) {
@@ -105,10 +111,10 @@ DASHBOARD.init = function() {
     });  
 }
 
-//変数として設定しているガジェットに初期表示で取得したデータを設定
+// Update pickup config from setting dashboard data
 DASHBOARD.updateDataPickups = function(settings, dataDashboard) {
     DASHBOARD.pickupItems.forEach(function(item) {
-        let enabled = settings[item.id];
+        const enabled = settings[item.id];
         if (enabled == true || enabled == false) {
             item.enabled = enabled;
         }
@@ -119,7 +125,7 @@ DASHBOARD.updateDataPickups = function(settings, dataDashboard) {
     });
 }
 
-//変数として設定しているコミュニケーションに初期表示で取得したデータを設定
+//Update communication setting from dashboard data
 DASHBOARD.updateDataCommunications = function(dataDashboard) {
     DASHBOARD.communicationItems.forEach(function(item) {
         if (item.id == 'messageList') {
@@ -134,17 +140,17 @@ DASHBOARD.updateDataCommunications = function(dataDashboard) {
     });
 }
 
-//ガジェット画面に移動
+// Direct to pickup screen
 DASHBOARD.goPickup = function(pickupId) {
-    CHK.goUrlWithCurrentParams('pickup.html', {pickupActive: pickupId});
+    COMMON.goUrlWithCurrentParams('pickup.html', {pickupActive: pickupId});
 }
 
-//コミュニケーション画面に移動
+// Direct to Message list screen
 DASHBOARD.goMessageList = function() {
-    CHK.goUrlWithCurrentParams('message-list.html', {});
+    COMMON.goUrlWithCurrentParams('message-list.html', {});
 }
 
-//コミュニケーション画面に移動
+// get message language
 DASHBOARD.getMsg = function(message, defaultMessage) {
     return defaultMessage;
 }
\ No newline at end of file