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
73a4a403
Commit
73a4a403
authored
Aug 29, 2021
by
Kim Eunchul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#43864 【Check CMS 1.4.0】パフォーマンス改善依頼2(カテゴリー)
#43733【Check CMS 1.4.0】作業期間に含まれる「期間」で検索しても、該当する作業が一覧に表示されない
parent
585bfc60
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
16 deletions
+20
-16
app/css/app.css
+13
-13
app/script/check.js
+7
-3
No files found.
app/css/app.css
View file @
73a4a403
...
@@ -20013,7 +20013,7 @@ button {
...
@@ -20013,7 +20013,7 @@ button {
}
}
.drawer-menu dt {
.drawer-menu dt {
padding: 10px 0 10px
3
0px;
padding: 10px 0 10px
4
0px;
font-weight: 400
font-weight: 400
}
}
...
@@ -20038,51 +20038,51 @@ button {
...
@@ -20038,51 +20038,51 @@ button {
}
}
.category-a {
.category-a {
margin-left: 8px;
margin-left:
1
8px;
}
}
.group-level-1 {
.group-level-1 {
padding-left:
3
0px !important;
padding-left:
4
0px !important;
}
}
.group-level-2 {
.group-level-2 {
padding-left:
5
0px !important;
padding-left:
6
0px !important;
}
}
.group-level-3 {
.group-level-3 {
padding-left:
7
0px !important;
padding-left:
8
0px !important;
}
}
.group-level-4 {
.group-level-4 {
padding-left:
9
0px !important;
padding-left:
10
0px !important;
}
}
.group-level-5 {
.group-level-5 {
padding-left: 1
1
0px !important;
padding-left: 1
2
0px !important;
}
}
.group-level-6 {
.group-level-6 {
padding-left: 1
3
0px !important;
padding-left: 1
4
0px !important;
}
}
.group-level-7 {
.group-level-7 {
padding-left: 1
5
0px !important;
padding-left: 1
6
0px !important;
}
}
.group-level-8 {
.group-level-8 {
padding-left: 1
7
0px !important;
padding-left: 1
8
0px !important;
}
}
.group-level-9 {
.group-level-9 {
padding-left:
19
0px !important;
padding-left:
20
0px !important;
}
}
.group-level-10 {
.group-level-10 {
padding-left: 2
1
0px !important;
padding-left: 2
2
0px !important;
}
}
.group-level-11 {
.group-level-11 {
padding-left: 2
3
0px !important;
padding-left: 2
4
0px !important;
}
}
.drawer-menu .drawer-menu3 li {
.drawer-menu .drawer-menu3 li {
...
...
app/script/check.js
View file @
73a4a403
...
@@ -2961,7 +2961,7 @@ CHK.search = function() {
...
@@ -2961,7 +2961,7 @@ CHK.search = function() {
var
operationGroupMasterId
=
CHK
.
operationGroupMasterId
;
var
operationGroupMasterId
=
CHK
.
operationGroupMasterId
;
var
searchResult
;
var
searchResult
;
if
(
searchStartDate
>
searchEndDate
){
if
(
(
searchStartDate
&&
searchEndDate
)
&&
(
searchStartDate
>
searchEndDate
)
){
CHK
.
displayAlert
(
"dateError"
);
CHK
.
displayAlert
(
"dateError"
);
return
;
return
;
}
}
...
@@ -2971,12 +2971,16 @@ CHK.search = function() {
...
@@ -2971,12 +2971,16 @@ CHK.search = function() {
if
(
searchKeyword
.
length
)
{
if
(
searchKeyword
.
length
)
{
result
=
result
*
operation
.
operationName
.
includes
(
searchKeyword
);
result
=
result
*
operation
.
operationName
.
includes
(
searchKeyword
);
}
}
if
(
searchStartDate
.
length
)
{
if
(
searchStartDate
.
length
&&
!
searchEndDate
.
length
)
{
result
=
result
*
(
operation
.
operationStartDate
>=
searchStartDate
);
result
=
result
*
(
operation
.
operationStartDate
>=
searchStartDate
);
}
}
if
(
searchEndDate
.
length
)
{
if
(
searchEndDate
.
length
&&
!
searchStartDate
.
length
)
{
result
=
result
*
(
operation
.
operationEndDate
<=
searchEndDate
);
result
=
result
*
(
operation
.
operationEndDate
<=
searchEndDate
);
}
}
if
(
searchStartDate
.
length
&&
searchEndDate
.
length
)
{
result
=
result
*
((
operation
.
operationStartDate
<=
searchEndDate
)
&&
(
operation
.
operationEndDate
>=
searchStartDate
));
}
if
(
operationGroupMasterId
!=
0
)
{
if
(
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
;
...
...
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