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

b46562b0 · Takumi Imai · 0350dbf1 · 4447a725 · b46562b0 · b46562b0
Commit b46562b0 authored Nov 15, 2022 by Takumi Imai
7 changed files
--- a/abweb/common/html/confirmModal.html
+++ b/abweb/common/html/confirmModal.html
@@ -2,7 +2,7 @@
  <div class="modal-dialog modal-dialog-centered" role="document">
    <div class="modal-content">
      <div class="modal-header bg-dark10">
-          <h5 class="modal-title lang" lang="confirmation"></h5>
+          <h5 class="modal-title lang" lang="confirmation" id="modalTitle"></h5>
          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
            <span aria-hidden="true">&times;</span>
          </button>

--- a/abweb/common/json/lang/lang-ko.json
+++ b/abweb/common/json/lang/lang-ko.json
@@ -79,38 +79,38 @@
 "sendDate":"송신일시",
 "sender":"송신자",
 "content":"내용",
-"buttonOperationSelect":"Operation",
+"buttonOperationSelect":"작업",
-"labelSendTypeTitle":"Type",
+"labelSendTypeTitle":"타입",
-"labelSendTypeGroup":"Group",
+"labelSendTypeGroup":"그룹",
-"labelSendTypeAll":"All",
+"labelSendTypeAll":"전체",
-"txtMessageContent":"Message",
+"txtMessageContent":"메시지",
-"buttonTemplateSelection":"Template",
+"buttonTemplateSelection":"정형문",
-"buttonSend":"Send",
+"buttonSend":"전송",
-"msgContentRequired":"Content is required",
+"msgContentRequired":"전송할 내용이 없습니다.",
-"msgContentInvalidLength":"The content length exceeds the maximum of {0} characters",
+"msgContentInvalidLength":"최대 전송 가능한 메시지 글자 수는 {0} 자입니다.",
-"msgOperationRequired":"Operation is required",
+"msgOperationRequired":"작업을 선택되지 않았습니다.",
-"msgSendTypeRequired":"Send type is required",
+"msgSendTypeRequired":"전송할 타입이 선택되지 않았습니다.",
-"operationSelection":"Operation select",
+"operationSelection":"작업 선택",
-"selection":"Selection",
+"selection":"선택",
-"templateSelection":"Template selection",
+"templateSelection":"정형문 선택",
-"logo":"logo",
+"logo":"로고",
-"listDisplay":"list display",
+"listDisplay":"일람 표시",
-"gridDisplay":"Grid display",
+"gridDisplay":"그리드 표시",
-"operationListSearchPlacehoder":"Operation Name",
+"operationListSearchPlacehoder":"작업명",
-"searchIcon":"Search Icon",
+"searchIcon":"검색",
-"category":"Category",
+"category":"카테고리",
-"term":"Term",
+"term":"기간",
-"searchClear":"Search Clear",
+"searchClear":"검색 초기화",
-"calendar":"Calendar",
+"calendar":"달력",
-"startDate":"Start Date",
+"startDate":"개시일",
-"endDate":"End Date",
+"endDate":"종료일",
-"sortBy":"Sort By",
+"sortBy":"정렬",
-"sortByName":"Name",
+"sortByName":"작업명",
-"sortByStartDate":"Start Date",
+"sortByStartDate":"개시일",
-"sortByEndDate":"End Date",
+"sortByEndDate":"종료일",
-"sortByLastEdit":"Last Edit",
+"sortByLastEdit":"최근 수정일",
-"categorySelection":"Category Selection",
+"categorySelection":"카테고리 선택",
-"categoryAll":"All",
+"categoryAll":"전체",
 "reportForm": "보고서",
 "periodicInspectionPeriod": "정기점검기간",
 "msgSendPushMessageSuccess":"푸시메시지를 보냈습니다.",

--- a/abweb/html/login.html
+++ b/abweb/html/login.html
@@ -93,6 +93,7 @@
                        <label for="confirm" class="lang" lang="txtPwdNewRe">新しいパスワード（確認）</label>
                        <input type="password" class="form-control" id="txtConfirmNew" aria-describedby="confirm" maxlength="16">
                    </div>
+                    <input type="hidden" id="getToken">
                </form>
                <span id="dialog-error-message" class="alertTxtDialog lang"></span>
            </div>

--- a/abweb/js/dashboard/dashboard.js
+++ b/abweb/js/dashboard/dashboard.js
@@ -129,6 +129,7 @@ DASHBOARD.init = function () {
    sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
    sessionStorage.removeItem("operationId");
+    sessionStorage.removeItem("RL_searchWord");
    DASHBOARD.loadCommon();
    DashboardSetting.getSettingData(function (settings) {
        DASHBOARD.getDashboardData(function (dataDashboard) {

--- a/abweb/js/login/login.js
+++ b/abweb/js/login/login.js
@@ -216,6 +216,7 @@ LOGIN.processLogin = function () {
                    // move to home.html page
                    COMMON.avwScreenMove('index.html');
                } else if (data.requirePasswordChange == 1) {
+                    $('#getToken').val(data.token);
                    if (LOGIN.force_pw_change_on_login == 2) {
                        // force to change
                        // password
@@ -257,6 +258,7 @@ LOGIN.processLogin = function () {
                        COMMON.avwScreenMove('index.html');
                    }
                } else if (data.requirePasswordChange == 2) {
+                    $('#getToken').val(data.token);
                    if (LOGIN.force_pw_change_periodically == 1) {
                        // recommend to
                        // change
@@ -325,6 +327,7 @@ LOGIN.changePasswordProcess = function () {
    var loginId = $('#txtAccId').val();
    var password = $('#txtCurrentPass').val();
    var confirmPass = $('#txtConfirmNew').val();
+    var tokenVal = $('#getToken').val();
    var params = {
        sid: sid,
@@ -332,6 +335,7 @@ LOGIN.changePasswordProcess = function () {
        password: password,
        newPassword: confirmPass,
        appId: 4,
+        token: tokenVal,
    };
    if (I18N.getCurrentLanguage()) {

--- a/abweb/js/operationList/operationList.js
+++ b/abweb/js/operationList/operationList.js
@@ -24,6 +24,7 @@ OL.init = function () {
    console.log('OperationList start');
    sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST;
    sessionStorage.removeItem("operationId");
+    sessionStorage.removeItem("RL_searchWord");
    TEMPLATE.loadHeader('#includedHeader');
    TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'workList', true, null);
@@ -300,18 +301,18 @@ OL.createCategoryList = function () {
    //Create a side menu category structure
    var categoryListElement = $('#categoryListMenu');
    categoryListElement.empty();
+    //sort group master list by level low to hight
    OL.operationGroupMaster.sort(function (a, b) {
        if (a.operationGroupMasterLevel < b.operationGroupMasterLevel) return -1;
        if (a.operationGroupMasterLevel > b.operationGroupMasterLevel) return 1;
        return 1;
    });
    let allChecked = '';
    if (typeof OL.operationGroupMasterId === 'undefined' || OL.operationGroupMasterId == 0) {
        allChecked = ' checked';
    }
    const allCategory = $(
-        '<ul><li><label><input type="radio" name="category" value="0"' + allChecked + '><span class="lang" lang="categoryAll">' + I18N.i18nText('categoryAll') + '</span></label></li></ul>',
+        '<ul><li><label><input type="radio" name="category" value="0"' + allChecked + '> <span>' + I18N.i18nText('categoryAll') + '</span></label></li></ul>',
    );
    categoryListElement.append(allCategory);
    //create category(operationGroupMaster) structure
@@ -326,12 +327,22 @@ OL.createCategoryList = function () {
        }
        let groupSpan = $('<span>' + item.operationGroupMasterName + '</span>');
        inputLabel.append(inputRadio);
+        inputLabel.append(' ');
        inputLabel.append(groupSpan);
-        if (item.operationGroupMasterLevel == 0) {
+        const isParent = OL.operationGroupMaster.find(function(child) {
+            return item.operationGroupMasterId == child.parentOperationGroupMasterId;
+        });
+        let parentElement = categoryListElement;
+        if (item.parentOperationGroupMasterId != 0) {
+            parentElement = $('#collapse' + item.parentOperationGroupMasterId + ' > ul');
+        }
+        if (isParent) {
+            //accordion
            const accordionId = 'accordion' + item.operationGroupMasterId;
            const headingId = 'heading' + item.operationGroupMasterId;
            const collapseId = 'collapse' + item.operationGroupMasterId;
-            let categoryParentElm = $('<li class="accordion" id="' + accordionId + '" />');
+            let accordionElm = $('<li class="accordion" id="' + accordionId + '" />');
+            //heading
            let headingDiv = $('<div id="' + headingId + '" />');
            let linkA = $('<a class="list-menu-link" />');
            let collapseButton = $('<button type="button" class="collapsed" data-toggle="collapse" aria-expanded="true" />');
@@ -341,26 +352,19 @@ OL.createCategoryList = function () {
            linkA.append(collapseButton);
            linkA.append(inputLabel);
            headingDiv.append(linkA);
-            categoryParentElm.append(headingDiv);
+            //collapse
-            categoryListElement.append(categoryParentElm);
+            let collapseElm = $('<div id="' + collapseId + '" class="collapse">');
+            collapseElm.attr('data-parent', '#' + accordionId);
+            collapseElm.attr('aria-labelledby', headingId);
+            let ul = $('<ul>');
+            collapseElm.append(ul);
+            accordionElm.append(headingDiv);
+            accordionElm.append(collapseElm);
+            parentElement.append(accordionElm);
        } else {
            let li = $('<li>');
            li.append(inputLabel);
-            let parentElm = $('#collapse' + item.parentOperationGroupMasterId + ' > ul');
+            parentElement.append(li);
-            if (typeof parentElm === 'undefined' || !parentElm || parentElm.length < 1) {
-                const accordionParentId = 'accordion' + item.parentOperationGroupMasterId;
-                const headingParentId = 'heading' + item.parentOperationGroupMasterId;
-                const collapseParentId = 'collapse' + item.parentOperationGroupMasterId;
-                parentElm = $('<div id="' + collapseParentId + '" class="collapse">');
-                parentElm.attr('data-parent', '#' + accordionParentId);
-                parentElm.attr('aria-labelledby', headingParentId);
-                let ul = $('<ul>');
-                ul.append(li);
-                parentElm.append(ul);
-                $('#' + accordionParentId).append(parentElm);
-            } else {
-                parentElm.append(li);
-            }
        }
    }
 };

--- a/abweb/js/reportList/reportList.js
+++ b/abweb/js/reportList/reportList.js
@@ -29,6 +29,9 @@ RL.loadCommon = function () {
 };
+/**
+ * create breadcrumb menu on ReportList
+ */
 RL.initBreadcrumb = function () {
    if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
        navs = [