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 !113

abweb/js/reportForm/reportForm.js

@@ -122,12 +122,17 @@ RF.initFormView = function () {
         if (reportStartDate) params.reportStartDate = reportStartDate;
         if (reportStartDate) params.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 () {
-            initPageLoad();
-            COMMON.closeLoading();
+        $('#report-form').load(url, params, function (data, status) {
+            if (status === 'success') {
+                initPageLoad();
+                COMMON.closeLoading();
+            } else {
+                RF.backPage();
+                COMMON.closeLoading();
+            }
         });
         });
     } else {
     } else {
-        COMMON.avwScreenMove('index.html');
+        RF.backPage();
     }
     }
 };
 };
 
 
@@ -137,21 +142,19 @@ RF.initFormView = function () {
 RF.backPage = function () {
 RF.backPage = function () {
     // need to save Data
     // need to save Data
     setTimeout(function () {
     setTimeout(function () {
-        RF.initFormView();
-    }, 750);
-
-    if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
-        if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.NEW_REPORT) {
-            COMMON.avwScreenMove('reportList.html');
+        if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
+            if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.NEW_REPORT) {
+                COMMON.avwScreenMove('reportList.html');
+            } else {
+                COMMON.avwScreenMove('pickup.html');
+            }
         } else {
         } else {
-            COMMON.avwScreenMove('pickup.html');
+            const reportType = sessionStorage.getItem('reportType');
+            if (addReportFlg == 1 || reportType == CONSTANT.REPORT_TYPE_INT.ROUTINE) {
+                COMMON.avwScreenMove('reportList.html');
+            } else {
+                COMMON.avwScreenMove('index.html');
+            }
         }
         }
-    } else {
-        const reportType = sessionStorage.getItem('reportType');
-        if (addReportFlg == 1 || reportType == CONSTANT.REPORT_TYPE_INT.ROUTINE) {
-            COMMON.avwScreenMove('reportList.html');
-        } else {
-            COMMON.avwScreenMove('index.html');
-        }
-    }
+    }, 750);
 };
 };