Merge branch 'feature/1.4.3_dev' into feature/1.4.3_dev_19123

76a8beaa · NGO THI HONG · 84a967d3 · 386534aa · 76a8beaa · 76a8beaa
Commit 76a8beaa authored Sep 10, 2022 by NGO THI HONG
9 changed files
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -20364,3 +20364,11 @@ button {
        margin-left: -2px
    }
 }
+.alignCenter_header {
+	position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translateY(-50%) translateX(-50%);
+    margin: auto;
+}
--- a/app/index.html
+++ b/app/index.html
@@ -29,12 +29,14 @@
        <header style="position: fixed; width: 100%; top: 0px; left: 0; z-index: 999;">
            <nav class="navbar navbar-dark bg-primary">
-                <h1 class="fs-10 font-weight-bold mb-0 text-white"></h1>
+                <div>
-                <div class="d-flex align-items-center">
                    <a class="navbar-brand category-btn lht-0 d-none" onclick="CHK.openCategory();" id="operationGroupMasterButton" href="javascript:CHK.setCategoryHeight();">
                        <i class="fa fa-folder fs-12 p-1" id="category-toggle-button"></i>
                        <span class="d-none d-md-inline fs-10 multi-lang" data-msg="buttonCategory">カテゴリー</span>
                    </a>
+                </div>
+                <h1 class="fs-10 font-weight-bold mb-0 text-white multi-lang alignCenter_header" data-msg="operationListHeaderTitle">作業一覧</h1>
+                <div class="d-flex align-items-center">
                <a class="navbar-brand lht-0" href="javascript:CHK_L.sendAppCommand('refreshContent');" style="margin: 0 10px 0 10px;float: right;">
                    <i class="fa fa-redo fs-12 p-1" id="updateButton"></i>
                    <span class="d-none d-md-inline fs-10 multi-lang" data-msg="buttonRefresh">更新</span>
@@ -160,8 +162,7 @@
        <header>
            <nav class="navbar navbar-dark bg-primary position-fixed fixed-top w-100">
                <div></div>
-                <div></div>
+                <h1 class="fs-10 font-weight-bold mb-0 text-white multi-lang alignCenter_header" data-msg="dashboardHeaderTitle">ダッシュボード</h1>
-                <h1 class="fs-10 font-weight-bold mb-0 text-white multi-lang" data-msg="dashboardHeaderTitle">ダッシュボード</h1>
                <div class="d-flex align-items-center">
                    <a href="javascript:CHK.goUrlWithCurrentParams('dashboard-setting.html');" class="nav-link text-white lht-0 p-1 mr-2">
                        <img class="icon" src="img/icon_dashboard_setting.svg" alt="設定">
@@ -209,23 +210,4 @@
    <script type="text/javascript" src="js/app.js" defer></script>
 </body>
-<script>
-    $(document).ready(function() {
-        $("#footer").load("main-footer.html", function() {
-            if (!sessionStorage.activeTab) {
-                CHK.loadDashboardSetting(function() {
-                    if (CHK.dashboardSetting.dashboardHome) {
-                        CHK_Footer.goDashboard();
-                    } else {
-                        CHK_Footer.goOperationList();
-                    }
-                });
-            } else if (sessionStorage.activeTab === 'dashboard') {
-                CHK_Footer.goDashboard();
-            } else if (sessionStorage.activeTab === 'operationList') {
-                CHK_Footer.goOperationList();
-            }
-        });
-    });
-</script>
 </html>
\ No newline at end of file
--- a/app/main-footer.html
+++ b/app/main-footer.html
 <footer class="fixed-bottom bg-light">
    <nav class="d-flex justify-content-around">
-        <a id="dashboardBottomNav" class="d-block w-100 text-center py-2 text-decoration-none text-secondary bottom-nav" onclick="CHK_Footer.goDashboard();">
+        <a id="dashboardBottomNav" class="d-block w-100 text-center py-2 text-decoration-none text-secondary bottom-nav" href="javascript:CHK_Footer.goDashboard();">
            <img src="img/icon_dashboard_inactive.svg" data-inactive-src="img/icon_dashboard_inactive.svg" data-src="img/icon_dashboard.svg" alt="ダッシュボード" class="p-1">
            <div class="fs-7 multi-lang" data-msg="buttonDashboard">ダッシュボード</div>
        </a>
-        <a id="operationListBottomNav" class="d-block w-100 text-center py-2 text-decoration-none text-primary bottom-nav" onclick="CHK_Footer.goOperationList();">
+        <a id="operationListBottomNav" class="d-block w-100 text-center py-2 text-decoration-none text-primary bottom-nav" href="javascript:CHK_Footer.goOperationList();">
            <i class="fas fa-tasks fs-14 p-1"></i>
            <div class="fs-7 multi-lang" data-msg="buttonOperationList">作業一覧</div>
        </a>

--- a/app/script/check-dashboard.js
+++ b/app/script/check-dashboard.js
@@ -83,7 +83,11 @@ CHK_Dashboard.updateDataCommunications = function() {
        if (item.id == 'messageList') {
            item.count = 0;
            if (typeof CHK.pushMessageList !== 'undefined') {
-                item.count = CHK.pushMessageList.length;
+                CHK.pushMessageList.forEach(function(message) {
+                    if (!message.readingFlg) {
+                        item.count += 1;
+                    }
+                });
            }
        } else if (item.id == 'chat') {
            item.enabled = CHK.isChat;

--- a/app/script/check-footer.js
+++ b/app/script/check-footer.js
@@ -51,7 +51,11 @@ CHK_Footer.isIndexPage = function() {
 CHK_Footer.goIndexPage = function(tabId) {
    sessionStorage.activeTab = tabId;
-    CHK.goUrlWithCurrentParams('index.html', {activeTab: tabId});
+    var params = {activeTab: tabId};
+    if (typeof sessionStorage.sortIndex != 'undefined') {
+        params.sortIndex = sessionStorage.sortIndex;
+    }
+    CHK.goUrlWithCurrentParams('index.html', params);
 }
 CHK_Footer.activeDashboardBottomNav = function() {

--- a/app/script/check-list.js
+++ b/app/script/check-list.js
@@ -17,6 +17,7 @@ CHK_L.init = function() {
 	CHK.afterDeleteReport = CHK_L.afterDeleteReport;
 	// 共通初期表示処理
 	CHK.initCommon();
+	CHK.initFooter();
 	// リストの場合、フォーム表示を全画面表示とする
 	$("#checkInput").css("width", "calc(100% - 0px)");
@@ -122,9 +123,9 @@ CHK_L.init = function() {
        });
        CHK_L.sendAppCommand("finishInit");
-        if (CHK.isWindows) {
+        // if (CHK.isWindows) {
-            CHK.createOperationListBySavedSortType();
+        //     CHK.createOperationListBySavedSortType();
-        }
+        // }
 	}
 	if (CHK.isWeb) {

--- a/app/script/check-message-detail.js
+++ b/app/script/check-message-detail.js
@@ -2,7 +2,7 @@ var CHK_MessageDetail = {};
 msgMap.messageDetailTopTitle = {ja:"プッシュメッセージ詳細", ko:"푸시 메시지 상세", en:"Push message details"};
 msgMap.messageDetailHeaderTitle = {ja:"メッセージ詳細", ko:"메시지 상세", en:"Message Details"};
-msgMap.messageDetailContentTitle = {ja:"内容", ko:"내용", en:"Content"};
+msgMap.messageDetailContentTitle = {ja:"件名", ko:"내용", en:"Content"};
 msgMap.messageDetailSendDateTitle = {ja:"日時", ko:"일시", en:"Send Date"};
 msgMap.messageDetailWorkingNameTitle = {ja:"作業名", ko:"작업명", en:"Operation Name"};
 msgMap.messageDetailSenderTitle = {ja:"送信者", ko:"송신자", en:"Sender"};

--- a/app/script/check-message-list.js
+++ b/app/script/check-message-list.js
@@ -18,7 +18,7 @@ CHK_MessageList.initPushMessageListCallback = function(pushMessageList) {
 }
 CHK_MessageList.goBack = function() {
-    history.back();
+    CHK_Footer.goDashboard();
 }
 CHK_MessageList.refresh = function() {

--- a/app/script/check.js
+++ b/app/script/check.js
@@ -105,6 +105,7 @@ var msgMap = { // velocity?
    buttonSetting: { ja: "設定", ko: "설정", en: "Setting" },
    labelLoading: { ja: "読み込み中", ko: "로딩중", en: "Loading" },
 	buttonOperationList: { ja: "作業一覧", ko: "작업일람", en: "Operations List" },
+	operationListHeaderTitle: { ja: "作業一覧", ko: "작업일람", en: "Operations List" },
 	buttonDashboard: { ja: "ダッシュボード", ko: "대시보드", en: "Dashboard" },
 	dashboardHeaderTitle: { ja: "ダッシュボード", ko: "대시보드", en: "Dashboard" },
 	buttonDashboardSetting: { ja: "設定", ko: "설정", en: "Setting" },
@@ -343,7 +344,7 @@ CHK.hasAddTaskAuthority = function() {
 CHK.sessionKeys = [
 	'reportType', 'isCms', 'isWeb', 'isWindows', 'isAndroid', 'isIOS', 'isRFIDBarcodeScan', 'isOperationGroupMaster', 
-	'lang', 'debug', 'isMobile', 'isChat',
+	'sortIndex', 'lang', 'debug', 'isMobile', 'isChat',
 ];
 CHK.loadSessionData = function() {
@@ -394,6 +395,19 @@ CHK.goUrlWithCurrentParams = function(url, params) {
 	}
 }
+CHK.initActiveSortIndex = function(sortIndex) {
+	if (typeof sortIndex == 'undefined') {
+		return;
+	}
+	$(".sort-type").each(function() {
+		var sortType = $(this).data("sort");
+		if (sortType == CHK.sortIndex) {
+			$(".sort-type").removeClass("active");
+			$(this).addClass("active");
+		}
+	});
+}
 // 共通初期処理
 CHK.initCommon = function() {
 	//JSON初期化
@@ -413,6 +427,9 @@ CHK.initCommon = function() {
    CHK.isRFIDBarcodeScan = urlParam.isRFIDBarcodeScan && urlParam.isRFIDBarcodeScan == "1";
    CHK.isOperationGroupMaster = urlParam.isOperationGroupMaster && urlParam.isOperationGroupMaster == "1";
    if (typeof CHK.sortIndex == 'undefined') CHK.sortIndex = urlParam.sortIndex;
+	if (typeof CHK.sortIndex == 'undefined') {
+		CHK.sortIndex = CHK_CONSTANT.SORT_TYPE.START_DATE_DESC;
+	}
    CHK.lang = urlParam.lang;
 	CHK.debug = urlParam.debug;
 	CHK.isMobile = urlParam.mobile_flg && urlParam.mobile_flg == "1";
@@ -458,6 +475,7 @@ CHK.initCommon = function() {
 		$("#checkList").css("min-width", "400px");
 	}
+	CHK.initActiveSortIndex(CHK.sortIndex);
 }
 /**
@@ -3085,6 +3103,7 @@ CHK.changeSortType = function(sortType) {
 	$(".sort-type").removeClass("active");
    $(sortType).addClass("active");
    CHK.sortIndex = $(sortType).attr("data-sort");
+	sessionStorage.sortIndex = CHK.sortIndex;
 	CHK.createOperationList(CHK.operation.operationList, true);
 }
@@ -3475,6 +3494,30 @@ CHK.getFormatDate = function(date) {
 	     + ("0" + date.getHours()).slice(-2) + ":" + ("0" + date.getMinutes()).slice(-2);
 }
+CHK.initFooter = function() {
+	$("#footer").load("main-footer.html", function() {
+		let activeTab;
+		if (typeof sessionStorage != 'undefined' && typeof sessionStorage.activeTab != 'undefined') {
+			activeTab = sessionStorage.activeTab;
+		}
+		if (typeof activeTab != 'undefined') {
+			if (activeTab == 'dashboard') {
+				CHK_Footer.goDashboard();
+			} else {
+				CHK_Footer.goOperationList();
+			}
+			return;
+		}
+		CHK.loadDashboardSetting(function() {
+			if (CHK.dashboardSetting.dashboardHome) {
+				CHK_Footer.goDashboard();
+			} else {
+				CHK_Footer.goOperationList();
+			}
+		});
+	});
+}
 $(document).ready(function () {
    var urlParam = CHK.getUrlParameter();
 	if (typeof urlParam !== 'undefined' && typeof urlParam.lang !== 'undefined') {