Skip to content

T
Tia-dev
Commit 4dbd9fe1 authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'rifka' into 'master' 

taxplan form

See merge request !377
parents 7b3c224b f859094d
Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 76 deletions
src/container/BudgetTahunan/TaxPlanning.js
View file @ 4dbd9fe1
...@@ -103,7 +103,7 @@ export default class TaxPlanning extends Component { ...@@ -103,7 +103,7 @@ export default class TaxPlanning extends Component {
item.type_report_tax.value_tbf.type_report_id, item.type_report_tax.value_tbf.type_report_id,
item.id, item.id,
item.parent, item.parent,
item.formula, {tbc : item.formula_tax.value_tbc, fcp: item.formula_tax.value_fc, tbf: item.formula_tax.value_tbf },
item.level, item.level,
item.description, item.description,
{tbc : item.tax_planning.january.tbc, fcp: item.tax_planning.january.fcp, tbf: item.tax_planning.january.tbf}, {tbc : item.tax_planning.january.tbc, fcp: item.tax_planning.january.fcp, tbf: item.tax_planning.january.tbf},
...@@ -140,7 +140,7 @@ export default class TaxPlanning extends Component { ...@@ -140,7 +140,7 @@ export default class TaxPlanning extends Component {
item.type_report_tax.value_tbf.type_report_id, item.type_report_tax.value_tbf.type_report_id,
item.id, item.id,
item.parent, item.parent,
item.formula, {tbc : item.formula_tax.value_tbc, fcp: item.formula_tax.value_fc, tbf: item.formula_tax.value_tbf },
item.level, item.level,
item.description, item.description,
{tbc : item.tax_planning.january.tbc, fcp: item.tax_planning.january.fcp, tbf: item.tax_planning.january.tbf}, {tbc : item.tax_planning.january.tbc, fcp: item.tax_planning.january.fcp, tbf: item.tax_planning.january.tbf},
...@@ -785,11 +785,68 @@ export default class TaxPlanning extends Component { ...@@ -785,11 +785,68 @@ export default class TaxPlanning extends Component {
return a return a
} }
const handleFormula = (data, tableMeta) => { const handleFormula = (data, tableMeta, month, rowColumn) => {
let arrayFormula = tableMeta.rowData[6].match(/[a-zA-Z]+|[0-9]+|[-!$%^&*()_+|~=`{}\[\]:";'<>?,.\/]+(?:\.[0-9]+@|)/g) let rilFormula = String(rowColumn == 0 ? tableMeta.rowData[6].tbc : tableMeta.rowData[6].tbf)
if (rilFormula.includes('#')) {
if (this.props.status === "not-yet") {
let splitOrder = String(rowColumn == 0 ? tableMeta.rowData[6].tbc : tableMeta.rowData[6].tbf).split('@')
for (let index = 0; index < splitOrder.length; index++) {
if (splitOrder[index] === "") {
} else {
if (splitOrder[index].includes('#')) {
} else {
let splitOperator = splitOrder[index].match(/[a-zA-Z]+|[0-9]+|[-!$%^&*()_+|~=`{}\[\]:";'<>?,.\/]+(?:\.[0-9]+@|)/g)
let reg = /^\d+$/
splitOperator.map((item) => {
if (reg.test(item) === true) {
let i = dataTable2.findIndex((val) => val[23] == item)
if (i > 0) {
rilFormula = rilFormula.replace(item, dataTable2[i][tableMeta.columnIndex] === "" ? "0" : dataTable2[i][tableMeta.columnIndex])
}
}
})
}
}
}
let body = {
"submission_id": null,
"company_id": this.props.company.company_id,
"report_id": this.props.report_id,
"year": this.props.periode,
"month": month,
"formula": rilFormula
}
api.create().countingFormula(body).then(response => {
console.log(response);
})
} else {
let body = {
"submission_id": this.props.submissionID,
"company_id": this.props.company.company_id,
"report_id": this.props.report_id,
"year": this.props.periode,
"month": month,
"formula": rilFormula
}
api.create().countingFormula(body).then(response => {
console.log(response)
console.log(tableMeta)
console.log(tableMeta.rowIndex)
console.log(rowColumn)
if (response.data) {
if (response.data.status === "success") {
return response.data.data.result
}
}
})
}
} else {
let kondisi = rowColumn == 0 ? tableMeta.rowData[6].tbc : tableMeta.rowData[6].tbf
let arrayFormula = kondisi.match(/[a-zA-Z]+|[0-9]+|[-!$%^&*()_+|~=`{}\[\]:";'<>?,.\/]+(?:\.[0-9]+@|)/g)
let arrayJumlah = [] let arrayJumlah = []
arrayFormula.map((item, indexs) => { arrayFormula.map((item, indexs) => {
let index = dataTable2.findIndex((val) => val[4] == item) let index = dataTable2.findIndex((val) => val[23] == item)
if (index > 0) { if (index > 0) {
arrayJumlah.push(dataTable2[index][tableMeta.columnIndex]) arrayJumlah.push(dataTable2[index][tableMeta.columnIndex])
} else { } else {
...@@ -827,6 +884,7 @@ export default class TaxPlanning extends Component { ...@@ -827,6 +884,7 @@ export default class TaxPlanning extends Component {
}) })
let a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(total) let a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(total)
return a return a
}
} }
const columns = [{ const columns = [{
...@@ -975,26 +1033,24 @@ export default class TaxPlanning extends Component { ...@@ -975,26 +1033,24 @@ export default class TaxPlanning extends Component {
null null
: :
tableMeta.rowData[1] === 6 ? tableMeta.rowData[1] === 6 ?
// <NumberFormat <NumberFormat
// thousandSeparator={true} thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text" type="text"
// placeholder="" placeholder=""
// disabled={true} disabled={true}
// value={Number(handleFormula(value, tableMeta)).toFixed(1)} value={Number(handleFormula(value, tableMeta, 1, 0)).toFixed(1)}
// /> />
null
: :
tableMeta.rowData[1] === 5 ? tableMeta.rowData[1] === 5 ?
// <NumberFormat <NumberFormat
// thousandSeparator={true} thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text" type="text"
// placeholder="" placeholder=""
// disabled={true} disabled={false}
// value={Number(handleFormula(value, tableMeta)).toFixed(1)} value={Number(handleFormula(value, tableMeta, 1, 0)).toFixed(1)}
// /> />
null
: :
tableMeta.rowData[1] === 1 ? tableMeta.rowData[1] === 1 ?
// value[0] === "" ? // value[0] === "" ?
...@@ -1131,26 +1187,24 @@ export default class TaxPlanning extends Component { ...@@ -1131,26 +1187,24 @@ export default class TaxPlanning extends Component {
null null
: :
tableMeta.rowData[3] === 6 ? tableMeta.rowData[3] === 6 ?
// <NumberFormat <NumberFormat
// thousandSeparator={true} thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text" type="text"
// placeholder="" placeholder=""
// disabled={true} disabled={true}
// value={Number(handleFormula(value, tableMeta)).toFixed(1)} value={Number(handleFormula(value, tableMeta, 1, 2)).toFixed(1)}
// /> />
null
: :
tableMeta.rowData[3] === 5 ? tableMeta.rowData[3] === 5 ?
// <NumberFormat <NumberFormat
// thousandSeparator={true} thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text" type="text"
// placeholder="" placeholder=""
// disabled={true} disabled={false}
// value={Number(handleFormula(value, tableMeta)).toFixed(1)} value={Number(handleFormula(value, tableMeta, 1, 2)).toFixed(1)}
// /> />
null
: :
tableMeta.rowData[3] === 1 ? tableMeta.rowData[3] === 1 ?
// value[2] === "" ? // value[2] === "" ?
......
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