Commit 4c9fdbb1 by Yujin Seo

・For moving dashboard or operationList after logout&login in Windows

parent d834730a
...@@ -65,7 +65,7 @@ CHK_DashboardSetting.bindToggleClick = function() { ...@@ -65,7 +65,7 @@ CHK_DashboardSetting.bindToggleClick = function() {
} }
CHK_DashboardSetting.init = function() { CHK_DashboardSetting.init = function() {
CHK.initCommon(); CHK.initCommon(true);
$("#footer").load("main-footer.html", function() { $("#footer").load("main-footer.html", function() {
CHK_Footer.activeDashboardBottomNav(); CHK_Footer.activeDashboardBottomNav();
}); });
......
...@@ -409,7 +409,7 @@ CHK.initActiveSortIndex = function(sortIndex) { ...@@ -409,7 +409,7 @@ CHK.initActiveSortIndex = function(sortIndex) {
} }
// 共通初期処理 // 共通初期処理
CHK.initCommon = function() { CHK.initCommon = function (isDashboardSetting) {
//JSON初期化 //JSON初期化
//作業報告情報初期化 //作業報告情報初期化
CHK.taskReport = {taskReport_0: []}; CHK.taskReport = {taskReport_0: []};
...@@ -440,7 +440,15 @@ CHK.initCommon = function() { ...@@ -440,7 +440,15 @@ CHK.initCommon = function() {
//save url parameter of top page //save url parameter of top page
CHK.saveInitSession(); CHK.saveInitSession();
} }
CHK.loadDashboardSetting(); CHK.loadDashboardSetting(function () {
if (isDashboardSetting !== true) {
if (CHK.dashboardSetting.dashboardHome) {
CHK_Footer.goDashboard();
} else {
CHK_Footer.goOperationList();
}
}
});
// ウェブの場合、作業一覧の表示広さを変更 // ウェブの場合、作業一覧の表示広さを変更
if (CHK.isWeb) { if (CHK.isWeb) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment