Skip to content

T
Tia-dev
Commit a1ee31dd authored by Rifka Kurnia Irfiana's avatar Rifka Kurnia Irfiana
Browse files
Options

add monthly report

parent 36599645
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 452 additions and 30 deletions
src/container/ApprovalMatrix/ApprovalMatrix.js
View file @ a1ee31dd
...@@ -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 @ a1ee31dd
...@@ -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/TaxPlanning.js
View file @ a1ee31dd
...@@ -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 @ a1ee31dd
This diff is collapsed.
src/library/Array.js
View file @ a1ee31dd
...@@ -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 @ a1ee31dd
...@@ -12,6 +12,7 @@ import ReportItems from '../container/MasterData/ReportItems' ...@@ -12,6 +12,7 @@ import ReportItems from '../container/MasterData/ReportItems'
import DashboardCAT from '../container/Laporan/DashboardCAT' import DashboardCAT from '../container/Laporan/DashboardCAT'
import BudgetTahunan from '../container/BudgetTahunan'; import BudgetTahunan from '../container/BudgetTahunan';
import OperatingIndicator from '../container/OperatingIndicator/OperatingIndicator' import OperatingIndicator from '../container/OperatingIndicator/OperatingIndicator'
import MonthlyReport from '../container/MonthlyReport';
const routes = [ const routes = [
{ {
...@@ -66,6 +67,10 @@ const routes = [ ...@@ -66,6 +67,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