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
31628d6e
Commit
31628d6e
authored
Feb 23, 2021
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'GGMAC' into 'master'
update euy See merge request
!1193
parents
74de00e5
d9f85fb3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
26 deletions
+32
-26
BudgetTahunan.js
src/container/BudgetTahunan.js
+9
-9
DashboardFinancial.js
src/container/Laporan/DashboardFinancial.js
+14
-8
MonthlyReport.js
src/container/MonthlyReport.js
+9
-9
No files found.
src/container/BudgetTahunan.js
View file @
31628d6e
...
...
@@ -538,7 +538,7 @@ export default class BudgetTahunan extends Component {
this
.
getCashFlow
(
type
)
this
.
getPL
(
type
)
}
this
.
getFR
(
type
)
//
this.getFR(type)
api
.
create
().
checkApprover
().
then
(
response
=>
{
// // console.log(this.state.btncreate);
// // console.log(this.state.btnedit)
...
...
@@ -1066,12 +1066,12 @@ export default class BudgetTahunan extends Component {
// if (this.state.submissionID != null) {
// this.createCashFlow()
// }
if
(
type
!=
undefined
)
{
if
(
type
==
'BS'
||
type
==
'FAM'
||
type
==
'PL'
)
{
//
if (type != undefined) {
//
if (type == 'BS' || type == 'FAM' || type == 'PL') {
console
.
log
(
'tarik sis'
)
this
.
createCashFlow
()
}
}
//
}
//
}
})
}
...
...
@@ -1563,12 +1563,12 @@ export default class BudgetTahunan extends Component {
// if (this.state.submissionID != null) {
// this.createDBPL()
// }
if
(
type
!=
undefined
)
{
if
(
type
==
'PL'
)
{
//
if (type != undefined) {
//
if (type == 'PL') {
console
.
log
(
'tarik sis'
)
this
.
createDBPL
()
}
}
//
}
//
}
})
}
...
...
src/container/Laporan/DashboardFinancial.js
View file @
31628d6e
...
...
@@ -11,6 +11,7 @@ import Constant from '../../library/Constant';
import
{
format
}
from
'date-fns'
;
import
{
PropagateLoader
}
from
'react-spinners'
;
import
ReactECharts
from
'echarts-for-react'
;
import
{
FormatListNumberedRtlOutlined
}
from
'@material-ui/icons'
;
const
Alert
=
withStyles
({
})((
props
)
=>
<
MuiAlert
elevation
=
{
6
}
variant
=
"filled"
{...
props
}
/>
)
;
...
...
@@ -64,16 +65,19 @@ export default class DashboardFinancial extends React.Component {
mrRev
:
[],
minRev
:
0
,
maxRev
:
0
,
intervalRev
:
0
,
companyTPAT
:
[],
mbTPAT
:
[],
mrTPAT
:
[],
minTPAT
:
0
,
maxTPAT
:
0
,
intervalTPAT
:
0
,
companyEBITDA
:
[],
mbEBITDA
:
[],
mrEBITDA
:
[],
minEBITDA
:
0
,
maxEBITDA
:
0
,
intervalEBITDA
:
0
,
data
:
[
],
};
...
...
@@ -394,18 +398,21 @@ export default class DashboardFinancial extends React.Component {
let
mrRev
=
[]
let
maxRev
=
response
.
revenue
.
vertical_pointing
[
0
]
let
minRev
=
response
.
revenue
.
vertical_pointing
[
1
]
let
intervalRev
=
Number
(
response
.
revenue
.
interval
)
let
companyTPAT
=
[]
let
mbTPAT
=
[]
let
mrTPAT
=
[]
let
maxTPAT
=
response
.
tpat
.
vertical_pointing
[
0
]
let
minTPAT
=
response
.
tpat
.
vertical_pointing
[
1
]
let
intervalTPAT
=
Number
(
response
.
tpat
.
interval
)
let
companyEBITDA
=
[]
let
mbEBITDA
=
[]
let
mrEBITDA
=
[]
let
maxEBITDA
=
response
.
ebitda
.
vertical_pointing
[
0
]
let
minEBITDA
=
response
.
ebitda
.
vertical_pointing
[
1
]
let
intervalEBITDA
=
Number
(
response
.
ebitda
.
interval
)
response
.
revenue
.
nodes
.
map
((
item
,
index
)
=>
{
if
(
this
.
state
.
report
.
value
==
'summary'
)
{
...
...
@@ -452,11 +459,10 @@ export default class DashboardFinancial extends React.Component {
"MBColor"
:
"hsl(212, 64%, 46%)"
,
"MR"
:
item
.
value_mr
,
"MRColor"
:
"hsl(212, 78%, 62%)"
,
})
})
}
this
.
setState
({
companyRev
,
mbRev
,
mrRev
,
minRev
,
maxRev
,
companyTPAT
,
mbTPAT
,
mrTPAT
,
minTPAT
,
maxTPAT
,
companyEBITDA
,
mbEBITDA
,
mrEBITDA
,
minEBITDA
,
max
EBITDA
},
()
=>
{
this
.
setState
({
companyRev
,
mbRev
,
mrRev
,
minRev
,
maxRev
,
intervalRev
,
companyTPAT
,
mbTPAT
,
mrTPAT
,
minTPAT
,
maxTPAT
,
intervalTPAT
,
companyEBITDA
,
mbEBITDA
,
mrEBITDA
,
minEBITDA
,
maxEBITDA
,
interval
EBITDA
},
()
=>
{
console
.
log
(
companyTPAT
)
this
.
setState
({
loading
:
false
})
})
...
...
@@ -675,7 +681,7 @@ export default class DashboardFinancial extends React.Component {
name
:
'(Rp bn)'
,
min
:
this
.
state
.
minRev
,
max
:
this
.
state
.
maxRev
,
interval
:
1000
interval
:
this
.
state
.
intervalRev
}
]
:
[
...
...
@@ -684,7 +690,7 @@ export default class DashboardFinancial extends React.Component {
name
:
'(Rp bn)'
,
min
:
this
.
state
.
minRev
,
max
:
this
.
state
.
maxRev
,
interval
:
1000
interval
:
this
.
state
.
intervalRev
},
{
type
:
'value'
,
...
...
@@ -767,7 +773,7 @@ export default class DashboardFinancial extends React.Component {
name
:
'(Rp bn)'
,
min
:
this
.
state
.
minTPAT
,
max
:
this
.
state
.
maxTPAT
,
interval
:
1000
interval
:
this
.
state
.
intervalTPAT
}
]
:
[
...
...
@@ -776,7 +782,7 @@ export default class DashboardFinancial extends React.Component {
name
:
'(Rp bn)'
,
min
:
this
.
state
.
minTPAT
,
max
:
this
.
state
.
maxTPAT
,
interval
:
1000
interval
:
this
.
state
.
intervalTPAT
},
{
type
:
'value'
,
...
...
@@ -933,7 +939,7 @@ export default class DashboardFinancial extends React.Component {
name
:
'(Rp bn)'
,
min
:
this
.
state
.
minEBITDA
,
max
:
this
.
state
.
maxEBITDA
,
interval
:
1000
interval
:
this
.
state
.
intervalEBITDA
}
]
:
[
...
...
@@ -942,7 +948,7 @@ export default class DashboardFinancial extends React.Component {
name
:
'(Rp bn)'
,
min
:
this
.
state
.
minEBITDA
,
max
:
this
.
state
.
maxEBITDA
,
interval
:
1000
interval
:
this
.
state
.
intervalEBITDA
},
{
type
:
'value'
,
...
...
src/container/MonthlyReport.js
View file @
31628d6e
...
...
@@ -627,7 +627,7 @@ export default class MonthlyReport extends Component {
this
.
getLatestPeriodSubmit
()
this
.
getCashFlow
(
type
)
this
.
getPL
(
type
)
this
.
getFR
(
type
)
//
this.getFR(type)
// this.getReport()
// this.getReportAttachment()
api
.
create
().
checkApproverMonthly
().
then
(
response
=>
{
...
...
@@ -1361,12 +1361,12 @@ export default class MonthlyReport extends Component {
// console.log(listCF)
this
.
setState
({
dbCF
:
listCF
}
,
()
=>
{
if
(
type
!=
undefined
)
{
if
(
type
==
'BS'
||
type
==
'FAM'
||
type
==
'PL'
)
{
//
if (type != undefined) {
//
if (type == 'BS' || type == 'FAM' || type == 'PL') {
console
.
log
(
'tarik sis'
)
this
.
createCashFlow
()
}
}
//
}
//
}
})
}
...
...
@@ -1785,12 +1785,12 @@ export default class MonthlyReport extends Component {
console
.
log
(
listPL
)
this
.
setState
({
dbPL
:
listPL
}
,
()
=>
{
if
(
type
!=
undefined
)
{
if
(
type
==
'PL'
)
{
//
if (type != undefined) {
//
if ( type == 'PL') {
console
.
log
(
'tarik sis'
)
this
.
createPL
()
}
}
//
}
//
}
})
}
...
...
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