Skip to content

C
check
Commit 4b76b71b by Takumi Imai
Options

Merge branch 'feature/1.0.1_check_web_dev' into 'feature/1.0.1_check_web' 

Feature/1.0.1 check web dev

See merge request !133
parents c41b039d b6a316ac
Showing with 33 additions and 5 deletions
abweb/js/pickup/pickup.js
...@@ -544,7 +544,7 @@ PICKUP.initWarningReportWithReportOnlyType = function (report) { ...@@ -544,7 +544,7 @@ PICKUP.initWarningReportWithReportOnlyType = function (report) {
PICKUP.REPORT_TYPE.REPORTONLY + PICKUP.REPORT_TYPE.REPORTONLY +
",'" + ",'" +
report.taskKey + report.taskKey +
"', null,null,null);\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" + "', null,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'>" +
...@@ -577,7 +577,9 @@ PICKUP.initWarningReportWithInspectType = function (report) { ...@@ -577,7 +577,9 @@ PICKUP.initWarningReportWithInspectType = function (report) {
PICKUP.REPORT_TYPE.INSPECT + PICKUP.REPORT_TYPE.INSPECT +
",'" + ",'" +
report.taskKey + report.taskKey +
"', null,null,null);\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" + "', null,null,null,'" +
report.reportStartDateString +
"');\" 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'>" +
...@@ -611,7 +613,7 @@ PICKUP.initWarningReportWithAnswerReportType = function (report, reportType, rep ...@@ -611,7 +613,7 @@ PICKUP.initWarningReportWithAnswerReportType = function (report, reportType, rep
report.taskKey + report.taskKey +
"', null,null," + "', null,null," +
reportType + reportType +
");\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" + ",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='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'>" + "<div class='fs-8 bg-dark10 px-2 py-1 mr-2 rounded mb-1 w-fit-content text-truncate mw-100'>" +
...@@ -661,7 +663,7 @@ PICKUP.initWarningReportWithContinuousReportType = function (report) { ...@@ -661,7 +663,7 @@ PICKUP.initWarningReportWithContinuousReportType = function (report) {
report.processKey + report.processKey +
"' ,'" + "' ,'" +
report.phaseNo + report.phaseNo +
"',null);\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" + "',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='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'>" +
...@@ -746,6 +748,28 @@ PICKUP.getInspectDate = function (dateString) { ...@@ -746,6 +748,28 @@ PICKUP.getInspectDate = function (dateString) {
}; };
/** /**
* Change Inspect Date format
* @param {*} dateString
* @returns 2023-03-29 08:30:00
*/
PICKUP.changeFormatInspectDate = function (dateString) {
let date = new Date(dateString);
return (
date.getFullYear() +
'-' +
('0' + (date.getMonth() + 1)).slice(-2) +
'-' +
('0' + date.getDate()).slice(-2) +
' ' +
('0' + date.getHours()).slice(-2) +
':' +
('0' + date.getMinutes()).slice(-2) +
':' +
('0' + date.getSeconds()).slice(-2)
);
};
/**
* send data to open report form from New report pickup * send data to open report form from New report pickup
* @param operarionId * @param operarionId
* @returns * @returns
...@@ -781,8 +805,9 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces ...@@ -781,8 +805,9 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces
* @param {*} processKey * @param {*} processKey
* @param {*} phaseNo * @param {*} phaseNo
* @param {*} replyNo * @param {*} replyNo
* @param {*} reportStartDate
*/ */
PICKUP.sendReportFormFromWarningReport = function (operationId, reportType, taskKey, processKey, phaseNo, replyNo) { PICKUP.sendReportFormFromWarningReport = function (operationId, reportType, taskKey, processKey, phaseNo, replyNo, reportStartDate) {
//Transaction to the report form or operation list screen //Transaction to the report form or operation list screen
sessionStorage.setItem('pickUpType', CONSTANT.PICK_UP_TYPE.WARNING_REPORT); sessionStorage.setItem('pickUpType', CONSTANT.PICK_UP_TYPE.WARNING_REPORT);
sessionStorage.setItem('operationId', operationId); sessionStorage.setItem('operationId', operationId);
...@@ -793,6 +818,9 @@ PICKUP.sendReportFormFromWarningReport = function (operationId, reportType, task ...@@ -793,6 +818,9 @@ PICKUP.sendReportFormFromWarningReport = function (operationId, reportType, task
break; break;
case PICKUP.REPORT_TYPE.INSPECT: case PICKUP.REPORT_TYPE.INSPECT:
url += '&taskKey=' + taskKey; url += '&taskKey=' + taskKey;
if (reportStartDate) {
url += '&reportStartDate=' + PICKUP.changeFormatInspectDate(reportStartDate);
}
break; break;
case PICKUP.REPORT_TYPE.WITHREPLY: case PICKUP.REPORT_TYPE.WITHREPLY:
url += '&taskKey=' + taskKey; url += '&taskKey=' + taskKey;
......
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