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
7d7aba89
Commit
7d7aba89
authored
Oct 12, 2020
by
d.arizona
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apddd
parent
b34c9bfc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
29 deletions
+36
-29
FixedAssetsMovement.js
src/container/BudgetTahunan/FixedAssetsMovement.js
+34
-27
TaxPlanning.js
src/container/BudgetTahunan/TaxPlanning.js
+2
-2
No files found.
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @
7d7aba89
...
...
@@ -476,6 +476,10 @@ export default class FixedAssetsMovement extends Component {
}
})
// if (tableMeta.columnIndex == 18) {
// console.log(splitFormula)
// console.log(baru)
// }
// console.log(baru)
baru
.
map
((
item
,
index
)
=>
{
if
(
item
==
'-'
||
item
==
'+'
||
item
==
'/'
||
item
==
'*'
)
{
...
...
@@ -490,7 +494,7 @@ export default class FixedAssetsMovement extends Component {
let
indexID
=
tableMeta
.
rowData
[
data
].
formula
.
findIndex
((
val
)
=>
val
.
item_formula
==
String
(
`@
${
tst
}
`
)
&&
val
.
periode
==
period
)
// console.log(indexID)
if
(
indexID
!==
-
1
)
{
let
valuezz
=
tableMeta
.
rowData
[
18
].
formula
[
indexID
].
value
let
valuezz
=
tableMeta
.
rowData
[
data
].
formula
[
indexID
].
value
// baru.push(valuezz)
anjay
.
push
(
valuezz
==
""
?
0
:
valuezz
)
// console.log(valuezz)
...
...
@@ -543,10 +547,12 @@ export default class FixedAssetsMovement extends Component {
}
})
// console.log(dataTable2[tableMeta.rowIndex][22])
// console.log(tableMeta.rowData[5])
// console.log(baru)
// console.log(anjay)
// console.log(total)
// console.log(tableMeta.rowData[5])
// if (tableMeta.rowData[5] == 'Beginning Balance') {
// console.log(baru)
// console.log(anjay)
// console.log(total)
// }
if
(
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
value
==
undefined
)
{
// console.log([tableMeta.rowIndex][tableMeta.columnIndex])
...
...
@@ -576,9 +582,12 @@ export default class FixedAssetsMovement extends Component {
}
const
handleTotal
=
(
tableMeta
)
=>
{
let
total
=
0
// if (tableMeta.rowData[5] == 'Beginning balance') {
// console.log(tableMeta.rowData)
// }
dataTable2
[
tableMeta
.
rowIndex
].
map
((
item
,
index
)
=>
{
if
(
index
>=
7
&&
index
<=
18
)
{
let
valItem
=
item
==
undefined
||
item
==
""
?
0
:
item
let
valItem
=
item
.
value
==
undefined
?
item
==
undefined
||
item
==
""
?
0
:
item
:
item
.
value
==
""
?
0
:
item
.
value
total
+=
Number
(
valItem
)
}
})
...
...
@@ -1837,7 +1846,7 @@ export default class FixedAssetsMovement extends Component {
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
handle
Formula
(
value
,
tableMeta
,
12
)).
toFixed
(
1
)}
value
=
{
Number
(
handle
ValueFormula
(
value
,
tableMeta
)).
toFixed
(
1
)}
/
>
:
tableMeta
.
rowData
[
0
]
===
5
?
...
...
@@ -1964,19 +1973,18 @@ export default class FixedAssetsMovement extends Component {
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
handleFormula
(
value
,
tableMeta
,
12
)
).
toFixed
(
1
)}
value
=
{
Number
(
value
).
toFixed
(
1
)}
/
>
:
tableMeta
.
rowData
[
0
]
===
5
?
// <NumberFormat
// thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text"
// placeholder=""
// disabled={true}
// value={handleFormula(value, tableMeta)}
// />
null
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
value
).
toFixed
(
1
)}
/
>
:
tableMeta
.
rowData
[
0
]
===
1
?
// value === "" ?
...
...
@@ -2053,19 +2061,18 @@ export default class FixedAssetsMovement extends Component {
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
handleFormula
(
value
,
tableMeta
,
12
)
).
toFixed
(
1
)}
value
=
{
Number
(
value
).
toFixed
(
1
)}
/
>
:
tableMeta
.
rowData
[
0
]
===
5
?
// <NumberFormat
// thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text"
// placeholder=""
// disabled={true}
// value={handleFormula(value, tableMeta)}
// />
null
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
value
).
toFixed
(
1
)}
/
>
:
tableMeta
.
rowData
[
0
]
===
1
?
// value === "" ?
...
...
src/container/BudgetTahunan/TaxPlanning.js
View file @
7d7aba89
...
...
@@ -754,10 +754,10 @@ export default class TaxPlanning extends Component {
let
tst
=
String
(
item
).
replace
(
'[M-1]'
,
''
)
let
data
=
tableMeta
.
columnIndex
==
9
?
20
:
tableMeta
.
columnIndex
-
1
let
dataSub
=
dex
==
1
?
tableMeta
.
rowData
[
data
].
tbc
:
dex
==
2
?
tableMeta
.
rowData
[
data
].
fcp
:
tableMeta
.
rowData
[
data
].
tbf
let
period
=
data
==
18
?
Number
(
this
.
props
.
periode
)
-
1
:
this
.
props
.
periode
let
period
=
data
==
20
?
Number
(
this
.
props
.
periode
)
-
1
:
this
.
props
.
periode
let
indexID
=
dataSub
.
formula
.
findIndex
((
val
)
=>
val
.
item_formula
==
String
(
`@
${
tst
}
`
)
&&
val
.
periode
==
period
)
if
(
indexID
!==
-
1
)
{
let
valuezz
=
tableMeta
.
rowData
[
18
].
formula
[
indexID
].
value
let
valuezz
=
tableMeta
.
rowData
[
data
].
formula
[
indexID
].
value
anjay
.
push
(
valuezz
==
""
?
0
:
valuezz
)
}
}
else
{
...
...
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