Skip to content

D
design
Commit 0d566af7 by NGO THI HONG
Options

#19123 Update Back button

parent dadc1f39
Showing with 11 additions and 7 deletions
app/script/check-list.js
...@@ -243,12 +243,16 @@ CHK_L.updateList = function() { ...@@ -243,12 +243,16 @@ CHK_L.updateList = function() {
* アプリにコマンド送信 * アプリにコマンド送信
* @param {any} command * @param {any} command
*/ */
CHK_L.sendAppCommand = function (command, operationId, contentId, operationGroupMasterId) { CHK_L.sendAppCommand = function (command, operationId, contentId, operationGroupMasterId, directPage, backPage, directTaskKey ) {
var param = {}; var param = {};
param.cmd = CHK.getCommand(command); param.cmd = CHK.getCommand(command);
param.operationId = operationId; param.operationId = operationId;
param.contentId = contentId; param.contentId = contentId;
param.operationGroupMasterId = operationGroupMasterId; param.operationGroupMasterId = operationGroupMasterId;
param.directPage = directPage;
param.backPage = backPage;
param.directTaskKey = directPage;
console.log("CHK_L.sendAppCommand " + JSON.stringify(param));
CHK.sendABookCheckApi(param); CHK.sendABookCheckApi(param);
} }
/** /**
......
app/script/check_pu.js
...@@ -166,7 +166,7 @@ CHK_pu.createNewReportList = function(operationList, isSearched = false) { ...@@ -166,7 +166,7 @@ CHK_pu.createNewReportList = function(operationList, isSearched = false) {
} }
else else
{ {
ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId + "');\" class='d-block px-3 py-3 text-decoration-none text-dark'></a>"); ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId + " ', null ,'NEW_FORM_INPUT' ,'NEW_REPORT',null);\" class='d-block px-3 py-3 text-decoration-none text-dark'></a>");
} }
var divTitle = $("<div class='title'>" + operationList[i].operationName + "</div>"); var divTitle = $("<div class='title'>" + operationList[i].operationName + "</div>");
var iIcon = $("<i class='fas fa-chevron-right fs-12'></i>"); var iIcon = $("<i class='fas fa-chevron-right fs-12'></i>");
...@@ -209,7 +209,7 @@ CHK_pu.createContinousWorkList = function(operationList, isSearched = false) { ...@@ -209,7 +209,7 @@ CHK_pu.createContinousWorkList = function(operationList, isSearched = false) {
else else
{ {
ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'></a>"); + " ', null ,'NEW_FORM_INPUT' ,'CONTINOUS_WORK',null);\" class='d-block px-3 py-2 text-decoration-none text-dark'></a>");
} }
var divProccess = $("<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].processList[0].processName + "</div>"); var divProccess = $("<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].processList[0].processName + "</div>");
var divTitle = $("<div class='title'>" + operationList[i].operationName + "</div>"); var divTitle = $("<div class='title'>" + operationList[i].operationName + "</div>");
...@@ -264,7 +264,7 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) { ...@@ -264,7 +264,7 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
case 0: case 0:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].taskKey operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].taskKey
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId + "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>" + " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + operationList[i].warningReportList[j].taskKey + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName +"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode
+ "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].taskName + "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].taskName
...@@ -273,7 +273,7 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) { ...@@ -273,7 +273,7 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
case 1: case 1:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].taskKey operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].taskKey
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId + "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>" + " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + operationList[i].warningReportList[j].taskKey + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName +"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].operationStartDate + " / " + operationList[i].operationEndDate + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].operationStartDate + " / " + operationList[i].operationEndDate
+ "</div></div> </div> <i class='fas fa-chevron-right fs-12''></i> </a></li>"); + "</div></div> </div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
...@@ -281,7 +281,7 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) { ...@@ -281,7 +281,7 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
case 2: case 2:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].taskKey operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].taskKey
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId + "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>" + " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + operationList[i].warningReportList[j].taskKey + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName +"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode
+ "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].taskName + "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].taskName
...@@ -290,7 +290,7 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) { ...@@ -290,7 +290,7 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
case 3: case 3:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].taskKey operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].taskKey
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId + "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>" + " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + operationList[i].warningReportList[j].taskKey + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].processList[0].processName +"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].processList[0].processName
+ "</div> <div class='title'>" + operationList[i].operationName + "</div> <div class='title'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment