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
Expand all
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
This diff is collapsed.
Click to expand it.
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
This diff is collapsed.
Click to expand it.
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