Skip to content

D
design
Commit 0080a8d2 by NGUYEN HOANG SON
Options

Merge commit '76cc3985' into feature/1.4.3_dev 

* commit '76cc3985':
  #49123 fix bug wrong font size tab title
  #49123  fix bug direct tab answer report
parents 0d3315ec 76cc3985
Showing with 30 additions and 15 deletions
app/pickup.html
......@@ -53,7 +53,7 @@
<ul class="tab-menu pl-0">
<li class="tab-label list-unstyled on" id="liTabNewReport" data-active="newReport" onclick="CHK_pu.changeActivePickup(this);"><label class="tab-label-NewReport fs-9 multi-lang" data-msg="labelNewReport" for="tab-NewReport" >新規報告</label><div class="task-cnt" id="count-NewReport"></div></li>
<li class="tab-label list-unstyled" id="liTabContinousWork" data-active="continousWork" onclick="CHK_pu.changeActivePickup(this);"><label class="tab-label-ContinousWork fs-9 multi-lang" data-msg="labelContinousWork" for="tab-ContinousWork" >工程作業</label><div class="task-cnt" id="count-ContinousWork"></div></li>
<li class="tab-label list-unstyled" id="liTabReportWithWarning" data-active="reportWarning" onclick="CHK_pu.changeActivePickup(this);"><label class="tab-label-ReportWithWarning fs- multi-lang" data-msg="labelReportWithWarning" for="tab-ReportWithWarning" >警告を含む報告</label><div class="task-cnt" id="count-ReportWithWarning"></div></li>
<li class="tab-label list-unstyled" id="liTabReportWithWarning" data-active="reportWarning" onclick="CHK_pu.changeActivePickup(this);"><label class="tab-label-ReportWithWarning fs-9 multi-lang" data-msg="labelReportWithWarning" for="tab-ReportWithWarning" >警告を含む報告</label><div class="task-cnt" id="count-ReportWithWarning"></div></li>
</ul>
<div class="tab-content-area">
<!-- 新規報告 -->
......
app/script/check.js
......@@ -127,7 +127,9 @@ var msgMap = { // velocity?
labelPickUp: { ja: "ピックアップ", ko: "픽업", en: "Pickup" },
labelNewReport: { ja: "新規報告", ko: "신규 보고", en: "New report" },
labelContinousWork: { ja: "工程作業", ko: "공정 작업", en: "Continous Work" },
labelReportWithWarning: { ja: "警告を含む報告", ko: "경고를 포함한 보고", en: "Reports With Warnings" }
labelReportWithWarning: { ja: "警告を含む報告", ko: "경고를 포함한 보고", en: "Reports With Warnings" },
reportLevelReport: { ja: "報告書", ko: "보고서", en: "Report" },
reportLevelAnswer: { ja: "報告(回答)", ko: "보고(응답)", en: "Answer" }
};
// 言語取得
......
app/script/check_pu.js
......@@ -135,13 +135,10 @@ CHK_pu.setCountElementInPickup = function() {
{
$("#count-ContinousWork")[0].innerHTML = CHK_pu.countContinousWorkReport;
}
if($("#count-NewReport"))
if($("#count-ReportWithWarning"))
{
$("#count-NewReport")[0].innerHTML = CHK_pu.countNewReportList;
}
$("#count-ReportWithWarning")[0].innerHTML = CHK_pu.countReportWithWarning;
}
}
CHK_pu.createNewReportList = function(operationList, isSearched = false) {
......@@ -258,7 +255,10 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
return;
}
$('#notFoundReportWithWarning').addClass('d-none');
var msgLevelReport = " [" + getMsg("reportLevelReport") + "]";
console.log("msgLevelReport :" + msgLevelReport);
var msgLevelAnswer = " [" + getMsg("reportLevelAnswer") + "]";
console.log("msgLevelAnswer :" + msgLevelAnswer);
for (var i = 0; i < operationList.length; i++) {
if(!operationList[i].warningReportList || operationList[i].warningReportList.length === 0) continue;
//TODO aタグlist.html 転移処理
......@@ -286,13 +286,26 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
+ "</div></div> </div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
break;
case 2:
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
+ " ', 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> <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> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].taskKey + "'></li>");
var ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + operationList[i].warningReportList[j].taskKey + "','" + operationList[i].warningReportList[j].taskType + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'></a>");
var liTagTitle ;
if( operationList[i].warningReportList[j].taskType == 0 )
{
liTagTitle = $("<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName + msgLevelReport + "</div>") ;
}
else
{
liTagTitle = $("<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName + msgLevelAnswer + "</div>") ;
}
var divCode = $("<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>");
var iIcon = $("<i class='fas fa-chevron-right fs-12'></i>");
ahrefRequiredFlg.append(liTagTitle);
ahrefRequiredFlg.append(divCode);
ahrefRequiredFlg.append(iIcon);
operationNameLi.append(ahrefRequiredFlg);
break;
case 3:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].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