Commit f1a599f0 by Takumi Imai

Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_imai

parents 9013b5bd 739e1686
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1"> <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<title lang="pickup"></title> <title class="lang" lang="pickup"></title>
<!-- favicons --> <!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon"> <link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon"> <link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
......
...@@ -12,12 +12,19 @@ ...@@ -12,12 +12,19 @@
RL.init = function () { RL.init = function () {
//Check if user is logged in //Check if user is logged in
COMMON.showLoading(); COMMON.showLoading();
console.log("kdh check closeLoading RL.init1");
COMMON.checkAuth(false); COMMON.checkAuth(false);
console.log("kdh check closeLoading RL.init2");
console.log('ReportList init start'); console.log('ReportList init start');
console.log("kdh check closeLoading RL.init3");
RL.checkQuickReport(); RL.checkQuickReport();
console.log("kdh check closeLoading RL.init4");
RL.loadCommon(); RL.loadCommon();
console.log("kdh check closeLoading RL.init5");
RL.initTaskReportList(); RL.initTaskReportList();
console.log("kdh check closeLoading RL.init6");
COMMON.closeLoading(); COMMON.closeLoading();
console.log("kdh check closeLoading RL.init7");
}; };
/** /**
......
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