Skip to content

T
Tia-dev
Commit aaf87030 authored by EKSAD's avatar EKSAD
Browse files
Options

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

parents d2c31426 fc399326
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1270 additions and 102 deletions
src/container/ApprovalMatrix/ApprovalMatrix.js
View file @ aaf87030
...@@ -188,7 +188,7 @@ export default class ApprovalMatrix extends Component { ...@@ -188,7 +188,7 @@ export default class ApprovalMatrix extends Component {
} }
}, },
{ {
name: "Start Date", name: "Valid From",
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
...@@ -213,7 +213,7 @@ export default class ApprovalMatrix extends Component { ...@@ -213,7 +213,7 @@ export default class ApprovalMatrix extends Component {
} }
}, },
{ {
name: "End Date", name: "Valid To",
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
let check = null let check = null
......
src/container/ApprovalMatrix/CreateApprovalMatrix.js
View file @ aaf87030
...@@ -195,7 +195,7 @@ export default class CreateApprovalMatrix extends Component { ...@@ -195,7 +195,7 @@ export default class CreateApprovalMatrix extends Component {
<div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}> <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
<div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}> <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
<div className="popup-title"> <div className="popup-title">
<span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Add Data</span> <span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Create Data</span>
</div> </div>
</div> </div>
<div className="col-2 content-right" style={{ maxWidth: "inherit", alignSelf: 'center' }}> <div className="col-2 content-right" style={{ maxWidth: "inherit", alignSelf: 'center' }}>
......
src/container/BudgetTahunan.js
View file @ aaf87030
...@@ -225,7 +225,7 @@ export default class BudgetTahunan extends Component { ...@@ -225,7 +225,7 @@ export default class BudgetTahunan extends Component {
} }
else { else {
const formData = new FormData(); const formData = new FormData();
formData.append("revision", Number(this.state.revisi)); formData.append("revision", Number(this.state.revision.revision));
formData.append("companyId", this.state.company.company_id); formData.append("companyId", this.state.company.company_id);
formData.append("periode", Number(this.state.periode.periode)); formData.append("periode", Number(this.state.periode.periode));
formData.append("file", event); formData.append("file", event);
......
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ aaf87030
...@@ -2,6 +2,7 @@ import React, { Component } from 'react'; ...@@ -2,6 +2,7 @@ import React, { Component } from 'react';
import { Typography, Paper, createMuiTheme, MuiThemeProvider, TableCell, FormControlLabel, TextField, Input } from '@material-ui/core'; import { Typography, Paper, createMuiTheme, MuiThemeProvider, TableCell, FormControlLabel, TextField, Input } from '@material-ui/core';
import MUIDataTable from 'mui-datatables'; import MUIDataTable from 'mui-datatables';
import NumberFormat from 'react-number-format'; import NumberFormat from 'react-number-format';
import api from '../../api';
var ct = require("../../library/CustomTable"); var ct = require("../../library/CustomTable");
const getMuiTheme = () => createMuiTheme(ct.customTable()); const getMuiTheme = () => createMuiTheme(ct.customTable());
...@@ -25,32 +26,183 @@ export default class CorporateAnnualTarget extends Component { ...@@ -25,32 +26,183 @@ export default class CorporateAnnualTarget extends Component {
super(props) super(props)
this.state = { this.state = {
dataTable: [ dataTable: [
["FINANCIAL PERSPECTIVE", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181"], // ["FINANCIAL PERSPECTIVE", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181", "9,884,181"],
["Control", "-", "-"], // ["Control", "-", "-"],
["Accumulated Depreciation (negative value)", "2,647,647", "2,058,898"], // ["Accumulated Depreciation (negative value)", "2,647,647", "2,058,898"],
["Control", "-", "-"], // ["Control", "-", "-"],
["Gain / (Loss) on Fixed Assets", "-", "-"], // ["Gain / (Loss) on Fixed Assets", "-", "-"],
["Control", "-", "-"] // ["Control", "-", "-"]
] ]
} }
this.handleValue = this.handleValue.bind(this)
} }
componentDidMount() { componentDidMount() {
this.getItemHierarki()
console.log(this.props); console.log(this.props);
} }
getItemHierarki() {
let payload = {
"report_id": this.props.report_id,
"company_id": this.props.company.company_id
}
api.create().getItemReportHierarki(payload).then(response => {
console.log(response);
if (response.data) {
if (response.data.status === "success") {
let dataTable = []
response.data.data.map((item, index) => {
if (item.children && item.children.length > 0) {
dataTable.push([
item.type_report_id,
item.id,
item.parent,
item.formula,
item.level,
item.description
])
item.children.map(i => {
if (i.children) {
if (i.children.length > 0) {
dataTable.push([
i.type_report_id,
i.id,
i.parent,
i.formula,
i.level,
i.description
])
i.children.map(val => {
if (val.children && val.children.length > 0) {
dataTable.push([
val.type_report_id,
val.id,
val.parent,
val.formula,
val.level,
val.description
])
val.children.map(items => {
console.log(items)
dataTable.push([
items.type_report_id,
items.id,
items.parent,
items.formula,
items.level,
items.description
])
})
} else {
dataTable.push([
val.type_report_id,
val.id,
val.parent,
val.formula,
val.level,
val.description
])
}
})
} else {
dataTable.push([
i.type_report_id,
i.id,
i.parent,
i.formula,
i.level,
i.description
])
}
} else {
dataTable.push([
i.type_report_id,
i.id,
i.parent,
i.formula,
i.level,
i.description
])
}
})
} else {
dataTable.push([
item.type_report_id,
item.id,
item.parent,
item.formula,
item.level,
item.description
])
}
})
console.log(dataTable);
this.setState({ dataTable })
}
}
})
}
handleValue(data) {
let total = 0
this.state.dataTable.map((item, index) => {
if (data.rowData[1] == item[2]) {
total = item[data.columnIndex] == undefined ? (total + 0) : (total + item[data.columnIndex])
}
})
let indexParent = this.state.dataTable.findIndex((val) => val[1] == this.state.dataTable[data.rowIndex][2])
let a = this.state.dataTable[data.rowIndex][data.columnIndex] = total
// console.log(indexParent);
return a
}
handleChange(value, tableMeta) { handleChange(value, tableMeta) {
let val = String(value).split(",").join("")
let data = this.state.dataTable let data = this.state.dataTable
let a = data[tableMeta.rowIndex][tableMeta.columnIndex] = value let indexParent = data.findIndex((val) => val[1] == data[tableMeta.rowIndex][2])
this.setState({ if (indexParent > 0) {
data: a console.log(indexParent)
}, () => console.log(this.state.dataTable)) let a = data[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
// let a = data[0].tableMeta.tableData[tableMeta.rowIndex] === value let jagain = data[indexParent][tableMeta.columnIndex]
// console.log(data) a = data[indexParent][tableMeta.columnIndex] = jagain == undefined ? (0 + Number(val)) : (jagain + Number(val))
} else {
data[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
}
this.forceUpdate()
// console.log(this.state.dataTable)
// this.setState({
// data: a,
// }, () => console.log(this.state.dataTable))
} }
render() { render() {
const columns = [{ const columns = [{
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "Key Performance Indicator", name: "Key Performance Indicator",
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
......
src/container/BudgetTahunan/TaxPlanning.js
View file @ aaf87030
...@@ -123,9 +123,9 @@ export default class TaxPlanning extends Component { ...@@ -123,9 +123,9 @@ export default class TaxPlanning extends Component {
handleValue(data) { handleValue(data) {
let total = 0 let total = 0
this.state.dataTable.map((item,index) => { this.state.dataTable.map((item, index) => {
if (data.rowData[1] == item[2]) { if (data.rowData[1] == item[2]) {
total = item[6] == undefined? (total + 0) : (total + item[6]) total = item[data.columnIndex] == undefined ? (total + 0) : (total + item[data.columnIndex])
} }
}) })
let indexParent = this.state.dataTable.findIndex((val) => val[1] == this.state.dataTable[data.rowIndex][2]) let indexParent = this.state.dataTable.findIndex((val) => val[1] == this.state.dataTable[data.rowIndex][2])
...@@ -135,17 +135,17 @@ export default class TaxPlanning extends Component { ...@@ -135,17 +135,17 @@ export default class TaxPlanning extends Component {
} }
handleChange(value, tableMeta) { handleChange(value, tableMeta) {
let val = String(value).split(",").join("")
let data = this.state.dataTable let data = this.state.dataTable
let indexParent = data.findIndex((val) => val[1] == data[tableMeta.rowIndex][2]) let indexParent = data.findIndex((val) => val[1] == data[tableMeta.rowIndex][2])
// console.log(indexParent);
if (indexParent > 0) { if (indexParent > 0) {
let a = data[tableMeta.rowIndex][tableMeta.columnIndex] = Number(value) let a = data[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
let jagain = data[indexParent][tableMeta.columnIndex] let jagain = data[indexParent][tableMeta.columnIndex]
a = data[indexParent][tableMeta.columnIndex] = jagain == undefined? (0 + Number(value)) : (jagain + Number(value)) a = data[indexParent][tableMeta.columnIndex] = jagain == undefined ? (0 + Number(val)) : (jagain + Number(val))
} else { } else {
let a = data[tableMeta.rowIndex][tableMeta.columnIndex] = Number(value) data[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
} }
// console.log(this.state.dataTable)
// this.setState({ // this.setState({
// data: a, // data: a,
// }, () => console.log(this.state.dataTable)) // }, () => console.log(this.state.dataTable))
...@@ -246,7 +246,16 @@ export default class TaxPlanning extends Component { ...@@ -246,7 +246,16 @@ export default class TaxPlanning extends Component {
/> />
</div> : </div> :
tableMeta.rowData[0] === 2 ? tableMeta.rowData[0] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}>{this.handleValue(tableMeta)}</span> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={this.handleValue(tableMeta)}
/>
</span>
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
<span>-</span> <span>-</span>
...@@ -262,8 +271,83 @@ export default class TaxPlanning extends Component { ...@@ -262,8 +271,83 @@ export default class TaxPlanning extends Component {
options: { options: {
filter: false, filter: false,
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th key={3} style={{ cursor: 'pointer', backgroundColor: '#354960', color: '#fff', fontSize: 13, fontWeight: 1, width: 150}} > <th key={3} style={{ cursor: 'pointer', backgroundColor: '#354960', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, border: "1px solid rgb(255, 255, 255)" }} >
<div style={{ borderBottom: "1px #fff solid", textAlign: 'center' }}>{columnMeta.name}</div> <div style={{ borderBottom: "1px #fff solid", textAlign: 'center', padding: 5 }}>{columnMeta.name}</div>
<div className="grid grid-3x" style={{ backgroundColor: '#354960', color: '#fff', fontSize: 13, fontWeight: 1, position: "sticky" }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
<span>{"Trial Balance (Commercial) MTD"}</span>
</div>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
<span>{"Fiscal Correction Positive /(Negative)"}</span>
</div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
<span>{"Trial Balance (Fiscal) MTD"}</span>
</div>
</div>
</th>
),
customBodyRender: (value, tableMeta, updateValue) => {
return (
<div>
<div className="grid grid-3x content-center">
<div className="column-1" style={{ paddingRight: 20}}>
{99}
</div>
<div className="column-2" style={{ }}>
{tableMeta.rowData[0] === 4 ?
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={value}
control={
<NumberFormat
thousandSeparator={true}
style={{ color: "#5198ea", fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, width: '100%', backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={value}
onChange={event => {
// console.log(event.target)
updateValue(event.target.value)
this.handleChange(event.target.value, tableMeta)
}}
/>
}
/>
</div> :
tableMeta.rowData[0] === 2 ?
<span style={{ fontSize: 12, textAlign: 'center' }}>
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, width: '100%', backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={this.handleValue(tableMeta)}
/>
</span>
:
tableMeta.rowData[0] === 1 ?
<span>-</span>
:
<span>validasi</span>
}
</div>
<div className="column-3" style={{ paddingLeft: 35}}>
{99}
</div>
</div>
</div>
);
}
}
}, {
name: "March 2021",
options: {
filter: false,
customHeadRender: (columnMeta) => (
<th style={{ cursor: 'pointer', backgroundColor: '#354960', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, border: "1px solid rgb(255, 255, 255)" }} >
<div style={{ borderBottom: "1px #fff solid", textAlign: 'center', padding: 5 }}>{columnMeta.name}</div>
<div className="grid grid-3x" style={{ backgroundColor: '#354960', color: '#fff', fontSize: 13, fontWeight: 1, position: "sticky" }}> <div className="grid grid-3x" style={{ backgroundColor: '#354960', color: '#fff', fontSize: 13, fontWeight: 1, position: "sticky" }}>
<div style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}> <div style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
<span style={{ textAlign: 'center' }}>{"Trial Balance (Commercial) MTD"}</span> <span style={{ textAlign: 'center' }}>{"Trial Balance (Commercial) MTD"}</span>
...@@ -295,22 +379,6 @@ export default class TaxPlanning extends Component { ...@@ -295,22 +379,6 @@ export default class TaxPlanning extends Component {
); );
} }
} }
}, {
name: "March 2021",
options: {
customHeadRender: (columnMeta) => (
<TableCell style={{ backgroundColor: '#354960', width: 96 }}>
<Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
</TableCell>
),
customBodyRender: (val) => {
return (
<div style={{ width: 96 }}>
{val}
</div>
)
}
}
}, { }, {
name: "April 2021", name: "April 2021",
options: { options: {
......
src/container/MonthlyReport.js 0 → 100644
View file @ aaf87030
This diff is collapsed.
src/library/Array.js
View file @ aaf87030
...@@ -16,7 +16,7 @@ const arraySide = [ ...@@ -16,7 +16,7 @@ const arraySide = [
{ {
img: Images.laporanBulanan, img: Images.laporanBulanan,
label: 'Monthly Report', label: 'Monthly Report',
path: 'beranda', path: 'monthly-report',
subItem: null subItem: null
}, },
{ {
......
src/router/homeRoutes.js
View file @ aaf87030
...@@ -13,6 +13,7 @@ import DashboardCAT from '../container/Laporan/DashboardCAT' ...@@ -13,6 +13,7 @@ import DashboardCAT from '../container/Laporan/DashboardCAT'
import BudgetTahunan from '../container/BudgetTahunan'; import BudgetTahunan from '../container/BudgetTahunan';
import RollingOutlook from '../container/RollingOutlook'; import RollingOutlook from '../container/RollingOutlook';
import OperatingIndicator from '../container/OperatingIndicator/OperatingIndicator' import OperatingIndicator from '../container/OperatingIndicator/OperatingIndicator'
import MonthlyReport from '../container/MonthlyReport';
const routes = [ const routes = [
{ {
...@@ -71,6 +72,10 @@ const routes = [ ...@@ -71,6 +72,10 @@ const routes = [
path: "/home/profile", path: "/home/profile",
main: Profile main: Profile
}, },
{
path: "/home/monthly-report",
main: MonthlyReport
},
{ {
path: "*", path: "*",
main: screen404 main: screen404
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment