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
5fb3d18c
Commit
5fb3d18c
authored
2 years ago
by
NGUYEN HOANG SON
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
check search value null
parent
072c9ae1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
app/script/check.js
+5
-6
No files found.
app/script/check.js
View file @
5fb3d18c
...
@@ -3067,20 +3067,20 @@ CHK.createOperationList = function(operationList, isSearched = false) {
...
@@ -3067,20 +3067,20 @@ CHK.createOperationList = function(operationList, isSearched = false) {
operationList
=
operationList
.
filter
(
function
(
operation
)
{
operationList
=
operationList
.
filter
(
function
(
operation
)
{
var
result
=
true
;
var
result
=
true
;
if
(
searchKeyword
.
length
)
{
if
(
searchKeyword
&&
searchKeyword
.
length
)
{
result
=
result
*
operation
.
operationName
.
includes
(
searchKeyword
);
result
=
result
*
operation
.
operationName
.
includes
(
searchKeyword
);
}
}
if
(
searchStartDate
.
length
&&
!
searchEndDate
.
length
)
{
if
(
searchStartDate
&&
searchEndDate
&&
searchStartDate
.
length
&&
!
searchEndDate
.
length
)
{
result
=
result
*
(
operation
.
operationStartDate
>=
searchStartDate
);
result
=
result
*
(
operation
.
operationStartDate
>=
searchStartDate
);
}
}
if
(
searchEndDate
.
length
&&
!
searchStartDate
.
length
)
{
if
(
search
StartDate
&&
searchEndDate
&&
search
EndDate
.
length
&&
!
searchStartDate
.
length
)
{
result
=
result
*
(
operation
.
operationEndDate
<=
searchEndDate
);
result
=
result
*
(
operation
.
operationEndDate
<=
searchEndDate
);
}
}
if
(
searchStartDate
.
length
&&
searchEndDate
.
length
)
{
if
(
searchStartDate
&&
searchEndDate
&&
searchStartDate
.
length
&&
searchEndDate
.
length
)
{
result
=
result
*
((
operation
.
operationStartDate
<=
searchEndDate
)
&&
(
operation
.
operationEndDate
>=
searchStartDate
));
result
=
result
*
((
operation
.
operationStartDate
<=
searchEndDate
)
&&
(
operation
.
operationEndDate
>=
searchStartDate
));
}
}
if
(
operationGroupMasterId
!=
0
)
{
if
(
CHK
.
operationGroupMasterRelation
&&
operationGroupMasterId
!=
0
)
{
var
operationGroupMasterIdList
=
CHK
.
operationGroupMasterRelation
.
operationGroupMasterRelationList
.
filter
(
function
(
operationGroupMasterRelation
)
{
var
operationGroupMasterIdList
=
CHK
.
operationGroupMasterRelation
.
operationGroupMasterRelationList
.
filter
(
function
(
operationGroupMasterRelation
)
{
return
operationGroupMasterRelation
.
operationId
==
operation
.
operationId
;
return
operationGroupMasterRelation
.
operationId
==
operation
.
operationId
;
})
})
...
@@ -3253,7 +3253,6 @@ CHK.search = function() {
...
@@ -3253,7 +3253,6 @@ CHK.search = function() {
CHK
.
isSearched
=
true
;
CHK
.
isSearched
=
true
;
CHK
.
operation
.
searchOperationList
=
searchResult
;
CHK
.
operation
.
searchOperationList
=
searchResult
;
CHK
.
createOperationList
(
searchResult
,
CHK
.
isSearched
);
CHK
.
createOperationList
(
searchResult
,
CHK
.
isSearched
);
CHK_PU
.
createOperationList
(
searchResult
,
CHK
.
isSearched
);
};
};
/**
/**
...
...
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