Skip to content

C
check
Commit 611a9940 by Kang Donghun
Options

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

Feature/1.0 check web dev imai

See merge request !78
parents 0639f7a5 8c4ec6ae
Showing with 68 additions and 20 deletions
abweb/html/accountSetting.html
......@@ -35,6 +35,7 @@
<div id="includedHeader"></div>
<!-- account setting -->
<div id="includedMainTitle"></div>
<div id="loadingNone" style="display:none;">
<main id="main">
<div class="container-wrap">
<!-- content -->
......@@ -97,6 +98,7 @@
<input type="hidden" id="getToken">
<!-- confirm -->
<div id="includedConfirmModal"></div>
</div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/dashboard.html
......@@ -41,6 +41,8 @@
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<div id="loadingNone" style="display:none;">
<!-- dashboard -->
<main>
<div class="container-wrap">
......@@ -67,6 +69,7 @@
<!-- confirm -->
<div id="includedConfirmModal"></div>
</div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/index.html
......@@ -35,6 +35,7 @@
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<div id="loadingNone" style="display:none;">
<!-- task list -->
<main>
<div class="container-wrap">
......@@ -131,6 +132,7 @@
<!-- confirm -->
<div id="includedConfirmModal"></div>
</div>
<script src="../common/js/app.js?__UPDATEID__" defer></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/pdfPrint.html
......@@ -40,6 +40,7 @@
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<div id="loadingNone" style="display:none;">
<!-- title -->
<div id="includedMainTitle"></div>
......@@ -49,6 +50,7 @@
<!-- confirm -->
<div id="includedConfirmModal"></div>
</div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/pickup.html
......@@ -44,6 +44,7 @@
<body>
<div id="loader"></div>
<div id="includedHeader"></div>
<div id="loadingNone" style="display:none;">
<!-- pickup -->
<main>
<div class="container-wrap">
......@@ -139,6 +140,7 @@
<!-- confirm -->
<div id="includedConfirmModal"></div>
</div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/pushMessageDetail.html
......@@ -37,6 +37,7 @@
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<div id="loadingNone" style="display:none;">
<!-- message detail -->
<main>
<div class="container-wrap">
......@@ -72,6 +73,7 @@
</div>
</div>
</main>
</div>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/pushMessageList.html
......@@ -37,6 +37,7 @@
<body>
<div id="loader"></div>
<div id="includedHeader"></div>
<div id="loadingNone" style="display:none;">
<!-- message list -->
<main>
<div class="container-wrap">
......@@ -53,6 +54,7 @@
</ul>
</div>
</main>
</div>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/reportForm.html
......@@ -32,6 +32,15 @@
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<div id="loadingNone" style="display:none;">
<div id="includedMainTitle"></div>
<div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">
<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom"
title="pdfPrint">
</div>
<!-- report list -->
<div class="mb-5" id="report-form"></div>
<div id="includedMainTitle"></div>
......@@ -40,6 +49,7 @@
<!-- confirm -->
<div id="includedConfirmModal"></div>
</div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/reportList.html
......@@ -40,6 +40,7 @@
<div id="loader" style="display: none;"></div>
<!-- header -->
<div id="includedHeader"></div>
<div id="loadingNone" style="display:none;">
<div id="includedMainTitle"></div>
<!-- report list -->
......@@ -47,6 +48,7 @@
<!-- confirm -->
<div id="includedConfirmModal"></div>
</div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/sendMessage.html
......@@ -40,6 +40,7 @@
<body>
<div id="loader"></div>
<div id="includedHeader"></div>
<div id="loadingNone" style="display:none;">
<!-- send message -->
<main>
<div class="container-wrap">
......@@ -91,6 +92,7 @@
<!-- select template modal -->
<div id="includeTemplateModal"></div>
</div>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/js/reportForm/reportForm.js
......@@ -14,12 +14,12 @@ RF.addReportFlg;
RF.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
COMMON.checkQuickReport(function(result) {
COMMON.checkQuickReport(function (result) {
if (result) {
result.isQuickReport = RF.isQuickReport;
result.addReportFlg = RF.addReportFlg;
}
})
});
RF.loadCommon();
RF.initFormView();
};
......@@ -38,7 +38,7 @@ RF.loadCommon = function () {
*/
RF.initBreadcrumb = function () {
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
if (sessionStorage.getItem("pickUpType") == CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK) {
if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK) {
navs = [
{
titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
......@@ -49,10 +49,10 @@ RF.initBreadcrumb = function () {
href: CONSTANT.URL_TREE_NAME.PICKUP_CONTINUOS,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
]
} else if (sessionStorage.getItem("pickUpType") == CONSTANT.PICK_UP_TYPE.WARNING_REPORT) {
];
} else if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.WARNING_REPORT) {
navs = [
{
titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
......@@ -63,9 +63,9 @@ RF.initBreadcrumb = function () {
href: CONSTANT.URL_TREE_NAME.PICKUP_WARNING,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
]
];
} else {
navs = [
{
......@@ -78,17 +78,17 @@ RF.initBreadcrumb = function () {
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
href: CONSTANT.URL_TREE_NAME.REPORT_LIST
href: CONSTANT.URL_TREE_NAME.REPORT_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
]
];
}
} else {
if (sessionStorage.getItem("pickUpType")) sessionStorage.removeItem("pickUpType");
if (sessionStorage.getItem('pickUpType')) sessionStorage.removeItem('pickUpType');
if ((RF.addReportFlg) && RF.addReportFlg == 1) {
if (RF.addReportFlg && RF.addReportFlg == 1) {
navs = [
{
titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST,
......@@ -96,12 +96,12 @@ RF.initBreadcrumb = function () {
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
href: CONSTANT.URL_TREE_NAME.REPORT_LIST
href: CONSTANT.URL_TREE_NAME.REPORT_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
]
];
} else {
navs = [
{
......@@ -109,15 +109,15 @@ RF.initBreadcrumb = function () {
href: CONSTANT.URL_TREE_NAME.OPERATION_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
]
];
}
}
TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.REPORT_FORM, navs, RF.loadMainTitleCallback);
}
};
/**
/**
* load main title callcack
*/
RF.loadMainTitleCallback = function () {
......@@ -163,3 +163,22 @@ RF.initFormView = function () {
COMMON.avwScreenMove('index.html');
}
};
/**
* back page url
*/
RF.backPage = function () {
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
if (addReportFlg == 1) {
COMMON.avwScreenMove('reportList.html');
} else {
COMMON.avwScreenMove('pickup.html');
}
} else {
if (addReportFlg == 1) {
COMMON.avwScreenMove('reportList.html');
} else {
COMMON.avwScreenMove('index.html');
}
}
};
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