Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
design
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abookCheck
design
Commits
260b38f6
Commit
260b38f6
authored
2 years ago
by
NGO THI HONG
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#49123 fix bug direct tab answer report
parent
c44f3f61
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
14 deletions
+29
-14
app/script/check.js
+3
-1
app/script/check_pu.js
+26
-13
No files found.
app/script/check.js
View file @
260b38f6
...
...
@@ -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"
}
};
// 言語取得
...
...
This diff is collapsed.
Click to expand it.
app/script/check_pu.js
View file @
260b38f6
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment