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
7ad51750
Commit
7ad51750
authored
Oct 13, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aman?
parent
b13ea830
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
53 deletions
+32
-53
FixedAssetsMovement.js
src/container/BudgetTahunan/FixedAssetsMovement.js
+5
-3
MonthlyReport.js
src/container/MonthlyReport.js
+27
-50
No files found.
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @
7ad51750
...
@@ -327,7 +327,7 @@ export default class FixedAssetsMovement extends Component {
...
@@ -327,7 +327,7 @@ export default class FixedAssetsMovement extends Component {
item
.
total_current_year
,
item
.
total_current_year
,
item
.
total_next_year
,
item
.
total_next_year
,
item
.
total_more_year
,
item
.
total_more_year
,
item
.
order
,
item
.
order
s
,
item
.
error
item
.
error
]
]
})
})
...
@@ -525,6 +525,8 @@ export default class FixedAssetsMovement extends Component {
...
@@ -525,6 +525,8 @@ export default class FixedAssetsMovement extends Component {
}
}
}
}
})
})
// console.log(baru)
// console.log(anjay)
let
total
=
0
let
total
=
0
let
opt
=
""
let
opt
=
""
...
@@ -556,8 +558,8 @@ export default class FixedAssetsMovement extends Component {
...
@@ -556,8 +558,8 @@ export default class FixedAssetsMovement extends Component {
// console.log(dataTable2[tableMeta.rowIndex][22])
// console.log(dataTable2[tableMeta.rowIndex][22])
// console.log(tableMeta.rowData[5])
// console.log(tableMeta.rowData[5])
// if (tableMeta.rowData[5] == 'Beginning Balance') {
// if (tableMeta.rowData[5] == 'Beginning Balance') {
// console.log(baru)
// console.log(baru)
// console.log(anjay)
// console.log(anjay)
// console.log(total)
// console.log(total)
// }
// }
...
...
src/container/MonthlyReport.js
View file @
7ad51750
...
@@ -32,7 +32,8 @@ export default class MonthlyReport extends Component {
...
@@ -32,7 +32,8 @@ export default class MonthlyReport extends Component {
visibleFAM
:
false
,
visibleFAM
:
false
,
visibleCAT
:
false
,
visibleCAT
:
false
,
listAttachment
:
[],
listAttachment
:
[],
visibleUpload
:
false
visibleUpload
:
false
,
lastRevision
:
0
}
}
this
.
fileHandler
=
this
.
fileHandler
.
bind
(
this
);
this
.
fileHandler
=
this
.
fileHandler
.
bind
(
this
);
}
}
...
@@ -64,7 +65,7 @@ export default class MonthlyReport extends Component {
...
@@ -64,7 +65,7 @@ export default class MonthlyReport extends Component {
"report_type"
:
"Monthly Report"
,
"report_type"
:
"Monthly Report"
,
}
}
api
.
create
().
getReportTypeBody
(
payload
).
then
(
response
=>
{
api
.
create
().
getReportTypeBody
(
payload
).
then
(
response
=>
{
//
console.log(response);
console
.
log
(
response
);
if
(
response
.
data
)
{
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
if
(
response
.
data
.
status
===
"success"
)
{
let
dataTable
=
response
.
data
.
data
.
map
((
item
,
index
)
=>
{
let
dataTable
=
response
.
data
.
data
.
map
((
item
,
index
)
=>
{
...
@@ -296,10 +297,20 @@ export default class MonthlyReport extends Component {
...
@@ -296,10 +297,20 @@ export default class MonthlyReport extends Component {
return
(
return
(
<
div
style
=
{{
display
:
'flex'
}}
>
<
div
style
=
{{
display
:
'flex'
}}
>
{
val
===
"submitted"
||
val
===
"approved"
?
{
val
===
"submitted"
||
val
===
"approved"
?
<
img
src
=
{
Images
.
ceklis
}
style
=
{{
width
:
31
,
height
:
24
}}
/>
:
<
span
>
COMPLETED
<
/span>
:
val
===
"revision"
?
val
===
"draft"
?
<
span
>
Revisi
<
/span>
:
<
span
>
DRAFT
<
/span>
:
null
val
===
"revision"
?
<
span
>
REVISION
<
/span>
:
val
===
"approval_proccess"
?
<
span
>
APPROVAL
PROCCESS
<
/span>
:
val
===
"approval_review"
?
<
span
>
APPROVAL
REVIEW
<
/span>
:
val
===
"not-yet"
?
<
span
>
OPEN
<
/span>
:
val
===
"CLOSED"
?
<
span
>
CLOSED
<
/span>
:
<
img
src
=
{
Images
.
cross
}
style
=
{{
width
:
31
,
height
:
24
}}
/
>
}
}
<
/div
>
<
/div
>
);
);
...
@@ -335,54 +346,19 @@ export default class MonthlyReport extends Component {
...
@@ -335,54 +346,19 @@ export default class MonthlyReport extends Component {
name
:
""
,
name
:
""
,
options
:
{
display
:
false
}
options
:
{
display
:
false
}
}]
}]
// const dataTable = [
// ["1", "Balance Sheet", "done"],
// ["2", "Profit & Loss", ""],
// ["3", "CAT", "done"],
// ["4", "Fixed Assets Movement", ""],
// ["5", "Tax Planning", "done"],
// ["6", "Balance Sheet", "done"],
// ["7", "Profit & Loss", ""],
// ["8", "CAT", "done"],
// ["9", "Fixed Assets Movement", ""],
// ["10", "Tax Planning", "done"],
// ["11", "Balance Sheet", "done"],
// ["12", "Profit & Loss", "done"],
// ["13", "CAT", "done"],
// ["14", "Fixed Assets Movement", "done"],
// ["15", "Tax Planning", "done"],
// ]
const
options
=
{
const
options
=
{
filter
:
false
,
filter
:
false
,
sort
:
false
,
sort
:
false
,
responsive
:
"scroll"
,
//
responsive: "scroll",
print
:
false
,
print
:
false
,
download
:
false
,
download
:
false
,
selectableRows
:
false
,
selectableRows
:
false
,
viewColumns
:
false
,
viewColumns
:
false
,
rowsPerPage
:
5
,
pagination
:
false
,
rowsPerPageOptions
:
[
5
,
25
,
100
],
search
:
false
search
:
false
}
}
const
periode
=
[
{
value
:
'2021'
,
label
:
'2021'
},
{
value
:
'2020'
,
label
:
'2020'
},
{
value
:
'2019'
,
label
:
'2019'
},
{
value
:
'2018'
,
label
:
'2018'
},
{
value
:
'2017'
,
label
:
'2017'
},
{
value
:
'2016'
,
label
:
'2016'
},
]
const
perusahaan
=
[
{
value
:
'TAP Group'
,
label
:
'TAP Group'
},
{
value
:
'2019'
,
label
:
'2019'
},
{
value
:
'2018'
,
label
:
'2018'
},
{
value
:
'2017'
,
label
:
'2017'
},
{
value
:
'2016'
,
label
:
'2016'
},
]
const
revisi
=
[
{
value
:
'0'
,
label
:
'0'
},
{
value
:
'1'
,
label
:
'1'
},
]
return
(
return
(
<
div
style
=
{{
flex
:
1
,
backgroundColor
:
'#f8f8f8'
}}
>
<
div
style
=
{{
flex
:
1
,
backgroundColor
:
'#f8f8f8'
}}
>
{
this
.
state
.
visibleMonthlyReport
&&
(
{
this
.
state
.
visibleMonthlyReport
&&
(
...
@@ -393,7 +369,7 @@ export default class MonthlyReport extends Component {
...
@@ -393,7 +369,7 @@ export default class MonthlyReport extends Component {
<
div
style
=
{{
padding
:
20
,
width
:
'100%'
}}
>
<
div
style
=
{{
padding
:
20
,
width
:
'100%'
}}
>
<
Paper
style
=
{{
paddingTop
:
10
}}
>
<
Paper
style
=
{{
paddingTop
:
10
}}
>
<
div
style
=
{{
borderBottom
:
'solid 1px #c4c4c4'
}}
>
<
div
style
=
{{
borderBottom
:
'solid 1px #c4c4c4'
}}
>
<
Typography
style
=
{{
fontSize
:
'12px'
,
color
:
'#4b4b4b'
,
margin
:
10
}}
>
MonthlyReport
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
'12px'
,
color
:
'#4b4b4b'
,
margin
:
10
}}
>
Monthly
Report
<
/Typography
>
<
/div
>
<
/div
>
<
div
style
=
{{
padding
:
20
}}
>
<
div
style
=
{{
padding
:
20
}}
>
<
div
>
<
div
>
...
@@ -427,7 +403,7 @@ export default class MonthlyReport extends Component {
...
@@ -427,7 +403,7 @@ export default class MonthlyReport extends Component {
/
>
/
>
<
/div
>
<
/div
>
<
div
style
=
{{
marginTop
:
20
}}
>
<
div
style
=
{{
marginTop
:
20
}}
>
<
Autocomplete
{
/*
<Autocomplete
{...this.state.listRevision}
{...this.state.listRevision}
id="revision"
id="revision"
onChange={(event, newInputValue) => this.setState({ revision: newInputValue }, () => {
onChange={(event, newInputValue) => this.setState({ revision: newInputValue }, () => {
...
@@ -439,7 +415,8 @@ export default class MonthlyReport extends Component {
...
@@ -439,7 +415,8 @@ export default class MonthlyReport extends Component {
style={{ width: 250 }}
style={{ width: 250 }}
renderInput={(params) => <TextField {...params} label="Revision" margin="normal" style={{ marginTop: 7 }} />}
renderInput={(params) => <TextField {...params} label="Revision" margin="normal" style={{ marginTop: 7 }} />}
value={this.state.revision}
value={this.state.revision}
/
>
/> */
}
<
TextField
disabled
=
{
true
}
label
=
"Revision"
margin
=
"normal"
style
=
{{
marginTop
:
7
,
width
:
250
}}
value
=
{
this
.
state
.
lastRevision
}
/
>
<
/div
>
<
/div
>
<
div
style
=
{{
marginTop
:
20
}}
>
<
div
style
=
{{
marginTop
:
20
}}
>
...
@@ -547,7 +524,7 @@ export default class MonthlyReport extends Component {
...
@@ -547,7 +524,7 @@ export default class MonthlyReport extends Component {
submissionID
=
{
this
.
state
.
submissionID
}
submissionID
=
{
this
.
state
.
submissionID
}
// saveToMasterBudget={this.saveToMasterBudget.bind(this)}
// saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose
=
{()
=>
this
.
setState
({
visibleBS
:
false
,
visibleBudgetTahunan
:
true
})}
onClickClose
=
{()
=>
this
.
setState
({
visibleBS
:
false
,
visibleBudgetTahunan
:
true
})}
// getReport={this.getCompanyActive.bind(this)}
// getReport={this.getCompanyActive.bind(this)}
/
>
/
>
)}
)}
{
this
.
state
.
visiblePL
&&
(
{
this
.
state
.
visiblePL
&&
(
...
@@ -562,7 +539,7 @@ export default class MonthlyReport extends Component {
...
@@ -562,7 +539,7 @@ export default class MonthlyReport extends Component {
submissionID
=
{
this
.
state
.
submissionID
}
submissionID
=
{
this
.
state
.
submissionID
}
// saveToMasterBudget={this.saveToMasterBudget.bind(this)}
// saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose
=
{()
=>
this
.
setState
({
visiblePL
:
false
,
visibleBudgetTahunan
:
true
})}
onClickClose
=
{()
=>
this
.
setState
({
visiblePL
:
false
,
visibleBudgetTahunan
:
true
})}
// getReport={this.getCompanyActive.bind(this)}
// getReport={this.getCompanyActive.bind(this)}
/
>
/
>
)}
)}
...
...
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