feedback

d81ce01e · Kang Donghun · 8c207652 · d81ce01e · d81ce01e · d81ce01e
Commit d81ce01e authored Nov 08, 2022 by Kang Donghun
15 changed files
--- a/abweb/common/css/appCommon/footer.css
+++ b/abweb/common/css/appCommon/footer.css
+@charset "UTF-8";
+footer img {
+    width: 30px;
+}
--- a/abweb/common/js/constant.js
+++ b/abweb/common/js/constant.js
@@ -65,7 +65,7 @@ CONSTANT.URL = {
            BASE: '/checkapi/web/html/',
            TASK_REPORT_LIST: 'getTaskReport/',
            LIST_REPORT_FORM: 'listReportForm/showReport',
-            TASK_LIST: 'taskList',
+            REPORT_LIST: 'reportList',
        },
    },
    WEB: {

--- a/abweb/common/json/lang/lang-en.json
+++ b/abweb/common/json/lang/lang-en.json
@@ -67,6 +67,7 @@
 "btnKeep":"Keep",
 "addNew":"Add New",
 "display":" display",
+"reportList":"Report List",
 "reportLevelReport":"Report",
 "reportLevelAnswer":"Answer",
 "msgNotFound":"There is no applicable work.",

--- a/abweb/common/json/lang/lang-ja.json
+++ b/abweb/common/json/lang/lang-ja.json
@@ -12,7 +12,7 @@
 "msgInvaildLength":"パスワードの長さは6文字以上16文字以下の間でなければいけません。",
 "msgHasSeqChar":"新しいパスワードに同じ文字を3文字以上連続して使えません。",
 "msgContainSameSeqChar":"現在のパスワードに使用されている文字は4文字以上使えません。",
-"mgsInvalidPassWord":"{0}が不正です。半角英数字,記号（-_）のみ可能です。",
+"msgInvalidPassWord":"{0}が不正です。半角英数字,記号（-_）のみ可能です。",
 "msgLoginErrWrong":"ログインできません。入力情報を確認してください。(エラーコード：{0})",
 "dspLogin":"ログイン",
 "dspSkip":"スキップ",
@@ -39,6 +39,11 @@
 "msgPWDNeedChange":"パスワードの変更が必要です。設定変更画面に戻って変更してください。",
 "msgAnonymousLoginErr":"ログインできません。(エラーコード：{0})",
 "msgAnonymousLoginErr2":"ログインできません。",
+"txtLoginDate":"ログイン日時",
+"accountInformation":"アカウント情報",
+"errorOccurred": "エラーが発生しました",
+"msgLogoutConfirm": "ログアウトしますか？",
+"msgEssential": "{0}は必須です。",
 "dashboard":"ダッシュボード",
 "dashboardSettings":"ダッシュボード設定",
@@ -60,6 +65,7 @@
 "btnKeep":"保存",
 "addNew":"新規追加",
 "display":" 件表示",
+"reportList":"報告一覧",
 "reportLevelReport":"報告",
 "reportLevelAnswer":"回答",
 "msgNotFound":"該当する作業がありません。",

--- a/abweb/common/json/lang/lang-ko.json
+++ b/abweb/common/json/lang/lang-ko.json
@@ -64,6 +64,7 @@
 "btnKeep":"저장",
 "addNew":"신규 추가",
 "display":"건 표시",
+"reportList":"보고일람",
 "reportLevelReport":"보고",
 "reportLevelAnswer":"해답",
 "msgNotFound":"해당 작업 데이터를 찾을 수 없습니다.",

--- a/abweb/html/account-Setting.html
+++ b/abweb/html/account-Setting.html
@@ -3,7 +3,7 @@
 <head>
    <meta charset="utf-8">
-    <title>アカウント設定</title>
+    <title class="lang"  lang="account_setting"></title>
    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
    <!-- favicons -->
    <link href="../common/img/favicon.ico" rel="icon">

--- a/abweb/html/dashboard.html
+++ b/abweb/html/dashboard.html
@@ -21,7 +21,8 @@
    <script src="../common/js/constant.js?__UPDATEID__"></script>
    <script src="../common/js/common.js?__UPDATEID__"></script>
+    <script type="text/javascript" src="../js/header/header.js"></script>
    <script type="text/javascript" src="../js/dashboardSetting/dashboard-setting.js"></script>
    <script type="text/javascript" src="../js/template/template.js"></script>
    <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>

--- a/abweb/html/index.html
+++ b/abweb/html/index.html
@@ -27,6 +27,8 @@
    <script src="../common/js/footer.js?__UPDATEID__"></script>
    <script src="../common/js/app.js?__UPDATEID__" defer></script>
+    <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
 </head>
 <body onload="TOP.init();" style="position: relative; margin-top: 53px;">

--- a/abweb/html/login.html
+++ b/abweb/html/login.html
@@ -8,7 +8,7 @@
    <meta http-equiv="Cache-Control" content="no-store">
    <meta http-equiv="Cache-Control" content="no-cache">
    <meta http-equiv="Expires" content="-1">
-    <title>ログイン</title>
+    <title class="lang" lang="dspLogin"></title>
    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
    <!-- favicons -->
    <link href="../common/img/favicon.ico" rel="icon">

--- a/abweb/html/push-message-list.html
+++ b/abweb/html/push-message-list.html
@@ -24,6 +24,7 @@
    <script src="../common/js/constant.js?__UPDATEID__"></script>
    <script src="../common/js/common.js?__UPDATEID__"></script>
+    <script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
    <script type="text/javascript" src="../js/template/template.js"></script>
    <script type="text/javascript" src="../js/pushMessageList/push-message-list.js"></script>

--- a/abweb/html/reportList.html
+++ b/abweb/html/reportList.html
+<!DOCTYPE html>
+<html lang="ja-JP">
+<head>
+    <meta charset="utf-8">
+    <title class="lang" lang="reportList"></title>
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <!-- favicons -->
+    <link href="../common/img/favicon.ico" rel="icon">
+    <link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
+    <!-- main css -->
+    <link rel="stylesheet" type="text/css" href="../common/css/appCommon/app.css">
+    <link rel="stylesheet" type="text/css" href="../common/css/appCommon/header.css">
+    <link rel="stylesheet" type="text/css" href="../common/css/appCommon/style.css">
+    <!-- vender css -->
+    <link rel="stylesheet" type="text/css" href="../common/css/appCommon/fontawesome_relative_path.css">
+    <script type="text/javascript" src="../common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script>
+    <script type="text/javascript" src="../common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
+    <script type="text/javascript" src="../common/js/web/i18n.js?__UPDATEID__"></script>
+    <script type="text/javascript" src="../common/js/constant.js?__UPDATEID__"></script>
+    <script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
+    <script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
+    <script type="text/javascript" src="../js/reportList/reportList.js?__UPDATEID__"></script>
+</head>
+<body onload="RL.init();">
+    <!-- header -->
+    <div id="includedHeader"></div>
+    <!-- report list -->
+    <main>
+        <div class="container">
+            <!-- breadcrumb -->
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb px-0 mb-0">
+                    <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>
+                </ol>
+            </nav>
+            <!-- title -->
+            <div class="d-flex align-items-center">
+                <h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0 mr-auto">報告一覧</h1>
+                <a href="pdf.html">
+                    <img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdf出力">
+                </a>
+            </div>
+        </div>
+    </main>
+    <!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
+    <div class="container-fluid mb-5" id="task-list"></div>
+    <!-- confirm -->
+    <!-- confirm -->
+    <div id="includedConfirmModal"></div>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script type="text/javascript" src="../common/js/web/app.js?__UPDATEID__"></script>
+    <script type="text/javascript" src="../common/js/web/common.js?__UPDATEID__"></script>
+</body>
+</html>
--- a/abweb/js/login/login.js
+++ b/abweb/js/login/login.js
@@ -189,7 +189,7 @@ LOGIN.processLogin = function() {
 	// Get url to login
 	url = CONSTANT.URL.CMS.BASE + accountPath + CONSTANT.URL.CMS.API.BASE + CONSTANT.URL.CMS.API.LOGIN;
-	COMMON.cmsAjax(url, 'POST', params, true, function(data) {
+	COMMON.cmsAjax(url, params, true, function(data) {
 		LOGIN.userinfo_sid = data.sid;
 		LOGIN.userInfo_userName = data.userName;
 		LOGIN.optionList = data.serviceOptionList;
@@ -337,7 +337,7 @@ LOGIN.changePasswordProcess = function() {
 	const url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + CONSTANT.URL.CMS.API.PASSWORD_CHANGE;
-	COMMON.cmsAjax(url, 'POST', params, false, function(result) {
+	COMMON.cmsAjax(url, params, false, function(result) {
 		if (result.httpStatus == '200') {
 			LOGIN.CloseChangePasswordDialog();
 			$('#dialog-error-message').css('display', 'none');

--- a/abweb/js/operationList/operationList.js
+++ b/abweb/js/operationList/operationList.js
@@ -508,11 +508,8 @@ OL.sendOperation = function (operationId, operationType, reportType, enableAddRe
    OL.saveOperationReadingLog(operationId, operationType, reportType);
    //Transition to the report form or operation list screen
-    let params = {};
+    sessionStorage.OL_operationId = operationId;
-    params.sid = COMMON.getSid();
+    COMMON.avwScreenMove("reportList.html");
-    params.operationId = operationId;
-    const url = OL.createUrlOfOperation(enableAddReport, reportType);
-    COMMON.postCommunication(url, params);
 };
 /**

--- a/abweb/js/reportList/reportList.js
+++ b/abweb/js/reportList/reportList.js
+// ReportList function js
+var RL = {};
+RL.init = function() {
+    COMMON.checkAuth(false);
+    RL.loadCommon();
+    RL.initTaskReportList();
+};
+RL.loadCommon = function() {
+    $("#includedHeader").load("../html/common/header.html" , function() {
+        I18N.initi18n();
+        HEADER.init();
+    }); 
+    $("#includedConfirmModal").load("../html/common/confirm-modal.html", function() {
+        I18N.initi18n();
+    }); 
+}
+RL.initTaskReportList = function() {
+    if (sessionStorage.OL_operationId) {
+        let params = {};
+        params.sid = COMMON.getSid();
+        params.operationId = sessionStorage.OL_operationId;
+        params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
+        let url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST;
+        // COMMON.postCommunication(url, params);
+        $("#task-list").load(url, params);
+        // COMMON.cmsAjax(url, params, false, function(result) {
+        //     $("#task-list").html(result);
+        //     // $("#task-list").load(result);
+        // }, function(XMLHttpRequest, textStatus, errorThrown) {
+        // }, "text");
+    } else {
+        COMMON.displayAlert("error");
+        COMMON.avwScreenMove("taskList.html");
+    }
+}
--- a/abweb/js/template/template.js
+++ b/abweb/js/template/template.js
@@ -6,7 +6,7 @@ var TEMPLATE = {};
 /** template load header */
 TEMPLATE.loadHearder = function(elmentId) {
-    $(elmentId).load("../common/header.html" , function() {
+    $(elmentId).load("../html/common/header.html" , function() {
        I18N.initi18n();
    }); 
 }
@@ -25,7 +25,7 @@ TEMPLATE.loadDashboardSetting = function(elmentId, changeCallback) {
 /** Template load confirm model */
 TEMPLATE.loadConfirmModal = function(elmentId) {
-    $(elmentId).load("../common/confirm-modal.html", function() {
+    $(elmentId).load("../html/common/confirm-modal.html", function() {
        I18N.initi18n();
    }); 
 }