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 Show 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 {
}
},
{
name: "Start Date",
name: "Valid From",
options: {
customBodyRender: (val, tableMeta) => {
let check = null
......@@ -213,7 +213,7 @@ export default class ApprovalMatrix extends Component {
}
},
{
name: "End Date",
name: "Valid To",
options: {
customBodyRender: (val, tableMeta) => {
let check = null
......
src/container/ApprovalMatrix/CreateApprovalMatrix.js
View file @ aaf87030
......@@ -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="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
<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 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 {
}
else {
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("periode", Number(this.state.periode.periode));
formData.append("file", event);
......
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ aaf87030
......@@ -2,6 +2,7 @@ import React, { Component } from 'react';
import { Typography, Paper, createMuiTheme, MuiThemeProvider, TableCell, FormControlLabel, TextField, Input } from '@material-ui/core';
import MUIDataTable from 'mui-datatables';
import NumberFormat from 'react-number-format';
import api from '../../api';
var ct = require("../../library/CustomTable");
const getMuiTheme = () => createMuiTheme(ct.customTable());
......@@ -25,32 +26,183 @@ export default class CorporateAnnualTarget extends Component {
super(props)
this.state = {
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"],
["Control", "-", "-"],
["Accumulated Depreciation (negative value)", "2,647,647", "2,058,898"],
["Control", "-", "-"],
["Gain / (Loss) on Fixed Assets", "-", "-"],
["Control", "-", "-"]
// ["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", "-", "-"],
// ["Accumulated Depreciation (negative value)", "2,647,647", "2,058,898"],
// ["Control", "-", "-"],
// ["Gain / (Loss) on Fixed Assets", "-", "-"],
// ["Control", "-", "-"]
]
}
this.handleValue = this.handleValue.bind(this)
}
componentDidMount() {
this.getItemHierarki()
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) {
let val = String(value).split(",").join("")
let data = this.state.dataTable
let a = data[tableMeta.rowIndex][tableMeta.columnIndex] = value
this.setState({
data: a
}, () => console.log(this.state.dataTable))
// let a = data[0].tableMeta.tableData[tableMeta.rowIndex] === value
// console.log(data)
let indexParent = data.findIndex((val) => val[1] == data[tableMeta.rowIndex][2])
if (indexParent > 0) {
console.log(indexParent)
let a = data[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
let jagain = data[indexParent][tableMeta.columnIndex]
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() {
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",
options: {
customHeadRender: (columnMeta) => (
......
src/container/BudgetTahunan/TaxPlanning.js
View file @ aaf87030
This diff is collapsed.
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 = [
{
img: Images.laporanBulanan,
label: 'Monthly Report',
path: 'beranda',
path: 'monthly-report',
subItem: null
},
{
......
src/router/homeRoutes.js
View file @ aaf87030
......@@ -13,6 +13,7 @@ import DashboardCAT from '../container/Laporan/DashboardCAT'
import BudgetTahunan from '../container/BudgetTahunan';
import RollingOutlook from '../container/RollingOutlook';
import OperatingIndicator from '../container/OperatingIndicator/OperatingIndicator'
import MonthlyReport from '../container/MonthlyReport';
const routes = [
{
......@@ -71,6 +72,10 @@ const routes = [
path: "/home/profile",
main: Profile
},
{
path: "/home/monthly-report",
main: MonthlyReport
},
{
path: "*",
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