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
676ac1d9
Commit
676ac1d9
authored
Dec 19, 2023
by
Riri Novita
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'
Issue Subco See merge request
!2270
parents
ece57cb3
02889437
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
69 additions
and
124 deletions
+69
-124
.env_staging
.env_staging
+1
-1
package.json
package.json
+1
-1
app.css
src/assets/sass/app.css
+5
-0
BalanceSheet.js
src/container/BudgetTahunan/BalanceSheet.js
+15
-15
CorporateAnnualTarget.js
src/container/BudgetTahunan/CorporateAnnualTarget.js
+1
-1
LOVMR.js
src/container/MonthlyReport/LOVMR.js
+20
-97
SubHolding.js
src/container/Reports/SubHolding.js
+8
-2
RollingOutlook.js
src/container/RollingOutlook/RollingOutlook.js
+18
-7
No files found.
.env_staging
View file @
676ac1d9
// contents of .env
REACT_APP_URL_MAIN_BE=https://tia.eksad.com/tia-reporting-staging
REACT_APP_URL_MAIN_FE=/web
\ No newline at end of file
REACT_APP_URL_MAIN_FE=/web-staging
\ No newline at end of file
package.json
View file @
676ac1d9
src/assets/sass/app.css
View file @
676ac1d9
...
...
@@ -2,6 +2,11 @@
background-color: #273b80 !important;
}
/* for staging */
/* .main-color{
background-color: #0b6b24 !important;
} */
/* .main-color{
background-color: #1474CA !important;
} */
src/container/BudgetTahunan/BalanceSheet.js
View file @
676ac1d9
...
...
@@ -1175,7 +1175,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
@@ -1363,7 +1363,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
@@ -1552,7 +1552,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
@@ -1740,7 +1740,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
@@ -1928,7 +1928,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
@@ -2116,7 +2116,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
@@ -2304,7 +2304,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
@@ -2492,7 +2492,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
@@ -2680,7 +2680,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
@@ -2868,7 +2868,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
@@ -3056,7 +3056,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
@@ -3244,7 +3244,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
@@ -3432,7 +3432,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
@@ -3620,7 +3620,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
@@ -3808,7 +3808,7 @@ export default class BalanceSheet extends Component {
null
:
tableMeta
.
rowData
[
0
]
===
7
?
(
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
this
.
props
.
defaultCurrency
.
id
===
1
?
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
1
)
:
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
(
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
>=
Number
(
this
.
state
.
minValue
)
&&
fixNumber
(
Number
(
handleValidation
(
value
,
tableMeta
)),
12
)
<=
Number
(
this
.
state
.
maxValue
))
?
// (fixNumber(Number(handleValidation(value, tableMeta)), 12) >= Number(this.state.minValue) && fixNumber(Number(handleValidation(value, tableMeta)), 12) <= Number(this.state.maxValue)) ?
<
NumberFormat
thousandSeparator
=
{
true
}
...
...
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @
676ac1d9
...
...
@@ -219,7 +219,7 @@ export default class CorporateAnnualTarget extends Component {
item
.
level
,
""
,
item
.
description
,
item
.
type_report_id
==
1
?
(
`
${
String
(
item
.
weight
).
includes
(
'%'
)
?
String
(
item
.
weight
)
:
String
(
(
fixNumber
(
Number
(
item
.
weight
)
*
100
))
+
'% '
)}
`
)
:
(
String
(
Number
(
String
(
item
.
cat
.
weight
).
substr
(
0
,
String
(
item
.
cat
.
weight
).
length
-
1
)))
+
'%'
),
item
.
type_report_id
==
1
?
(
`
${
String
(
item
.
weight
).
includes
(
'%'
)
?
String
(
item
.
weight
)
:
String
(
fixNumber
(
(
Number
(
item
.
weight
)
*
100
))
+
'% '
)}
`
)
:
(
String
(
Number
(
String
(
item
.
cat
.
weight
).
substr
(
0
,
String
(
item
.
cat
.
weight
).
length
-
1
)))
+
'%'
),
item
.
cat
.
uom
,
item
.
kpi_type
==
""
?
null
:
{
value
:
item
.
kpi_type
},
item
.
max_ach
==
""
?
null
:
{
value
:
titleCase
(
item
.
max_ach
)
},
...
...
src/container/MonthlyReport/LOVMR.js
View file @
676ac1d9
...
...
@@ -41,6 +41,16 @@ const LightTooltip = withStyles((theme) => ({
fontSize
:
11
,
},
}))(
Tooltip
);
const
LightTooltipError
=
withStyles
((
theme
)
=>
({
tooltip
:
{
backgroundColor
:
theme
.
palette
.
common
.
white
,
color
:
'rgba(255, 0, 0, 0.87)'
,
boxShadow
:
theme
.
shadows
[
1
],
fontSize
:
11
,
},
}))(
Tooltip
);
var
ct
=
require
(
"../../library/CustomTable"
);
const
getMuiTheme
=
()
=>
createMuiTheme
(
ct
.
customTable3
());
const
options
=
ct
.
customOptionsFixedColumn
();
...
...
@@ -1234,42 +1244,6 @@ export default class LOV extends Component {
<
textarea
disabled
=
{
this
.
props
.
get_for
==
'view'
}
style
=
{{
borderColor
:
'white'
,
width
:
96
,
textAlign
:
'center'
,
justifyContent
:
'center'
,
padding
:
0
,
margin
:
0
,
color
:
this
.
props
.
get_for
==
'view'
?
"black"
:
"#5198ea"
,
backgroundColor
:
this
.
props
.
get_for
==
'view'
?
'white'
:
tableMeta
.
rowData
[
8
]
!==
''
?
'white'
:
tableMeta
.
rowData
[
7
]
==
null
?
'#ffac99'
:
(
tableMeta
.
rowData
[
8
]
==
''
&&
tableMeta
.
rowData
[
7
].
value
==
'Time deposit'
||
tableMeta
.
rowData
[
7
].
value
==
'N/A'
)
?
'white'
:
'#ffac99'
}}
type
=
"text"
defaultValue
=
{
tableMeta
.
rowData
[
8
]}
onBlur
=
{(
event
)
=>
handleChange
(
event
.
target
.
value
,
tableMeta
,
tableMeta
.
columnIndex
)}
/
>
<
/div
>
// <Input
// disableUnderline={true}
// style={{ fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text"
// disabled={tableMeta.rowData[0] == 8 || tableMeta.rowData[0] == 9 || this.props.get_for == 'view'? true : false}
// defaultValue={tableMeta.rowData[8]}
// // disabled={false}
// multiline={true}
// inputProps={{
// style: {
// color: this.props.get_for == 'view'? "black" : "#5198ea",
// textAlign: 'center',
// backgroundColor: 'white'
// }
// }}
// />
// <ThemeProvider theme={theme}>
// <Input
// disableUnderline={true}
// style={{color: this.props.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent', marginBottom: -105 }}
// type="text"
// placeholder=""
// disabled={tableMeta.rowData[0] == 8 || tableMeta.rowData[0] == 9? true : false}
// defaultValue={tableMeta.rowData[8]}
// multiline
// rowsMax={3}
// onBlur={(event) => {
// // // // console.log(event.target.value)
// // updateValue(event.target.value)
// handleChange(event.target.value, tableMeta, tableMeta.columnIndex)
// // // // console.log(dataTable2)
// }}
// />
// </ThemeProvider>
}
<
/div
>
...
...
@@ -1344,45 +1318,16 @@ export default class LOV extends Component {
{
tableMeta
.
rowData
[
0
]
===
8
||
tableMeta
.
rowData
[
0
]
===
9
?
null
:
<
div
style
=
{{
padding
:
0
,
margin
:
0
}}
>
<
textarea
disabled
=
{
this
.
props
.
get_for
==
'view'
}
style
=
{{
fontSize
:
12
,
borderColor
:
'white'
,
width
:
96
,
textAlign
:
'center'
,
justifyContent
:
'center'
,
padding
:
0
,
margin
:
0
,
color
:
this
.
props
.
get_for
==
'view'
?
"black"
:
"#5198ea"
,
backgroundColor
:
tableMeta
.
rowData
[
10
]
==
''
||
tableMeta
.
rowData
[
10
]
==
'0.0'
&&
this
.
props
.
get_for
==
'edit'
?
'#ffac99'
:
'white'
}}
type
=
"text"
defaultValue
=
{
tableMeta
.
rowData
[
10
]}
{
/* {tableMeta.rowData[10] == '' || tableMeta.rowData[10] == 0.0 || tableMeta.rowData[10] == 0 && this.props.get_for == 'edit' ?
<LightTooltipError title={"Data belum sesuai"} arrow>
<textarea disabled={this.props.get_for == 'view'} style={{ fontSize: 12, borderColor: 'white', width: 96, textAlign: 'center', justifyContent: 'center', padding: 0, margin: 0, color: this.props.get_for == 'view' ? "black" : "#5198ea", backgroundColor: tableMeta.rowData[10] == '' || tableMeta.rowData[10] == 0.0 || tableMeta.rowData[10] == 0 && this.props.get_for == 'edit' ? '#ffac99' : 'white' }} type="text" defaultValue={tableMeta.rowData[10]}
onBlur={(event) => handleChange(event.target.value, tableMeta, tableMeta.columnIndex)} />
</LightTooltipError>
: */
}
<
textarea
disabled
=
{
this
.
props
.
get_for
==
'view'
}
style
=
{{
fontSize
:
12
,
borderColor
:
'white'
,
width
:
96
,
textAlign
:
'center'
,
justifyContent
:
'center'
,
padding
:
0
,
margin
:
0
,
color
:
this
.
props
.
get_for
==
'view'
?
"black"
:
"#5198ea"
,
backgroundColor
:
tableMeta
.
rowData
[
10
]
==
''
||
tableMeta
.
rowData
[
10
]
==
0.0
||
tableMeta
.
rowData
[
10
]
==
0
&&
this
.
props
.
get_for
==
'edit'
?
'#ffac99'
:
'white'
}}
type
=
"text"
defaultValue
=
{
tableMeta
.
rowData
[
10
]}
onBlur
=
{(
event
)
=>
handleChange
(
event
.
target
.
value
,
tableMeta
,
tableMeta
.
columnIndex
)}
/
>
{
/* } */
}
<
/div
>
// <Input
// disableUnderline={true}
// style={{ fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text"
// disabled={tableMeta.rowData[0] == 8 || tableMeta.rowData[0] == 9 || this.props.get_for == 'view'? true : false}
// defaultValue={tableMeta.rowData[8]}
// // disabled={false}
// multiline={true}
// inputProps={{
// style: {
// color: this.props.get_for == 'view'? "black" : "#5198ea",
// textAlign: 'center',
// backgroundColor: 'white'
// }
// }}
// />
// <ThemeProvider theme={theme}>
// <Input
// disableUnderline={true}
// style={{color: this.props.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent', marginBottom: -105 }}
// type="text"
// placeholder=""
// disabled={tableMeta.rowData[0] == 8 || tableMeta.rowData[0] == 9? true : false}
// defaultValue={tableMeta.rowData[8]}
// multiline
// rowsMax={3}
// onBlur={(event) => {
// // // // console.log(event.target.value)
// // updateValue(event.target.value)
// handleChange(event.target.value, tableMeta, tableMeta.columnIndex)
// // // // console.log(dataTable2)
// }}
// />
// </ThemeProvider>
}
<
/div
>
...
...
@@ -1409,7 +1354,7 @@ export default class LOV extends Component {
control
=
{
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
color
:
this
.
props
.
get_for
==
'view'
?
"black"
:
"#5198ea"
,
fontSize
:
13
,
textAlign
:
'center'
,
paddingBottom
:
18
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
(
this
.
props
.
get_for
==
'edit'
&&
tableMeta
.
rowData
[
11
]
==
0.00
)
||
(
this
.
props
.
get_for
==
'edit'
&&
tableMeta
.
rowData
[
11
]
==
''
)
?
'#ffac99'
:
'transparent'
}}
style
=
{{
color
:
this
.
props
.
get_for
==
'view'
?
"black"
:
"#5198ea"
,
fontSize
:
13
,
textAlign
:
'center'
,
paddingBottom
:
18
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
(
this
.
props
.
get_for
==
'edit'
&&
tableMeta
.
rowData
[
11
]
==
0.00
)
||
(
this
.
props
.
get_for
==
'edit'
&&
tableMeta
.
rowData
[
11
]
==
''
)
?
'#ffac99'
:
'transparent'
}}
type
=
"text"
placeholder
=
""
decimalScale
=
{
this
.
props
.
defaultCurrency
.
id
==
1
?
2
:
16
}
...
...
@@ -1422,28 +1367,6 @@ export default class LOV extends Component {
/
>
}
/
>
// <FormControlLabel
// style={{ margin: 0 }}
// // value={value}
// control={
// <NumberFormat
// thousandSeparator={true}
// style={{ color: this.props.get_for == 'view' ? "black" : "#5198ea", fontSize: 12, textAlign: 'center', paddingBottom: 18, borderColor: 'transparent', margin: 0, width: 96, height: 30, backgroundColor: (tableMeta.rowData[11] == '0.00' || tableMeta.rowData[11] == '') && this.props.get_for == 'edit' ? '#ffac99' : 'transparent' }}
// type="text"
// placeholder=""
// // value={this.props.get_for == 'view' ? fixNumber(Number(value), 2) : this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 2) : Number(value) == 0 || Number(value) == "0.0" ? "0.00" : Number(value)}
// value={value}
// disabled={this.props.get_for == 'view'}
// // disabled={this.props.isApprover ? true : ((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') ? false : true)}
// // decimalScale={this.props.defaultCurrency.id == 1 ? 2 : 16}
// onBlur={(event) => {
// // updateValue(event.target.value)
// handleChange(event.target.value, tableMeta, tableMeta.columnIndex)
// // // // // console.log(tableMeta.rowData[0])
// }}
// />
// }
// />
}
<
/div
>
)
...
...
src/container/Reports/SubHolding.js
View file @
676ac1d9
...
...
@@ -4326,6 +4326,10 @@ export default class SubHolding extends Component {
{...
this
.
state
.
listPeriode
}
id
=
"periode"
onChange
=
{(
event
,
newInputValue
)
=>
this
.
setState
({
periode
:
newInputValue
,
loading
:
true
,
previewTable
:
false
},
()
=>
{
let
tahun
=
Number
(
this
.
state
.
periode
.
periode
)
let
bizpar
=
tahun
>=
2024
&&
defaultCurrencyID
==
2
&&
newInputValue
.
id
==
1
?
defaultReport
.
filter
(
e
=>
e
.
report
===
2
)
:
defaultReport
this
.
setState
({
report
:
bizpar
[
0
],
reportType
:
bizpar
})
this
.
getCurrency
(
this
.
state
.
company
.
company_id
)
this
.
getReportType
()
})}
disabled
=
{
this
.
state
.
intent
===
'Home'
?
true
:
false
}
...
...
@@ -4345,7 +4349,8 @@ export default class SubHolding extends Component {
onChange
=
{(
event
,
newInputValue
)
=>
this
.
setState
({
company
:
newInputValue
,
loading
:
true
,
previewTable
:
false
},
()
=>
{
this
.
getReportType
()
this
.
getCurrency
(
newInputValue
.
company_id
)
let
bizpar
=
this
.
state
.
usdBefore2024
==
false
&&
defaultCurrencyID
==
2
&&
newInputValue
.
id
==
1
?
defaultReport
.
filter
(
e
=>
e
.
report
===
2
)
:
defaultReport
let
tahun
=
Number
(
this
.
state
.
periode
.
periode
)
let
bizpar
=
tahun
>=
2024
&&
defaultCurrencyID
==
2
&&
newInputValue
.
id
==
1
?
defaultReport
.
filter
(
e
=>
e
.
report
===
2
)
:
defaultReport
this
.
setState
({
report
:
bizpar
[
0
],
reportType
:
bizpar
})
})}
disableClearable
...
...
@@ -4385,7 +4390,8 @@ export default class SubHolding extends Component {
// })
// console.log("report 2");
// }
let
bizpar
=
this
.
state
.
usdBefore2024
==
false
&&
defaultCurrencyID
==
2
&&
newInputValue
.
id
==
1
?
defaultReport
.
filter
(
e
=>
e
.
report
===
2
)
:
defaultReport
let
tahun
=
Number
(
this
.
state
.
periode
.
periode
)
let
bizpar
=
tahun
>=
2024
&&
defaultCurrencyID
==
2
&&
newInputValue
.
id
==
1
?
defaultReport
.
filter
(
e
=>
e
.
report
===
2
)
:
defaultReport
this
.
setState
({
report
:
bizpar
[
0
],
reportType
:
bizpar
})
this
.
getReportType
()
...
...
src/container/RollingOutlook/RollingOutlook.js
View file @
676ac1d9
...
...
@@ -2192,7 +2192,10 @@ export default class RollingOutlook extends Component {
<
/div
>
)}
{
this
.
state
.
checkApprover
===
true
?
this
.
state
.
lastStatus
===
'WAITING FOR REVIEW'
?
this
.
state
.
lastStatus
===
'SUBMITTED'
?
<
div
style
=
{{
width
:
'100%'
,
padding
:
'10px 20px'
,
backgroundColor
:
'yellow'
,
textAlign
:
'center'
,
marginTop
:
20
}}
>
<
span
>
{
this
.
state
.
lastStatus
}
<
/span
>
<
/div> : this.state.lastStatus === 'WAITING FOR REVIEW'
?
<
div
style
=
{{
width
:
'100%'
,
padding
:
'10px 20px'
,
backgroundColor
:
'yellow'
,
textAlign
:
'center'
,
marginTop
:
20
}}
>
<
span
>
{
this
.
state
.
lastStatus
}
<
/span
>
<
/div> : this.state.lastStatus === 'WAITING FOR YOUR APPROVAL'
?
...
...
@@ -2213,6 +2216,14 @@ export default class RollingOutlook extends Component {
<
div
style
=
{{
width
:
'100%'
,
padding
:
'10px 20px'
,
backgroundColor
:
'yellow'
,
textAlign
:
'center'
,
marginTop
:
20
}}
>
<
span
>
{
this
.
state
.
lastStatus
}
<
/span
>
<
/div>
:
this
.
state
.
lastStatus
===
'WAITING FOR REVIEW'
?
<
div
style
=
{{
width
:
'100%'
,
padding
:
'10px 20px'
,
backgroundColor
:
'yellow'
,
textAlign
:
'center'
,
marginTop
:
20
}}
>
<
span
>
{
`
${
this
.
state
.
lastStatus
}
-
${
this
.
state
.
pic
}
`
}
<
/span
>
<
/div>
:
this
.
state
.
lastStatus
===
'WAITING FOR YOUR APPROVAL'
?
<
div
style
=
{{
width
:
'100%'
,
padding
:
'10px 20px'
,
backgroundColor
:
'yellow'
,
textAlign
:
'center'
,
marginTop
:
20
}}
>
<
span
>
{
`
${
this
.
state
.
lastStatus
}
-
${
this
.
state
.
pic
}
`
}
<
/span
>
<
/div>
:
this
.
state
.
lastStatus
===
'WAITING FOR APPROVAL'
?
<
div
style
=
{{
width
:
'100%'
,
padding
:
'10px 20px'
,
backgroundColor
:
'yellow'
,
textAlign
:
'center'
,
marginTop
:
20
}}
>
<
span
>
{
`
${
this
.
state
.
lastStatus
}
-
${
this
.
state
.
pic
}
`
}
<
/span
>
...
...
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