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

abweb/html/pickup.html

@@ -25,11 +25,17 @@
     
     
 
 
     <!-- main js -->
     <!-- main js -->
-    <script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
+    <script type="text/javascript" src="../js/operationList/operationList.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../js/dashboardSetting/dashboard-setting.js"></script>
     <script type="text/javascript" src="../js/dashboardSetting/dashboard-setting.js"></script>
     <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
     <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
+    <script src="/abweb/common/js/header.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../js/template/template.js"></script>
     <script type="text/javascript" src="../js/template/template.js"></script>
+
+    <script type="text/javascript" src="/abweb/js/topPage/topPage.js?__UPDATEID__"></script>
+    <script type="text/javascript" src="../common/js/app.js?__UPDATEID__" defer></script>
     <script type="text/javascript" src="../js/pickup/pickup.js"></script>
     <script type="text/javascript" src="../js/pickup/pickup.js"></script>
+    <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
+
     <script type="text/javascript">
     <script type="text/javascript">
       $(document).ready(function(){
       $(document).ready(function(){
         PICKUP.init();
         PICKUP.init();
@@ -41,20 +47,10 @@
     
     
     <!-- header -->
     <!-- header -->
     <div id="includedHeader"></div>
     <div id="includedHeader"></div>
+    <div id="includedMainTitle"></div>
     <!-- pickup -->
     <!-- pickup -->
     <main>
     <main>
         <div class="container">
         <div class="container">
-            <!-- breadcrumb -->
-            <nav aria-label="breadcrumb">
-                <ol class="breadcrumb px-0 mb-0">
-                    <li class="breadcrumb-item"><a href="dashboard.html" class="text-decoration-none text-underline lang" lang="dashboard"></a></li>
-                    <li class="breadcrumb-item active lang" lang="pickup" aria-current="page"><span></span></li>
-                </ol>
-            </nav>
-
-            <!-- title -->
-            <h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0 lang" lang="pickup"></h1>
-
             <!-- tab -->
             <!-- tab -->
             <ul class="nav nav-tabs line" id="myTab" role="tablist">
             <ul class="nav nav-tabs line" id="myTab" role="tablist">
                 <li class="nav-item" id="liTabNewReport">
                 <li class="nav-item" id="liTabNewReport">
@@ -81,7 +77,15 @@
                     <nav aria-label="view" class="view-menu mt-2" id="viewMenuNewReport">
                     <nav aria-label="view" class="view-menu mt-2" id="viewMenuNewReport">
                         <div class="d-flex justify-content-between align-items-center">
                         <div class="d-flex justify-content-between align-items-center">
                             <div class="fs-9" id="count-NewReport"></div>
                             <div class="fs-9" id="count-NewReport"></div>
-                            <div id="includedNewReportMenuDisplay"></div>
+                            <!-- view display type menu -->
+                            <div class="view">
+                              <a href="#" class="text-decoration-none view-btn view-list-btn">
+                                  <img src="../common/img/icon_view_list.svg" alt="" class="list-block-icon mx-1 lang" lang="listDisplay" type="image" data-toggle="tooltip" data-placement="bottom" title="">
+                              </a>
+                              <a href="#" class="text-decoration-none view-btn view-block-btn active">
+                                  <img src="../common/img/icon_view_block.svg" alt="" class="list-block-icon mx-1 lang" lang="gridDisplay" type="image" data-toggle="tooltip" data-placement="bottom" title="">
+                              </a>
+                            </div>
                         </div>
                         </div>
                     </nav>
                     </nav>
                     <!-- task list -->
                     <!-- task list -->
@@ -94,7 +98,15 @@
                     <nav aria-label="view" class="view-menu mt-2" id="viewMenuContinuousWork">
                     <nav aria-label="view" class="view-menu mt-2" id="viewMenuContinuousWork">
                         <div class="d-flex justify-content-between align-items-center">
                         <div class="d-flex justify-content-between align-items-center">
                             <div class="fs-9" id="count-ContinuousWork"></div>
                             <div class="fs-9" id="count-ContinuousWork"></div>
-                            <div id="includedContinuousWorkMenuDisplay"></div>
+                            <!-- view display type menu -->
+                            <div class="view">
+                              <a href="#" class="text-decoration-none view-btn view-list-btn">
+                                  <img src="../common/img/icon_view_list.svg" alt="" class="list-block-icon mx-1 lang" lang="listDisplay" type="image" data-toggle="tooltip" data-placement="bottom" title="">
+                              </a>
+                              <a href="#" class="text-decoration-none view-btn view-block-btn active">
+                                  <img src="../common/img/icon_view_block.svg" alt="" class="list-block-icon mx-1 lang" lang="gridDisplay" type="image" data-toggle="tooltip" data-placement="bottom" title="">
+                              </a>
+                            </div>
                         </div>
                         </div>
                     </nav>
                     </nav>
                     <!-- task list -->
                     <!-- task list -->
@@ -107,7 +119,15 @@
                     <nav aria-label="view" class="view-menu mt-2" id="viewMenuReportWithWarnings">
                     <nav aria-label="view" class="view-menu mt-2" id="viewMenuReportWithWarnings">
                         <div class="d-flex justify-content-between align-items-center">
                         <div class="d-flex justify-content-between align-items-center">
                             <div class="fs-9" id="count-ReportWithWarnings"></div>
                             <div class="fs-9" id="count-ReportWithWarnings"></div>
-                            <div id="includedReportWithWarningsMenuDisplay"></div>
+                            <!-- view display type menu -->
+                            <div class="view">
+                              <a href="#" class="text-decoration-none view-btn view-list-btn">
+                                  <img src="../common/img/icon_view_list.svg" alt="" class="list-block-icon mx-1 lang" lang="listDisplay" type="image" data-toggle="tooltip" data-placement="bottom" title="">
+                              </a>
+                              <a href="#" class="text-decoration-none view-btn view-block-btn active">
+                                  <img src="../common/img/icon_view_block.svg" alt="" class="list-block-icon mx-1 lang" lang="gridDisplay" type="image" data-toggle="tooltip" data-placement="bottom" title="">
+                              </a>
+                            </div>
                         </div>
                         </div>
                     </nav>
                     </nav>
                     <!-- task list -->
                     <!-- task list -->
@@ -120,7 +140,6 @@
 
 
     <!-- confirm -->
     <!-- confirm -->
     <div id="includedConfirmModal"></div>
     <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/newdash/app.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../common/js/newdash/app.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../common/js/newdash/common.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../common/js/newdash/common.js?__UPDATEID__"></script>
 </body>
 </body>

abweb/js/pickup/pickup.js

@@ -116,7 +116,16 @@ PICKUP.init = function() {
 	console.log("PICKUP.init");
 	console.log("PICKUP.init");
 	TEMPLATE.loadHearder("#includedHeader");
 	TEMPLATE.loadHearder("#includedHeader");
     TEMPLATE.loadConfirmModal("#includedConfirmModal");
     TEMPLATE.loadConfirmModal("#includedConfirmModal");
-
+	const navs = [
+        {
+            titleLang: 'dashboard',
+            href: 'dashboard.html',
+        },
+        {
+            titleLang: 'pickup',
+        },
+    ];
+    TEMPLATE.loadMainNavsTitle("#includedMainTitle", "pickup", navs, null);
 	PICKUP.initSettingActivePickup();
 	PICKUP.initSettingActivePickup();
 	PICKUP.settingPickup();
 	PICKUP.settingPickup();
 }
 }
@@ -299,7 +308,8 @@ PICKUP.createNewReportList = function(operationListOld) {
 				break;
 				break;
 		}
 		}
 		let messageli = $("<li class='card mb-2' name = 'operationId_" + operationList[i].operationId + "' ></li>");
 		let messageli = $("<li class='card mb-2' name = 'operationId_" + operationList[i].operationId + "' ></li>");
-		let ahrefRequiredFlg =  $("<a href='report-list.html' class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>");
+		let ahrefRequiredFlg =  $("<a href=\"javascript:PICKUP.sendReportFormFromNewReport ('" 
+								+ operationList[i].operationId +"');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>");
 		let divIcon = $("<div class='position-absolute translate-middle top-50 left-0 ml-3'>"
 		let divIcon = $("<div class='position-absolute translate-middle top-50 left-0 ml-3'>"
 						+ "<div class='type-icon'>"
 						+ "<div class='type-icon'>"
 						+ "<span class='" + classIcon + "'></span>"
 						+ "<span class='" + classIcon + "'></span>"
@@ -419,8 +429,8 @@ PICKUP.createContinousWorkList = function(operationListOld) {
         }
         }
         else
         else
         {
         {
-            ahrefRequiredFlg =  $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
-            + " ', null ,'DETAIL_FORM_INPUT' ,'CONTINOUS_WORK','" + directKey + "','" + operationList[i].phaseNo  + "');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>");
+            ahrefRequiredFlg =  $("<a href=\"javascript:PICKUP.sendReportFormFromContinuousWork ('" 
+			+ operationList[i].operationId +"','" + operationList[i].taskKey + "','" + operationList[i].processKey + "'," + operationList[i].phaseNo + ");\"  class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>");
         }
         }
 
 
 		let divProccess = $("<div class='position-absolute translate-middle top-50 left-0 ml-3'><div class='type-icon'><span class='proccess'></span></div></div>");
 		let divProccess = $("<div class='position-absolute translate-middle top-50 left-0 ml-3'><div class='type-icon'><span class='proccess'></span></div></div>");
@@ -515,8 +525,8 @@ PICKUP.sortWarningList = function(operationList) {
  */
  */
 PICKUP.initWarningReportWithReportOnlyType = function(report) {
 PICKUP.initWarningReportWithReportOnlyType = function(report) {
 	let ele = $("<li class='card mb-2'>" 
 	let ele = $("<li class='card mb-2'>" 
-				+ "<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + report.operationId + "', '" + report.contentId
-				+ " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + report.taskKey + "');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>"
+				+ "<a href=\"javascript:PICKUP.sendReportFormFromWarningReport ('" 
+				+ report.operationId +"'," + PICKUP.REPORT_TYPE.REPORTONLY + ",'" + report.taskKey + "', null,null,null);\"  class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>"
 				+ "<div class='position-absolute translate-middle top-50 left-0 ml-3'>"
 				+ "<div class='position-absolute translate-middle top-50 left-0 ml-3'>"
 				+ "<div class='type-icon'><span class='report'></span></div></div>"
 				+ "<div class='type-icon'><span class='report'></span></div></div>"
 				+ "<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>"
 				+ "<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>"
@@ -530,8 +540,8 @@ PICKUP.initWarningReportWithReportOnlyType = function(report) {
 
 
 PICKUP.initWarningReportWithInspectType = function(report) {
 PICKUP.initWarningReportWithInspectType = function(report) {
 	let ele = $("<li class='card mb-2'>"
 	let ele = $("<li class='card mb-2'>"
-				+ "<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + report.operationId + "', '" + report.contentId
-				+ " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + report.taskKey + "');\"  class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>"
+				+ "<a href=\"javascript:PICKUP.sendReportFormFromWarningReport ('" 
+				+ report.operationId +"'," + PICKUP.REPORT_TYPE.INSPECT + ",'" + report.taskKey + "', null,null,null);\"   class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>"
 				+ "<div class='position-absolute translate-middle top-50 left-0 ml-3'>"
 				+ "<div class='position-absolute translate-middle top-50 left-0 ml-3'>"
 				+ "<div class='type-icon'><span class='inspection'></span></div></div>"
 				+ "<div class='type-icon'><span class='inspection'></span></div></div>"
 				+ "<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>"
 				+ "<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>"
@@ -550,8 +560,8 @@ PICKUP.initWarningReportWithInspectType = function(report) {
  */
  */
 PICKUP.initWarningReportWithAnswerReportType = function(report, reportTypeMsg) {
 PICKUP.initWarningReportWithAnswerReportType = function(report, reportTypeMsg) {
 	let ele = $("<li class='card mb-2'>"
 	let ele = $("<li class='card mb-2'>"
-				+ "<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + report.operationId + "', '" + report.contentId
-				+ " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + report.taskKey + "','" + report.taskType  + "');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>"
+				+ "<a href=\"javascript:PICKUP.sendReportFormFromWarningReport ('" 
+				+ report.operationId +"'," + PICKUP.REPORT_TYPE.WITHREPLY + ",null, null,null," + report.replyNo +");\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>"
 				+ "<div class='position-absolute translate-middle top-50 left-0 ml-3'><div class='type-icon'>"
 				+ "<div class='position-absolute translate-middle top-50 left-0 ml-3'><div class='type-icon'>"
 				+ "<span class='questionary'></span></div></div><div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>"
 				+ "<span class='questionary'></span></div></div><div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>"
 				+ "<div class='fs-8 bg-dark10 px-2 py-1 mr-2 rounded mb-1 w-fit-content text-truncate mw-100'>" + reportTypeMsg + "</div>"
 				+ "<div class='fs-8 bg-dark10 px-2 py-1 mr-2 rounded mb-1 w-fit-content text-truncate mw-100'>" + reportTypeMsg + "</div>"
@@ -583,8 +593,8 @@ PICKUP.initWarningReportWithContinuousReportType = function(report) {
 			}
 			}
 		}
 		}
 	let ele = $("<li class='card mb-2'>"
 	let ele = $("<li class='card mb-2'>"
-			+ "<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + report.operationId + "', '" + report.contentId
-			+ " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + directKey + "','" + report.phaseNo  + "');\"  class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>"
+			+ "<a href=\"javascript:PICKUP.sendReportFormFromWarningReport ('" 
+			+ report.operationId +"'," + PICKUP.REPORT_TYPE.WORKFLOW + ",null,'" + report.processKey +"' ,'"+ report.phaseNo +"',null);\"  class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>"
 			+ "<div class='position-absolute translate-middle top-50 left-0 ml-3'>"
 			+ "<div class='position-absolute translate-middle top-50 left-0 ml-3'>"
 			+ "<div class='type-icon'><span class='proccess'></span></div></div>"
 			+ "<div class='type-icon'><span class='proccess'></span></div></div>"
 			+ "<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>"
 			+ "<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>"
@@ -664,4 +674,60 @@ PICKUP.createReportWithWarningList = function(operationListOld) {
 PICKUP.getInspectDate = function(dateString) {
 PICKUP.getInspectDate = function(dateString) {
 	let date = new Date(dateString)
 	let date = new Date(dateString)
 	return date.getFullYear() + "/" + ("0" + (date.getMonth() + 1)).slice(-2) + "/" + ("0" + date.getDate()).slice(-2) ;
 	return date.getFullYear() + "/" + ("0" + (date.getMonth() + 1)).slice(-2) + "/" + ("0" + date.getDate()).slice(-2) ;
-}
+}
\ No newline at end of file
+
+/**
+ * send data to open report form from New report pickup
+ * @returns 
+ */
+ PICKUP.sendReportFormFromNewReport = function(operationId) {
+	//Transition to the report form or operation list screen
+    let params = {};
+	params.sid = COMMON.getSid();
+	params.operationId = operationId;
+	let url =  CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM + '/' + CONSTANT.REPLY_NO.REPORT;
+    COMMON.postCommunication(url, params);
+}
+
+/**
+ * send data to open report form of event click continuous work operation report
+ * @returns 
+ */
+PICKUP.sendReportFormFromContinuousWork = function(operationId, taskKey, processKey,phaseNo) {
+	//Transition to the report form or operation list screen
+    let params = {};
+	params.sid = COMMON.getSid();
+	params.operationId = operationId;
+	params.processKey = processKey;
+	params.phaseNo = phaseNo;
+	let url =  CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM + '/' + CONSTANT.REPLY_NO.REPORT;
+    COMMON.postCommunication(url, params);
+}
+
+/**
+ * send data to open report form of event click warning operation report
+ * @returns 
+ */
+ PICKUP.sendReportFormFromWarningReport = function(operationId,reportType, taskKey, processKey,phaseNo, replyNo) {
+	//Transition to the report form or operation list screen
+    let params = {};
+	params.sid = COMMON.getSid();
+	params.operationId = operationId;
+	switch(reportType) {
+		case PICKUP.REPORT_TYPE.REPORTONLY:
+			params.taskKey = taskKey;
+		  break;
+		case PICKUP.REPORT_TYPE.INSPECT:
+			params.taskKey = taskKey;
+		  break;
+		case PICKUP.REPORT_TYPE.WITHREPLY:
+			params.replyNo = replyNo;
+			break;
+		case PICKUP.REPORT_TYPE.WORKFLOW:
+			params.processKey = processKey;
+			params.phaseNo = phaseNo;
+			break;
+	  }
+	let url =  CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM + '/' + CONSTANT.REPLY_NO.REPORT;
+    COMMON.postCommunication(url, params);
+}