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
d9da61f7
Commit
d9da61f7
authored
Mar 05, 2021
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'GGMAC' into 'master'
Ggmac See merge request
!1256
parents
da686588
17228e59
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
38 deletions
+39
-38
CashFlow.js
src/container/BudgetTahunan/CashFlow.js
+3
-3
MonthlyReport.js
src/container/MonthlyReport.js
+1
-2
CashFlowMR.js
src/container/MonthlyReport/CashFlowMR.js
+35
-33
No files found.
src/container/BudgetTahunan/CashFlow.js
View file @
d9da61f7
...
@@ -3195,8 +3195,8 @@ export default class CashFlow extends Component {
...
@@ -3195,8 +3195,8 @@ export default class CashFlow extends Component {
<
/div
>
<
/div
>
<
/button
>
<
/button
>
<
/div
>
<
/div
>
{
this
.
props
.
isApprover
===
true
||
dataTable2
.
length
==
0
?
null
:
{
/* {
this.props.isApprover === true || dataTable2.length == 0 ? null :
(
this
.
props
.
lastStatus
===
'SUBMIT'
||
this
.
props
.
lastStatus
===
'REVISION'
)
&&
this
.
props
.
prevRevision
===
false
&&
(
this
.
props
.
status
===
'revision'
||
this
.
props
.
status
===
'not-yet'
||
this
.
props
.
status
===
'draft'
||
this
.
props
.
status
===
'submitted'
)
?
(this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ?
*/
}
<
div
className
=
"col-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
maxWidth
:
'100%'
}}
>
<
div
className
=
"col-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
maxWidth
:
'100%'
}}
>
<
button
<
button
type
=
"button"
type
=
"button"
...
@@ -3221,7 +3221,7 @@ export default class CashFlow extends Component {
...
@@ -3221,7 +3221,7 @@ export default class CashFlow extends Component {
<
/div
>
<
/div
>
<
/button
>
<
/button
>
<
/div
>
<
/div
>
:
null
}
{
/* // : null} */
}
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/Paper
>
<
/Paper
>
...
...
src/container/MonthlyReport.js
View file @
d9da61f7
...
@@ -625,10 +625,8 @@ export default class MonthlyReport extends Component {
...
@@ -625,10 +625,8 @@ export default class MonthlyReport extends Component {
// // console.log(this.state.lastStatus);
// // console.log(this.state.lastStatus);
this
.
historyApproval
()
this
.
historyApproval
()
this
.
getLatestPeriodSubmit
()
this
.
getLatestPeriodSubmit
()
// this.getCashFlow(type)
// this.getPL(type)
// this.getPL(type)
if
(
type
!=
undefined
)
{
if
(
type
!=
undefined
)
{
// this.getCashFlow(type)
this
.
getPL
(
type
)
this
.
getPL
(
type
)
}
else
{
}
else
{
this
.
setState
({
loading
:
false
})
this
.
setState
({
loading
:
false
})
...
@@ -722,6 +720,7 @@ export default class MonthlyReport extends Component {
...
@@ -722,6 +720,7 @@ export default class MonthlyReport extends Component {
visibleBS
:
false
,
visibleBS
:
false
,
visiblePL
:
false
,
visiblePL
:
false
,
visibleCAT
:
false
,
visibleCAT
:
false
,
visibleCF
:
false
,
visibleFAM
:
false
,
visibleFAM
:
false
,
visibleTP
:
false
,
visibleTP
:
false
,
visibleLOCF
:
false
,
visibleLOCF
:
false
,
...
...
src/container/MonthlyReport/CashFlowMR.js
View file @
d9da61f7
...
@@ -63,19 +63,19 @@ export default class CashFlowMR extends Component {
...
@@ -63,19 +63,19 @@ export default class CashFlowMR extends Component {
}
else
{
}
else
{
checkApprover
=
false
checkApprover
=
false
}
}
if
(
this
.
props
.
lastStatus
==
'SUBMIT'
||
this
.
props
.
lastStatus
==
'REVISION'
)
{
if
(
this
.
props
.
lastStatus
==
'SUBMIT'
||
this
.
props
.
lastStatus
==
'REVISION'
)
{
checkLastStatus
=
true
checkLastStatus
=
true
}
else
{
}
else
{
checkLastStatus
=
false
checkLastStatus
=
false
}
}
if
(
this
.
props
.
prevRevision
)
{
if
(
this
.
props
.
prevRevision
)
{
checkPrevRev
=
true
checkPrevRev
=
true
}
else
{
}
else
{
checkPrevRev
=
false
checkPrevRev
=
false
}
}
if
(
this
.
props
.
status
===
'revision'
||
this
.
props
.
status
===
'not-yet'
||
this
.
props
.
status
===
'drat'
||
this
.
props
.
status
===
'submitted'
)
{
if
(
this
.
props
.
status
===
'revision'
||
this
.
props
.
status
===
'not-yet'
||
this
.
props
.
status
===
'drat'
||
this
.
props
.
status
===
'submitted'
)
{
checkStatus
=
true
checkStatus
=
true
}
else
{
}
else
{
...
@@ -85,7 +85,7 @@ export default class CashFlowMR extends Component {
...
@@ -85,7 +85,7 @@ export default class CashFlowMR extends Component {
// console.log(checkLastStatus)
// console.log(checkLastStatus)
// console.log(checkApprover)
// console.log(checkApprover)
// console.log(checkPrevRev)
// console.log(checkPrevRev)
this
.
setState
({
viewOnly
:
!
checkApprover
&&
checkLastStatus
&&
checkStatus
&&
checkPrevRev
})
this
.
setState
({
viewOnly
:
!
checkApprover
&&
checkLastStatus
&&
checkStatus
&&
checkPrevRev
})
}
}
componentDidMount
()
{
componentDidMount
()
{
...
@@ -214,10 +214,10 @@ export default class CashFlowMR extends Component {
...
@@ -214,10 +214,10 @@ export default class CashFlowMR extends Component {
dataTable2
.
map
((
item
,
index
)
=>
{
dataTable2
.
map
((
item
,
index
)
=>
{
// if (item[6].value == "" || item[6].value == 0 || item[6].value == "0.0") {
// if (item[6].value == "" || item[6].value == 0 || item[6].value == "0.0") {
// item[6].value = this.handleValueFormula(item, index)
// item[6].value = this.handleValueFormula(item, index)
listCF
.
push
({
listCF
.
push
({
"item_report_id"
:
item
[
1
],
"item_report_id"
:
item
[
1
],
"actual"
:
item
[
0
]
==
1
?
""
:
Number
(
item
[
6
].
value
).
toFixed
(
1
)
"actual"
:
item
[
0
]
==
1
?
""
:
Number
(
item
[
6
].
value
).
toFixed
(
1
)
})
})
// } else {
// } else {
// listCF.push({
// listCF.push({
// "item_report_id": item[1],
// "item_report_id": item[1],
...
@@ -717,30 +717,32 @@ export default class CashFlowMR extends Component {
...
@@ -717,30 +717,32 @@ export default class CashFlowMR extends Component {
<
/div
>
<
/div
>
<
/button
>
<
/button
>
<
/div
>
<
/div
>
{
this
.
state
.
viewOnly
&&
<
div
className
=
"col-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
maxWidth
:
'100%'
}}
>
{
this
.
state
.
viewOnly
&&
<
button
<
div
className
=
"col-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
maxWidth
:
'100%'
}}
>
type
=
"button"
<
button
// disabled={this.state.buttonError}
type
=
"button"
onClick
=
{()
=>
// disabled={this.state.buttonError}
// this.state.buttonError ?
onClick
=
{()
=>
// this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
// this.state.buttonError ?
// :
// this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
this
.
state
.
handleTekTekTek
==
1
?
null
:
// :
this
.
setState
({
handleTekTekTek
:
1
},
()
=>
{
this
.
state
.
handleTekTekTek
==
1
?
null
:
this
.
payloadCF
(
dataTable2
)
this
.
setState
({
handleTekTekTek
:
1
},
()
=>
{
})}
this
.
payloadCF
(
dataTable2
)
style
=
{{
})}
backgroundColor
:
'transparent'
,
style
=
{{
cursor
:
this
.
state
.
buttonError
===
true
?
'default'
:
'pointer'
,
backgroundColor
:
'transparent'
,
borderColor
:
'transparent'
,
cursor
:
this
.
state
.
buttonError
===
true
?
'default'
:
'pointer'
,
outline
:
'none'
,
borderColor
:
'transparent'
,
}}
outline
:
'none'
,
>
}}
<
div
style
=
{{
backgroundColor
:
'#354960'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
<
div
style
=
{{
backgroundColor
:
'#354960'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
/div
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
<
/button
>
<
/div
>
<
/div>
}
<
/button
>
<
/div
>
}
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/Paper
>
<
/Paper
>
...
...
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