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

Feature/1.0 check web dev

See merge request !115

abweb/common/js/common.js

@@ -440,6 +440,15 @@ var ClientData = {
         }
     },
 
+    // application version
+    conf_appVersion: function (data) {
+        if (arguments.length > 0) {
+            SessionStorageUtils.set(CONSTANT.KEYS.conf_appVersion, data);
+        } else {
+            return SessionStorageUtils.get(CONSTANT.KEYS.conf_appVersion);
+        }
+    },
+
     // api resorce dl url
     conf_apiResourceDlUrl: function (data) {
         if (arguments.length > 0) {

abweb/common/js/constant.js

@@ -168,14 +168,12 @@ CONSTANT.KEYS = {
     userInfo_sid_bak: 'sid_bak',
     // Session: Notification Information (pushInfo)_Number of new arrivals: Interger
     pushInfo_newMsgNumber: 'pushInfo_newMsgNumber',
+    // Web Application Version
+    conf_appVersion: 'conf_appVersion',
     conf_apiUrl: 'conf_apiUrl',
     conf_apiLoginUrl: 'conf_apiLoginUrl',
     conf_checkApiUrl: 'conf_checkApiUrl',
     conf_apiResourceDlUrl: 'conf_apiResourceDlUrl',
-    // Session :ABookCheck:Char (Y: Yes, N: No)
-    serviceOpt_abook_check: 'abook_check',
-    // Session :Chat Function:Char (Y: Yes, N: No)
-    serviceOpt_chat_function: 'chat_function',
     // Session: Enterprise Option (serviceOpt)_Any push message: Char (Y: Yes, N: No)
     serviceOpt_usable_push_message: 'usable_push_message',
     // Local

abweb/common/json/sys/conf.json

@@ -18,7 +18,7 @@
 	"anonymousLoginPath"    : "test",
 	"anonymousLoginId"      : "nologin",
 	"appName"               : "ABookWebCL",
-	"appVersion"            : "0.0.1",
+	"appVersion"            : "1.0.0",
 	"optMusicMode"          : 1,
 	"previewFlg"            : false
 }

abweb/js/login/login.js

@@ -183,6 +183,7 @@ LOGIN.processLogin = function () {
         password: password,
         urlpath: accountPath,
         language: language,
+        appVersion: ClientData.conf_appVersion(),
     };
 
     // Set sid for login, this will be checked authoring 2 sessions
@@ -549,6 +550,7 @@ LOGIN.ready = function () {
             ClientData.conf_apiLoginUrl(siteUrl + 'nuabvapi');
             ClientData.conf_checkApiUrl(siteUrl + 'checkapi/web');
             ClientData.conf_apiResourceDlUrl(siteUrl + '{0}/dl');
+            ClientData.conf_appVersion("1.0.0");
             // set account setting value
             ClientData.userInfo_accountPath(urlPath);
             ClientData.userInfo_accountPath_session(urlPath);
@@ -559,6 +561,7 @@ LOGIN.ready = function () {
         // conf parameter set
         ClientData.conf_apiUrl(sysSettings.apiUrl);
         ClientData.conf_checkApiUrl(sysSettings.checkApiUrl);
+        ClientData.conf_appVersion(sysSettings.appVersion);
         ClientData.conf_apiLoginUrl(sysSettings.apiLoginUrl);
         ClientData.conf_apiResourceDlUrl(sysSettings.apiResourceDlUrl);
     }

abweb/js/reportForm/reportForm.js

@@ -122,12 +122,17 @@ RF.initFormView = function () {
         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;
-        $('#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 {
-        COMMON.avwScreenMove('index.html');
+        RF.backPage();
     }
 };
 
@@ -137,21 +142,19 @@ RF.initFormView = function () {
 RF.backPage = function () {
     // need to save Data
     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 {
-            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);
 };

env.sh

@@ -37,7 +37,7 @@ modify_api()
         "anonymousLoginPath"  : "test",
         "anonymousLoginId"    : "nologin",
         "appName"             : "ABookWebCL",
-        "appVersion"          : "0.0.1",
+        "appVersion"          : "1.0.0",
         "optMusicMode"        : 1,
         "previewFlg"          : false
 }

env_preview.sh

@@ -21,7 +21,7 @@ modify_api()
         "anonymousLoginPath"  : "test",
         "anonymousLoginId"    : "nologin",
         "appName"             : "ABookWebCL",
-        "appVersion"          : "0.0.1",
+        "appVersion"          : "1.0.0",
         "optMusicMode"        : 1,
         "previewFlg"          : true
 }