Skip to content

C
check
Commit d434b3ce by Kang Donghun
Options

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

テスト

See merge request !57
parents 60c59c01 ed9a5f33
Showing with 27 additions and 34 deletions
abweb/html/reportForm.html
...@@ -35,23 +35,25 @@ ...@@ -35,23 +35,25 @@
<!-- report list --> <!-- report list -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
<!-- breadcrumb --> <div id="main-ttl">
<nav aria-label="breadcrumb"> <!-- breadcrumb -->
<ol class="breadcrumb px-0 mb-0"> <nav aria-label="breadcrumb">
<li class="breadcrumb-item"><a href="task-list.html" class="text-decoration-none text-underline">作業一覧</a></li> <ol class="breadcrumb px-0 mb-0">
<li class="breadcrumb-item active" aria-current="page"><span>報告一覧</span></li> <li class="breadcrumb-item"><a href="task-list.html" class="text-decoration-none text-underline">作業一覧</a></li>
<li class="breadcrumb-item active" aria-current="page"><span>報告</span></li> <li class="breadcrumb-item active" aria-current="page"><span>報告一覧</span></li>
</ol> <li class="breadcrumb-item active" aria-current="page"><span>報告</span></li>
</nav> </ol>
<!-- title --> </nav>
<div class="d-flex align-items-center"> <!-- title -->
<h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0 mr-auto" lang="reportForm"></h1> <div class="d-flex align-items-center">
<div style="display: none;"> <h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0 mr-auto" lang="reportForm"></h1>
<div><span style="font-size:18px;" lang="periodicInspectionPeriod"></span></div> <div style="display: none;">
<div><span id="inspectDate"></span></div> <div><span style="font-size:18px;" lang="periodicInspectionPeriod"></span></div>
</div> <div><span id="inspectDate"></span></div>
<div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();"> </div>
<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint"> <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>
</div> </div>
</div> </div>
</div> </div>
......
abweb/js/reportForm/reportForm.js
...@@ -12,36 +12,25 @@ RF.init = function () { ...@@ -12,36 +12,25 @@ RF.init = function () {
//Check if user is logged in //Check if user is logged in
COMMON.checkAuth(false); COMMON.checkAuth(false);
RF.loadCommon(); TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
RF.initFormView(); RF.initFormView();
}; };
/** /**
* load common
*/
RF.loadCommon = function () {
$('#includedHeader').load('../common/html/header.html', function () {
I18N.initi18n();
HEADER.init();
});
$('#includedConfirmModal').load('../html/common/confirm-modal.html', function () {
I18N.initi18n();
});
};
/**
* iinit form view * iinit form view
*/ */
RF.initFormView = function () { RF.initFormView = function () {
const urlParameterList = COMMON.getUrlParameter(); const urlParameterList = COMMON.getUrlParameter();
const operationId = urlParameterList['operationId']; const operationId = urlParameterList['operationId'];
sessionStorage.setItem(['operationId'], operationId);
if (operationId) { if (operationId) {
let params = {}; let params = {};
const taskKey = urlParameterList['taskKey']; const taskKey = urlParameterList['taskKey'];
const replyNo = urlParameterList['replyNo']; const replyNo = urlParameterList['replyNo'];
const processKey = urlParameterList['processKey']; const processKey = urlParameterList['processKey'];
const phaseNo = urlParameterList['phaseNo']; const phaseNo = urlParameterList['phaseNo'];
const reportStartDate = urlParameterList['reportStartDate'];
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = operationId; params.operationId = operationId;
...@@ -50,11 +39,13 @@ RF.initFormView = function () { ...@@ -50,11 +39,13 @@ RF.initFormView = function () {
if (replyNo) params.replyNo = replyNo; if (replyNo) params.replyNo = replyNo;
if (processKey) params.processKey = processKey; if (processKey) params.processKey = processKey;
if (phaseNo) params.phaseNo = phaseNo; if (phaseNo) params.phaseNo = phaseNo;
if (reportStartDate) prarams.reportStartDate = reportStartDate;
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM; const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
$('#report-form').load(url, params, function () { $('#report-form').load(url, params, function () {
initPageLoad(); initPageLoad();
COMMON.closeLoading(); $('#contentFieldOrverlay').show();
//COMMON.closeLoading();
}); });
} else { } else {
COMMON.avwScreenMove('index.html'); COMMON.avwScreenMove('index.html');
......
abweb/js/template/template.js
...@@ -6,7 +6,7 @@ var TEMPLATE = {}; ...@@ -6,7 +6,7 @@ var TEMPLATE = {};
/** template load header */ /** template load header */
TEMPLATE.loadHearder = function (elmentId) { TEMPLATE.loadHearder = function (elmentId) {
COMMON.showLoading(); // COMMON.showLoading();
$(elmentId).load('../common/html/header.html', function () { $(elmentId).load('../common/html/header.html', function () {
$('#iconHomeDashboard').removeClass('active'); $('#iconHomeDashboard').removeClass('active');
$('#iconHomeWorkList').removeClass('active'); $('#iconHomeWorkList').removeClass('active');
......
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