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

テスト

See merge request !57

abweb/html/reportForm.html

@@ -35,6 +35,7 @@
         <!-- report list -->
         <!-- report list -->
         <main>
         <main>
             <div class="container-wrap">
             <div class="container-wrap">
+                <div id="main-ttl">
                     <!-- breadcrumb -->
                     <!-- breadcrumb -->
                     <nav aria-label="breadcrumb">
                     <nav aria-label="breadcrumb">
                         <ol class="breadcrumb px-0 mb-0">
                         <ol class="breadcrumb px-0 mb-0">
@@ -55,6 +56,7 @@
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
+            </div>
         </main>
         </main>
 
 
         <div class="mb-5" id="report-form"></div>
         <div class="mb-5" id="report-form"></div>

abweb/js/reportForm/reportForm.js

@@ -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 () {
         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 = {};
 
 
 /** 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');