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
b4f4c049
Commit
b4f4c049
authored
Jul 31, 2023
by
Riri Novita
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev/riri' into 'ENV-DEV'
Fixing OI IDR mn See merge request
!1941
parents
7b5179bd
a44bda0a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
6 deletions
+14
-6
OperatingIndicatorMR.js
src/container/MonthlyReport/OperatingIndicatorMR.js
+0
-2
ProfitLossMR.js
src/container/MonthlyReport/ProfitLossMR.js
+2
-2
OperatingIndicatorDetail.js
src/container/OperatingIndicator/OperatingIndicatorDetail.js
+12
-2
No files found.
src/container/MonthlyReport/OperatingIndicatorMR.js
View file @
b4f4c049
...
...
@@ -1220,7 +1220,6 @@ export default class OperatingIndicatorMR extends Component {
fixedDecimalScale
=
{
1
}
disabled
=
{
!
this
.
props
.
permission
.
create
||
!
this
.
props
.
permission
.
edit
||
this
.
state
.
get_for
==
'view'
}
value
=
{
Number
(
tableMeta
.
rowData
[
10
]).
toFixed
(
1
)}
decimalScale
=
{
1
}
onBlur
=
{(
event
)
=>
{
handleChange
(
event
.
target
.
value
,
tableMeta
)
}}
...
...
@@ -1243,7 +1242,6 @@ export default class OperatingIndicatorMR extends Component {
disabled
=
{
true
}
decimalScale
=
{
1
}
value
=
{
Number
(
handleFormula
(
val
,
tableMeta
,
2
)).
toFixed
(
1
)}
decimalScale
=
{
1
}
/
>
}
/
>
...
...
src/container/MonthlyReport/ProfitLossMR.js
View file @
b4f4c049
...
...
@@ -1240,7 +1240,7 @@ export default class ProfitLossMR extends Component {
disabled
=
{
true
}
decimalScale
=
{
1
}
value
=
{
Number
(
tableMeta
.
rowData
[
10
]).
toFixed
(
1
)}
decimalScale
=
{
1
}
//
decimalScale={1}
/
>
:
tableMeta
.
rowData
[
0
]
===
3
?
...
...
@@ -1709,7 +1709,7 @@ export default class ProfitLossMR extends Component {
control
=
{
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
color
:
'red'
,
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
//
style={{ color: 'red', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type
=
"text"
placeholder
=
""
style
=
{{
color
:
Number
(
tableMeta
.
rowData
[
18
]).
toFixed
(
1
)
<
this
.
state
.
minValue
||
Number
(
tableMeta
.
rowData
[
18
]).
toFixed
(
1
)
>
this
.
state
.
maxValue
?
'red'
:
'#000000b0'
,
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
...
...
src/container/OperatingIndicator/OperatingIndicatorDetail.js
View file @
b4f4c049
...
...
@@ -2157,7 +2157,12 @@ export default class BalanceSheet extends Component {
<
div
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
}}
>
{
this
.
props
.
data
.
company
.
company_name
}
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
}}
>
Period
:
{
this
.
props
.
data
.
periode
}
<
/Typography
>
{
/* <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography> */
}
{
this
.
props
.
defaultCurrency
.
id
===
1
?
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
}}
>
in
IDR
mn
<
/Typography
>
:
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
}}
>
in
USD
thousand
<
/Typography
>
}
<
/div
>
<
div
style
=
{{
width
:
'50%'
}}
>
<
div
style
=
{{
justifyContent
:
'flex-end'
,
display
:
'flex'
,
flexFlow
:
'wrap'
}}
>
...
...
@@ -2335,7 +2340,12 @@ export default class BalanceSheet extends Component {
<
div
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
}}
>
{
this
.
props
.
data
.
company
.
company_name
}
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
}}
>
Period
:
{
this
.
props
.
data
.
periode
}
<
/Typography
>
{
/* <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography> */
}
{
this
.
props
.
defaultCurrency
.
id
===
1
?
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
}}
>
in
IDR
mn
<
/Typography
>
:
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
}}
>
in
USD
thousand
<
/Typography
>
}
<
/div
>
{
this
.
state
.
dataLoaded
&&
(
<
div
style
=
{{
marginTop
:
20
,
width
:
this
.
props
.
width
-
(
this
.
props
.
open
===
true
?
400
:
150
)
}}
>
...
...
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