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
dc06a583
Commit
dc06a583
authored
Feb 23, 2021
by
Rifka Kurnia
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rifka' into 'master'
push See merge request
!1195
parents
3f97a2e7
3377a7fa
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
150 additions
and
329 deletions
+150
-329
TaxPlanningMR.js
src/container/MonthlyReport/TaxPlanningMR.js
+15
-9
SummaryOfTriputra.js
src/container/SummaryTriputra/SummaryOfTriputra.js
+14
-8
TableSummaryTriputra.js
src/container/SummaryTriputra/TableSummaryTriputra.js
+121
-312
No files found.
src/container/MonthlyReport/TaxPlanningMR.js
View file @
dc06a583
...
...
@@ -116,6 +116,7 @@ export default class TaxPlanningMR extends Component {
}
api
.
create
().
getAllSettingByType
(
body
).
then
(
response
=>
{
console
.
log
(
response
)
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
'success'
)
{
this
.
setState
({
...
...
@@ -468,12 +469,13 @@ export default class TaxPlanningMR extends Component {
})
}
handleValidate
()
{
handleValidate
(
dataTable2
)
{
let
data
=
[]
let
errorContrl
=
this
.
state
.
buttonError
let
editAble
=
this
.
state
.
editAble
// console.log(this.state.dataTable)
this
.
state
.
dataTable
.
map
(
i
=>
{
console
.
log
(
this
.
state
.
dataTable
)
console
.
log
(
dataTable2
)
dataTable2
.
map
(
i
=>
{
data
.
push
({
item_report_id
:
i
[
4
],
trial_balance_commercial
:
String
(
Number
(
i
[
9
].
tbc
).
toFixed
(
1
)),
...
...
@@ -484,7 +486,11 @@ export default class TaxPlanningMR extends Component {
})
if
(
String
(
i
[
8
])
==
"Control (should be nil)"
)
{
if
(
i
[
9
].
tbf
<
this
.
state
.
minValue
||
i
[
9
].
tbf
>
this
.
state
.
maxValue
)
{
this
.
setState
({
loading
:
true
})
console
.
log
(
i
[
9
].
tbf
)
console
.
log
(
this
.
state
.
minValue
)
console
.
log
(
this
.
state
.
maxValue
)
if
(
Number
(
i
[
9
].
tbf
)
<
Number
(
this
.
state
.
minValue
)
||
Number
(
i
[
9
].
tbf
)
>
Number
(
this
.
state
.
maxValue
))
{
errorContrl
=
true
editAble
=
true
}
else
{
...
...
@@ -494,7 +500,7 @@ export default class TaxPlanningMR extends Component {
}
})
// this.setState({ loading: false, buttonError: errorContrl, editable: editAble, saveDraft: false })
console
.
log
(
errorContrl
)
let
i
=
this
.
state
.
dataTable
let
payload
=
{
"monthly_report_id"
:
this
.
props
.
monthlyReportId
,
...
...
@@ -780,7 +786,6 @@ export default class TaxPlanningMR extends Component {
}
const
handleChange
=
(
value
,
tableMeta
,
indexChilds
)
=>
{
console
.
log
(
dataTable2
)
let
val
=
String
(
value
).
split
(
","
).
join
(
""
)
// let data = this.state.dataTable2
let
indexParent
=
dataTable2
.
findIndex
((
val
)
=>
val
[
4
]
===
dataTable2
[
tableMeta
.
rowIndex
][
5
])
...
...
@@ -802,6 +807,7 @@ export default class TaxPlanningMR extends Component {
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
=
Number
(
val
)
}
}
console
.
log
(
dataTable2
)
}
const
handleTotal
=
(
value
,
tableMeta
,
dex
)
=>
{
// console.log(tableMeta)
...
...
@@ -1556,13 +1562,13 @@ export default class TaxPlanningMR extends Component {
<
div
style
=
{{
marginTop
:
20
,
width
:
this
.
props
.
width
-
(
this
.
props
.
open
===
true
?
400
:
150
)
}}
>
{
this
.
state
.
loading
&&
loadingComponent
}
{
!
this
.
state
.
loading
&&
<
MuiThemeProvider
theme
=
{
getMuiTheme
()}
>
<
MuiThemeProvider
theme
=
{
getMuiTheme
()}
>
<
MUIDataTable
data
=
{
dataTable2
}
columns
=
{
columns
}
options
=
{
options
}
/
>
<
/MuiThemeProvider>
}
<
/MuiThemeProvider
>
{
/* )} */
}
<
/div
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
,
marginTop
:
20
,
marginLeft
:
20
}}
>
Last
Updated
by
:
{
this
.
state
.
updateBy
}
<
/Typography
>
...
...
@@ -1630,7 +1636,7 @@ export default class TaxPlanningMR extends Component {
this
.
setState
({
loading
:
true
,
buttonDraft
:
false
},
()
=>
{
setTimeout
(()
=>
{
// this.setState({ loading: false, buttonError: false, editable: true })
this
.
handleValidate
()
this
.
handleValidate
(
dataTable2
)
},
100
);
})
}
...
...
src/container/SummaryTriputra/SummaryOfTriputra.js
View file @
dc06a583
...
...
@@ -379,7 +379,7 @@ export default class SummaryOfTriputra extends Component {
item
.
npat_fy_last_year
,
item
.
npat_fy_percent_of_last_year
,
item
.
order
,
item
.
is_approved
item
.
is_approved
==
undefined
?
true
:
item
.
is_approved
,
])
}
if
(
item
.
children
!==
null
)
{
...
...
@@ -437,7 +437,7 @@ export default class SummaryOfTriputra extends Component {
item
.
npat_fy_last_year
,
item
.
npat_fy_percent_of_last_year
,
item
.
order
,
item
.
is_approved
item
.
is_approved
==
undefined
?
true
:
item
.
is_approved
,
])
if
(
item
.
children
!==
null
)
{
if
(
item
.
children
.
length
>
0
)
{
...
...
@@ -619,7 +619,8 @@ export default class SummaryOfTriputra extends Component {
item
.
revenue_last_three_year
,
item
.
revenue_last_two_year
,
item
.
revenue_last_year
,
item
.
revenue
,
// item.revenue,
0
,
item
.
ebitda_last_ten_year
,
item
.
ebitda_last_nine_year
,
item
.
ebitda_last_eight_year
,
...
...
@@ -630,7 +631,8 @@ export default class SummaryOfTriputra extends Component {
item
.
ebitda_last_three_year
,
item
.
ebitda_last_two_year
,
item
.
ebitda_last_year
,
item
.
ebitda
,
// item.ebitda,
0
,
item
.
tpat_last_ten_year
,
item
.
tpat_last_nine_year
,
item
.
tpat_last_eight_year
,
...
...
@@ -641,7 +643,8 @@ export default class SummaryOfTriputra extends Component {
item
.
tpat_last_three_year
,
item
.
tpat_last_two_year
,
item
.
tpat_last_year
,
item
.
tpat
,
// item.tpat,
0
,
item
.
npat_last_ten_year
,
item
.
npat_last_nine_year
,
item
.
npat_last_eight_year
,
...
...
@@ -652,7 +655,8 @@ export default class SummaryOfTriputra extends Component {
item
.
npat_last_three_year
,
item
.
npat_last_two_year
,
item
.
npat_last_year
,
item
.
npat
,
// item.npat,
0
,
item
.
total_asset_last_ten_year
,
item
.
total_asset_last_nine_year
,
item
.
total_asset_last_eight_year
,
...
...
@@ -663,7 +667,8 @@ export default class SummaryOfTriputra extends Component {
item
.
total_asset_last_three_year
,
item
.
total_asset_last_two_year
,
item
.
total_asset_last_year
,
item
.
total_asset
,
// item.total_asset,
0
,
item
.
total_equity_last_ten_year
,
item
.
total_equity_last_nine_year
,
item
.
total_equity_last_eight_year
,
...
...
@@ -674,7 +679,8 @@ export default class SummaryOfTriputra extends Component {
item
.
total_equity_last_three_year
,
item
.
total_equity_last_two_year
,
item
.
total_equity_last_year
,
item
.
total_equity
,
// item.total_equity,
0
,
item
.
order
,
])
}
...
...
src/container/SummaryTriputra/TableSummaryTriputra.js
View file @
dc06a583
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