Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dida Adams Arizona
Tia-dev
Commits
dc262576
Commit
dc262576
authored
Jan 19, 2021
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'didam' into 'master'
yap See merge request
!988
parents
0e134140
159df07c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
CorporateAnnualTargetMR.js
src/container/MonthlyReport/CorporateAnnualTargetMR.js
+8
-5
No files found.
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @
dc262576
...
@@ -100,7 +100,7 @@ export default class CorporateAnnualTargetMR extends Component {
...
@@ -100,7 +100,7 @@ export default class CorporateAnnualTargetMR extends Component {
let
checkApprover
=
false
let
checkApprover
=
false
let
checkLastStatus
=
false
let
checkLastStatus
=
false
let
checkStatus
=
false
let
checkStatus
=
false
let
checkPrevRev
=
false
if
(
this
.
props
.
isApprover
)
{
if
(
this
.
props
.
isApprover
)
{
checkApprover
=
true
checkApprover
=
true
}
else
{
}
else
{
...
@@ -112,9 +112,12 @@ export default class CorporateAnnualTargetMR extends Component {
...
@@ -112,9 +112,12 @@ export default class CorporateAnnualTargetMR extends Component {
}
else
{
}
else
{
checkLastStatus
=
false
checkLastStatus
=
false
}
}
// else if (this.props.prevRevision) {
// viewOnly = false
if
(
this
.
props
.
prevRevision
)
{
// }
checkPrevRev
=
true
}
else
{
checkPrevRev
=
false
}
if
(
this
.
props
.
status
===
'revision'
||
this
.
props
.
status
===
'not-yet'
||
this
.
props
.
status
===
'draft'
||
this
.
props
.
status
===
'submitted'
)
{
if
(
this
.
props
.
status
===
'revision'
||
this
.
props
.
status
===
'not-yet'
||
this
.
props
.
status
===
'draft'
||
this
.
props
.
status
===
'submitted'
)
{
checkStatus
=
true
checkStatus
=
true
...
@@ -122,7 +125,7 @@ export default class CorporateAnnualTargetMR extends Component {
...
@@ -122,7 +125,7 @@ export default class CorporateAnnualTargetMR extends Component {
checkStatus
=
false
checkStatus
=
false
}
}
this
.
setState
({
viewOnly
:
!
checkApprover
&&
checkLastStatus
&&
checkStatus
})
this
.
setState
({
viewOnly
:
!
checkApprover
&&
checkLastStatus
&&
checkStatus
&&
checkPrevRev
})
}
}
getParameterGroup
()
{
getParameterGroup
()
{
...
...
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