#50269 implement Operation select

202269b0 · NGO THI HONG · 43bb1ed4 · 202269b0 · 202269b0 · 202269b0
Commit 202269b0 authored Oct 31, 2022 by NGO THI HONG
9 changed files
--- a/abvw/common/json/lang/lang-en.json
+++ b/abvw/common/json/lang/lang-en.json
@@ -63,7 +63,7 @@
 "reportLevelReport":"Report",
 "reportLevelAnswer":"Answer",
 "msgNotFound":"There is no applicable work.",
-"confirmation":"confirmation",
+"confirmation":"Confirmation",
 "confirmYes":"Yes",
 "confirmNo":"No",
 "messageListEmpty":"No Messages",
@@ -71,5 +71,8 @@
 "operationName":"Operation Name",
 "sendDate":"Send Date",
 "sender":"Sender",
-"content":"Content"
+"content":"Content",
+"operationSelection":"Operation select",
+"selection":"Selection"
 }
\ No newline at end of file
--- a/abvw/common/json/lang/lang-ja.json
+++ b/abvw/common/json/lang/lang-ja.json
@@ -71,5 +71,7 @@
 "operationName":"作業名",
 "sendDate":"送信日時",
 "sender":"送信者",
-"content":"内容"
+"content":"内容",
+"operationSelection":"作業選択",
+"selection":"選択"
 }
\ No newline at end of file
--- a/abvw/common/json/lang/lang-ko.json
+++ b/abvw/common/json/lang/lang-ko.json
@@ -40,28 +40,28 @@
 "msgAnonymousLoginErr":"로그인할 수 없습니다. (에러코드 : {0})",
 "msgAnonymousLoginErr2":"로그인할 수 없습니다.",
-"dashboard":"Dashboard",
+"dashboard":"대시보드",
-"dashboardSettings":"Dashboard Settings",
+"dashboardSettings":"대시보드 설정",
-"pickup":"Pick up",
+"pickup":"픽업",
-"communication":"Communication",
+"communication":"커뮤니케이션",
 "workList":"Work list",
 "profile":"Profile",
 "account_setting":"Account setting",
-"newRegistrationTitle":"New Registration",
+"newRegistrationTitle":"신규 보고",
-"continousWorkTitle":"Continous Work",
+"continousWorkTitle":"공정 작업",
 "processWorkTitle":"Process work",
 "reportWarningTitle":"Report With Warning",
-"workWithWarningsTitle":"Work with warnings",
+"workWithWarningsTitle":"경고를 포함한 보고",
-"messageListTitle":"Message List",
+"messageListTitle":"메시지 일람",
-"sendMessageTitle":"Send Message",
+"sendMessageTitle":"메시지 송신",
-"distanceSupportTitle":"DistanceSupport",
+"distanceSupportTitle":"원격지원",
-"chatTitle":"Chat",
+"chatTitle":"채팅",
 "makeDashboardAsHome":"Make dashboard your home screen",
 "btnKeep":"Keep",
 "addNew":"Add New",
 "display":" display",
-"reportLevelReport":"Report",
+"reportLevelReport":"보고",
-"reportLevelAnswer":"Answer",
+"reportLevelAnswer":"응답",
 "msgNotFound":"There is no applicable work.",
 "confirmation":"confirmation",
 "confirmYes":"Yes",
@@ -71,5 +71,7 @@
 "operationName":"Operation Name",
 "sendDate":"Send Date",
 "sender":"Sender",
-"content":"Content"
+"content":"Content",
+"operationSelection":"Operation select",
+"selection":"Selection"
 }
\ No newline at end of file
--- a/abvw/html/dashboard.html
+++ b/abvw/html/dashboard.html
@@ -18,13 +18,12 @@
    <script type="text/javascript" src="/abvw/common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script>
    <script type="text/javascript" src="/abvw/common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
    <script type="text/javascript" src="/abvw/common/js/web/i18n.js?__UPDATEID__"></script>
-    <script type="text/javascript" src="../common/js/newdash/app.js"></script>
-    <script type="text/javascript" src="../common/js/newdash/common.js"></script>
    <script src="../common/js/constant.js?__UPDATEID__"></script>
    <script src="../common/js/common.js?__UPDATEID__"></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>
 </head>
@@ -39,7 +38,7 @@
            <!-- title -->
            <div class="d-flex align-items-center">
                <h1 class="fs-14 font-weight-bold pt-4 pb-3 mb-0 mr-auto lang" lang="dashboard"></h1>
-                <a href="#" data-toggle="modal" data-target="#dashboard-setting-modal">
+                <a href="#" data-toggle="modal" data-target="#dashboard-setting-modal" >
                    <img src="../common/img/icon_dashboard_setting.svg" alt="ダッシュボード設定" class="p-1 w-40px">
                </a>
            </div>
@@ -65,6 +64,9 @@
    <!-- confirm -->
    <div id="includedConfirmModal"></div>
+    <script type="text/javascript" src="../common/js/newdash/app.js?__UPDATEID__"></script>
+    <script type="text/javascript" src="../common/js/newdash/common.js?__UPDATEID__"></script>
 </body>
 </html>
\ No newline at end of file
--- a/abvw/html/operation-select.html
+++ b/abvw/html/operation-select.html
+<!-- task list modal -->
+<div class="modal fade" id="task-list-modal" tabindex="-1" role="dialog">
+    <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable" role="document">
+      <div class="modal-content">
+        <div class="modal-header bg-dark10">
+            <h5 class="modal-title lang" lang="operationSelection"></h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+        </div>
+        <div class="modal-body">
+          <ul class="card-list select-card-list" id="operationSelectList">
+          </ul>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-primary lang" lang="selection"></button>
+            <button type="button" class="btn btn-tertiary lang" lang="dspCancel" data-dismiss="modal"></button>
+        </div>
+      </div>
+    </div>
+  </div>
\ No newline at end of file
--- a/abvw/js/dashboard/dashboard.js
+++ b/abvw/js/dashboard/dashboard.js
@@ -27,8 +27,7 @@ DASHBOARD.defaultDashboard = {
    pushMesage: 0,
 }
-DASHBOARD.baseApiUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + 'topScreen/';
+DASHBOARD.getDataApiUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + 'dashboard/';
-DASHBOARD.getDataApiUrl = DashboardSetting.baseApiUrl + 'getAllData';
 /**
 * Call api get data 
@@ -115,16 +114,9 @@ DASHBOARD.init = function() {
 }
 /** load common data */
 DASHBOARD.loadCommon = function() {
-    $("#includedHeader").load("../common/header.html" , function() {
+    TEMPLATE.loadHearder("#includedHeader");
-        I18N.initi18n();
+    TEMPLATE.loadDashboardSetting("#includedDashboardSetting");
-    }); 
+    TEMPLATE.loadConfirmModal("#includedConfirmModal");
-    $("#includedDashboardSetting").load("dashboard-setting.html", function() {
-        DashboardSetting.init();
-        I18N.initi18n();
-    }); 
-    $("#includedConfirmModal").load("../common/confirm-modal.html", function() {
-        I18N.initi18n();
-    }); 
 }
 /** Update pickup config from setting dashboard data */

--- a/abvw/js/operationSelect/operation-select.js
+++ b/abvw/js/operationSelect/operation-select.js
+/**
+ * Operation Select js in operation-select.html
+ *
+ * @since 1.0 check web
+ */
+var OperationSelect = {};
+OperationSelect.operationIdSelected="";
+OperationSelect.operationNameSelected="";
+/**
+ * default operation select data JSON
+ */
+OperationSelect.defaultOperationSelectJson = [];
+/**
+ * get operation select data from cms
+ * @param {function} callback 
+ */
+OperationSelect.getOperationSelectData = function (callback) {
+    let param = {
+        sid: COMMON.getSid(),
+    };
+    const url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + 'operationSelect/';
+    COMMON.cmsAjax(url, param, false, function (json) {
+        if (callback) {
+            callback(json);
+        }
+    }, function() {
+        console.log('OperationSelect.getOperationSelectData error');
+        if (callback) {
+            callback(OperationSelect.defaultOperationSelectJson);
+        }
+    });
+};
+/**
+ * handle click operation setting
+ */
+OperationSelect.selectOperationClick = function () {
+    $('.select-card-list .card .select-label').on('click', function () {
+        $(this).closest('.select-card-list').find('.card').removeClass('selected');
+        $(this).closest('.card').addClass('selected');
+        OperationSelect.operationIdSelected = $(this).attr('data-key');
+        OperationSelect.operationNameSelected = $(this).attr('data-name');
+    });
+};
+/**
+ * init data, action when screen onload
+ */
+OperationSelect.init = function () {
+    OperationSelect.getOperationSelectData(function (data) {
+        OperationSelect.createOperationSelectList(data);
+    });
+    OperationSelect.selectOperationClick();
+};
+/**
+ * Implement operation select html
+ * @returns 
+ */
+ OperationSelect.createOperationSelectList = function(data) {
+	$("#operationSelectList").empty();
+	if (typeof data === 'undefined' || data.length < 1) return;
+	for (let i = 0; i < data.length; i++) {
+		let messageli = $("<li class='card mb-2' name = 'operationId_" + data[i].operationId + "' ></li>");
+		let ahrefRequiredFlg =  $("<a href='#' class='d-block px-5 py-3 text-decoration-none select-label' data-key='" + data[i].operationId + "' data-name='" + data[i].operationName + "' ></a>");
+		let divText = $("<div class='fs-12 text-truncate d-block'>"+ data[i].operationName + "</div>");
+		ahrefRequiredFlg.append(divText);
+		messageli.append(ahrefRequiredFlg);
+		$("#operationSelectList").append(messageli);
+	}
+    $("#operationSelectList :first-child").addClass("selected");
+}
--- a/abvw/js/pickup/pickup.js
+++ b/abvw/js/pickup/pickup.js
@@ -47,9 +47,9 @@ PICKUP.defaultPickupList = {
 }
 PICKUP.baseApiUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + 'pickup/';
-PICKUP.getNewReportListApiUrl = PICKUP.baseApiUrl + 'newReportList';
+PICKUP.getNewReportListApiUrl = PICKUP.baseApiUrl + 'newReport';
-PICKUP.getContinuousWorkListApiUrl = PICKUP.baseApiUrl + 'continuousWorkList';
+PICKUP.getContinuousWorkListApiUrl = PICKUP.baseApiUrl + 'workingFlow';
-PICKUP.getReportWithWarningsListApiUrl = PICKUP.baseApiUrl + 'reportWithWarnings';
+PICKUP.getReportWithWarningsListApiUrl = PICKUP.baseApiUrl + 'warningWithReport';
 /**
 * Call get new report list api get data 

--- a/abvw/js/template/template.js
+++ b/abvw/js/template/template.js
 /**
- * Header js 
+ * template js 
 * @since cms:1.4.3.2&1.4.3.3 web:1.0
 */
 var TEMPLATE = {};
+/** template load header */
-/** load common data */
+TEMPLATE.loadHearder = function(elmentId) {
-TEMPLATE.loadCommon = function() {
+    $(elmentId).load("../common/header.html" , function() {
-    $("#includedHeader").load("../common/header.html" , function() {
        I18N.initi18n();
    }); 
-    $("#includedDashboardSetting").load("dashboard-setting.html", function() {
+}
+/** template load dashboard setting */
+TEMPLATE.loadDashboardSetting = function(elmentId) {
+    $(elmentId).load("dashboard-setting.html", function() {
        DashboardSetting.init();
        I18N.initi18n();
    }); 
-    $("#includedConfirmModal").load("../common/confirm-modal.html", function() {
-        I18N.initi18n();
-    }); 
 }
-TEMPLATE.loadHearder = function() {
+/** Template load confirm model */
-    $("#includedHeader").load("../common/header.html" , function() {
+TEMPLATE.loadConfirmModal = function(elmentId) {
+    $(elmentId).load("../common/confirm-modal.html", function() {
        I18N.initi18n();
    }); 
 }
+/** Template load operation select */
-TEMPLATE.loadDashboardSetting = function() {
+TEMPLATE.loadOperationSelect = function(elmentId) {
-    $("#includedDashboardSetting").load("dashboard-setting.html", function() {
+    $(elmentId).load("operation-select.html", function() {
-        DashboardSetting.init();
+        OperationSelect.init();
        I18N.initi18n();
    }); 
 }
+/**
-TEMPLATE.loadConfirmModal = function() {
+ * show confirm model
-    $("#includedConfirmModal").load("../common/confirm-modal.html", function() {
+ */
-        I18N.initi18n();
+ TEMPLATE.showModalConfirm = function () {
-    }); 
+    $("#showConfirm").click(function(){
-}
+        $("#confirm-modal").modal();
\ No newline at end of file
+    });
+};