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
1dc0cccc
Commit
1dc0cccc
authored
Jun 29, 2021
by
Lee Munkyeong
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
検索対応
parent
773ca169
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
app/script/check.js
+7
-6
No files found.
app/script/check.js
View file @
1dc0cccc
...
...
@@ -372,10 +372,11 @@ CHK.initReport = function(callback) {
CHK
.
initReportApp
=
function
(
callback
)
{
// 作業一覧JSONデータ
CHK
.
loadJson
(
CHK
.
jsonPath
.
operationList
,
function
(
json
)
{
CHK
.
operation
=
json
;
if
(
CHK
.
isAndroid
)
{
$
(
'#operationTable'
).
empty
();
CHK
.
operation
.
searchOperationList
=
json
.
operationList
;
}
CHK
.
operation
=
json
;
//作業一覧描画
CHK
.
createOperationList
(
CHK
.
operation
.
operationList
);
});
...
...
@@ -2734,9 +2735,9 @@ CHK.createCategory = function(operationGroupMasterList) {
/**
* 作業一覧描画
*/
CHK
.
createOperationList
=
function
(
operationList
)
{
CHK
.
createOperationList
=
function
(
operationList
,
isSearched
=
false
)
{
$
(
'#operationTable'
).
empty
();
if
(
CHK
.
isSearched
)
{
if
(
isSearched
)
{
operationList
=
CHK
.
operation
.
searchOperationList
;
}
if
(
operationList
.
length
>
1
)
{
...
...
@@ -2807,14 +2808,13 @@ CHK.search = function() {
var
searchResult
;
if
(
CHK
.
isAndroid
)
{
searchResult
=
JSON
.
parse
(
android
.
searchOperationList
(
searchKeyword
,
searchStartDate
,
searchEndDate
));
CHK
.
isSearched
=
true
;
CHK
.
operation
.
searchOperationList
=
searchResult
.
operationList
;
CHK
.
createOperationList
(
searchResult
.
operationList
);
CHK
.
createOperationList
(
searchResult
.
operationList
,
true
);
}
};
CHK
.
changeSortType
=
function
(
sortType
)
{
$
(
".sort-type"
).
removeClass
(
"active"
);
$
(
sortType
).
addClass
(
"active"
);
CHK
.
createOperationList
(
CHK
.
operation
.
operationList
);
CHK
.
createOperationList
(
CHK
.
operation
.
operationList
,
true
);
}
\ No newline at end of file
Takatoshi Miura
@miura-t
mentioned in commit
87292941
Jun 29, 2021
mentioned in commit
87292941
mentioned in commit 872929413552f3da2bbffab37c2538c5fcccf2f3
Toggle commit list
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