Skip to content

T
Tia-dev
Commit 70666ca7 authored by Deni Rinaldi's avatar Deni Rinaldi
Browse files
Options

Merge branch 'deni-dev(pc)' into 'master' 

Deni dev(pc)

See merge request !319
parents cf0e1edd 6ea3a4ef
Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 170 deletions
src/container/BudgetTahunan.js
View file @ 70666ca7
...@@ -316,8 +316,7 @@ export default class BudgetTahunan extends Component { ...@@ -316,8 +316,7 @@ export default class BudgetTahunan extends Component {
console.log(response); console.log(response);
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.getReport() this.getCompanyActive()
this.getSubmission()
this.setState({ loading: false }) this.setState({ loading: false })
} else { } else {
this.setState({ loading: false }) this.setState({ loading: false })
...@@ -653,8 +652,7 @@ export default class BudgetTahunan extends Component { ...@@ -653,8 +652,7 @@ export default class BudgetTahunan extends Component {
submissionID={this.state.submissionID} submissionID={this.state.submissionID}
saveToMasterBudget={this.saveToMasterBudget.bind(this)} saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose={() => this.setState({ visibleBS: false, visibleBudgetTahunan: true })} onClickClose={() => this.setState({ visibleBS: false, visibleBudgetTahunan: true })}
getReport={this.getReport.bind(this)} getReport={this.getCompanyActive.bind(this)}
getReportAttachment={this.getReportAttachment.bind(this)}
/> />
)} )}
{this.state.visiblePL && ( {this.state.visiblePL && (
......
src/container/BudgetTahunan/BalanceSheet.js
View file @ 70666ca7
...@@ -33,7 +33,8 @@ export default class BalanceSheet extends Component { ...@@ -33,7 +33,8 @@ export default class BalanceSheet extends Component {
this.state = { this.state = {
dataTable: [], dataTable: [],
visibleBalanceSheet: true, visibleBalanceSheet: true,
disabledSave: true disabledSave: true,
editable: false
} }
this.handleValue = this.handleValue.bind(this) this.handleValue = this.handleValue.bind(this)
this.fileHandler = this.fileHandler.bind(this); this.fileHandler = this.fileHandler.bind(this);
...@@ -68,7 +69,7 @@ export default class BalanceSheet extends Component { ...@@ -68,7 +69,7 @@ export default class BalanceSheet extends Component {
item.formula, item.formula,
item.level, item.level,
item.description, item.description,
item.balance_sheet.total_actual_before, item.balance_sheet.total_actual_before === null ? "" : item.balance_sheet.total_actual_before,
item.balance_sheet.january, item.balance_sheet.january,
item.balance_sheet.february, item.balance_sheet.february,
item.balance_sheet.march, item.balance_sheet.march,
...@@ -102,7 +103,7 @@ export default class BalanceSheet extends Component { ...@@ -102,7 +103,7 @@ export default class BalanceSheet extends Component {
item.formula, item.formula,
item.level, item.level,
item.description, item.description,
item.balance_sheet.total_actual_before, item.balance_sheet.total_actual_before === null ? "" : item.balance_sheet.total_actual_before,
item.balance_sheet.january, item.balance_sheet.january,
item.balance_sheet.february, item.balance_sheet.february,
item.balance_sheet.march, item.balance_sheet.march,
...@@ -341,7 +342,6 @@ export default class BalanceSheet extends Component { ...@@ -341,7 +342,6 @@ export default class BalanceSheet extends Component {
if (response.data.status === "success") { if (response.data.status === "success") {
this.props.onClickClose() this.props.onClickClose()
this.props.getReport() this.props.getReport()
this.props.getReportAttachment()
} else { } else {
alert(response.data.status) alert(response.data.status)
} }
...@@ -586,16 +586,17 @@ export default class BalanceSheet extends Component { ...@@ -586,16 +586,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -672,16 +673,17 @@ export default class BalanceSheet extends Component { ...@@ -672,16 +673,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -758,16 +760,17 @@ export default class BalanceSheet extends Component { ...@@ -758,16 +760,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -844,16 +847,17 @@ export default class BalanceSheet extends Component { ...@@ -844,16 +847,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -930,16 +934,17 @@ export default class BalanceSheet extends Component { ...@@ -930,16 +934,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1016,16 +1021,17 @@ export default class BalanceSheet extends Component { ...@@ -1016,16 +1021,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1102,16 +1108,17 @@ export default class BalanceSheet extends Component { ...@@ -1102,16 +1108,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1188,16 +1195,17 @@ export default class BalanceSheet extends Component { ...@@ -1188,16 +1195,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1274,16 +1282,17 @@ export default class BalanceSheet extends Component { ...@@ -1274,16 +1282,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1360,16 +1369,17 @@ export default class BalanceSheet extends Component { ...@@ -1360,16 +1369,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1446,16 +1456,17 @@ export default class BalanceSheet extends Component { ...@@ -1446,16 +1456,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1532,16 +1543,17 @@ export default class BalanceSheet extends Component { ...@@ -1532,16 +1543,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1618,16 +1630,17 @@ export default class BalanceSheet extends Component { ...@@ -1618,16 +1630,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1704,16 +1717,17 @@ export default class BalanceSheet extends Component { ...@@ -1704,16 +1717,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1790,16 +1804,17 @@ export default class BalanceSheet extends Component { ...@@ -1790,16 +1804,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1876,16 +1891,17 @@ export default class BalanceSheet extends Component { ...@@ -1876,16 +1891,17 @@ export default class BalanceSheet extends Component {
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
value === "" ? // value === "" ?
null : // null :
<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(value)} // value={Number(value)}
/> // />
null
: :
<span>validasi</span> <span>validasi</span>
} }
...@@ -1998,7 +2014,7 @@ export default class BalanceSheet extends Component { ...@@ -1998,7 +2014,7 @@ export default class BalanceSheet extends Component {
<div className="col-1"> <div className="col-1">
<button <button
type="button" type="button"
onClick={() => this.backToMasterBudget('draft')} onClick={() => this.state.editable === true ? this.backToMasterBudget('draft') : this.props.onClickClose()}
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: 'pointer', cursor: 'pointer',
...@@ -2058,7 +2074,7 @@ export default class BalanceSheet extends Component { ...@@ -2058,7 +2074,7 @@ export default class BalanceSheet extends Component {
onClick={() => { onClick={() => {
this.setState({ loading: true }, () => { this.setState({ loading: true }, () => {
setTimeout(() => { setTimeout(() => {
this.setState({ loading: false, disabledSave: false }) this.setState({ loading: false, disabledSave: false, editable: true })
}, 100); }, 100);
}) })
}} }}
......
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