Commit 91785afc by hoangson

fix init footer

parent 17462d5a
...@@ -209,29 +209,4 @@ ...@@ -209,29 +209,4 @@
<script type="text/javascript" src="js/app.js" defer></script> <script type="text/javascript" src="js/app.js" defer></script>
</body> </body>
<script>
$(document).ready(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();
}
});
});
});
</script>
</html> </html>
\ No newline at end of file
...@@ -17,6 +17,7 @@ CHK_L.init = function() { ...@@ -17,6 +17,7 @@ CHK_L.init = function() {
CHK.afterDeleteReport = CHK_L.afterDeleteReport; CHK.afterDeleteReport = CHK_L.afterDeleteReport;
// 共通初期表示処理 // 共通初期表示処理
CHK.initCommon(); CHK.initCommon();
CHK.initFooter();
// リストの場合、フォーム表示を全画面表示とする // リストの場合、フォーム表示を全画面表示とする
$("#checkInput").css("width", "calc(100% - 0px)"); $("#checkInput").css("width", "calc(100% - 0px)");
......
...@@ -3475,6 +3475,30 @@ CHK.getFormatDate = function(date) { ...@@ -3475,6 +3475,30 @@ CHK.getFormatDate = function(date) {
+ ("0" + date.getHours()).slice(-2) + ":" + ("0" + date.getMinutes()).slice(-2); + ("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 () { $(document).ready(function () {
var urlParam = CHK.getUrlParameter(); var urlParam = CHK.getUrlParameter();
if (typeof urlParam !== 'undefined' && typeof urlParam.lang !== 'undefined') { if (typeof urlParam !== 'undefined' && typeof urlParam.lang !== 'undefined') {
......
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