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
5d302b17
Commit
5d302b17
authored
Jun 20, 2023
by
Riri Novita
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev/riri' into 'ENV-DEV'
Update CAT MB & RO See merge request
!1850
parents
2119bc95
13ba3087
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
137 additions
and
130 deletions
+137
-130
CorporateAnnualTarget.js
src/container/BudgetTahunan/CorporateAnnualTarget.js
+1
-1
CorporateAnnualTargetMR.js
src/container/MonthlyReport/CorporateAnnualTargetMR.js
+2
-2
MonthlyReport.js
src/container/MonthlyReport/MonthlyReport.js
+1
-0
CorporateAnnualTargetRO.js
src/container/RollingOutlook/CorporateAnnualTargetRO.js
+1
-1
ProfitLossRO.js
src/container/RollingOutlook/ProfitLossRO.js
+130
-125
RollingOutlook.js
src/container/RollingOutlook/RollingOutlook.js
+2
-1
No files found.
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @
5d302b17
...
...
@@ -280,7 +280,7 @@ export default class CorporateAnnualTarget extends Component {
downloadTemplate
=
async
()
=>
{
let
res
=
await
fetch
(
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/master_budget/download_template?report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
`
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/master_budget/download_template?report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
&¤cy_id=
${
this
.
props
.
defaultCurrency
.
id
}
`
)
res
=
await
res
.
blob
()
// // // // console.log(res)
...
...
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @
5d302b17
...
...
@@ -338,9 +338,9 @@ export default class CorporateAnnualTargetMR extends Component {
}
downloadTemplate
=
async
()
=>
{
console
.
log
(
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/cat/monthly_report/download_template?report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
&&months=
${
this
.
props
.
month
.
month_id
}
`
)
console
.
log
(
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/cat/monthly_report/download_template?report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
&&months=
${
this
.
props
.
month
.
month_id
}
&¤cy_id=
${
this
.
props
.
defaultCurrency
.
id
}
`
)
let
res
=
await
fetch
(
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/cat/monthly_report/download_template?report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
&&months=
${
this
.
props
.
month
.
month_id
}
`
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/cat/monthly_report/download_template?report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
&&months=
${
this
.
props
.
month
.
month_id
}
&¤cy_id=
${
this
.
props
.
defaultCurrency
.
id
}
`
)
console
.
log
(
res
);
res
=
await
res
.
blob
()
...
...
src/container/MonthlyReport/MonthlyReport.js
View file @
5d302b17
...
...
@@ -2549,6 +2549,7 @@ export default class MonthlyReport extends Component {
name
:
"Action"
,
options
:
{
customBodyRender
:
(
val
,
tableMeta
)
=>
{
console
.
log
(
tableMeta
);
return
(
<
div
style
=
{{
display
:
'flex'
}}
>
<
button
...
...
src/container/RollingOutlook/CorporateAnnualTargetRO.js
View file @
5d302b17
...
...
@@ -343,7 +343,7 @@ export default class CorporateAnnualTargetRO extends Component {
downloadTemplate
=
async
()
=>
{
let
res
=
await
fetch
(
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/cat/rolling_outlook/download_template?report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
&&quartal=
${
this
.
props
.
quarter
}
`
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/cat/rolling_outlook/download_template?report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
&&quartal=
${
this
.
props
.
quarter
}
&¤cy_id=
${
this
.
props
.
defaultCurrency
.
id
}
`
)
res
=
await
res
.
blob
()
if
(
res
.
size
>
0
)
{
...
...
src/container/RollingOutlook/ProfitLossRO.js
View file @
5d302b17
This diff is collapsed.
Click to expand it.
src/container/RollingOutlook/RollingOutlook.js
View file @
5d302b17
...
...
@@ -672,7 +672,7 @@ export default class RollingOutlook extends Component {
}
api
.
create
().
getRollingOutlookIsApprover
().
then
(
response
=>
{
//
console.log(response);
console
.
log
(
response
);
if
(
response
.
data
.
data
.
is_approver
===
true
)
{
this
.
setState
({
isApprover
:
true
,
checkApprover
:
true
})
}
else
{
...
...
@@ -1722,6 +1722,7 @@ export default class RollingOutlook extends Component {
name
:
"Action"
,
options
:
{
customBodyRender
:
(
val
,
tableMeta
)
=>
{
// console.log(tableMeta);
return
(
<
div
style
=
{{
display
:
'flex'
}}
>
<
button
...
...
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