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
21093928
Commit
21093928
authored
Jul 28, 2021
by
Yujin Seo
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/1.4.0' of gitlab.agentec.jp:abookCheck/design into feature/1.4.0
parents
c32ca408
29f21530
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
7 deletions
+27
-7
app/script/check.js
+27
-7
No files found.
app/script/check.js
View file @
21093928
...
...
@@ -2848,19 +2848,39 @@ CHK.createOperationList = function(operationList, isSearched = false) {
}
switch
(
sortType
)
{
case
CHK_CONSTANT
.
SORT_TYPE
.
NAME
:
operationList
.
sort
((
a
,
b
)
=>
(
a
.
operationName
>
b
.
operationName
)
?
1
:
-
1
);
operationList
.
sort
(
function
(
a
,
b
)
{
if
(
a
.
operationName
>
b
.
operationName
)
return
1
;
if
(
a
.
operationName
<
b
.
operationName
)
return
-
1
;
return
0
;
});
break
;
case
CHK_CONSTANT
.
SORT_TYPE
.
START_DATE_DESC
:
operationList
.
sort
((
a
,
b
)
=>
(
setOperationDate
(
a
.
operationStartDate
)
<
setOperationDate
(
b
.
operationStartDate
))
?
1
:
-
1
);
operationList
.
sort
(
function
(
a
,
b
)
{
if
(
setOperationDate
(
a
.
operationStartDate
)
<
setOperationDate
(
b
.
operationStartDate
))
return
1
;
if
(
setOperationDate
(
a
.
operationStartDate
)
>
setOperationDate
(
b
.
operationStartDate
))
return
-
1
;
return
0
;
});
break
;
case
CHK_CONSTANT
.
SORT_TYPE
.
START_DATE_ASC
:
operationList
.
sort
((
a
,
b
)
=>
(
setOperationDate
(
a
.
operationStartDate
)
>
setOperationDate
(
b
.
operationStartDate
))
?
1
:
-
1
);
operationList
.
sort
(
function
(
a
,
b
)
{
if
(
setOperationDate
(
a
.
operationStartDate
)
>
setOperationDate
(
b
.
operationStartDate
))
return
1
;
if
(
setOperationDate
(
a
.
operationStartDate
)
<
setOperationDate
(
b
.
operationStartDate
))
return
-
1
;
return
0
;
});
break
;
case
CHK_CONSTANT
.
SORT_TYPE
.
TYPE
:
operationList
.
sort
((
a
,
b
)
=>
(
a
.
operationType
<
b
.
operationType
)
?
1
:
-
1
);
operationList
.
sort
(
function
(
a
,
b
)
{
if
(
a
.
operationType
<
b
.
operationType
)
return
1
;
if
(
a
.
operationType
>
b
.
operationType
)
return
-
1
;
return
0
;
});
break
;
case
CHK_CONSTANT
.
SORT_TYPE
.
LAST_EDIT_DATE
:
operationList
.
sort
((
a
,
b
)
=>
(
a
.
lastEditDate
<
b
.
lastEditDate
)
?
1
:
-
1
);
operationList
.
sort
(
function
(
a
,
b
)
{
if
(
a
.
lastEditDate
<
b
.
lastEditDate
)
return
1
;
if
(
a
.
lastEditDate
>
b
.
lastEditDate
)
return
-
1
;
return
0
;
});
break
;
}
}
...
...
@@ -2922,10 +2942,10 @@ CHK.search = function() {
result
=
result
*
operation
.
operationName
.
includes
(
searchKeyword
);
}
if
(
searchStartDate
.
length
)
{
result
=
result
*
(
operation
.
operation
End
Date
>=
searchStartDate
);
result
=
result
*
(
operation
.
operation
Start
Date
>=
searchStartDate
);
}
if
(
searchEndDate
.
length
)
{
result
=
result
*
(
operation
.
operation
Start
Date
<=
searchEndDate
);
result
=
result
*
(
operation
.
operation
End
Date
<=
searchEndDate
);
}
if
(
operationGroupMasterId
!=
0
)
{
var
operationGroupMasterIdList
=
CHK
.
operationGroupMasterRelation
.
operationGroupMasterRelationList
.
filter
(
function
(
operationGroupMasterRelation
)
{
...
...
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