Skip to content

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

Merge branch 'didam' into 'master' 

Didam

See merge request !1100
parents 8c9c1125 7f33f985
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 10 deletions
src/container/BudgetTahunan.js
View file @ 27694341
...@@ -452,7 +452,9 @@ export default class BudgetTahunan extends Component { ...@@ -452,7 +452,9 @@ export default class BudgetTahunan extends Component {
let periode = (this.state.lastPeriod == "" ? String(Number(currentYear)) : this.state.lastPeriod) let periode = (this.state.lastPeriod == "" ? String(Number(currentYear)) : this.state.lastPeriod)
let index = data.sort((a, b) => a - b).findIndex((val) => val === periode) let index = data.sort((a, b) => a - b).findIndex((val) => val === periode)
// // console.log(this.props.location.state.rawData) // // console.log(this.props.location.state.rawData)
// console.log(this.state.lastPeriod) console.log(this.state.lastPeriod)
console.log(periode)
console.log(index)
// console.log(periodeData) // console.log(periodeData)
// // // console.log(index) // // // console.log(index)
this.setState({ listPeriode: defaultProps, periode: index === -1 ? periodeData[0] : periodeData[index] }, () => { this.setState({ listPeriode: defaultProps, periode: index === -1 ? periodeData[0] : periodeData[index] }, () => {
...@@ -1158,7 +1160,8 @@ export default class BudgetTahunan extends Component { ...@@ -1158,7 +1160,8 @@ export default class BudgetTahunan extends Component {
item.order, item.order,
item.condition_it_should_be, item.condition_it_should_be,
item.condition_if_wrong, item.condition_if_wrong,
item.profit_detail.forecast_formula == null ? [] : item.profit_detail.forecast_formula item.profit_detail.forecast_formula == null ? [] : item.profit_detail.forecast_formula,
item.profit_detail.notes
]) ])
if (item.children !== null) { if (item.children !== null) {
...@@ -1196,7 +1199,8 @@ export default class BudgetTahunan extends Component { ...@@ -1196,7 +1199,8 @@ export default class BudgetTahunan extends Component {
item.order, item.order,
item.condition_it_should_be, item.condition_it_should_be,
item.condition_if_wrong, item.condition_if_wrong,
item.profit_detail.forecast_formula == null ? [] : item.profit_detail.forecast_formula item.profit_detail.forecast_formula == null ? [] : item.profit_detail.forecast_formula,
item.profit_detail.notes
]) ])
if (item.children !== null) { if (item.children !== null) {
if (item.children.length > 0) { if (item.children.length > 0) {
...@@ -1206,7 +1210,7 @@ export default class BudgetTahunan extends Component { ...@@ -1206,7 +1210,7 @@ export default class BudgetTahunan extends Component {
} }
} }
}) })
// console.log(dataTable) console.log(dataTable)
this.setState({ dbPL: dataTable, loading: false }, () => { this.setState({ dbPL: dataTable, loading: false }, () => {
this.olahDataPL(this.state.dbPL, type) this.olahDataPL(this.state.dbPL, type)
}) })
...@@ -1545,7 +1549,7 @@ export default class BudgetTahunan extends Component { ...@@ -1545,7 +1549,7 @@ export default class BudgetTahunan extends Component {
"total_current_year": String(item[19]), "total_current_year": String(item[19]),
"total_next_year": String(item[20] != ''? Number(item[20]).toFixed(1) : item[20]), "total_next_year": String(item[20] != ''? Number(item[20]).toFixed(1) : item[20]),
"total_more_year": String(item[21] != ''? Number(item[21]).toFixed(1) : item[21]), "total_more_year": String(item[21] != ''? Number(item[21]).toFixed(1) : item[21]),
"notes": "", "notes": String(item[26]),
} }
) )
......
src/container/Laporan/SubHolding.js
View file @ 27694341
...@@ -165,18 +165,18 @@ export default class SubHolding extends Component { ...@@ -165,18 +165,18 @@ export default class SubHolding extends Component {
options: periodeData, options: periodeData,
getOptionLabel: (option) => option.periode, getOptionLabel: (option) => option.periode,
}; };
let periode = (this.state.lastPeriod == "" ? String(Number(currentYear)) : this.state.lastPeriod) let periode = (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.lastPeriod)
let dateNow = new Date() let dateNow = new Date()
dateNow.setMonth(dateNow.getMonth() - 1); dateNow.setMonth(dateNow.getMonth() - 1);
let yearNow = dateNow.getFullYear() let yearNow = dateNow.getFullYear()
console.log(yearNow) console.log(yearNow)
console.log(periode) console.log(periode)
let index = data.sort((a, b) => a - b).findIndex((val) => val == String(this.state.report.label).toLocaleLowerCase().includes('summary') ? yearNow : periode) let index = data.sort((a, b) => a - b).findIndex((val) => val == (String(this.state.report.label).toLocaleLowerCase().includes('summary') ? yearNow : periode))
// console.log(data) // console.log(data)
// console.log(this.state.latestPeriode) // console.log(this.state.latestPeriode)
// console.log(periodeData) // console.log(periodeData)
// console.log(index) console.log(index)
this.setState({ listPeriode: defaultProps, periode: index === -1 ? periodeData[0] : periodeData[index] }, () => { this.setState({ listPeriode: defaultProps, periode: index === -1 ? periodeData[0] : periodeData[index] }, () => {
// this.getDataTable() // this.getDataTable()
// this.getSubmission() // this.getSubmission()
...@@ -266,6 +266,20 @@ export default class SubHolding extends Component { ...@@ -266,6 +266,20 @@ export default class SubHolding extends Component {
} }
getReportType() { getReportType() {
console.log('sini deh')
let data = this.state.listPeriode.options
let currentYear = new Date().getFullYear()
let periode = (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.lastPeriod)
let dateNow = new Date()
dateNow.setMonth(dateNow.getMonth() - 1);
let yearNow = dateNow.getFullYear()
// console.log(data)
// console.log(yearNow)
// console.log(periode)
let index = data.sort((a, b) => a - b).findIndex((val) => val.periode == (String(this.state.report.label).toLocaleLowerCase().includes('summary') ? yearNow : periode))
// console.log(index)
this.setState({periode: data[index]})
let payload = { let payload = {
"company_id": this.state.company.company_id, "company_id": this.state.company.company_id,
"periode": this.state.periode.periode, "periode": this.state.periode.periode,
......
src/container/MonthlyReport.js
View file @ 27694341
...@@ -1467,6 +1467,7 @@ export default class MonthlyReport extends Component { ...@@ -1467,6 +1467,7 @@ export default class MonthlyReport extends Component {
{ value: item.profit_detail.november, formula: item.profit_detail.november_formula } : { value: item.profit_detail.november, formula: item.profit_detail.november_formula } :
{ value: item.profit_detail.december, formula: item.profit_detail.december_formula }, { value: item.profit_detail.december, formula: item.profit_detail.december_formula },
item.order, item.order,
item.profit_detail.notes
]) ])
} }
if (item.children !== null) { if (item.children !== null) {
...@@ -1509,6 +1510,7 @@ export default class MonthlyReport extends Component { ...@@ -1509,6 +1510,7 @@ export default class MonthlyReport extends Component {
{ value: item.profit_detail.november, formula: item.profit_detail.november_formula } : { value: item.profit_detail.november, formula: item.profit_detail.november_formula } :
{ value: item.profit_detail.december, formula: item.profit_detail.december_formula }, { value: item.profit_detail.december, formula: item.profit_detail.december_formula },
item.order, item.order,
item.profit_detail.notes
]) ])
if (item.children !== null) { if (item.children !== null) {
if (item.children.length > 0) { if (item.children.length > 0) {
...@@ -1768,12 +1770,14 @@ export default class MonthlyReport extends Component { ...@@ -1768,12 +1770,14 @@ export default class MonthlyReport extends Component {
item[6].value = this.handleValueFormulaDBPLMR(item[6],item,6) item[6].value = this.handleValueFormulaDBPLMR(item[6],item,6)
listPL.push({ listPL.push({
"item_report_id": item[1], "item_report_id": item[1],
"actual": item[0] == 1? "" : Number(item[6].value).toFixed(1) "actual": item[0] == 1? "" : Number(item[6].value).toFixed(1),
"notes": item[8]
}) })
} else { } else {
listPL.push({ listPL.push({
"item_report_id": item[1], "item_report_id": item[1],
"actual": item[0] == 1? "" : Number(item[6].value).toFixed(1) "actual": item[0] == 1? "" : Number(item[6].value).toFixed(1),
"notes": item[8]
}) })
} }
......
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