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
99b41a7d
Commit
99b41a7d
authored
Apr 17, 2021
by
faisalhamdi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into faisal
parents
c3c9c19d
a6a73f8c
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
332 additions
and
304 deletions
+332
-304
BudgetTahunan.js
src/container/BudgetTahunan.js
+1
-1
MonthlyReport.js
src/container/MonthlyReport.js
+1
-1
ProfitLossMR.js
src/container/MonthlyReport/ProfitLossMR.js
+2
-1
OutlookPA.js
src/container/OutlookPA.js
+1
-0
CashFlowOLPA.js
src/container/OutlookPA/CashFlowOLPA.js
+282
-257
RollingOutlook.js
src/container/RollingOutlook.js
+1
-0
CashFlowRO.js
src/container/RollingOutlook/CashFlowRO.js
+44
-44
No files found.
src/container/BudgetTahunan.js
View file @
99b41a7d
...
@@ -3027,7 +3027,7 @@ export default class BudgetTahunan extends Component {
...
@@ -3027,7 +3027,7 @@ export default class BudgetTahunan extends Component {
status
=
{
this
.
state
.
status
}
status
=
{
this
.
state
.
status
}
lastStatus
=
{
this
.
state
.
lastStatus
}
lastStatus
=
{
this
.
state
.
lastStatus
}
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
PLBSFAMSubmitted
=
{
this
.
state
.
PLBSFAMSubmitted
}
PLBSFAMSubmitted
=
{
this
.
state
.
lastStatus
==
'APPROVED'
?
true
:
false
}
createCashFlow
=
{
this
.
createCashFlow
.
bind
(
this
)}
createCashFlow
=
{
this
.
createCashFlow
.
bind
(
this
)}
/
>
/
>
)
)
...
...
src/container/MonthlyReport.js
View file @
99b41a7d
...
@@ -3009,7 +3009,7 @@ export default class MonthlyReport extends Component {
...
@@ -3009,7 +3009,7 @@ export default class MonthlyReport extends Component {
lastStatus
=
{
this
.
state
.
lastStatus
}
lastStatus
=
{
this
.
state
.
lastStatus
}
isApprover
=
{
this
.
state
.
isApprover
}
isApprover
=
{
this
.
state
.
isApprover
}
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
PLBSFAMSubmitted
=
{
false
}
PLBSFAMSubmitted
=
{
this
.
state
.
lastStatus
==
'APPROVED'
?
true
:
false
}
createCashFlow
=
{
this
.
createCashFlow
.
bind
(
this
)}
createCashFlow
=
{
this
.
createCashFlow
.
bind
(
this
)}
/
>
/
>
)}
)}
...
...
src/container/MonthlyReport/ProfitLossMR.js
View file @
99b41a7d
...
@@ -136,7 +136,8 @@ export default class ProfitLossMR extends Component {
...
@@ -136,7 +136,8 @@ export default class ProfitLossMR extends Component {
checkStatus
=
false
checkStatus
=
false
}
}
this
.
setState
({
viewOnly
:
!
checkApprover
&&
checkLastStatus
&&
checkStatus
&&
checkPrevRev
})
// this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev })
this
.
setState
({
viewOnly
:
true
})
}
}
handleGetFor
(
type
)
{
handleGetFor
(
type
)
{
...
...
src/container/OutlookPA.js
View file @
99b41a7d
...
@@ -1948,6 +1948,7 @@ export default class OutlookPA extends Component {
...
@@ -1948,6 +1948,7 @@ export default class OutlookPA extends Component {
isApprover
=
{
this
.
state
.
isApprover
}
isApprover
=
{
this
.
state
.
isApprover
}
lastStatus
=
{
this
.
state
.
lastStatus
}
lastStatus
=
{
this
.
state
.
lastStatus
}
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
PLBSFAMSubmitted
=
{
this
.
state
.
lastStatus
==
'APPROVED'
?
true
:
false
}
/
>
/
>
)}
)}
{
this
.
state
.
visibleCAT
&&
(
{
this
.
state
.
visibleCAT
&&
(
...
...
src/container/OutlookPA/CashFlowOLPA.js
View file @
99b41a7d
This diff is collapsed.
Click to expand it.
src/container/RollingOutlook.js
View file @
99b41a7d
...
@@ -2027,6 +2027,7 @@ export default class RollingOutlook extends Component {
...
@@ -2027,6 +2027,7 @@ export default class RollingOutlook extends Component {
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
status
=
{
this
.
state
.
status
}
status
=
{
this
.
state
.
status
}
lastStatus
=
{
this
.
state
.
lastStatus
}
lastStatus
=
{
this
.
state
.
lastStatus
}
PLBSFAMSubmitted
=
{
this
.
state
.
lastStatus
==
'APPROVED'
?
true
:
false
}
/
>
/
>
)}
)}
...
...
src/container/RollingOutlook/CashFlowRO.js
View file @
99b41a7d
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